@shuvi/toolpack 1.0.0-rc.8 → 1.0.0-rc.9

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/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: {
@@ -68,16 +68,47 @@ function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, p
     config.bail(!dev);
     config.performance.hints(false);
     config.context(projectRoot);
+    config.output.path(outputDir);
+    config.output.merge({
+        publicPath,
+        filename: `${dev ? '[name].js' : '[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,20 +126,6 @@ function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, p
             }
         ]);
     }
-    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
-    });
     // Support for NODE_PATH
     const nodePathList = (process.env.NODE_PATH || '')
         .split(process.platform === 'win32' ? ';' : ':')
@@ -162,7 +179,6 @@ function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, p
         .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$/,
@@ -232,7 +248,6 @@ function baseWebpackChain({ dev, outputDir, parcelCss, experimental, compiler, p
             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,9 +32,12 @@ 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");
+// import PreferResolverPlugin from '../plugins/prefer-resolver-plugin';
+const constants_1 = require("../../constants");
 const dynamic_public_path_plugin_1 = __importDefault(require("../plugins/dynamic-public-path-plugin"));
 const base_1 = require("./base");
 const style_1 = require("./parts/style");
+const helpers_1 = require("./parts/helpers");
 const BIG_LIBRARY_THRESHOLD = 160000; // byte
 function createBrowserWebpackChain(options) {
     const { cacheDir, typescript, dev, publicPath, analyze } = options;
@@ -89,17 +92,24 @@ function createBrowserWebpackChain(options) {
     }
     else {
         chain.optimization.splitChunks({
-            chunks: 'all',
+            chunks: helpers_1.splitChunksFilter,
             cacheGroups: {
                 default: false,
                 defaultVendors: false,
                 framework: {
                     chunks: 'all',
                     name: 'framework',
+                    filename: constants_1.CommonChunkFilename,
                     // 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)[\\/]/,
+                    test(module) {
+                        const resource = module.nameForCondition();
+                        return resource
+                            ? ['@shuvi/redox-react', 'react', 'react-dom'].some(pkg => resource.indexOf(pkg) >= 0)
+                            : false;
+                    },
+                    // 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 +118,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 +133,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,

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.0-rc.8",
+  "version": "1.0.0-rc.9",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -20,7 +20,7 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/compiler": "1.0.0-rc.8",
+    "@shuvi/compiler": "1.0.0-rc.9",
     "@babel/core": "7.12.10",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
@@ -35,8 +35,8 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/runtime": "7.12.5",
     "@parcel/css": "1.2.0",
-    "@shuvi/shared": "1.0.0-rc.8",
-    "@shuvi/utils": "1.0.0-rc.8",
+    "@shuvi/shared": "1.0.0-rc.9",
+    "@shuvi/utils": "1.0.0-rc.9",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",