add plugin hook: chainWebpackConfig

wangxue16292016 · Jul 6, 2018 · e2feca7 · e2feca7
1 parent 8495d6d
commit e2feca7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/packages/af-webpack/src/getConfig/index.js b/packages/af-webpack/src/getConfig/index.js
@@ -1,6 +1,7 @@
 import Config from 'webpack-chain';
 import { join, dirname, resolve, relative } from 'path';
 import { existsSync } from 'fs';
+import assert from 'assert';
 import { getPkgPath, shouldTransform } from './es5ImcompatibleVersions';
 import resolveDefine from './resolveDefine';
 import { applyWebpackConfig } from './applyWebpackConfig';
@@ -294,5 +295,13 @@ export default function(opts) {
     require('./prod').default(webpackConfig, opts);
   }
 
+  if (opts.chainConfig) {
+    assert(
+      typeof opts.chainConfig === 'function',
+      `opts.chainConfig should be function, but got ${opts.chainConfig}`,
+    );
+    opts.chainConfig(webpackConfig);
+  }
+
   return applyWebpackConfig(opts.cwd, webpackConfig.toConfig());
 }
diff --git a/packages/umi-build-dev/src/getWebpackConfig.js b/packages/umi-build-dev/src/getWebpackConfig.js
@@ -180,11 +180,24 @@ export default function(service = {}) {
               }),
         }),
   };
+
+  // 修改传给 af-webpack 的配置项
+  // deprecated
   afWebpackOpts = service.applyPlugins('modifyAFWebpackOpts', {
     initialValue: afWebpackOpts,
   });
 
-  let webpackConfig = getConfig(afWebpackOpts);
+  // 通过 webpack-chain 扩展 webpack 配置
+  let webpackConfig = getConfig(afWebpackOpts, {
+    webpackChain(webpackConfig) {
+      service.applyPlugins('chainWebpackConfig', {
+        args: { webpackConfig },
+      });
+    },
+  });
+
+  // 直接修改 webpack 对象
+  // deprecated
   webpackConfig = service.applyPlugins('modifyWebpackConfig', {
     initialValue: webpackConfig,
   });