@modern-js/builder 2.20.0 → 2.21.1

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @modern-js/builder
 
+## 2.21.1
+
+### Patch Changes
+
+- Updated dependencies [19b3b64]
+  - @modern-js/builder-shared@2.21.1
+  - @modern-js/utils@2.21.1
+
+## 2.21.0
+
+### Patch Changes
+
+- 863f8df: feat(rspack-provider): support security.checkSyntax in Rspack
+
+  feat(rspack-provider): 在使用 Rspack 构建时支持 security.checkSyntax 配置项
+
+- 55d37e9: fix(builder): should not print file size of LICENSE.text
+
+  fix(builder): 打印文件体积时忽略 LICENSE.text
+
+- 26dcf3a: chore: bump typescript to v5 in devDependencies
+
+  chore: 升级 devDependencies 中的 typescript 版本到 v5
+
+- 441a579: feat(builder): support output.disableTsChecker in Rspack
+
+  feat(builder): 在使用 Rspack 构建时支持 output.disableTsChecker 配置项
+
+- 43b4e83: feat: support security.nonce for add nonce attribute on script tag
+  feat: 支持 security.nonce 配置，为 script 标签添加 nonce 属性
+- ad78387: chore(deps): bump babel-related dependencies to latest version
+
+  chore(deps): 升级 babel 相关依赖到最新版本
+
+- Updated dependencies [7d2972e]
+- Updated dependencies [863f8df]
+- Updated dependencies [e81eeaf]
+- Updated dependencies [26dcf3a]
+- Updated dependencies [1ef03dc]
+- Updated dependencies [056627f]
+- Updated dependencies [4274510]
+- Updated dependencies [0fc15ca]
+- Updated dependencies [43b4e83]
+- Updated dependencies [ad78387]
+  - @modern-js/builder-shared@2.21.0
+  - @modern-js/utils@2.21.0
+
 ## 2.20.0
 
 ### Patch Changes

package/dist/plugins/checkSyntax.d.ts

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

package/dist/plugins/checkSyntax.js

@@ -0,0 +1,59 @@
+"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.builderPluginCheckSyntax = void 0;
+const builder_shared_1 = require("@modern-js/builder-shared");
+function builderPluginCheckSyntax() {
+    return {
+        name: 'builder-plugin-check-syntax',
+        setup(api) {
+            api.modifyBundlerChain(async (chain, { isProd, target }) => {
+                const config = api.getNormalizedConfig();
+                const { checkSyntax } = config.security;
+                if (!isProd ||
+                    ['node', 'web-worker'].includes(target) ||
+                    !checkSyntax) {
+                    return;
+                }
+                const targets = await getCheckTargets(api.context, config, target, checkSyntax);
+                const { CheckSyntaxPlugin } = await Promise.resolve().then(() => __importStar(require('@modern-js/builder-shared')));
+                chain.plugin(CheckSyntaxPlugin.name).use(CheckSyntaxPlugin, [
+                    {
+                        targets,
+                        exclude: typeof checkSyntax === 'object' ? checkSyntax.exclude : undefined,
+                    },
+                ]);
+            });
+        },
+    };
+}
+exports.builderPluginCheckSyntax = builderPluginCheckSyntax;
+async function getCheckTargets(builderContext, builderConfig, builderTarget, checkSyntax) {
+    if (checkSyntax === true) {
+        const browserslist = await (0, builder_shared_1.getBrowserslistWithDefault)(builderContext.rootPath, builderConfig, builderTarget);
+        return browserslist || builder_shared_1.DEFAULT_BROWSERSLIST[builderTarget];
+    }
+    return checkSyntax.targets;
+}

package/dist/plugins/fileSize.d.ts

@@ -1,4 +1,4 @@
 import type { DefaultBuilderPlugin } from '@modern-js/builder-shared';
-/** Filter source map files */
+/** Filter source map and license files */
 export declare const filterAsset: (asset: string) => boolean;
 export declare const builderPluginFileSize: () => DefaultBuilderPlugin;

package/dist/plugins/fileSize.js

@@ -34,8 +34,8 @@ exports.builderPluginFileSize = exports.filterAsset = void 0;
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("@modern-js/utils/chalk"));
 const builder_shared_1 = require("@modern-js/builder-shared");
-/** Filter source map files */
-const filterAsset = (asset) => !/\.map$/.test(asset);
+/** Filter source map and license files */
+const filterAsset = (asset) => !/\.map$/.test(asset) && !/\.LICENSE\.txt$/.test(asset);
 exports.filterAsset = filterAsset;
 const getAssetColor = (size) => {
     if (size > 300 * 1000) {

package/dist/plugins/html.js

@@ -165,6 +165,15 @@ const builderPluginHtml = () => ({
                     .plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`)
                     .use(HtmlPlugin, [finalOptions]);
             }));
+            if (config.security) {
+                const { nonce } = config.security;
+                if (nonce) {
+                    const { HtmlNoncePlugin } = await Promise.resolve().then(() => __importStar(require('@modern-js/builder-shared')));
+                    chain
+                        .plugin(CHAIN_ID.PLUGIN.HTML_NONCE)
+                        .use(HtmlNoncePlugin, [{ nonce, HtmlPlugin }]);
+                }
+            }
             if (config.html) {
                 const { appIcon, crossorigin } = config.html;
                 if (crossorigin) {

package/dist/plugins/index.d.ts

@@ -1,21 +1,2 @@
-export declare const plugins: {
-    html: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    cleanOutput: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    startUrl: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    fileSize: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    devtool: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    target: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    entry: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    cache: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    yaml: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    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>;
-    media: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    assetsRetry: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-    antd: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
-};
+import { Plugins } from '@modern-js/builder-shared';
+export declare const plugins: Plugins;

package/dist/plugins/index.js

@@ -45,4 +45,6 @@ exports.plugins = {
     media: () => Promise.resolve().then(() => __importStar(require('./asset'))).then(m => m.builderAssetPlugin('media', builder_shared_1.MEDIA_EXTENSIONS)),
     assetsRetry: () => Promise.resolve().then(() => __importStar(require('./assetsRetry'))).then(m => m.builderPluginAssetsRetry()),
     antd: () => Promise.resolve().then(() => __importStar(require('./antd'))).then(m => m.builderAntdPlugin()),
+    tsChecker: () => Promise.resolve().then(() => __importStar(require('./tsChecker'))).then(m => m.builderPluginTsChecker()),
+    checkSyntax: () => Promise.resolve().then(() => __importStar(require('./checkSyntax'))).then(m => m.builderPluginCheckSyntax()),
 };

package/dist/plugins/tsChecker.d.ts

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

package/dist/plugins/tsChecker.js

@@ -0,0 +1,96 @@
+"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.builderPluginTsChecker = void 0;
+const builderPluginTsChecker = () => {
+    return {
+        name: 'builder-plugin-ts-checker',
+        setup(api) {
+            api.modifyBundlerChain(async (chain, { target }) => {
+                const config = api.getNormalizedConfig();
+                // Use tsChecker if disableTsChecker is not `true`, So there are two situations for user:
+                // 1. tsLoader + transpileOnly + tsChecker
+                // 2. @babel/preset-typescript + tsChecker
+                if (config.output.disableTsChecker || !api.context.tsconfigPath) {
+                    return;
+                }
+                // If there is multiple target, only apply tsChecker to the first target
+                // to avoid multiple tsChecker running at the same time
+                if (Array.isArray(api.context.target) &&
+                    target !== api.context.target[0]) {
+                    return;
+                }
+                const { default: ForkTsCheckerWebpackPlugin } = await Promise.resolve().then(() => __importStar(require('@modern-js/builder-shared/fork-ts-checker-webpack-plugin')));
+                const { logger, CHAIN_ID, applyOptionsChain } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils')));
+                // use typescript of user project
+                let typescriptPath;
+                try {
+                    typescriptPath = require.resolve('typescript', {
+                        paths: [api.context.rootPath],
+                    });
+                }
+                catch (err) {
+                    logger.warn('"typescript" is not found in current project, Type Checker will not work.');
+                    return;
+                }
+                const tsCheckerOptions = applyOptionsChain({
+                    typescript: {
+                        // avoid OOM issue
+                        memoryLimit: 8192,
+                        // use tsconfig of user project
+                        configFile: api.context.tsconfigPath,
+                        typescriptPath,
+                    },
+                    issue: {
+                        exclude: [
+                            { file: '**/*.(spec|test).ts' },
+                            { file: '**/node_modules/**/*' },
+                        ],
+                    },
+                    logger: {
+                        log() {
+                            // do nothing
+                            // we only want to display error messages
+                        },
+                        error(message) {
+                            console.error(message.replace(/ERROR/g, 'Type Error'));
+                        },
+                    },
+                }, typeof config.tools.tsChecker === 'object'
+                    ? config.tools.tsChecker
+                    : {});
+                if (api.context.bundlerType === 'rspack' &&
+                    chain.get('mode') === 'production') {
+                    logger.info('ts-checker running...');
+                    logger.info('ts-checker is running slowly and will block builds until it is complete, please be patient and wait.');
+                }
+                chain
+                    .plugin(CHAIN_ID.PLUGIN.TS_CHECKER)
+                    .use(ForkTsCheckerWebpackPlugin, [tsCheckerOptions]);
+            });
+        },
+    };
+};
+exports.builderPluginTsChecker = builderPluginTsChecker;

package/package.json

@@ -18,7 +18,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.20.0",
+  "version": "2.21.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -31,15 +31,14 @@
   },
   "dependencies": {
     "@svgr/webpack": "6.5.1",
-    "@modern-js/builder-shared": "2.20.0",
-    "@modern-js/utils": "2.20.0"
+    "@modern-js/builder-shared": "2.21.1",
+    "@modern-js/utils": "2.21.1"
   },
   "devDependencies": {
-    "@types/babel__core": "^7.1.19",
-    "@types/babel__preset-env": "^7.9.2",
+    "@types/babel__core": "^7.20.0",
     "@types/node": "^14",
-    "typescript": "^4",
-    "@scripts/vitest-config": "2.20.0"
+    "typescript": "^5",
+    "@scripts/vitest-config": "2.21.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",