Merge pull request #585 from umijs/fix/config

fix(umi-build-dev): config change don't update service's config
umijs · Jun 1, 2018 · fcb1de2 · fcb1de2
2 parents b1204c5 + 8df074e
commit fcb1de2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/packages/umi-build-dev/package.json b/packages/umi-build-dev/package.json
@@ -25,6 +25,7 @@
     "lodash.isequal": "^4.5.0",
     "lodash.remove": "^4.7.0",
     "mkdirp": "^0.5.1",
+    "object-assign": "^4.1.1",
     "path-is-absolute": "^1.0.1",
     "postcss-plugin-px2rem": "^0.7.0",
     "preact": "^8.2.5",

diff --git a/packages/umi-build-dev/src/Service.js b/packages/umi-build-dev/src/Service.js
@@ -7,6 +7,7 @@ import getWebpackRCConfig, {
 } from 'af-webpack/getUserConfig';
 import { clearConsole } from 'af-webpack/react-dev-utils';
 import chalk from 'chalk';
+import assign from 'object-assign';
 import getPaths from './getPaths';
 import getRouteConfig from './routes/getRouteConfig';
 import registerBabel from './registerBabel';
@@ -81,6 +82,7 @@ export default class Service {
     const userConfig = new UserConfig(this);
     try {
       this.config = userConfig.getConfig({ force: true });
+      assign(this._initialConfig, this.config);
     } catch (e) {
       console.error(chalk.red(e.message));
       debug('Get config failed, watch config and reload');
@@ -224,6 +226,7 @@ export default class Service {
       console.error(chalk.red(e.message));
       process.exit(1);
     }
+    this._initialConfig = config;
     this.config = new Proxy(config, {
       set: (target, name, value) => {
         target[name] = value;

diff --git a/packages/umi-build-dev/src/UserConfig.js b/packages/umi-build-dev/src/UserConfig.js
@@ -252,9 +252,12 @@ class UserConfig {
 
         const oldConfig = clone(this.config);
         this.config = newConfig;
+
         for (const plugin of this.plugins) {
           const { name } = plugin;
           if (!isEqual(newConfig[name], oldConfig[name])) {
+            this.service._initialConfig[name] = newConfig[name];
+            this.service.config[name] = newConfig[name];
             if (plugin.onChange) {
               plugin.onChange(newConfig);
             }