feat(init): 优化初始化逻辑

Author: yuhaoju

lib/commands/init.js

@@ -65,15 +65,15 @@ exports.run = function (options) {
             var isInitReady = false;
 
             spinner.start();
+            spinner.text = 'checking package ykit-config-' + initParam;
             async.series([
-            // 寻找是否存在 ykit-config-xxx 的插件
-            function (callback) {
-                spinner.text = 'checking package ykit-config-' + initParam;
-                checkConfigPkg(callback, 'ykit-config-' + initParam, 'taobao.org');
-            },
             // 寻找是否存在 @qnpm/ykit-config-xxx 的插件
             function (callback) {
                 checkConfigPkg(callback, '@qnpm/ykit-config-' + initParam, 'corp.qunar.com');
+            },
+            // 寻找是否存在 ykit-config-xxx 的插件
+            function (callback) {
+                checkConfigPkg(callback, 'ykit-config-' + initParam, 'taobao.org');
             }], function (err) {
                 // results is now equal to ['one', 'two']
                 if (isInitReady) {
@@ -115,20 +115,12 @@ exports.run = function (options) {
         async.series(funcSeries, function (err, results) {});
     }
 
-    function setup(callback) {
-        shell.exec('ykit setup', { silent: false }, function (code, stdout, stderr) {
-            callback(stderr);
-        });
-    }
-
     function installConfigPlugin(callback, configPkgName, registry) {
-        if (configPkgName) {
-            log('installing ' + configPkgName + '...');
+        log('installing ' + configPkgName + '...');
 
-            shell.exec('npm install ' + configPkgName + ' --registry http://registry.npm.' + registry, { silent: false }, function (code, stdout, stderr) {
-                callback(stderr);
-            });
-        }
+        shell.exec('npm install ' + configPkgName + ' --registry http://registry.npm.' + registry, { silent: false }, function (code, stdout, stderr) {
+            callback(null); // npm install 中的警告也会当成 stderr 输出，所以不在这里做错误处理
+        });
     }
 
     function createPackageJson(callback) {
@@ -169,6 +161,12 @@ exports.run = function (options) {
         }
     }
 
+    function setup(callback) {
+        shell.exec('ykit setup', { silent: true }, function (code, stdout, stderr) {
+            callback(null);
+        });
+    }
+
     function createTmpl(callback) {
         fs.copySync(sysPath.resolve(initTmplPath, './index.html'), sysPath.resolve(cwd, './index.html'));
         fs.copySync(sysPath.resolve(initTmplPath, './src'), sysPath.resolve(cwd, './src'));

src/commands/init.js

@@ -41,16 +41,16 @@ exports.run = function (options) {
         let isInitReady = false;
 
         spinner.start();
+        spinner.text =`checking package ykit-config-${initParam}`;
         async.series([
-            // 寻找是否存在 ykit-config-xxx 的插件
-            (callback) => {
-                spinner.text =`checking package ykit-config-${initParam}`;
-                checkConfigPkg(callback, `ykit-config-${initParam}`, 'taobao.org')
-            },
             // 寻找是否存在 @qnpm/ykit-config-xxx 的插件
             (callback) => {
                 checkConfigPkg(callback, `@qnpm/ykit-config-${initParam}`, 'corp.qunar.com')
             },
+            // 寻找是否存在 ykit-config-xxx 的插件
+            (callback) => {
+                checkConfigPkg(callback, `ykit-config-${initParam}`, 'taobao.org')
+            },
         ], (err) => {
             // results is now equal to ['one', 'two']
             if(isInitReady) {
@@ -112,30 +112,18 @@ exports.run = function (options) {
         });
     }
 
-    function setup(callback) {
+    function installConfigPlugin(callback, configPkgName, registry) {
+        log('installing ' + configPkgName + '...');
+
         shell.exec(
-            `ykit setup`,
+            `npm install ${configPkgName} --registry http://registry.npm.${registry}`,
             {silent: false},
             (code, stdout, stderr) => {
-                callback(stderr)
+                callback(null) // npm install 中的警告也会当成 stderr 输出，所以不在这里做错误处理
             }
         );
     }
 
-    function installConfigPlugin(callback, configPkgName, registry) {
-        if(configPkgName) {
-            log('installing ' + configPkgName + '...');
-
-            shell.exec(
-                `npm install ${configPkgName} --registry http://registry.npm.${registry}`,
-                {silent: false},
-                (code, stdout, stderr) => {
-                    callback(stderr)
-                }
-            );
-        }
-    }
-
     function createPackageJson(callback) {
         if (!UtilFs.fileExists(packageJsonPath)) {
             let writePackageJsonStream = create();
@@ -178,6 +166,16 @@ exports.run = function (options) {
         }
     }
 
+    function setup(callback) {
+        shell.exec(
+            `ykit setup`,
+            {silent: true},
+            (code, stdout, stderr) => {
+                callback(null)
+            }
+        );
+    }
+
     function createTmpl(callback) {
         fs.copySync(sysPath.resolve(initTmplPath, './index.html'), sysPath.resolve(cwd, './index.html'));
         fs.copySync(sysPath.resolve(initTmplPath, './src'), sysPath.resolve(cwd, './src'));