@umijs/bundler-webpack 4.0.0-rc.13 → 4.0.0-rc.16

package/dist/config/cssRules.js

@@ -1,98 +1,108 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCSSRules = void 0;
-function addCSSRules(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig } = opts;
-        const rulesConfig = [
-            { name: 'css', test: /\.css(\?.*)?$/ },
-            {
-                name: 'less',
-                test: /\.less(\?.*)?$/,
-                loader: require.resolve('@umijs/bundler-webpack/compiled/less-loader'),
-                loaderOptions: {
-                    implementation: require.resolve('@umijs/bundler-utils/compiled/less'),
-                    lessOptions: Object.assign({ modifyVars: userConfig.theme, javascriptEnabled: true }, userConfig.lessLoader),
+async function addCSSRules(opts) {
+    const { config, userConfig } = opts;
+    const rulesConfig = [
+        { name: 'css', test: /\.css(\?.*)?$/ },
+        {
+            name: 'less',
+            test: /\.less(\?.*)?$/,
+            loader: require.resolve('@umijs/bundler-webpack/compiled/less-loader'),
+            loaderOptions: {
+                implementation: require.resolve('@umijs/bundler-utils/compiled/less'),
+                lessOptions: {
+                    modifyVars: userConfig.theme,
+                    javascriptEnabled: true,
+                    ...userConfig.lessLoader,
                 },
             },
+        },
+        {
+            name: 'sass',
+            test: /\.(sass|scss)(\?.*)?$/,
+            loader: require.resolve('@umijs/bundler-webpack/compiled/sass-loader'),
+            loaderOptions: userConfig.sassLoader || {},
+        },
+    ];
+    for (const { name, test, loader, loaderOptions } of rulesConfig) {
+        const rule = config.module.rule(name);
+        const nestRulesConfig = [
+            userConfig.autoCSSModules && {
+                rule: rule
+                    .test(test)
+                    .oneOf('css-modules')
+                    .resourceQuery(/modules/),
+                isCSSModules: true,
+            },
             {
-                name: 'sass',
-                test: /\.(sass|scss)(\?.*)?$/,
-                loader: require.resolve('@umijs/bundler-webpack/compiled/sass-loader'),
-                loaderOptions: userConfig.sassLoader || {},
+                rule: rule.test(test).oneOf('css').sideEffects(true),
+                isCSSModules: false,
             },
-        ];
-        for (const { name, test, loader, loaderOptions } of rulesConfig) {
-            const rule = config.module.rule(name);
-            const nestRulesConfig = [
-                userConfig.autoCSSModules && {
-                    rule: rule
-                        .test(test)
-                        .oneOf('css-modules')
-                        .resourceQuery(/modules/),
-                    isCSSModules: true,
-                },
-                {
-                    rule: rule.test(test).oneOf('css').sideEffects(true),
-                    isCSSModules: false,
-                },
-            ].filter(Boolean);
-            // @ts-ignore
-            for (const { rule, isCSSModules } of nestRulesConfig) {
-                if (userConfig.styleLoader) {
-                    rule
-                        .use('style-loader')
-                        .loader(require.resolve('@umijs/bundler-webpack/compiled/style-loader'))
-                        .options(Object.assign({ base: 0, esModule: true }, userConfig.styleLoader));
-                }
-                else {
-                    rule
-                        .use('mini-css-extract-plugin')
-                        .loader(require.resolve('@umijs/bundler-webpack/compiled/mini-css-extract-plugin/loader'))
-                        .options({
-                        publicPath: './',
-                        emit: true,
-                        esModule: true,
-                    });
-                }
+        ].filter(Boolean);
+        // @ts-ignore
+        for (const { rule, isCSSModules } of nestRulesConfig) {
+            if (userConfig.styleLoader) {
                 rule
-                    .use('css-loader')
-                    .loader(require.resolve('css-loader'))
-                    .options(Object.assign(Object.assign({ importLoaders: 1, esModule: true, url: true, import: true }, (isCSSModules
-                    ? {
-                        modules: Object.assign({ localIdentName: '[local]___[hash:base64:5]' }, userConfig.cssLoaderModules),
-                    }
-                    : {})), userConfig.cssLoader));
+                    .use('style-loader')
+                    .loader(require.resolve('@umijs/bundler-webpack/compiled/style-loader'))
+                    .options({ base: 0, esModule: true, ...userConfig.styleLoader });
+            }
+            else {
                 rule
-                    .use('postcss-loader')
-                    .loader(require.resolve('@umijs/bundler-webpack/compiled/postcss-loader'))
+                    .use('mini-css-extract-plugin')
+                    .loader(require.resolve('@umijs/bundler-webpack/compiled/mini-css-extract-plugin/loader'))
                     .options({
-                    postcssOptions: Object.assign({ ident: 'postcss', plugins: [
-                            require('@umijs/bundler-webpack/compiled/postcss-flexbugs-fixes'),
-                            require('postcss-preset-env')({
-                                browsers: opts.browsers,
-                                autoprefixer: Object.assign({ flexbox: 'no-2009' }, userConfig.autoprefixer),
-                                stage: 3,
-                            }),
-                        ].concat(userConfig.extraPostCSSPlugins || []) }, userConfig.postcssLoader),
+                    publicPath: './',
+                    emit: true,
+                    esModule: true,
                 });
-                if (loader) {
-                    rule
-                        .use(loader)
-                        .loader(typeof loader === 'string' ? require.resolve(loader) : loader)
-                        .options(loaderOptions || {});
-                }
+            }
+            rule
+                .use('css-loader')
+                .loader(require.resolve('css-loader'))
+                .options({
+                importLoaders: 1,
+                esModule: true,
+                url: true,
+                import: true,
+                ...(isCSSModules
+                    ? {
+                        modules: {
+                            localIdentName: '[local]___[hash:base64:5]',
+                            ...userConfig.cssLoaderModules,
+                        },
+                    }
+                    : {}),
+                ...userConfig.cssLoader,
+            });
+            rule
+                .use('postcss-loader')
+                .loader(require.resolve('@umijs/bundler-webpack/compiled/postcss-loader'))
+                .options({
+                postcssOptions: {
+                    ident: 'postcss',
+                    plugins: [
+                        require('@umijs/bundler-webpack/compiled/postcss-flexbugs-fixes'),
+                        require('postcss-preset-env')({
+                            browsers: opts.browsers,
+                            autoprefixer: {
+                                flexbox: 'no-2009',
+                                ...userConfig.autoprefixer,
+                            },
+                            stage: 3,
+                        }),
+                    ].concat(userConfig.extraPostCSSPlugins || []),
+                    ...userConfig.postcssLoader,
+                },
+            });
+            if (loader) {
+                rule
+                    .use(loader)
+                    .loader(typeof loader === 'string' ? require.resolve(loader) : loader)
+                    .options(loaderOptions || {});
             }
         }
-    });
+    }
 }
 exports.addCSSRules = addCSSRules;

package/dist/config/definePlugin.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDefinePlugin = exports.resolveDefine = void 0;
 const webpack_1 = require("@umijs/bundler-webpack/compiled/webpack");
@@ -29,17 +20,18 @@ function resolveDefine(opts) {
             define[key] = JSON.stringify(opts.define[key]);
         }
     }
-    return Object.assign({ 'process.env': env }, define);
+    return {
+        'process.env': env,
+        ...define,
+    };
 }
 exports.resolveDefine = resolveDefine;
-function addDefinePlugin(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig } = opts;
-        config.plugin('define').use(webpack_1.DefinePlugin, [
-            resolveDefine({
-                define: userConfig.define || {},
-            }),
-        ]);
-    });
+async function addDefinePlugin(opts) {
+    const { config, userConfig } = opts;
+    config.plugin('define').use(webpack_1.DefinePlugin, [
+        resolveDefine({
+            define: userConfig.define || {},
+        }),
+    ]);
 }
 exports.addDefinePlugin = addDefinePlugin;

package/dist/config/detectDeadCodePlugin.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDetectDeadCodePlugin = void 0;
 const types_1 = require("../types");
@@ -52,24 +43,28 @@ class DetectDeadCodePlugin {
         if (!options) {
             return;
         }
-        this.options = Object.assign(Object.assign({}, this.options), options);
+        this.options = {
+            ...this.options,
+            ...options,
+        };
     }
     apply(compiler) {
         if (!this.options.context) {
-            this.options = Object.assign(Object.assign({}, this.options), { context: compiler.context });
+            this.options = {
+                ...this.options,
+                context: compiler.context,
+            };
         }
         compiler.hooks.afterEmit.tapAsync('DetectDeadCodePlugin', this.handleAfterEmit);
     }
 }
-function addDetectDeadCodePlugin(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig } = opts;
-        const isDev = opts.env === types_1.Env.development;
-        if (userConfig.deadCode && !isDev) {
-            config
-                .plugin('detect-dead-code-plugin')
-                .use(DetectDeadCodePlugin, [userConfig.deadCode]);
-        }
-    });
+async function addDetectDeadCodePlugin(opts) {
+    const { config, userConfig } = opts;
+    const isDev = opts.env === types_1.Env.development;
+    if (userConfig.deadCode && !isDev) {
+        config
+            .plugin('detect-dead-code-plugin')
+            .use(DetectDeadCodePlugin, [userConfig.deadCode]);
+    }
 }
 exports.addDetectDeadCodePlugin = addDetectDeadCodePlugin;

package/dist/config/fastRefreshPlugin.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,18 +8,16 @@ exports.addFastRefreshPlugin = void 0;
 const lib_1 = __importDefault(require("@pmmmwh/react-refresh-webpack-plugin/lib"));
 const constants_1 = require("../constants");
 const types_1 = require("../types");
-function addFastRefreshPlugin(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig, name } = opts;
-        const isDev = opts.env === types_1.Env.development;
-        const useFastRefresh = isDev && userConfig.fastRefresh !== false && name !== constants_1.MFSU_NAME;
-        // TODO: Should only run in react csr
-        if (useFastRefresh) {
-            config
-                .plugin('fastRefresh')
-                .after('hmr')
-                .use(lib_1.default, [{ overlay: false }]);
-        }
-    });
+async function addFastRefreshPlugin(opts) {
+    const { config, userConfig, name } = opts;
+    const isDev = opts.env === types_1.Env.development;
+    const useFastRefresh = isDev && userConfig.fastRefresh !== false && name !== constants_1.MFSU_NAME;
+    // TODO: Should only run in react csr
+    if (useFastRefresh) {
+        config
+            .plugin('fastRefresh')
+            .after('hmr')
+            .use(lib_1.default, [{ overlay: false }]);
+    }
 }
 exports.addFastRefreshPlugin = addFastRefreshPlugin;

package/dist/config/forkTSCheckerPlugin.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,20 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addForkTSCheckerPlugin = void 0;
 // @ts-ignore
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("@umijs/bundler-webpack/compiled/fork-ts-checker-webpack-plugin"));
-function addForkTSCheckerPlugin(opts) {
+async function addForkTSCheckerPlugin(opts) {
     var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig } = opts;
-        if (userConfig.forkTSChecker) {
-            // use user's typescript
-            if ((_a = userConfig.forkTSChecker.typescript) === null || _a === void 0 ? void 0 : _a.enable) {
-                userConfig.forkTSChecker.typescript.typescriptPath =
-                    require.resolve('typescript');
-            }
-            config
-                .plugin('fork-ts-checker-plugin')
-                .use(fork_ts_checker_webpack_plugin_1.default, [userConfig.forkTSChecker]);
+    const { config, userConfig } = opts;
+    if (userConfig.forkTSChecker) {
+        // use user's typescript
+        if ((_a = userConfig.forkTSChecker.typescript) === null || _a === void 0 ? void 0 : _a.enable) {
+            userConfig.forkTSChecker.typescript.typescriptPath =
+                require.resolve('typescript');
         }
-    });
+        config
+            .plugin('fork-ts-checker-plugin')
+            .use(fork_ts_checker_webpack_plugin_1.default, [userConfig.forkTSChecker]);
+    }
 }
 exports.addForkTSCheckerPlugin = addForkTSCheckerPlugin;

package/dist/config/harmonyLinkingErrorPlugin.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addHarmonyLinkingErrorPlugin = void 0;
 // ref: https://github.com/webpack/webpack/blob/ccecc17c01af96edddb931a76e7a3b21ef2969d8/lib/dependencies/HarmonyImportDependency.js#L164
@@ -33,10 +24,8 @@ class HarmonyLinkingErrorPlugin {
         });
     }
 }
-function addHarmonyLinkingErrorPlugin(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config } = opts;
-        config.plugin('harmony-linking-error-plugin').use(HarmonyLinkingErrorPlugin);
-    });
+async function addHarmonyLinkingErrorPlugin(opts) {
+    const { config } = opts;
+    config.plugin('harmony-linking-error-plugin').use(HarmonyLinkingErrorPlugin);
 }
 exports.addHarmonyLinkingErrorPlugin = addHarmonyLinkingErrorPlugin;

package/dist/config/ignorePlugin.js

@@ -1,27 +1,16 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addIgnorePlugin = void 0;
 const webpack_1 = require("@umijs/bundler-webpack/compiled/webpack");
-function addIgnorePlugin(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig } = opts;
-        if (userConfig.ignoreMomentLocale) {
-            config.plugin('ignore-moment-locale').use(webpack_1.IgnorePlugin, [
-                {
-                    resourceRegExp: /^\.\/locale$/,
-                    contextRegExp: /moment$/,
-                },
-            ]);
-        }
-    });
+async function addIgnorePlugin(opts) {
+    const { config, userConfig } = opts;
+    if (userConfig.ignoreMomentLocale) {
+        config.plugin('ignore-moment-locale').use(webpack_1.IgnorePlugin, [
+            {
+                resourceRegExp: /^\.\/locale$/,
+                contextRegExp: /moment$/,
+            },
+        ]);
+    }
 }
 exports.addIgnorePlugin = addIgnorePlugin;

package/dist/config/javaScriptRules.d.ts

@@ -7,6 +7,7 @@ interface IOpts {
     env: Env;
     extraBabelPlugins: any[];
     extraBabelPresets: any[];
+    extraBabelIncludes: string[];
     extraEsbuildLoaderHandler: any[];
     babelPreset: any;
     name?: string;