feat(config): 支持 module.exports 形式配置文件

Author: yuhaoju

lib/models/Project.js

@@ -115,20 +115,25 @@ var Project = function () {
 
                     // 获取项目配置中的插件
                     var configMethod = _this2._requireUncached(sysPath.join(_this2.cwd, _this2.configFile));
+                    var ykitConfigStartWith = 'ykit-config-';
                     if (Array.isArray(configMethod.plugins)) {
                         _this2.plugins = configMethod.plugins;
                     }
 
                     // 通配置文件名获取插件
                     if (_this2.extendConfig && _this2.extendConfig !== 'config') {
-                        var pluginName = 'ykit-config-' + _this2.extendConfig;
+                        var pluginName = ykitConfigStartWith + _this2.extendConfig;
                         if (_this2.plugins.indexOf(pluginName) === -1 && _this2.plugins.indexOf('@qnpm/' + pluginName) === -1) {
                             _this2.plugins.push(pluginName);
                         }
                     }
 
                     // 通过插件扩展配置
                     _this2.plugins.map(function (pluginName) {
+                        if (pluginName.indexOf(ykitConfigStartWith) === -1) {
+                            pluginName = ykitConfigStartWith + pluginName;
+                        }
+
                         var localSearchPath = sysPath.join(_this2.cwd, 'node_modules/', pluginName);
                         var localSearchPathQnpm = sysPath.join(_this2.cwd, 'node_modules/', '@qnpm/' + pluginName);
                         var pluginPath = '';
@@ -165,9 +170,7 @@ var Project = function () {
                                     _module2.config.call(userConfig, options, _this2.cwd);
                                 }
                             } else {
-                                if (_this2.extendConfig) {
-                                    warn('没有找到 ykit-config-' + _this2.extendConfig + ' 配置插件.');
-                                }
+                                warn('没有找到 ' + pluginName + ' 配置插件.');
                             }
                         }
                     });
@@ -205,7 +208,7 @@ var Project = function () {
                             this.config.setExports(exports);
                             this.config.setCompiler(userConfigObj.modifyWebpackConfig);
                             this.config.setSync(userConfigObj.sync);
-                            this.setCommands(userConfigObj.command);
+                            this.setCommands(configMethod.commands || userConfigObj.command); // 后者兼容以前形式
                         };
 
                         // 如果传入的是一个简单数组

src/models/Project.js

@@ -102,20 +102,25 @@ class Project {
 
             // 获取项目配置中的插件
             const configMethod = this._requireUncached(sysPath.join(this.cwd, this.configFile));
+            const ykitConfigStartWith = 'ykit-config-';
             if(Array.isArray(configMethod.plugins)) {
                 this.plugins = configMethod.plugins;
             }
 
             // 通配置文件名获取插件
             if (this.extendConfig && this.extendConfig !== 'config') {
-                const pluginName = 'ykit-config-' + this.extendConfig;
+                const pluginName = ykitConfigStartWith + this.extendConfig;
                 if(this.plugins.indexOf(pluginName) === -1 && this.plugins.indexOf('@qnpm/' + pluginName) === -1) {
                     this.plugins.push(pluginName);
                 }
             }
 
             // 通过插件扩展配置
             this.plugins.map((pluginName) => {
+                if(pluginName.indexOf(ykitConfigStartWith) === -1) {
+                    pluginName = ykitConfigStartWith + pluginName;
+                }
+
                 const localSearchPath = sysPath.join(this.cwd, 'node_modules/', pluginName);
                 const localSearchPathQnpm = sysPath.join(
                     this.cwd,
@@ -154,9 +159,7 @@ class Project {
                             module.config.call(userConfig, options, this.cwd);
                         }
                     } else {
-                        if (this.extendConfig) {
-                            warn('没有找到 ykit-config-' + this.extendConfig + ' 配置插件.');
-                        }
+                        warn('没有找到 ' + pluginName + ' 配置插件.');
                     }
                 }
             });
@@ -211,7 +214,7 @@ class Project {
                     this.config.setExports(exports);
                     this.config.setCompiler(userConfigObj.modifyWebpackConfig);
                     this.config.setSync(userConfigObj.sync);
-                    this.setCommands(userConfigObj.command);
+                    this.setCommands(configMethod.commands || userConfigObj.command); // 后者兼容以前形式
                 }
             }