revert to earlier working version

Author: ShMcK

lib/components/app.js

@@ -29,6 +29,7 @@ var default_1 = (function (_super) {
     }
     default_1.prototype.render = function () {
         var state = this.props.state;
+        console.log(state);
         return (React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(_components_1.Menu, {route: state.route, position: state.position}), React.createElement(_components_1.Routes, {state: state, ref: 'route'}), React.createElement(_components_1.Alert, {alert: state.alert})));
     };
     default_1 = __decorate([

lib/services/setup/setup.js

@@ -1,11 +1,9 @@
 "use strict";
-var system_checks_1 = require('./system-checks');
 var setup_checks_1 = require('./setup-checks');
 var _base_1 = require('../../_base');
 var Action = require('../../actions/actions');
 function verifySetupComplete() {
-    system_checks_1.npmVersionThreeOrLater()
-        .then(setup_checks_1.hasDirectory)
+    setup_checks_1.hasDirectory()
         .then(setup_checks_1.hasPackageJson)
         .then(setup_checks_1.hasTutorialDep)
         .then(function () {

lib/services/setup/system-checks.js

@@ -1,22 +1,8 @@
 "use strict";
-var command_line_1 = require('../command-line');
 function npmVersionThreeOrLater() {
     var minVersion = 3;
     return new Promise(function (resolve, reject) {
-        var threeOrLater = command_line_1.default('npm', '-v').then(function (res) { return parseInt(res, 10) >= minVersion; });
-        if (!threeOrLater) {
-            reject({
-                key: 'updateNpm',
-                title: 'Please update to NPM version 3+',
-                click: null,
-                text: 'Open a terminal and run:\n `npm install npm -g`',
-                button: 'Update NPM',
-                verify: 'NPM updated to version 3 or later'
-            });
-        }
-        else {
-            resolve();
-        }
+        resolve();
     });
 }
 exports.npmVersionThreeOrLater = npmVersionThreeOrLater;

lib/services/setup/tutorials.js

@@ -37,7 +37,6 @@ function _isTutorial(name) {
         console.log("Error with " + name + ": no test runner specified. " + tutorialError);
         return false;
     }
-    var pathToTestRunner = path.join(window.coderoad.dir, 'node_modules', packageJson.config.testRunner);
     return true;
 }
 function searchForTutorials(deps) {

lib/services/setup/update-tutorial.js

@@ -0,0 +1,4 @@
+"use strict";
+function canUpdateTutorial(name, currentVersion) {
+}
+exports.canUpdateTutorial = canUpdateTutorial;

src/components/app.tsx

@@ -16,6 +16,7 @@ window.onresize = function() {
 export default class extends React.Component<{state?: CR.State}, {}> {
   render(): React.ReactElement<{}> {
     const state = this.props.state;
+    console.log(state);
     return (
       <section className='cr' key='main' style={{height}}>
         <Menu route={state.route} position={state.position} />

src/services/setup/setup.ts

@@ -9,9 +9,9 @@ import * as Action from '../../actions/actions';
 
 export function verifySetupComplete() {
   // system checks
-  npmVersionThreeOrLater()
+  // npmVersionThreeOrLater()
   // setup checks
-    .then(hasDirectory)
+  hasDirectory()
     .then(hasPackageJson)
     .then(hasTutorialDep)
     .then(() => {

src/services/setup/system-checks.ts

@@ -3,16 +3,17 @@ import commandLine from '../command-line';
 export function npmVersionThreeOrLater(): Promise<CR.SetupWarning> {
   const minVersion = 3;
   return new Promise((resolve, reject) => {
-    let threeOrLater: Promise<boolean> = commandLine('npm', '-v').then((res: string) => parseInt(res, 10) >= minVersion);
-    if (!threeOrLater) {
-      reject({
-        key: 'updateNpm',
-        title: 'Please update to NPM version 3+',
-        text: 'Open a terminal and run:\n `npm install npm -g`',
-        verify: 'NPM updated to version 3 or later'
-      });
-    } else {
-      resolve();
-    }
+    resolve();
+    // let threeOrLater: Promise<boolean> = commandLine('npm', '-v').then((res: string) => parseInt(res, 10) >= minVersion);
+    // if (!threeOrLater) {
+    //   reject({
+    //     key: 'updateNpm',
+    //     title: 'Please update to NPM version 3+',
+    //     text: 'Open a terminal and run:\n `npm install npm -g`',
+    //     verify: 'NPM updated to version 3 or later'
+    //   });
+    // } else {
+    //   resolve();
+    // }
   });
 }

src/services/setup/tutorials.ts

@@ -43,8 +43,8 @@ function _isTutorial(name: string): boolean {
     return false;
   }
 
-  let currentTutorialVersion: string = packageJson.dependencies[name] || packageJson.devDependencies[name];
-  canUpdateTutorial(name, currentTutorialVersion);
+  // let currentTutorialVersion: string = packageJson.dependencies[name] || packageJson.devDependencies[name];
+  // canUpdateTutorial(name, currentTutorialVersion);
 
   // let pathToTestRunner = path.join(window.coderoad.dir, 'node_modules', packageJson.config.testRunner);
   // // if (!fileExists(pathToTestRunner)) {

src/services/setup/update-tutorial.ts

@@ -1,6 +1,6 @@
 import commandLine from '../command-line';
 
 export function canUpdateTutorial(name: string, currentVersion: string) {
-  let latestVersion = commandLine('npm', `outdated ${name}`);
-  console.log(latestVersion, currentVersion);
+  // let latestVersion = commandLine('npm', `outdated ${name}`);
+  // console.log(latestVersion, currentVersion);
 }