@shuvi/toolpack 1.0.38 → 1.0.41

package/lib/webpack/config/base.js

@@ -98,7 +98,6 @@ function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot,
         emitOnErrors: !dev,
         checkWasmTypes: false,
         nodeEnv: false,
-        splitChunks: false,
         runtimeChunk: undefined,
         minimize: !dev,
         realContentHash: false

package/lib/webpack/config/browser.js

@@ -36,7 +36,6 @@ 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|doura)[\\/]/;
-const NODE_MODULES_REGEXP = /[\\/]node_modules[\\/]/i;
 const FRAMEWORK_REACT_MODULES = [
     {
         test: /[/\\]node_modules[/\\]react[/\\]/
@@ -95,6 +94,8 @@ function createBrowserWebpackChain(options) {
     }
     if (dev) {
         chain.plugin('private/hmr-plugin').use(webpack_1.default.HotModuleReplacementPlugin);
+        // disable splitChunks at dev mode to prevent preload error
+        chain.optimization.splitChunks(false);
     }
     else {
         const getDefaultChunkName = (_module, chunks) => {
@@ -109,22 +110,8 @@ function createBrowserWebpackChain(options) {
         chain.optimization.splitChunks({
             chunks: helpers_1.splitChunksFilter,
             cacheGroups: {
-                default: {
-                    name: getDefaultChunkName,
-                    filename: (0, helpers_1.commonChunkFilename)({ dev: false }),
-                    idHint: '',
-                    reuseExistingChunk: true,
-                    minChunks: 2,
-                    priority: -20
-                },
-                defaultVendors: {
-                    name: getDefaultChunkName,
-                    filename: (0, helpers_1.commonChunkFilename)({ dev: false }),
-                    idHint: 'vendors',
-                    reuseExistingChunk: true,
-                    test: NODE_MODULES_REGEXP,
-                    priority: -10
-                },
+                default: Object.assign({ name: getDefaultChunkName, filename: (0, helpers_1.commonChunkFilename)({ dev: false }) }, helpers_1.defaultCacheGroups.default),
+                defaultVendors: Object.assign({ name: getDefaultChunkName, filename: (0, helpers_1.commonChunkFilename)({ dev: false }) }, helpers_1.defaultCacheGroups.defaultVendors),
                 framework: {
                     chunks: 'all',
                     name: 'framework',
@@ -168,7 +155,7 @@ function createBrowserWebpackChain(options) {
                 lib: {
                     test(module) {
                         return (module.size() > BIG_LIBRARY_THRESHOLD &&
-                            NODE_MODULES_REGEXP.test(module.nameForCondition() || ''));
+                            helpers_1.NODE_MODULES_REGEXP.test(module.nameForCondition() || ''));
                     },
                     name(module) {
                         const hash = crypto.createHash('sha1');

package/lib/webpack/config/node.js

@@ -24,6 +24,8 @@ function createNodeWebpackChain(options) {
     chain.resolve.mainFields.clear().add('main').add('module');
     chain.output.libraryTarget('commonjs2');
     chain.optimization.minimize(false);
+    // use default splitChunks config
+    chain.optimization.splitChunks((0, helpers_1.getDefaultSplitChunksConfig)(dev));
     (0, helpers_1.addExternals)(chain, (0, external_1.nodeExternals)({
         projectRoot: options.projectRoot,
         include: options.include

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

@@ -7,3 +7,43 @@ export declare function splitChunksFilter(chunk: any): boolean;
 export declare const commonChunkFilename: ({ dev }: {
     dev: boolean;
 }) => string;
+export declare const NODE_MODULES_REGEXP: RegExp;
+export declare const defaultCacheGroups: {
+    default: {
+        idHint: string;
+        reuseExistingChunk: boolean;
+        minChunks: number;
+        priority: number;
+    };
+    defaultVendors: {
+        idHint: string;
+        reuseExistingChunk: boolean;
+        test: RegExp;
+        priority: number;
+    };
+};
+/** default splitChunks config https://github.com/webpack/webpack/blob/v5.73.0/lib/config/defaults.js#L1181 */
+export declare const getDefaultSplitChunksConfig: (dev: boolean) => {
+    chunks: string;
+    minChunks: number;
+    minSize: number;
+    minRemainingSize: number | undefined;
+    enforceSizeThreshold: number;
+    maxAsyncRequests: number;
+    maxInitialRequests: number;
+    automaticNameDelimiter: string;
+    cacheGroups: {
+        default: {
+            idHint: string;
+            reuseExistingChunk: boolean;
+            minChunks: number;
+            priority: number;
+        };
+        defaultVendors: {
+            idHint: string;
+            reuseExistingChunk: boolean;
+            test: RegExp;
+            priority: number;
+        };
+    };
+};

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commonChunkFilename = exports.splitChunksFilter = exports.shouldUseRelativeAssetPaths = exports.addExternals = exports.checkWebpackExternals = void 0;
+exports.getDefaultSplitChunksConfig = exports.defaultCacheGroups = exports.NODE_MODULES_REGEXP = exports.commonChunkFilename = exports.splitChunksFilter = exports.shouldUseRelativeAssetPaths = exports.addExternals = exports.checkWebpackExternals = void 0;
 const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const externalsFunctionMap = new WeakMap();
 const checkWebpackExternals = (webpackChain) => {
@@ -74,3 +74,33 @@ const commonChunkFilename = ({ dev }) => {
     return `static/common/${dev ? '[name]' : '[name].[contenthash:8]'}.js`;
 };
 exports.commonChunkFilename = commonChunkFilename;
+exports.NODE_MODULES_REGEXP = /[\\/]node_modules[\\/]/i;
+exports.defaultCacheGroups = {
+    default: {
+        idHint: '',
+        reuseExistingChunk: true,
+        minChunks: 2,
+        priority: -20
+    },
+    defaultVendors: {
+        idHint: 'vendors',
+        reuseExistingChunk: true,
+        test: exports.NODE_MODULES_REGEXP,
+        priority: -10
+    }
+};
+/** default splitChunks config https://github.com/webpack/webpack/blob/v5.73.0/lib/config/defaults.js#L1181 */
+const getDefaultSplitChunksConfig = (dev) => {
+    return {
+        chunks: 'async',
+        minChunks: 1,
+        minSize: dev ? 10000 : 20000,
+        minRemainingSize: dev ? 0 : undefined,
+        enforceSizeThreshold: dev ? 30000 : 50000,
+        maxAsyncRequests: dev ? Infinity : 30,
+        maxInitialRequests: dev ? Infinity : 30,
+        automaticNameDelimiter: '-',
+        cacheGroups: exports.defaultCacheGroups
+    };
+};
+exports.getDefaultSplitChunksConfig = getDefaultSplitChunksConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.38",
+  "version": "1.0.41",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -20,7 +20,7 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/compiler": "1.0.38",
+    "@shuvi/compiler": "1.0.41",
     "@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",
     "lightningcss": "1.19.0",
-    "@shuvi/shared": "1.0.38",
-    "@shuvi/utils": "1.0.38",
+    "@shuvi/shared": "1.0.41",
+    "@shuvi/utils": "1.0.41",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",