optimize startup

Author: ShMcK

CHANGELOG.md

@@ -3,10 +3,14 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [0.7.0] - in progress
-- move to '[email protected]'
+- update to 'react@15'
+- move to '[email protected]'
 - much improved setup ui & checks
   - check Node, NPM versions
   - Stepper UI
+- loading tutorials
+  - check for new versions
+  - update tutorial button
 - remove 'lodash' dependency
 - attach hints to toolbar
 

lib/reducers/checks/verify.js

@@ -1,24 +1,22 @@
 "use strict";
 var check_system_1 = require('./check-system');
 var root_package_1 = require('../../services/root-package');
+var check_tutorials_1 = require('../tutorials/check-tutorials');
 var result = function (x) { return x; };
 function allTrue(obj) {
     return Object.values(obj).every(function (x) { return x === true; });
 }
-function hasTutorialDep() {
-    var tutorials = root_package_1.default.getTutorials();
-    return !!tutorials && tutorials.length > 0;
-}
 function setupVerify() {
     var dir = !!window.coderoad.dir;
     var packageJson = false;
     var tutorial = false;
     root_package_1.default.set();
+    var pj = root_package_1.default.get();
     if (dir) {
-        packageJson = !!root_package_1.default.get();
+        packageJson = !!pj;
     }
     if (dir && packageJson) {
-        tutorial = hasTutorialDep();
+        tutorial = !!check_tutorials_1.searchForTutorials(pj.dependencies).length || !!check_tutorials_1.searchForTutorials(pj.devDependencies).length;
     }
     var checks = {
         system: {

lib/reducers/tutorials/tutorials.js

@@ -2,13 +2,17 @@
 var _types_1 = require('../../actions/_types');
 var update_tutorial_1 = require('./update-tutorial');
 var root_package_1 = require('../../services/root-package');
+var check_tutorials_1 = require('./check-tutorials');
 function tutorialsReducer(tutorials, action) {
     if (tutorials === void 0) { tutorials = []; }
     switch (action.type) {
         case _types_1.TUTORIAL_UPDATE:
             update_tutorial_1.tutorialUpdate(action.payload.name);
         case _types_1.TUTORIALS_FIND:
-            return root_package_1.default.getTutorials();
+            var packageJson = root_package_1.default.get();
+            return ([]
+                .concat(check_tutorials_1.searchForTutorials(packageJson.dependencies))
+                .concat(check_tutorials_1.searchForTutorials(packageJson.devDependencies)));
         default:
             return tutorials;
     }

lib/services/root-package.js

@@ -2,7 +2,6 @@
 var fs_1 = require('fs');
 var exists_1 = require('./exists');
 var path_1 = require('path');
-var check_tutorials_1 = require('../reducers/tutorials/check-tutorials');
 var RootPackageService = (function () {
     function RootPackageService() {
         this.packageJson = null;
@@ -19,16 +18,6 @@ var RootPackageService = (function () {
     RootPackageService.prototype.get = function () {
         return this.packageJson;
     };
-    RootPackageService.prototype.getTutorials = function () {
-        if (this.packageJson) {
-            return ([]
-                .concat(check_tutorials_1.searchForTutorials(this.packageJson.dependencies))
-                .concat(check_tutorials_1.searchForTutorials(this.packageJson.devDependencies)));
-        }
-        else {
-            return null;
-        }
-    };
     return RootPackageService;
 }());
 Object.defineProperty(exports, "__esModule", { value: true });

src/reducers/checks/verify.ts

@@ -1,29 +1,25 @@
 import {npmMinVersion, nodeMinVersion} from './check-system';
-// import {hasDirectory} from './check-setup';
 import RootPackage from '../../services/root-package';
+import {searchForTutorials} from '../tutorials/check-tutorials';
 
 const result = (x) => x;
 function allTrue(obj: Object): boolean {
   return Object.values(obj).every((x) => x === true);
 }
 
-function hasTutorialDep(): boolean {
-  const tutorials = RootPackage.getTutorials();
-  return !!tutorials && tutorials.length > 0;
-}
-
 export default function setupVerify(): CR.Checks {
   let dir = !!window.coderoad.dir;
   let packageJson = false;
   let tutorial = false;
 
   RootPackage.set();
+  let pj = RootPackage.get();
 
   if (dir) {
-    packageJson = !!RootPackage.get();
+    packageJson = !!pj;
   }
   if (dir && packageJson) {
-    tutorial = hasTutorialDep();
+    tutorial = !!searchForTutorials(pj.dependencies).length || !!searchForTutorials(pj.devDependencies).length;
   }
 
   let checks: CR.Checks = {

src/reducers/tutorials/tutorials.ts

@@ -1,6 +1,7 @@
 import {TUTORIAL_UPDATE, TUTORIALS_FIND} from '../../actions/_types';
 import {tutorialUpdate} from './update-tutorial';
 import RootPackage from '../../services/root-package';
+import {searchForTutorials} from './check-tutorials';
 
 export default function tutorialsReducer(tutorials = [],
   action: CR.Action): CR.Tutorial[] {
@@ -9,7 +10,10 @@ export default function tutorialsReducer(tutorials = [],
       tutorialUpdate(action.payload.name);
       /* falls through */
     case TUTORIALS_FIND:
-      return RootPackage.getTutorials();
+          const packageJson = RootPackage.get();
+          return ([]
+            .concat(searchForTutorials(packageJson.dependencies))
+            .concat(searchForTutorials(packageJson.devDependencies)));
     default:
       return tutorials;
   }

src/services/root-package.ts

@@ -1,7 +1,6 @@
 import {readFileSync} from 'fs';
 import {fileExists} from './exists';
 import {join} from 'path';
-import {searchForTutorials} from '../reducers/tutorials/check-tutorials';
 
 class RootPackageService {
   packageJson: PackageJson;
@@ -20,14 +19,5 @@ class RootPackageService {
   get(): PackageJson {
     return this.packageJson;
   }
-  getTutorials(): CR.Tutorial[] {
-    if (this.packageJson) {
-      return ([]
-        .concat(searchForTutorials(this.packageJson.dependencies))
-        .concat(searchForTutorials(this.packageJson.devDependencies)));
-    } else {
-      return null;
-    }
-  }
 }
 export default new RootPackageService();