:feat: add target: plugin

Author: zyao89

.gitignore

@@ -86,3 +86,7 @@ dist
 *.njsproj
 *.sln
 *.sw*
+
+
+# custom
+microapp/.temp

micro-app.config.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = {
+const config = {
     name: '@micro-app/demo',
     description: '',
     version: '0.0.1',
@@ -43,14 +43,6 @@ module.exports = {
         },
     },
 
-    strict: true,
-
-    // micros: [ 'test' ], // 被注册的容器
-    // micros$$test: { // 单独配置
-    //     disabled: true, // 禁用入口
-    //     link: '', // 本地路径, 进行本地开发使用的软链接.
-    // },
-
     // 服务配置
     server: {
         entry: '', // 服务端入口
@@ -59,11 +51,11 @@ module.exports = {
             // 服务端回调参数
         },
     },
-
-    plugins: [
-        {
-            id: 'test',
-            link: __dirname + '/src/index.js',
-        },
-    ],
 };
+
+
+config.plugins = [
+    __dirname,
+];
+
+module.exports = config;

package.json

@@ -47,12 +47,13 @@
         "@micro-app/cli": ">=0.3.0"
     },
     "devDependencies": {
-        "@micro-app/cli": "file:../MicroApp-CLI",
+        "@micro-app/cli": "^0.3.0-alpha.4",
         "@types/jest": "^24.0.19",
         "babel-eslint": "^10.0.3",
         "coveralls": "^3.0.7",
         "eslint": "^5.16.0",
         "eslint-config-2o3t": "^1.1.17",
+        "hash-sum": "^2.0.0",
         "husky": "^3.0.9",
         "jest": "^24.9.0",
         "lint-staged": "^9.4.2",

src/commands/build/index.js

@@ -5,14 +5,6 @@ const defaults = {
     target: 'app',
 };
 
-const modifyConfig = (config, fn) => {
-    if (Array.isArray(config)) {
-        config.forEach(c => fn(c));
-    } else {
-        fn(config);
-    }
-};
-
 module.exports = function buildCommand(api, opts) {
 
     const { tryRequire, chalk, fs } = require('@micro-app/shared-utils');
@@ -28,15 +20,14 @@ module.exports = function buildCommand(api, opts) {
             '--mode': 'specify env mode (default: development)',
             '--type <type>': 'adapter type, eg. [ webpack, etc. ].',
             '--dest': 'specify output directory',
-            '--watch': 'watch for changes',
             '--clean': 'remove the dist directory before building the project',
-            // '--target': `app | lib (default: ${defaults.target})`,
+            '--target': `app | lib | plugin (default: ${defaults.target})`,
         },
         details: `
 Examples:
     ${chalk.gray('# watch')}
     micro-app build --watch
-          `.trim(),
+            `.trim(),
     }, async args => {
         const logger = api.logger;
 
@@ -63,13 +54,9 @@ Examples:
 
         api.applyPluginHooks('beforeBuild', { args });
 
-        const webpackConfig = api.resolveWebpackConfig();
-
-        if (args.watch) {
-            modifyConfig(webpackConfig, config => {
-                config.watch = true;
-            });
-        }
+        const webpackConfig = api.resolveWebpackConfig({
+            target: args.target,
+        });
 
         if (args.dest) {
             // Override outputDir before resolving webpack config as config relies on it (#2327)
@@ -102,6 +89,7 @@ Examples:
                 if (stats.hasErrors()) {
                     // 在这里处理错误
                     api.applyPluginHooks('onBuildFail', { stats, args });
+                    // console.warn(stats);
                     return reject('Build failed with errors.');
                 }
 
@@ -114,7 +102,6 @@ Examples:
                     if (args.target === 'app') {
                         if (!args.watch) {
                             logger.success(`Build complete. The ${chalk.cyan(targetDirShort)} directory is ready to be deployed.`);
-                            logger.info(`Check out deployment instructions at ${chalk.cyan('https://cli.vuejs.org/guide/deployment.html')}\n`);
                         } else {
                             logger.success('Build complete. Watching for changes...');
                         }
@@ -127,7 +114,7 @@ Examples:
                 resolve();
             });
         }).then(() => {
-            api.logger.success('>>> Build Success >>>');
+            api.logger.success('>>> Build Success !!!');
         }).catch(e => {
             api.logger.error('>>> Build Error >>>', e);
         });

src/commands/inspect/index.js

@@ -32,7 +32,9 @@ Examples:
 
         const { _: paths, verbose } = args;
 
-        const webpackConfig = api.resolveWebpackConfig();
+        const webpackConfig = api.resolveWebpackConfig({
+            target: args.target,
+        });
 
         const config = _.cloneDeep(webpackConfig);
 

src/commands/serve/index.js

@@ -105,7 +105,9 @@ module.exports = function serveCommand(api, opts) {
                 return webpackChain;
             });
 
-            const webpackConfig = api.resolveWebpackConfig();
+            const webpackConfig = api.resolveWebpackConfig({
+                target: args.target,
+            });
 
             // check for common config errors
             validateWebpackConfig(webpackConfig, api, options);
@@ -194,6 +196,8 @@ module.exports = function serveCommand(api, opts) {
 
             const isWebpackDevServer3 = semver.satisfies(webpackDevServerVersion, '>=3');
 
+            const contentBase = Array.isArray(options.staticPaths) ? (options.staticPaths.length ? options.staticPaths : false) : options.staticPaths || false;
+
             // create server
             const server = new WebpackDevServer(compiler, Object.assign(isWebpackDevServer3 ? {
                 logLevel: 'silent',
@@ -203,7 +207,7 @@ module.exports = function serveCommand(api, opts) {
                     disableDotRule: true,
                     rewrites: genHistoryApiFallbackRewrites(options.publicPath, options.pages),
                 },
-                contentBase: options.staticPaths || [],
+                contentBase,
                 watchContentBase: !isProduction,
                 hot: !isProduction,
                 compress: isProduction,
@@ -390,5 +394,5 @@ function genHistoryApiFallbackRewrites(baseUrl, pages = {}) {
 
 module.exports.configuration = {
     description: 'webpack hot serve for dev',
-    mode: 'development',
+    // mode: 'development',
 };

src/extends/enhance/index.js

@@ -12,34 +12,47 @@ module.exports = function WebpackAdapter(api, opts) {
 
     let initialized = false;
 
+    const logger = api.logger;
+
     api.extendMethod('resolveChainableWebpackConfig', {
         description: 'resolve webpack-chain config.',
-    }, () => {
+    }, ({ target = 'app' } = {}) => {
         if (!initialized) {
-            api.logger.error('please call after "onInitWillDone" !');
-            process.exit(1);
+            logger.throw('please call after "onInitWillDone" !');
         }
-        const selfConfig = api.selfConfig || {};
-        const originalConfig = selfConfig.originalConfig || {};
-        const _originalWebpackConfig = _.cloneDeep(originalConfig.webpack || {});
-        delete _originalWebpackConfig.entry; // 不接受 entry, 内部已经做了兼容
-        delete _originalWebpackConfig.plugins; // 不接受 plugins
 
         const webpackChainConfig = new Config();
-        webpackChainConfig.merge(_originalWebpackConfig);
+        let finalWebpackChainConfig = webpackChainConfig;
+        if (target === 'plugin') {
+            // TODO 针对所有 plugin 的配置进行处理
+            finalWebpackChainConfig = api.applyPluginHooks('modifyChainWebpackPluginConfig', webpackChainConfig);
+            api.applyPluginHooks('onChainWebpcakPluginConfig', finalWebpackChainConfig);
+        } else {
+            const selfConfig = api.selfConfig || {};
+            const originalConfig = selfConfig.originalConfig || {};
+            const _originalWebpackConfig = _.cloneDeep(originalConfig.webpack || {});
+            delete _originalWebpackConfig.entry; // 不接受 entry, 内部已经做了兼容
+            delete _originalWebpackConfig.plugins; // 不接受 plugins
+            webpackChainConfig.merge(_originalWebpackConfig);
 
-        const finalWebpackChainConfig = api.applyPluginHooks('modifyChainWebpackConfig', webpackChainConfig);
-        api.applyPluginHooks('onChainWebpcakConfig', finalWebpackChainConfig);
+            finalWebpackChainConfig = api.applyPluginHooks('modifyChainWebpackConfig', webpackChainConfig);
+            api.applyPluginHooks('onChainWebpcakConfig', finalWebpackChainConfig);
+        }
 
         api.setState('webpackChainConfig', finalWebpackChainConfig);
         return finalWebpackChainConfig;
     });
 
     api.extendMethod('resolveWebpackConfig', {
         description: 'resolve webpack config.',
-    }, () => {
-        const finalWebpackChainConfig = api.resolveChainableWebpackConfig();
-        const webpackConfig = api.applyPluginHooks('modifyWebpackConfig', finalWebpackChainConfig.toConfig());
+    }, ({ target = 'app' } = {}) => {
+        const finalWebpackChainConfig = api.resolveChainableWebpackConfig({ target });
+        const webpackConfig = finalWebpackChainConfig.toConfig();
+        if (target === 'plugin') {
+            api.applyPluginHooks('modifyWebpackPluginConfig', webpackConfig);
+        } else {
+            api.applyPluginHooks('modifyWebpackConfig', webpackConfig);
+        }
 
         api.setState('webpackConfig', webpackConfig);
         return webpackConfig;

src/extends/enhance/methods.js

@@ -15,4 +15,17 @@ module.exports = (api, opts) => {
         description: '合并之后提供 webpack config 进行再次修改事件',
     });
 
+    // plugin webpack
+    api.registerMethod('modifyChainWebpackPluginConfig', {
+        type: api.API_TYPE.MODIFY,
+        description: '合并所有 plugin 之后提供 webpack-chain 进行再次修改事件',
+    });
+    api.registerMethod('onChainWebpcakPluginConfig', {
+        type: api.API_TYPE.EVENT,
+        description: '修改所有 plugin 之后提供 webpack-chain 进行查看事件',
+    });
+    api.registerMethod('modifyWebpackPluginConfig', {
+        type: api.API_TYPE.MODIFY,
+        description: '合并所有 plugin 之后提供 webpack config 进行再次修改事件',
+    });
 };