@shuvi/toolpack 1.0.0-rc.0 → 1.0.0-rc.11

package/lib/babel/plugins/{loadable-plugin.d.ts → dynamic-plugin.d.ts}

@@ -19,6 +19,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
 */
 import { PluginObj, types as BabelTypes } from '@babel/core';
-export default function ({ types: t, }: {
+export default function ({ types: t }: {
     types: typeof BabelTypes;
 }): PluginObj;

package/lib/babel/plugins/{loadable-plugin.js → dynamic-plugin.js}

@@ -23,14 +23,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
 // This file is https://github.com/jamiebuilds/react-loadable/blob/master/src/babel.js
 // Modified to also look for `shuvi/dynamic`
 Object.defineProperty(exports, "__esModule", { value: true });
-function default_1({ types: t, }) {
+function default_1({ types: t }) {
     return {
         visitor: {
             ImportDeclaration(path) {
                 let source = path.node.source.value;
                 if (source !== '@shuvi/runtime')
                     return;
-                let dynamicSpecifier = path.get('specifiers').find((specifier) => {
+                let dynamicSpecifier = path.get('specifiers').find(specifier => {
                     return specifier.node.imported.name === 'dynamic';
                 });
                 if (!dynamicSpecifier)
@@ -40,7 +40,7 @@ function default_1({ types: t, }) {
                 if (!binding) {
                     return;
                 }
-                binding.referencePaths.forEach((refPath) => {
+                binding.referencePaths.forEach(refPath => {
                     const callExpression = refPath.parentPath;
                     if (!callExpression.isCallExpression())
                         return;
@@ -68,7 +68,7 @@ function default_1({ types: t, }) {
                         return;
                     let properties = options.get('properties');
                     let propertiesMap = {};
-                    properties.forEach((property) => {
+                    properties.forEach(property => {
                         const key = property.get('key');
                         propertiesMap[key.node.name] = property;
                     });
@@ -89,17 +89,17 @@ function default_1({ types: t, }) {
                                 return;
                             const node = args[0].node;
                             dynamicImports.push(node);
-                        },
+                        }
                     });
                     if (!dynamicImports.length)
                         return;
-                    options.node.properties.push(t.objectProperty(t.identifier('webpack'), t.arrowFunctionExpression([], t.arrayExpression(dynamicImports.map((dynamicImport) => {
+                    options.node.properties.push(t.objectProperty(t.identifier('webpack'), t.arrowFunctionExpression([], t.arrayExpression(dynamicImports.map(dynamicImport => {
                         return t.callExpression(t.memberExpression(t.identifier('require'), t.identifier('resolveWeak')), [dynamicImport]);
                     })))));
                     options.node.properties.push(t.objectProperty(t.identifier('modules'), t.arrayExpression(dynamicImports)));
                 });
-            },
-        },
+            }
+        }
     };
 }
 exports.default = default_1;

package/lib/babel/preset.js

@@ -89,7 +89,7 @@ exports.default = (api, options = {}) => {
                 }
             ],
             require('@babel/plugin-syntax-dynamic-import'),
-            require('./plugins/loadable-plugin'),
+            require('./plugins/dynamic-plugin'),
             require('@babel/plugin-proposal-class-properties'),
             [
                 require('@babel/plugin-proposal-object-rest-spread'),

package/lib/constants.d.ts

@@ -1 +1,2 @@
 export declare const AppSourceRegexs: RegExp[];
+export declare const CommonChunkFilename = "static/common/[name].js";

package/lib/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppSourceRegexs = void 0;
+exports.CommonChunkFilename = exports.AppSourceRegexs = void 0;
 exports.AppSourceRegexs = [
     /([/\\]shuvi-app[/\\])|([/\\]\.shuvi[/\\])/
 ];
+exports.CommonChunkFilename = 'static/common/[name].js';

package/lib/utils/formatWebpackMessages.d.ts

@@ -1,5 +1,19 @@
-export default formatWebpackMessages;
-declare function formatWebpackMessages(json: any): {
-    errors: any;
-    warnings: any;
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+interface StatsError {
+    moduleName?: string;
+    file?: string;
+    message?: string;
+}
+declare function formatWebpackMessages(json: {
+    warnings?: StatsError[];
+    errors?: StatsError[];
+}): {
+    errors: string[];
+    warnings: string[];
 };
+export default formatWebpackMessages;

package/lib/utils/formatWebpackMessages.js

@@ -1,22 +1,24 @@
+"use strict";
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require('@shuvi/utils/lib/chalk').default;
+const chalk_1 = __importDefault(require("@shuvi/utils/lib/chalk"));
 const friendlySyntaxErrorLabel = 'Syntax error:';
 function isLikelyASyntaxError(message) {
     return message.indexOf(friendlySyntaxErrorLabel) !== -1;
 }
 // Cleans up webpack error messages.
-function formatMessage(message, isError) {
-    message =
-        (message.moduleName ? message.moduleName + '\n' : '') +
-            (message.file ? message.file + '\n' : '') +
-            message.message;
+function formatMessage(stats, isError) {
+    let message = (stats.moduleName ? stats.moduleName + '\n' : '') +
+        (stats.file ? stats.file + '\n' : '') +
+        stats.message;
     let lines = message.split('\n');
     // Strip Webpack-added headers off errors/warnings
     // https://github.com/webpack/webpack/blob/master/lib/ModuleError.js
@@ -55,12 +57,12 @@ function formatMessage(message, isError) {
         ];
     }
     // Add helpful message for users trying to use Sass for the first time
-    if (lines[1] && lines[1].match(/Cannot find module.+node-sass/)) {
-        lines[1] = 'To import Sass files, you first need to install node-sass.\n';
+    if (lines[1] && lines[1].match(/Cannot find module.+sass/)) {
+        lines[1] = 'To import Sass files, you first need to install sass.\n';
         lines[1] +=
-            'Run `npm install node-sass` or `yarn add node-sass` inside your workspace.';
+            'Run `npm install sass` or `yarn add sass` inside your workspace.';
     }
-    lines[0] = chalk.inverse(lines[0]);
+    lines[0] = chalk_1.default.inverse(lines[0]);
     message = lines.join('\n');
     // Internal stacks are generally useless so we strip them... with the
     // exception of stacks containing `webpack:` because they're normally
@@ -76,10 +78,10 @@ function formatMessage(message, isError) {
     return message.trim();
 }
 function formatWebpackMessages(json) {
-    const formattedErrors = json.errors.map(function (message) {
+    const formattedErrors = (json.errors || []).map(function (message) {
         return formatMessage(message, true);
     });
-    const formattedWarnings = json.warnings.map(function (message) {
+    const formattedWarnings = (json.warnings || []).map(function (message) {
         return formatMessage(message, false);
     });
     const result = { errors: formattedErrors, warnings: formattedWarnings };

package/lib/webpack/config/base.d.ts

@@ -21,6 +21,8 @@ export interface BaseOptions {
     env?: {
         [x: string]: string | undefined;
     };
+    experimental?: Record<string, any>;
+    compiler?: Record<string, any>;
 }
 export { WebpackChain };
-export declare function baseWebpackChain({ dev, outputDir, parcelCss, projectRoot, include, typescript, name, buildManifestFilename, publicPath, env, cacheDir }: BaseOptions): WebpackChain;
+export declare function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, projectRoot, include, typescript, name, buildManifestFilename, publicPath, env, cacheDir }: BaseOptions): WebpackChain;

package/lib/webpack/config/base.js

@@ -35,12 +35,12 @@ const webpack_1 = __importDefault(require("webpack"));
 const path = __importStar(require("path"));
 const constants_1 = require("@shuvi/shared/lib/constants");
 const build_manifest_plugin_1 = __importDefault(require("../plugins/build-manifest-plugin"));
-const chunk_names_plugin_1 = __importDefault(require("../plugins/chunk-names-plugin"));
 const fix_watching_plugin_1 = __importDefault(require("../plugins/fix-watching-plugin"));
 const constants_2 = require("../../constants");
 const crypto = __importStar(require("crypto"));
 const jsconfig_paths_plugin_1 = __importDefault(require("../plugins/jsconfig-paths-plugin"));
 const support_ts_extension_resolver_plugin_1 = __importDefault(require("../plugins/support-ts-extension-resolver-plugin"));
+const helpers_1 = require("./parts/helpers");
 const resolveLocalLoader = (name) => path.join(__dirname, `../loaders/${name}`);
 const terserOptions = {
     parse: {
@@ -61,23 +61,54 @@ const terserOptions = {
         ascii_only: true
     }
 };
-function baseWebpackChain({ dev, outputDir, parcelCss, projectRoot, include, typescript, name, buildManifestFilename, publicPath = '/', env = {}, cacheDir }) {
+function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, projectRoot, include, typescript, name, buildManifestFilename, publicPath = '/', env = {}, cacheDir }) {
     var _a;
     const config = new webpack_chain_1.default();
     config.mode(dev ? 'development' : 'production');
     config.bail(!dev);
     config.performance.hints(false);
     config.context(projectRoot);
+    config.output.path(outputDir);
+    config.output.merge({
+        publicPath,
+        filename: `${dev ? '[name]' : '[name].[contenthash:8]'}.js`,
+        // This saves chunks with the name given via `import()`
+        chunkFilename: `static/chunks/${dev ? '[name]' : '[name].[contenthash:8]'}.js`,
+        hotUpdateChunkFilename: 'static/webpack/[id].[fullhash].hot-update.js',
+        hotUpdateMainFilename: 'static/webpack/[fullhash].hot-update.json',
+        strictModuleExceptionHandling: true,
+        // crossOriginLoading: crossOrigin,
+        webassemblyModuleFilename: 'static/wasm/[modulehash:8].wasm',
+        hashFunction: 'xxhash64',
+        hashDigestLength: 16
+    });
     config.optimization.merge({
         emitOnErrors: !dev,
         checkWasmTypes: false,
         nodeEnv: false,
-        splitChunks: false,
         runtimeChunk: undefined,
         minimize: !dev,
         realContentHash: false
     });
-    if (!dev) {
+    if (dev) {
+        config.optimization.usedExports(false);
+        config.optimization.splitChunks({
+            chunks: helpers_1.splitChunksFilter,
+            cacheGroups: {
+                defaultVendors: false,
+                default: false,
+                vendors: {
+                    name: 'vendors',
+                    filename: constants_2.CommonChunkFilename,
+                    test: /[\\/]node_modules[\\/]/,
+                    // Don't let webpack eliminate this chunk (prevents this chunk from
+                    // becoming a part of the commons chunk)
+                    enforce: true
+                }
+            }
+        });
+    }
+    else {
         // @ts-ignore
         config.optimization.minimizer('terser').use(terser_webpack_plugin_1.default, [
             {
@@ -95,18 +126,6 @@ function baseWebpackChain({ dev, outputDir, parcelCss, projectRoot, include, typ
             }
         ]);
     }
-    config.output.path(outputDir);
-    config.output.merge({
-        publicPath,
-        filename: `${dev ? '[name]' : '[name].[contenthash:8]'}.js`,
-        // This saves chunks with the name given via `import()`
-        chunkFilename: `static/chunks/${dev ? '[name]' : '[name].[contenthash:8]'}.js`,
-        hotUpdateChunkFilename: 'static/webpack/[id].[fullhash].hot-update.js',
-        hotUpdateMainFilename: 'static/webpack/[fullhash].hot-update.json',
-        strictModuleExceptionHandling: true,
-        // crossOriginLoading: crossOrigin,
-        webassemblyModuleFilename: 'static/wasm/[modulehash:8].wasm'
-    });
     // Support for NODE_PATH
     const nodePathList = (process.env.NODE_PATH || '')
         .split(process.platform === 'win32' ? ';' : ':')
@@ -144,8 +163,13 @@ function baseWebpackChain({ dev, outputDir, parcelCss, projectRoot, include, typ
         .use('shuvi-swc-loader')
         .loader('@shuvi/shuvi-swc-loader')
         .options({
-        isNode: false
+        isServer: false,
+        experimental,
+        compiler,
+        supportedBrowsers: false,
+        swcCacheDir: path.join(cacheDir, 'swc')
     });
+    config.resolve.alias.set('@swc/helpers', path.dirname(require.resolve(`@swc/helpers/package.json`)));
     mainRule
         .oneOf('media')
         .exclude.merge([/\.(tsx|ts|js|cjs|mjs|jsx)$/, /\.html$/, /\.json$/])
@@ -155,7 +179,6 @@ function baseWebpackChain({ dev, outputDir, parcelCss, projectRoot, include, typ
         .options({
         name: 'static/media/[name].[hash:8].[ext]'
     });
-    config.plugin('chunk-names').use(chunk_names_plugin_1.default);
     config.plugin('private/ignore-plugin').use(webpack_1.default.IgnorePlugin, [
         {
             resourceRegExp: /^\.\/locale$/,
@@ -218,15 +241,13 @@ function baseWebpackChain({ dev, outputDir, parcelCss, projectRoot, include, typ
     if (dev) {
         // For webpack-dev-middleware usage
         config.watchOptions({
-            // timeout 300 will make hmr.test to failed, set to 350
-            aggregateTimeout: 350,
-            ignored: ['**/.git/**', '**/node_modules/**']
+            aggregateTimeout: 5,
+            ignored: ['**/.git/**']
         });
         config.set('infrastructureLogging', {
             level: 'none'
         });
         config.plugin('private/fix-watching-plugin').use(fix_watching_plugin_1.default);
-        config.optimization.usedExports(false);
     }
     else {
         config

package/lib/webpack/config/browser.js

@@ -32,10 +32,24 @@ const webpack_1 = __importDefault(require("webpack"));
 const path = __importStar(require("path"));
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const resolve_1 = require("@shuvi/utils/lib/resolve");
-const dynamic_public_path_plugin_1 = __importDefault(require("../plugins/dynamic-public-path-plugin"));
+const constants_1 = require("../../constants");
 const base_1 = require("./base");
 const style_1 = require("./parts/style");
+const helpers_1 = require("./parts/helpers");
 const BIG_LIBRARY_THRESHOLD = 160000; // byte
+const SHUVI_PKGS_REGEX = /[\\/]node_modules[\\/]@shuvi[\\/]/;
+const FRAMEWORK_REACT_MODULES = [
+    {
+        test: /[/\\]node_modules[/\\]react[/\\]/
+    },
+    {
+        test: /[/\\]node_modules[/\\]react-dom[/\\]/
+    },
+    {
+        test: /[/\\]node_modules[/\\]scheduler[/\\]/,
+        issuers: [/[/\\]node_modules[/\\]react-dom[/\\]/]
+    }
+];
 function createBrowserWebpackChain(options) {
     const { cacheDir, typescript, dev, publicPath, analyze } = options;
     const chain = (0, base_1.baseWebpackChain)(options);
@@ -79,27 +93,46 @@ function createBrowserWebpackChain(options) {
             }
         ]);
     }
-    // if (options.target) {
-    //   chain.resolve
-    //     .plugin('private/prefer-resolver-plugin')
-    //     .use(PreferResolverPlugin, [{ suffix: options.target }]);
-    // }
     if (dev) {
         chain.plugin('private/hmr-plugin').use(webpack_1.default.HotModuleReplacementPlugin);
     }
     else {
         chain.optimization.splitChunks({
-            chunks: 'all',
+            chunks: helpers_1.splitChunksFilter,
             cacheGroups: {
                 default: false,
                 defaultVendors: false,
                 framework: {
                     chunks: 'all',
                     name: 'framework',
-                    // This regex ignores nested copies of framework libraries so they're
-                    // bundled with their issuer.
-                    // https://github.com/zeit/next.js/pull/9012
-                    test: /(?<!node_modules.*)[\\/]node_modules[\\/](react|react-dom|@shuvi\/router|@shuvi\/router-react|scheduler|prop-types|use-sync-external-store|history)[\\/]/,
+                    filename: constants_1.CommonChunkFilename,
+                    test(module) {
+                        const resource = module.nameForCondition();
+                        if (!resource) {
+                            return false;
+                        }
+                        if (SHUVI_PKGS_REGEX.test(resource)) {
+                            return true;
+                        }
+                        return FRAMEWORK_REACT_MODULES.some(frameworkModule => {
+                            if (!frameworkModule.test.test(resource)) {
+                                return false;
+                            }
+                            // Check issuer to ignore nested copies of framework libraries so they're
+                            // bundled with their issuer.
+                            // https://github.com/zeit/next.js/pull/9012
+                            if (frameworkModule.issuers) {
+                                for (const issuer of frameworkModule.issuers) {
+                                    const issuerResource = module.issuer.nameForCondition();
+                                    if (!issuer.test(issuerResource)) {
+                                        return false;
+                                    }
+                                }
+                            }
+                            return true;
+                        });
+                    },
+                    // test: /(?<!node_modules.*)[\\/]node_modules[\\/](react|react-dom|@shuvi[\\/]router|@shuvi[\\/]router-react|scheduler|prop-types|use-sync-external-store|history)[\\/]/,
                     priority: 40,
                     // Don't let webpack eliminate this chunk (prevents this chunk from
                     // becoming a part of the commons chunk)
@@ -108,7 +141,7 @@ function createBrowserWebpackChain(options) {
                 lib: {
                     test(module) {
                         return (module.size() > BIG_LIBRARY_THRESHOLD &&
-                            /node_modules[/\\]/.test(module.identifier()));
+                            /[/\\]node_modules[/\\]/.test(module.nameForCondition() || ''));
                     },
                     name(module) {
                         const hash = crypto.createHash('sha1');
@@ -123,27 +156,10 @@ function createBrowserWebpackChain(options) {
                         }
                         return hash.digest('hex').substring(0, 8);
                     },
+                    filename: constants_1.CommonChunkFilename,
                     priority: 30,
                     minChunks: 1,
                     reuseExistingChunk: true
-                },
-                commons: {
-                    name: 'commons',
-                    minChunks: 2,
-                    priority: 20
-                },
-                shared: {
-                    name(module, chunks) {
-                        return crypto
-                            .createHash('sha1')
-                            .update(chunks.reduce((acc, chunk) => {
-                            return acc + chunk.name;
-                        }, ''))
-                            .digest('hex');
-                    },
-                    priority: 10,
-                    minChunks: 2,
-                    reuseExistingChunk: true
                 }
             },
             maxInitialRequests: 25,
@@ -185,7 +201,7 @@ function createBrowserWebpackChain(options) {
             // prevent errof of destructing process.env
             'process.env': JSON.stringify('{}') })
     ]);
-    chain.plugin('dynamic-public-path-plugin').use(dynamic_public_path_plugin_1.default);
+    // chain.plugin('dynamic-public-path-plugin').use(DynamicPublicPathPlugin);
     chain.plugin('private/build-manifest').tap(([options]) => [
         Object.assign(Object.assign({}, options), { modules: true })
     ]);

package/lib/webpack/config/node.js

@@ -5,11 +5,11 @@ const base_1 = require("./base");
 const external_1 = require("./parts/external");
 const style_1 = require("./parts/style");
 function createNodeWebpackChain(options) {
-    const { webpackHelpers, typescript } = options;
+    const { webpackHelpers, typescript, dev } = options;
     const chain = (0, base_1.baseWebpackChain)(options);
     const useTypeScript = !!(typescript === null || typescript === void 0 ? void 0 : typescript.useTypeScript);
     chain.target('node');
-    chain.devtool(false);
+    chain.devtool(dev ? 'cheap-module-source-map' : false);
     chain.resolve.extensions.merge([
         ...(useTypeScript ? ['.ts', '.tsx'] : []),
         '.js',
@@ -31,7 +31,7 @@ function createNodeWebpackChain(options) {
         .rule('main')
         .oneOf('js')
         .use('shuvi-swc-loader')
-        .tap(options => (Object.assign(Object.assign({}, options), { isNode: true })));
+        .tap(options => (Object.assign(Object.assign({}, options), { isServer: true })));
     chain.plugin('private/build-manifest').tap(([options]) => [
         Object.assign(Object.assign({}, options), { modules: false })
     ]);

package/lib/webpack/config/parts/helpers.d.ts

@@ -1,3 +1,4 @@
 import { IWebpackHelpers } from '../../types';
 export declare const webpackHelpers: () => IWebpackHelpers;
 export declare function shouldUseRelativeAssetPaths(publicPath: string): boolean;
+export declare function splitChunksFilter(chunk: any): boolean;

package/lib/webpack/config/parts/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldUseRelativeAssetPaths = exports.webpackHelpers = void 0;
+exports.splitChunksFilter = exports.shouldUseRelativeAssetPaths = exports.webpackHelpers = void 0;
 const webpackHelpers = () => {
     const externalFns = [];
     const defaultExternalsFn = ({ context, request }, callback) => {
@@ -48,3 +48,10 @@ function shouldUseRelativeAssetPaths(publicPath) {
     return publicPath === './';
 }
 exports.shouldUseRelativeAssetPaths = shouldUseRelativeAssetPaths;
+function splitChunksFilter(chunk) {
+    const excludes = {
+        'static/polyfill': true
+    };
+    return excludes[chunk.name] !== true;
+}
+exports.splitChunksFilter = splitChunksFilter;

package/lib/webpack/dynamic-dll/bundler/webpack-config.js

@@ -37,7 +37,7 @@ function getConfig({ name, entry, filename, outputDir, publicPath, shared, exter
     config.optimization.merge({
         emitOnErrors: true,
         checkWasmTypes: false,
-        // TODO: need to use DefinePlugin to set process.env.NODE_ENV
+        // need to use DefinePlugin to set process.env.NODE_ENV
         nodeEnv: false,
         runtimeChunk: false,
         minimize: false,

package/lib/webpack/dynamic-dll/index.d.ts

@@ -1,8 +1,9 @@
 import { IncomingMessage, ServerResponse } from 'http';
+import type * as webpackType from 'webpack';
 import type { Configuration } from 'webpack';
 import type WebpackChain from 'webpack-chain';
 import { ShareConfig } from './bundler';
-declare type IResolveWebpackModule = <T extends string>(path: T) => T extends `webpack/${infer R}` ? any : never;
+declare type IResolveWebpackModule = <T extends string>(path: T) => T extends `webpack` ? typeof webpackType : T extends `webpack/${infer R}` ? any : never;
 interface IOpts {
     cwd?: string;
     rootDir: string;
@@ -29,7 +30,6 @@ export declare class DynamicDll {
     modifyWebpackChain: (chain: WebpackChain) => WebpackChain;
     modifyWebpack: (config: Configuration) => Configuration;
     private _buildDLL;
-    private _makeAsyncEntry;
     private _getMFconfig;
 }
 export {};

package/lib/webpack/dynamic-dll/index.js

@@ -24,6 +24,30 @@ const dynamic_dll_plugin_1 = require("./plugin/dynamic-dll-plugin");
 const metadata_1 = require("./metadata");
 const utils_1 = require("./utils");
 const check_not_in_node_modules_1 = require("./helper/check-not-in-node-modules");
+function makeAsyncEntry(entry) {
+    const asyncEntry = {};
+    const virtualModules = {};
+    const entryObject = ((0, utils_1.isString)(entry) || (0, utils_1.isArray)(entry)
+        ? { main: [].concat(entry) }
+        : entry);
+    for (const key of Object.keys(entryObject)) {
+        const virtualPath = `./dynamic-dll-virtual-entry/${key}.js`;
+        const virtualContent = [];
+        const entryFiles = (0, utils_1.isArray)(entryObject[key])
+            ? entryObject[key]
+            : [entryObject[key]];
+        for (let entry of entryFiles) {
+            (0, invariant_1.default)((0, utils_1.isString)(entry), 'wepback entry must be a string');
+            virtualContent.push(`import('${entry}');`);
+        }
+        virtualModules[virtualPath] = virtualContent.join('\n');
+        asyncEntry[key] = virtualPath;
+    }
+    return {
+        asyncEntry,
+        virtualModules
+    };
+}
 class DynamicDll {
     constructor(opts) {
         this._hasBuilt = false;
@@ -79,7 +103,7 @@ class DynamicDll {
                 acc[name] = entries[name].values();
                 return acc;
             }, {});
-            const { asyncEntry, virtualModules } = this._makeAsyncEntry(entry);
+            const { asyncEntry, virtualModules } = makeAsyncEntry(entry);
             chain.entryPoints.clear();
             chain.merge({
                 entry: asyncEntry
@@ -94,7 +118,7 @@ class DynamicDll {
             return chain;
         };
         this.modifyWebpack = (config) => {
-            const { asyncEntry, virtualModules } = this._makeAsyncEntry(config.entry);
+            const { asyncEntry, virtualModules } = makeAsyncEntry(config.entry);
             config.entry = asyncEntry;
             const webpack = this._resolveWebpackModule('webpack');
             if (!config.plugins) {
@@ -135,30 +159,6 @@ class DynamicDll {
             });
         });
     }
-    _makeAsyncEntry(entry) {
-        const asyncEntry = {};
-        const virtualModules = {};
-        const entryObject = ((0, utils_1.isString)(entry) || (0, utils_1.isArray)(entry)
-            ? { main: [].concat(entry) }
-            : entry);
-        for (const key of Object.keys(entryObject)) {
-            const virtualPath = `./dynamic-dll-virtual-entry/${key}.js`;
-            const virtualContent = [];
-            const entryFiles = (0, utils_1.isArray)(entryObject[key])
-                ? entryObject[key]
-                : [entryObject[key]];
-            for (let entry of entryFiles) {
-                (0, invariant_1.default)((0, utils_1.isString)(entry), 'wepback entry must be a string');
-                virtualContent.push(`import('${entry}');`);
-            }
-            virtualModules[virtualPath] = virtualContent.join('\n');
-            asyncEntry[key] = virtualPath;
-        }
-        return {
-            asyncEntry,
-            virtualModules
-        };
-    }
     _getMFconfig() {
         return {
             name: '__',

package/lib/webpack/dynamic-dll/plugin/dynamic-dll-plugin.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicDLLPlugin = void 0;
 const moduleCollector_1 = require("../moduleCollector");
-// todo:
 const PLUGIN_NAME = 'DLLBuildDeps';
 class DynamicDLLPlugin {
     constructor(opts) {

package/lib/webpack/index.d.ts

@@ -1,7 +1,5 @@
 import webpack from 'webpack';
 export { webpack as default };
-import WebpackDevMiddleware from 'webpack-dev-middleware';
-export { WebpackDevMiddleware };
 export { WebpackChain } from './config';
 export { DynamicDll } from './dynamic-dll';
 /**
@@ -9,9 +7,9 @@ export { DynamicDll } from './dynamic-dll';
  */
 export { webpack, validate, validateSchema, version, cli, ModuleFilenameHelpers, RuntimeGlobals, UsageState, WebpackOptionsValidationError, ValidationError, cache, config, dependencies, ids, javascript, optimize, runtime, prefetch, web, webworker, node, electron, wasm, library, container, sharing, debug, util, sources, experiments, WebpackPluginFunction, 
 /** export */
-AutomaticPrefetchPlugin, AsyncDependenciesBlock, BannerPlugin, Cache, Chunk, ChunkGraph, CleanPlugin, Compilation, Compiler, ConcatenationScope, ContextExclusionPlugin, ContextReplacementPlugin, DefinePlugin, DelegatedPlugin, Dependency, DllPlugin, DllReferencePlugin, DynamicEntryPlugin, EntryOptionPlugin, EntryPlugin, EnvironmentPlugin, EvalDevToolModulePlugin, EvalSourceMapDevToolPlugin, ExternalModule, ExternalsPlugin, Generator, HotUpdateChunk, HotModuleReplacementPlugin, IgnorePlugin, JavascriptModulesPlugin, LibManifestPlugin, LibraryTemplatePlugin, LoaderOptionsPlugin, LoaderTargetPlugin, Module, ModuleGraph, ModuleGraphConnection, NoEmitOnErrorsPlugin, NormalModule, NormalModuleReplacementPlugin, MultiCompiler, Parser, PrefetchPlugin, ProgressPlugin, ProvidePlugin, RuntimeModule, EntryPlugin as SingleEntryPlugin, SourceMapDevToolPlugin, Stats, Template, WatchIgnorePlugin, WebpackError, WebpackOptionsApply, WebpackOptionsDefaulter, Entry, EntryNormalized, EntryObject, LibraryOptions, ModuleOptions, ResolveOptions, RuleSetCondition, RuleSetConditionAbsolute, RuleSetRule, RuleSetUse, RuleSetUseItem, Configuration, WebpackOptionsNormalized, WebpackPluginInstance, Asset, AssetInfo, MultiStats, ParserState, Watching, StatsAsset, StatsChunk, StatsChunkGroup, StatsChunkOrigin, StatsCompilation, StatsError, StatsLogging, StatsLoggingEntry, StatsModule, StatsModuleIssuer, StatsModuleReason, StatsModuleTraceDependency, StatsModuleTraceItem, StatsProfile } from 'webpack';
+AutomaticPrefetchPlugin, AsyncDependenciesBlock, BannerPlugin, Cache, Chunk, ChunkGraph, CleanPlugin, Compilation, Compiler, ConcatenationScope, ContextExclusionPlugin, ContextReplacementPlugin, DefinePlugin, DelegatedPlugin, Dependency, DllPlugin, DllReferencePlugin, DynamicEntryPlugin, EntryOptionPlugin, EntryPlugin, EnvironmentPlugin, EvalDevToolModulePlugin, EvalSourceMapDevToolPlugin, ExternalModule, ExternalsPlugin, Generator, HotUpdateChunk, HotModuleReplacementPlugin, IgnorePlugin, JavascriptModulesPlugin, LibManifestPlugin, LibraryTemplatePlugin, LoaderOptionsPlugin, LoaderTargetPlugin, Module, ModuleGraph, ModuleGraphConnection, NoEmitOnErrorsPlugin, NormalModule, NormalModuleReplacementPlugin, MultiCompiler, Parser, Plugin, PrefetchPlugin, ProgressPlugin, ProvidePlugin, RuntimeModule, EntryPlugin as SingleEntryPlugin, SourceMapDevToolPlugin, Stats, Template, WatchIgnorePlugin, WebpackError, WebpackOptionsApply, WebpackOptionsDefaulter, Entry, EntryNormalized, EntryObject, LibraryOptions, ModuleOptions, ResolveOptions, RuleSetCondition, RuleSetConditionAbsolute, RuleSetRule, RuleSetUse, RuleSetUseItem, Configuration, WebpackOptionsNormalized, WebpackPluginInstance, Asset, AssetInfo, MultiStats, ParserState, Watching, StatsAsset, StatsChunk, StatsChunkGroup, StatsChunkOrigin, StatsCompilation, StatsError, StatsLogging, StatsLoggingEntry, StatsModule, StatsModuleIssuer, StatsModuleReason, StatsModuleTraceDependency, StatsModuleTraceItem, StatsProfile } from 'webpack';
 /**
  * resolve webpack module for not shuvi plugin
  */
-declare const webpackPath: string;
-export { webpackPath };
+declare const webpackResolveContext: string;
+export { webpackResolveContext };