feat: support specify plugins in dev and build, Close #56

umijs · Jan 19, 2018 · 4d79f62 · 4d79f62
1 parent d8c7851
commit 4d79f62
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 17 deletions.
diff --git a/examples/func-test/config.js b/examples/func-test/config.js
@@ -6,7 +6,7 @@ export default {
     '/dynamic': { spmb: 'b3333333333333', context: { title: '动态页' } },
   },
   plugins: [
-    './plugin',
+    './plugin1',
     // 'umi-plugin-yunfengdie',
   ],
   // disableServiceWorker: true,

diff --git a/examples/func-test/plugin.js b/examples/func-test/plugin.js
diff --git a/examples/func-test/plugin1.js b/examples/func-test/plugin1.js
@@ -0,0 +1,3 @@
+export function generateEntry() {
+  console.log('generate entry in plugin1');
+}
diff --git a/examples/func-test/plugin2.js b/examples/func-test/plugin2.js
@@ -0,0 +1,3 @@
+export function generateEntry() {
+  console.log('generate entry in plugin2');
+}
diff --git a/packages/umi-build-dev/src/build.js b/packages/umi-build-dev/src/build.js
@@ -52,18 +52,18 @@ export default function(opts = {}) {
 
     // 获取用户配置
     const { config } = getConfig(cwd);
-    const configPlugins = (config.plugins || []).map(p => {
+    const configPlugins = [
+      ...(config.plugins || []),
+      ...(pluginsFromOpts || []),
+    ].map(p => {
       return resolvePlugin(p, { cwd });
     });
     if (configPlugins.length) {
       registerBabel(babel, {
         only: [new RegExp(`(${configPlugins.join('|')})`)],
       });
     }
-    const plugins = resolvePlugins([
-      ...configPlugins,
-      ...(pluginsFromOpts || []),
-    ]);
+    const plugins = resolvePlugins(configPlugins);
 
     debug(`清理临时文件夹 ${paths.tmpDirPath}`);
     rimraf(paths.absTmpDirPath);

diff --git a/packages/umi-build-dev/src/dev.js b/packages/umi-build-dev/src/dev.js
@@ -82,7 +82,10 @@ export default function runDev(opts) {
     return;
   }
 
-  const configPlugins = (config.plugins || []).map(p => {
+  const configPlugins = [
+    ...(config.plugins || []),
+    ...(pluginsFromOpts || []),
+  ].map(p => {
     return resolvePlugin(p, {
       cwd,
     });
@@ -92,10 +95,7 @@ export default function runDev(opts) {
       only: [new RegExp(`(${configPlugins.join('|')})`)],
     });
   }
-  const plugins = resolvePlugins([
-    ...configPlugins,
-    ...(pluginsFromOpts || []),
-  ]);
+  const plugins = resolvePlugins(configPlugins);
 
   // 生成入口文件
   let watchEntry = null;

diff --git a/packages/umi/src/scripts/build.js b/packages/umi/src/scripts/build.js
@@ -1,7 +1,12 @@
 import chalk from 'chalk';
+import yParser from 'yargs-parser';
 import build from '../build';
 
-build().catch(e => {
+const argv = yParser(process.argv.slice(2));
+
+build({
+  plugins: argv.plugins ? argv.plugins.split(',') : [],
+}).catch(e => {
   console.error(chalk.red('构建出错'));
   console.log(e);
 });
diff --git a/packages/umi/src/scripts/realDev.js b/packages/umi/src/scripts/realDev.js
@@ -1,9 +1,13 @@
-import { resolve } from 'path';
+import yParser from 'yargs-parser';
 import dev from '../dev';
 
+const argv = yParser(process.argv.slice(2));
+
 // 修复 Ctrl+C 时 dev server 没有正常退出的问题
 process.on('SIGINT', () => {
   process.exit(1);
 });
 
-dev();
+dev({
+  plugins: argv.plugins ? argv.plugins.split(',') : [],
+});