chore: change name of some methods

Author: zyao89

.eslintrc.js

@@ -4,7 +4,4 @@ module.exports = {
         browser: true,
         node: true
     },
-    extends: [
-        "eslint-config-2o3t"
-    ],
 }

README.md

@@ -84,8 +84,8 @@ npx micro-app show methods
 ```js
 ╰─➤  npx micro-app show methods
   Plugin Methods:
-     * modifyChainWebpackConfig    ( 合并之后提供 webpack-chain 进行再次修改事件 )
-     * onChainWebpcakConfig        ( 修改之后提供 webpack-chain 进行查看事件 )
+     * modifyWebpackChain          ( 合并之后提供 webpack-chain 进行再次修改事件 )
+     * onWebpcakChain              ( 修改之后提供 webpack-chain 进行查看事件 )
      * modifyWebpackConfig         ( 合并之后提供 webpack config 进行再次修改事件 )
      * onBuildSuccess              ( 构建成功时事件 )
      * onBuildFail                 ( 构建失败时事件 )

TODO.md

@@ -11,3 +11,5 @@
 - [ ] 梳理各个模块逻辑，输出文档等。
 
 *暂时放弃 plugin 打包。*
+
+- [ ] 增加一个虚拟文件，利用 alias 提供给 webpack 打包时前端引用。例如 import {} from '@microapp'

package.json

@@ -48,12 +48,12 @@
         }
     },
     "peerDependencies": {
-        "@micro-app/core": "^0.3.27",
+        "@micro-app/core": "^0.3.30",
         "@micro-app/cli": "^0.3.16"
     },
     "devDependencies": {
-        "@micro-app/cli": "^0.3.15",
-        "@micro-app/plugin-compatible": "0.0.4",
+        "@micro-app/cli": "^0.3.16",
+        "@micro-app/plugin-compatible": "0.0.6",
         "@micro-app/plugin-deploy": "^0.0.7",
         "@types/jest": "^24.9.1",
         "eslint-config-2o3t": "^2.0.1",
@@ -68,7 +68,7 @@
         "@babel/preset-env": "^7.9.5",
         "@intervolga/optimize-cssnano-plugin": "^1.0.6",
         "@marshallofsound/webpack-asset-relocator-loader": "^0.5.0",
-        "@micro-app/shared-utils": "^0.1.18",
+        "@micro-app/shared-utils": "^0.1.19",
         "@soda/friendly-errors-webpack-plugin": "^1.7.1",
         "address": "^1.1.2",
         "autoprefixer": "^9.7.6",

src/commands/serve/index.js

@@ -72,7 +72,7 @@ module.exports = function serveCommand(api, opts) {
             };
 
             // configs that only matters for dev server
-            api.modifyChainWebpackConfig(webpackChain => {
+            api.modifyWebpackChain(webpackChain => {
 
                 // webpack 4
                 const isWebpack4 = semver.satisfies(webpackVersion, '>=4');

src/extends/enhance/index.js

@@ -2,10 +2,7 @@
 
 module.exports = function WebpackAdapter(api, opts) {
 
-    api.assertVersion('>=0.3.0');
-
-    const registerMethods = require('./methods');
-    registerMethods(api);
+    api.assertVersion('>=0.3.29');
 
     const { _ } = require('@micro-app/shared-utils');
     const Config = require('webpack-chain');
@@ -14,15 +11,15 @@ module.exports = function WebpackAdapter(api, opts) {
 
     const logger = api.logger;
 
-    api.extendMethod('resolveChainableWebpackConfig', {
+    api.extendMethod('resolveWebpackChain', {
         description: 'resolve webpack-chain config.',
     }, (webpackChainConfig = new Config()) => {
         if (!initialized) {
             logger.throw('please call after "onInitWillDone" !');
         }
 
         // 可通过外部初始化一个已存在的 webpackChain 实例
-        webpackChainConfig = api.applyPluginHooks('createChainWebpackConfigInstance', webpackChainConfig);
+        webpackChainConfig = api.applyPluginHooks('createWebpackChainInstance', webpackChainConfig);
 
         const selfConfig = api.selfConfig || {};
         const originalConfig = selfConfig.originalConfig || {};
@@ -36,8 +33,8 @@ module.exports = function WebpackAdapter(api, opts) {
             webpackChainConfig.target('web');
         }
 
-        const finalWebpackChainConfig = api.applyPluginHooks('modifyChainWebpackConfig', webpackChainConfig);
-        api.applyPluginHooks('onChainWebpcakConfig', finalWebpackChainConfig);
+        const finalWebpackChainConfig = api.applyPluginHooks('modifyWebpackChain', webpackChainConfig);
+        api.applyPluginHooks('onWebpcakChain', finalWebpackChainConfig);
 
         api.setState('webpackChainConfig', finalWebpackChainConfig);
         return finalWebpackChainConfig;
@@ -46,9 +43,10 @@ module.exports = function WebpackAdapter(api, opts) {
     api.extendMethod('resolveWebpackConfig', {
         description: 'resolve webpack config.',
     }, webpackChainConfig => {
-        const finalWebpackChainConfig = api.resolveChainableWebpackConfig(webpackChainConfig);
+        const finalWebpackChainConfig = api.resolveWebpackChain(webpackChainConfig);
         const webpackConfig = finalWebpackChainConfig.toConfig();
         const finalWebpackConfig = api.applyPluginHooks('modifyWebpackConfig', webpackConfig);
+        api.applyPluginHooks('onWebpcakConfig', finalWebpackConfig);
 
         api.setState('webpackConfig', finalWebpackConfig);
         return finalWebpackConfig;
@@ -59,6 +57,8 @@ module.exports = function WebpackAdapter(api, opts) {
     });
 };
 
+module.exports.registerMethod = require('./methods');
+
 module.exports.configuration = {
     description: 'webpack 适配器, 对外提供多个触发事件',
 };

src/extends/enhance/methods.js

@@ -1,24 +1,28 @@
 'use strict';
 
-module.exports = (api, opts) => {
-
-    api.registerMethod('createChainWebpackConfigInstance', {
-        type: api.API_TYPE.MODIFY,
+module.exports = {
+    createWebpackChainInstance: {
+        type: 'MODIFY',
         description: '在 webpack 配置开始前提供一个 webpack-chain 实例.（用于内部特殊场景）',
-    });
+    },
 
-    api.registerMethod('modifyChainWebpackConfig', {
-        type: api.API_TYPE.MODIFY,
+    modifyWebpackChain: {
+        type: 'MODIFY',
         description: '合并之后提供 webpack-chain 进行再次修改事件',
-    });
+    },
 
-    api.registerMethod('onChainWebpcakConfig', {
-        type: api.API_TYPE.EVENT,
+    onWebpcakChain: {
+        type: 'EVENT',
         description: '修改之后提供 webpack-chain 进行查看事件',
-    });
+    },
 
-    api.registerMethod('modifyWebpackConfig', {
-        type: api.API_TYPE.MODIFY,
+    modifyWebpackConfig: {
+        type: 'MODIFY',
         description: '合并之后提供 webpack config 进行再次修改事件',
-    });
+    },
+
+    onWebpcakConfig: {
+        type: 'EVENT',
+        description: '修改之后提供 webpack config 进行查看事件',
+    },
 };

src/extends/submodule/index.js

@@ -4,9 +4,6 @@ module.exports = function subModuleWebpack(api, opts) {
 
     api.assertVersion('>=0.3.26');
 
-    const registerMethods = require('./methods');
-    registerMethods(api);
-
     // TODO 只有开启 --sub-module 时才处理
     if (!api.context.subModule) {
         return;
@@ -53,7 +50,7 @@ module.exports = function subModuleWebpack(api, opts) {
 
 
     // 生成 manifest
-    api.modifyChainWebpackConfig(webpackChain => {
+    api.modifyWebpackChain(webpackChain => {
         const otherOptions = Object.keys(config.subModule).reduce((obj, key) => {
             if (![ 'prefix', 'namespace', 'entry' ].includes(key)) {
                 obj[key] = config.subModule[key];
@@ -83,7 +80,7 @@ module.exports = function subModuleWebpack(api, opts) {
             }])
             .end();
 
-        return webpackChain;
+        return api.applyPluginHooks('modifySubModuleWebpackChain', webpackChain);
     });
 
     api.modifyWebpackConfig(webpackConfig => {
@@ -98,11 +95,12 @@ module.exports = function subModuleWebpack(api, opts) {
             webpackConfig.output.chunkFilename = `js/${prefix}_${namespace}-[name].[contenthash:8].js`;
         }
 
-        // TODO 提供方法对外补充一些修改
-        return webpackConfig;
+        return api.applyPluginHooks('modifySubModuleWebpackConfig', webpackConfig);
     });
 };
 
+module.exports.registerMethod = require('./methods');
+
 module.exports.configuration = {
     description: 'webpack 适配增强 config 配置信息',
 };

src/extends/submodule/methods.js

@@ -1,10 +1,15 @@
 'use strict';
 
-module.exports = api => {
+module.exports = {
 
-    // api.registerMethod('modifyDefaultServerConfig', {
-    //     type: api.API_TYPE.MODIFY,
-    //     description: '修改服务端配置合并事件',
-    // });
+    modifySubModuleWebpackChain: {
+        type: 'MODIFY',
+        description: '修改 SubModule webpack-chain 配置事件',
+    },
+
+    modifySubModuleWebpackConfig: {
+        type: 'MODIFY',
+        description: '修改 SubModule webpack config 配置事件',
+    },
 
 };

src/extends/unified/app.js

@@ -36,7 +36,7 @@ module.exports = function unifiedExtend(api, opts) {
             });
     }
 
-    api.modifyChainWebpackConfig(webpackChain => {
+    api.modifyWebpackChain(webpackChain => {
 
         const options = api.config || {};
 

src/extends/unified/babel.js

@@ -6,7 +6,7 @@ module.exports = function unifiedExtend(api, opts) {
 
     const path = require('path');
 
-    api.modifyChainWebpackConfig(webpackChain => {
+    api.modifyWebpackChain(webpackChain => {
         // const isProd = api.mode === 'production';
         // const rootOptions = api.config || {};
 

src/extends/unified/base.js

@@ -36,7 +36,7 @@ module.exports = function unifiedExtend(api, opts) {
         return webpackChain;
     }
 
-    api.modifyChainWebpackConfig(webpackChain => {
+    api.modifyWebpackChain(webpackChain => {
 
         webpackChain = baseConfig(webpackChain);
 

src/extends/unified/css.js

@@ -14,7 +14,7 @@ module.exports = function unifiedExtend(api, opts) {
         }
     };
 
-    api.modifyChainWebpackConfig(webpackChain => {
+    api.modifyWebpackChain(webpackChain => {
         const { getAssetPath } = require('./utils');
         const isProd = api.mode === 'production';
         const rootOptions = api.config || {};

src/extends/unified/plugins.js

@@ -4,7 +4,7 @@ module.exports = function unifiedExtend(api, opts) {
 
     api.assertVersion('>=0.3.0');
 
-    api.modifyChainWebpackConfig(webpackChain => {
+    api.modifyWebpackChain(webpackChain => {
         const { resolveLoaderError } = require('./utils');
 
         // const options = api.config || {};

src/extends/unified/prod.js

@@ -6,7 +6,7 @@ module.exports = function unifiedExtend(api, opts) {
 
     const { tryRequire, fs, hash } = require('@micro-app/shared-utils');
 
-    api.modifyChainWebpackConfig(webpackChain => {
+    api.modifyWebpackChain(webpackChain => {
         const { isWebpack4 } = require('./utils');
 
         const options = api.config || {};

src/extends/unified/rules.js

@@ -6,7 +6,7 @@ module.exports = function unifiedExtend(api, opts) {
 
     const { tryRequire } = require('@micro-app/shared-utils');
 
-    api.modifyChainWebpackConfig(webpackChain => {
+    api.modifyWebpackChain(webpackChain => {
         const { getAssetPath, isWebpack4 } = require('./utils');
 
         const options = api.config || {};

src/extends/unified/vue.js

@@ -4,7 +4,7 @@ module.exports = function unifiedExtend(api, opts) {
 
     api.assertVersion('>=0.3.0');
 
-    api.modifyChainWebpackConfig(webpackChain => {
+    api.modifyWebpackChain(webpackChain => {
         // const isProd = api.mode === 'production';
         // const rootOptions = api.config || {};