fix: 修复 alias 不生效

Author: yuhaoju

lib/models/Config.js

@@ -105,51 +105,36 @@ var Config = function () {
     }, {
         key: 'setCompiler',
         value: function setCompiler(compileConfig) {
-            var _this2 = this;
-
             if (compileConfig) {
-                (function () {
-                    var nextConfig = {};
-
-                    // 获取用户定义的compile配置
-                    if ((typeof compileConfig === 'undefined' ? 'undefined' : _typeof(compileConfig)) === 'object') {
-                        nextConfig = compileConfig;
-                    } else if (typeof compileConfig === 'function') {
-                        nextConfig = compileConfig(extend({}, _this2._config)) || {};
-                    }
+                var nextConfig = {};
 
-                    // 处理context
-                    if (nextConfig.context && !sysPath.isAbsolute(nextConfig.context)) {
-                        nextConfig.context = sysPath.resolve(_this2._config.cwd, nextConfig.context);
-                    }
+                // 获取用户定义的compile配置
+                if ((typeof compileConfig === 'undefined' ? 'undefined' : _typeof(compileConfig)) === 'object') {
+                    nextConfig = compileConfig;
+                } else if (typeof compileConfig === 'function') {
+                    nextConfig = compileConfig(extend({}, this._config)) || {};
+                }
 
-                    // 处理loaders => loader
-                    if (nextConfig.module && nextConfig.module.loaders) {
-                        nextConfig.module.loaders.map(function (loader, i) {
-                            if (loader.loaders && !loader.loader) {
-                                loader.loader = loader.loaders.join("!");
-                            }
-                            return loader;
-                        });
-                    }
+                // 处理 context
+                if (nextConfig.context && !sysPath.isAbsolute(nextConfig.context)) {
+                    nextConfig.context = sysPath.resolve(this._config.cwd, nextConfig.context);
+                }
 
-                    // 处理alias
-                    var context = nextConfig.context || _this2._config.context;
-                    var relativeContext = sysPath.relative(_this2._config.cwd, context);
-                    if (nextConfig.resolve && nextConfig.resolve.alias) {
-                        (function () {
-                            var alias = nextConfig.resolve.alias;
-                            Object.keys(alias).map(function (key, i) {
-                                alias[key] = sysPath.relative(relativeContext, alias[key]);
-                            });
-                            extend(true, _this2._config.resolve.alias, alias);
-                        })();
-                    }
+                // 处理 loaders => loader
+                if (nextConfig.module && nextConfig.module.loaders) {
+                    nextConfig.module.loaders.map(function (loader, i) {
+                        if (loader.loaders && !loader.loader) {
+                            loader.loader = loader.loaders.join("!");
+                        }
+                        return loader;
+                    });
+                }
 
-                    _this2._config.resolve.root.push(context);
+                // 处理 resolve.root
+                var context = nextConfig.context || this._config.context;
+                this._config.resolve.root.push(context);
 
-                    extend(true, _this2._config, nextConfig);
-                })();
+                extend(true, this._config, nextConfig);
             }
         }
     }, {

src/models/Config.js

@@ -100,12 +100,12 @@ class Config {
                 nextConfig = compileConfig(extend({}, this._config)) || {};
             }
 
-            // 处理context
+            // 处理 context
             if (nextConfig.context && !sysPath.isAbsolute(nextConfig.context)) {
                 nextConfig.context = sysPath.resolve(this._config.cwd, nextConfig.context)
             }
 
-            // 处理loaders => loader
+            // 处理 loaders => loader
             if (nextConfig.module && nextConfig.module.loaders) {
                 nextConfig.module.loaders.map((loader, i) => {
                     if (loader.loaders && !loader.loader) {
@@ -115,17 +115,8 @@ class Config {
                 })
             }
 
-            // 处理alias
+            // 处理 resolve.root
             const context = nextConfig.context || this._config.context
-            const relativeContext = sysPath.relative(this._config.cwd, context)
-            if (nextConfig.resolve && nextConfig.resolve.alias) {
-                let alias = nextConfig.resolve.alias
-                Object.keys(alias).map(function(key, i) {
-                    alias[key] = sysPath.relative(relativeContext, alias[key])
-                })
-                extend(true, this._config.resolve.alias, alias);
-            }
-
             this._config.resolve.root.push(context)
 
             extend(true, this._config, nextConfig);