@modern-js/builder 2.6.0 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @modern-js/builder
 
+## 2.7.0
+
+### Minor Changes
+
+- dfece9dc1c: fix(builder): vendor library chunks include sources
+  fix(builder): 用户源码被划分到第三方库所在 Chunk
+
+### Patch Changes
+
+- Updated dependencies [206c806efa]
+- Updated dependencies [0f15fc597c]
+- Updated dependencies [5f899af53a]
+- Updated dependencies [dcad887024]
+- Updated dependencies [a4672f7c16]
+- Updated dependencies [ebe0d2dd6e]
+- Updated dependencies [7fff9020e1]
+- Updated dependencies [84bfb439b8]
+  - @modern-js/builder-shared@2.7.0
+  - @modern-js/utils@2.7.0
+
 ## 2.6.0
 
 ### Patch Changes

package/dist/plugins/index.d.ts

@@ -11,6 +11,7 @@ export declare const plugins: {
     toml: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
     svg: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
     splitChunks: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
+    inlineChunk: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
     bundleAnalyzer: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
     font: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
     image: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;

package/dist/plugins/index.js

@@ -38,6 +38,7 @@ exports.plugins = {
     toml: () => Promise.resolve().then(() => __importStar(require('./toml'))).then(m => m.builderPluginToml()),
     svg: () => Promise.resolve().then(() => __importStar(require('./svg'))).then(m => m.builderPluginSvg()),
     splitChunks: () => Promise.resolve().then(() => __importStar(require('./splitChunks'))).then(m => m.builderPluginSplitChunks()),
+    inlineChunk: () => Promise.resolve().then(() => __importStar(require('./inlineChunk'))).then(m => m.builderPluginInlineChunk()),
     bundleAnalyzer: () => Promise.resolve().then(() => __importStar(require('./bundleAnalyzer'))).then(m => m.builderPluginBundleAnalyzer()),
     font: () => Promise.resolve().then(() => __importStar(require('./asset'))).then(m => m.builderAssetPlugin('font', builder_shared_1.FONT_EXTENSIONS)),
     image: () => Promise.resolve().then(() => __importStar(require('./asset'))).then(m => m.builderAssetPlugin('image', builder_shared_1.IMAGE_EXTENSIONS)),

package/dist/plugins/inlineChunk.d.ts

@@ -0,0 +1,2 @@
+import { DefaultBuilderPlugin } from '@modern-js/builder-shared';
+export declare const builderPluginInlineChunk: () => DefaultBuilderPlugin;

package/dist/plugins/inlineChunk.js

@@ -0,0 +1,57 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.builderPluginInlineChunk = void 0;
+const builder_shared_1 = require("@modern-js/builder-shared");
+const builderPluginInlineChunk = () => ({
+    name: 'builder-plugin-inline-chunk',
+    setup(api) {
+        api.modifyBundlerChain(async (chain, { target, CHAIN_ID, isProd, HtmlPlugin }) => {
+            const config = api.getNormalizedConfig();
+            if ((0, builder_shared_1.isHtmlDisabled)(config, target) || !isProd) {
+                return;
+            }
+            const { InlineChunkHtmlPlugin } = await Promise.resolve().then(() => __importStar(require('@modern-js/builder-shared')));
+            const { disableInlineRuntimeChunk, enableInlineStyles, 
+            // todo: not support enableInlineScripts in rspack yet, which will take unknown build error
+            enableInlineScripts, } = config.output;
+            chain.plugin(CHAIN_ID.PLUGIN.INLINE_HTML).use(InlineChunkHtmlPlugin, [
+                HtmlPlugin,
+                {
+                    tests: [
+                        enableInlineScripts && /\.js$/,
+                        enableInlineStyles && /\.css$/,
+                        !disableInlineRuntimeChunk &&
+                            // RegExp like /builder-runtime([.].+)?\.js$/
+                            // matches builder-runtime.js and builder-runtime.123456.js
+                            new RegExp(`${builder_shared_1.RUNTIME_CHUNK_NAME}([.].+)?\\.js$`),
+                    ].filter(Boolean),
+                    distPath: (0, builder_shared_1.pick)(config.output.distPath, ['js', 'css']),
+                },
+            ]);
+        });
+    },
+});
+exports.builderPluginInlineChunk = builderPluginInlineChunk;

package/dist/plugins/splitChunks.d.ts

@@ -1,2 +1,4 @@
 import { DefaultBuilderPlugin } from '@modern-js/builder-shared';
+/** Expect to match path just like "./node_modules/react-router/" */
+export declare const createDependenciesRegExp: (...dependencies: string[]) => RegExp;
 export declare function builderPluginSplitChunks(): DefaultBuilderPlugin;

package/dist/plugins/splitChunks.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builderPluginSplitChunks = void 0;
+exports.builderPluginSplitChunks = exports.createDependenciesRegExp = void 0;
 const assert_1 = __importDefault(require("assert"));
 const builder_shared_1 = require("@modern-js/builder-shared");
 function getUserDefinedCacheGroups(forceSplitting) {
@@ -43,28 +43,31 @@ function getUserDefinedCacheGroups(forceSplitting) {
     });
     return cacheGroups;
 }
+/** Expect to match path just like "./node_modules/react-router/" */
+const createDependenciesRegExp = (...dependencies) => new RegExp(`[\\\\/]node_modules[\\\\/](${dependencies.join('|')})[\\\\/]`);
+exports.createDependenciesRegExp = createDependenciesRegExp;
 async function splitByExperience(ctx) {
     const { isPackageInstalled } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils')));
     const { override, polyfill, rootPath, defaultConfig, userDefinedCacheGroups, } = ctx;
     const experienceCacheGroup = {};
     const packageRegExps = {
-        react: /[\\/]react|react-dom[\\/]/,
-        router: /[\\/]react-router|react-router-dom|history[\\/]/,
-        lodash: /[\\/]lodash|lodash-es[\\/]/,
+        react: (0, exports.createDependenciesRegExp)('react', 'react-dom'),
+        router: (0, exports.createDependenciesRegExp)('react-router', 'react-router-dom', 'history'),
+        lodash: (0, exports.createDependenciesRegExp)('lodash', 'lodash-es'),
     };
     // Detect if the package is installed in current project
     // If installed, add the package to cache group
     if (isPackageInstalled('antd', rootPath)) {
-        packageRegExps.antd = /[\\/]antd[\\/]/;
+        packageRegExps.antd = (0, exports.createDependenciesRegExp)('antd');
     }
     if (isPackageInstalled('@arco-design/web-react', rootPath)) {
-        packageRegExps.arco = /[\\/]arco-design[\\/]/;
+        packageRegExps.arco = (0, exports.createDependenciesRegExp)('arco-design');
     }
     if (isPackageInstalled('@douyinfe/semi-ui', rootPath)) {
-        packageRegExps.semi = /[\\/]semi-ui[\\/]/;
+        packageRegExps.semi = (0, exports.createDependenciesRegExp)('semi-ui');
     }
     if (polyfill === 'entry' || polyfill === 'usage') {
-        packageRegExps.polyfill = /[\\/]core-js|@babel\/runtime[\\/]/;
+        packageRegExps.polyfill = (0, exports.createDependenciesRegExp)('core-js', '@babel/runtime');
     }
     Object.entries(packageRegExps).forEach(([name, test]) => {
         const key = `lib-${name}`;

package/package.json

@@ -14,7 +14,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.6.0",
+  "version": "2.7.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@svgr/webpack": "6.5.1",
-    "@modern-js/builder-shared": "2.6.0",
-    "@modern-js/utils": "2.6.0"
+    "@modern-js/builder-shared": "2.7.0",
+    "@modern-js/utils": "2.7.0"
   },
   "devDependencies": {
     "@babel/core": "7.18.0",
@@ -36,7 +36,7 @@
     "@types/babel__preset-env": "^7.9.2",
     "@types/node": "^14",
     "typescript": "^4",
-    "@scripts/vitest-config": "2.6.0"
+    "@scripts/vitest-config": "2.7.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",