feat: use umirc for webpack config

packages/af-webpack/getUserConfigPlugins.js

@@ -0,0 +1 @@
+module.exports = require('./lib/getUserConfig/getPlugins');

packages/af-webpack/src/getUserConfig/getPlugins.js

@@ -0,0 +1,9 @@
+import { join } from 'path';
+import requireindex from 'requireindex';
+
+export default function() {
+  const pluginsMap = requireindex(join(__dirname, './configs'));
+  return Object.keys(pluginsMap).map(key => {
+    return pluginsMap[key].default();
+  });
+}

packages/af-webpack/src/getUserConfig/index.js

@@ -2,20 +2,17 @@ import { existsSync, readFileSync } from 'fs';
 import { join, resolve } from 'path';
 import assert from 'assert';
 import stripJsonComments from 'strip-json-comments';
-import requireindex from 'requireindex';
 import didyoumean from 'didyoumean';
 import chalk from 'chalk';
 import isEqual from 'lodash.isequal';
 import isPlainObject from 'is-plain-object';
 import { clearConsole } from '../reactDevUtils';
 import { watch, unwatch } from './watch';
+import getPlugins from './getPlugins';
 
 const debug = require('debug')('af-webpack:getUserConfig');
 
-const pluginsMap = requireindex(join(__dirname, './configs'));
-const plugins = Object.keys(pluginsMap).map(key => {
-  return pluginsMap[key].default();
-});
+const plugins = getPlugins();
 const pluginNames = plugins.map(p => p.name);
 const pluginsMapByName = plugins.reduce((memo, p) => {
   memo[p.name] = p;

packages/umi-build-dev/src/getConfig/configPlugins/routes.js

@@ -1,10 +1,6 @@
 import assert from 'assert';
-import { join } from 'path';
-import { existsSync } from 'fs';
 
 export default function(api) {
-  const { cwd } = api.service.paths;
-
   return {
     name: 'routes',
     validate(val) {

packages/umi-build-dev/src/getPlugins.js

@@ -65,6 +65,7 @@ Try:
     './plugins/hd',
     './plugins/mock',
     './plugins/hash-history',
+    './plugins/afwebpack-config',
     './plugins/404', // 404 must after mock
   ];
   const plugins = [

packages/umi-build-dev/src/getWebpackConfig.js

@@ -10,7 +10,6 @@ export default function(service = {}) {
   const {
     cwd,
     config,
-    webpackRCConfig,
     babel,
     hash,
     routes,
@@ -23,6 +22,13 @@ export default function(service = {}) {
   } = service;
   const isDev = process.env.NODE_ENV === 'development';
 
+  // merge config to webpackRCConfig
+  let { webpackRCConfig } = service;
+  webpackRCConfig = {
+    ...(config || {}),
+    ...(webpackRCConfig || {}),
+  };
+
   // entry
   const entryScript = join(cwd, `./${paths.tmpDirPath}/${libraryName}.js`);
   const setPublicPathFile = join(__dirname, '../template/setPublicPath.js');
@@ -39,7 +45,6 @@ export default function(service = {}) {
 
   const pageCount = isDev ? null : Object.keys(routes).length;
   debug(`pageCount: ${pageCount}`);
-  debug(`config: ${JSON.stringify(config)}`);
 
   // default react, support config with preact
   // 优先级：用户配置 > preact argument > default (React)
@@ -177,7 +182,6 @@ export default function(service = {}) {
   afWebpackOpts = service.applyPlugins('modifyAFWebpackOpts', {
     initialValue: afWebpackOpts,
   });
-  debug(`afWebpackOpts: ${JSON.stringify(afWebpackOpts)}`);
 
   let webpackConfig = getConfig(afWebpackOpts);
   webpackConfig = service.applyPlugins('modifyWebpackConfig', {

packages/umi-build-dev/src/plugins/afwebpack-config.js

@@ -0,0 +1,26 @@
+import getUserConfigPlugins from 'af-webpack/getUserConfigPlugins';
+
+const plugins = getUserConfigPlugins();
+
+function noop() {
+  return true;
+}
+
+const excludes = ['entry', 'outputPath', 'hash'];
+
+export default api => {
+  api.register('modifyConfigPlugins', ({ memo }) => {
+    plugins.forEach(({ name, validate = noop }) => {
+      if (!excludes.includes(name)) {
+        memo.push(() => ({
+          name,
+          validate,
+          onChange() {
+            api.service.restart(`${name} changed`);
+          },
+        }));
+      }
+    });
+    return memo;
+  });
+};

packages/umi/src/scripts/realDev.js

@@ -10,4 +10,7 @@ process.on('SIGINT', () => {
 
 dev({
   plugins: argv.plugins ? argv.plugins.split(',') : [],
+}).catch(e => {
+  console.log(e);
+  process.exit(1);
 });