@modern-js/builder 2.26.0 → 2.28.0

package/dist/plugins/svg.js

@@ -1,84 +1,67 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.builderPluginSvg = void 0;
-const path_1 = __importDefault(require("path"));
-const builder_shared_1 = require("@modern-js/builder-shared");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "builderPluginSvg", {
+  enumerable: true,
+  get: function() {
+    return builderPluginSvg;
+  }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _buildershared = require("@modern-js/builder-shared");
 const builderPluginSvg = () => {
-    return {
-        name: 'builder-plugin-svg',
-        setup(api) {
-            api.modifyBundlerChain(async (chain, { isProd, CHAIN_ID }) => {
-                const config = api.getNormalizedConfig();
-                const defaultExport = config.output.svgDefaultExport;
-                const assetType = 'svg';
-                const distDir = (0, builder_shared_1.getDistPath)(config.output, 'svg');
-                const filename = (0, builder_shared_1.getFilename)(config.output, 'svg', isProd);
-                const outputName = path_1.default.posix.join(distDir, filename);
-                const maxSize = config.output.dataUriLimit[assetType];
-                const rule = chain.module.rule(CHAIN_ID.RULE.SVG).test(builder_shared_1.SVG_REGEX);
-                if (config.output.disableSvgr) {
-                    // treat all .svg files as assets.
-                    (0, builder_shared_1.chainStaticAssetRule)({
-                        rule,
-                        maxSize,
-                        filename: path_1.default.posix.join(distDir, filename),
-                        assetType,
-                    });
-                    return;
-                }
-                // If we import SVG from a CSS file, it will be processed as assets.
-                (0, builder_shared_1.chainStaticAssetRule)({
-                    rule,
-                    maxSize,
-                    filename: path_1.default.posix.join(distDir, filename),
-                    assetType,
-                    issuer: {
-                        // The issuer option ensures that SVGR will only apply if the SVG is imported from a JS file.
-                        not: [builder_shared_1.JS_REGEX, builder_shared_1.TS_REGEX],
-                    },
-                });
-                rule
-                    .oneOf(CHAIN_ID.ONE_OF.SVG_INLINE)
-                    .type('javascript/auto')
-                    .resourceQuery(/inline/)
-                    .use(CHAIN_ID.USE.URL)
-                    .loader((0, builder_shared_1.getSharedPkgCompiledPath)('url-loader'))
-                    .options({
-                    limit: Infinity,
-                    name: outputName,
-                });
-                rule
-                    .oneOf(CHAIN_ID.ONE_OF.SVG_URL)
-                    .type('javascript/auto')
-                    .resourceQuery(/url/)
-                    .use(CHAIN_ID.USE.URL)
-                    .loader((0, builder_shared_1.getSharedPkgCompiledPath)('url-loader'))
-                    .options({
-                    limit: false,
-                    name: outputName,
-                });
-                rule
-                    .oneOf(CHAIN_ID.ONE_OF.SVG)
-                    .type('javascript/auto')
-                    .use(CHAIN_ID.USE.SVGR)
-                    .loader(require.resolve('@svgr/webpack'))
-                    .options({
-                    svgo: true,
-                    svgoConfig: (0, builder_shared_1.getSvgoDefaultConfig)(),
-                })
-                    .end()
-                    .when(defaultExport === 'url', c => c
-                    .use(CHAIN_ID.USE.URL)
-                    .loader((0, builder_shared_1.getSharedPkgCompiledPath)('url-loader'))
-                    .options({
-                    limit: config.output.dataUriLimit.svg,
-                    name: outputName,
-                }));
-            });
-        },
-    };
+  return {
+    name: "builder-plugin-svg",
+    setup(api) {
+      api.modifyBundlerChain(async (chain, { isProd, CHAIN_ID }) => {
+        const config = api.getNormalizedConfig();
+        const defaultExport = config.output.svgDefaultExport;
+        const assetType = "svg";
+        const distDir = (0, _buildershared.getDistPath)(config.output, "svg");
+        const filename = (0, _buildershared.getFilename)(config.output, "svg", isProd);
+        const outputName = _path.default.posix.join(distDir, filename);
+        const maxSize = config.output.dataUriLimit[assetType];
+        const rule = chain.module.rule(CHAIN_ID.RULE.SVG).test(_buildershared.SVG_REGEX);
+        if (config.output.disableSvgr) {
+          (0, _buildershared.chainStaticAssetRule)({
+            rule,
+            maxSize,
+            filename: _path.default.posix.join(distDir, filename),
+            assetType
+          });
+          return;
+        }
+        (0, _buildershared.chainStaticAssetRule)({
+          rule,
+          maxSize,
+          filename: _path.default.posix.join(distDir, filename),
+          assetType,
+          issuer: {
+            // The issuer option ensures that SVGR will only apply if the SVG is imported from a JS file.
+            not: [
+              _buildershared.JS_REGEX,
+              _buildershared.TS_REGEX
+            ]
+          }
+        });
+        rule.oneOf(CHAIN_ID.ONE_OF.SVG_INLINE).type("javascript/auto").resourceQuery(/inline/).use(CHAIN_ID.USE.URL).loader((0, _buildershared.getSharedPkgCompiledPath)("url-loader")).options({
+          limit: Infinity,
+          name: outputName
+        });
+        rule.oneOf(CHAIN_ID.ONE_OF.SVG_URL).type("javascript/auto").resourceQuery(/url/).use(CHAIN_ID.USE.URL).loader((0, _buildershared.getSharedPkgCompiledPath)("url-loader")).options({
+          limit: false,
+          name: outputName
+        });
+        rule.oneOf(CHAIN_ID.ONE_OF.SVG).type("javascript/auto").use(CHAIN_ID.USE.SVGR).loader(require.resolve("@svgr/webpack")).options({
+          svgo: true,
+          svgoConfig: (0, _buildershared.getSvgoDefaultConfig)()
+        }).end().when(defaultExport === "url", (c) => c.use(CHAIN_ID.USE.URL).loader((0, _buildershared.getSharedPkgCompiledPath)("url-loader")).options({
+          limit: config.output.dataUriLimit.svg,
+          name: outputName
+        }));
+      });
+    }
+  };
 };
-exports.builderPluginSvg = builderPluginSvg;

package/dist/plugins/target.d.ts

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

package/dist/plugins/target.js

@@ -1,35 +1,56 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.builderPluginTarget = void 0;
-const builder_shared_1 = require("@modern-js/builder-shared");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "builderPluginTarget", {
+  enumerable: true,
+  get: function() {
+    return builderPluginTarget;
+  }
+});
+const _buildershared = require("@modern-js/builder-shared");
 const builderPluginTarget = () => ({
-    name: 'builder-plugin-target',
-    setup(api) {
-        api.modifyBundlerChain(async (chain, { target }) => {
-            if (target === 'node') {
-                chain.target('node');
-                return;
-            }
-            if (target === 'service-worker') {
-                chain.target('webworker');
-                return;
-            }
-            // browserslist is not supported when target is web-worker
-            if (target === 'web-worker') {
-                chain.target(['webworker', 'es5']);
-                return;
-            }
-            const browserslist = await (0, builder_shared_1.getBrowserslist)(api.context.rootPath);
-            if (browserslist) {
-                chain.merge({ target: ['web', 'browserslist'] });
-            }
-            else if (target === 'modern-web') {
-                chain.merge({ target: ['web', 'es2015'] });
-            }
-            else {
-                chain.merge({ target: ['web', 'es5'] });
-            }
+  name: "builder-plugin-target",
+  setup(api) {
+    api.modifyBundlerChain(async (chain, { target }) => {
+      if (target === "node") {
+        chain.target("node");
+        return;
+      }
+      if (target === "service-worker") {
+        chain.target("webworker");
+        return;
+      }
+      if (target === "web-worker") {
+        chain.target([
+          "webworker",
+          "es5"
+        ]);
+        return;
+      }
+      const browserslist = await (0, _buildershared.getBrowserslist)(api.context.rootPath);
+      if (browserslist) {
+        chain.merge({
+          target: [
+            "web",
+            "browserslist"
+          ]
+        });
+      } else if (target === "modern-web") {
+        chain.merge({
+          target: [
+            "web",
+            "es2015"
+          ]
+        });
+      } else {
+        chain.merge({
+          target: [
+            "web",
+            "es5"
+          ]
         });
-    },
+      }
+    });
+  }
 });
-exports.builderPluginTarget = builderPluginTarget;

package/dist/plugins/toml.d.ts

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

package/dist/plugins/toml.js

@@ -1,18 +1,19 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.builderPluginToml = void 0;
-const builder_shared_1 = require("@modern-js/builder-shared");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "builderPluginToml", {
+  enumerable: true,
+  get: function() {
+    return builderPluginToml;
+  }
+});
+const _buildershared = require("@modern-js/builder-shared");
 const builderPluginToml = () => ({
-    name: 'builder-plugin-toml',
-    setup(api) {
-        api.modifyBundlerChain((chain, { CHAIN_ID }) => {
-            chain.module
-                .rule(CHAIN_ID.RULE.TOML)
-                .type('javascript/auto')
-                .test(/\.toml$/)
-                .use(CHAIN_ID.USE.TOML)
-                .loader((0, builder_shared_1.getSharedPkgCompiledPath)('toml-loader'));
-        });
-    },
+  name: "builder-plugin-toml",
+  setup(api) {
+    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
+      chain.module.rule(CHAIN_ID.RULE.TOML).type("javascript/auto").test(/\.toml$/).use(CHAIN_ID.USE.TOML).loader((0, _buildershared.getSharedPkgCompiledPath)("toml-loader"));
+    });
+  }
 });
-exports.builderPluginToml = builderPluginToml;

package/dist/plugins/tsChecker.d.ts

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

package/dist/plugins/tsChecker.js

@@ -1,96 +1,83 @@
 "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;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-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;
+Object.defineProperty(exports, "builderPluginTsChecker", {
+  enumerable: true,
+  get: function() {
+    return builderPluginTsChecker;
+  }
+});
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 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]);
-            });
-        },
-    };
+  return {
+    name: "builder-plugin-ts-checker",
+    setup(api) {
+      api.modifyBundlerChain(async (chain, { target }) => {
+        var _experiments;
+        const config = api.getNormalizedConfig();
+        if (config.output.disableTsChecker || !api.context.tsconfigPath) {
+          return;
+        }
+        if (Array.isArray(api.context.target) && target !== api.context.target[0]) {
+          return;
+        }
+        const { default: ForkTsCheckerWebpackPlugin } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/builder-shared/fork-ts-checker-webpack-plugin")));
+        const { logger, CHAIN_ID, applyOptionsChain } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils")));
+        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 { experiments } = api.getNormalizedConfig();
+        var _experiments_sourceBuild;
+        const enableSourceBuild = (_experiments_sourceBuild = (_experiments = experiments) === null || _experiments === void 0 ? void 0 : _experiments.sourceBuild) !== null && _experiments_sourceBuild !== void 0 ? _experiments_sourceBuild : false;
+        const tsCheckerOptions = applyOptionsChain({
+          typescript: {
+            // avoid OOM issue
+            memoryLimit: 8192,
+            // use tsconfig of user project
+            configFile: api.context.tsconfigPath,
+            typescriptPath,
+            // In source build mode, using the project reference generates a TS2307 error,
+            // so additional configuration of the tsChecker is required
+            ...enableSourceBuild ? {
+              build: true,
+              mode: "readonly"
+            } : {}
+          },
+          issue: {
+            exclude: [
+              {
+                file: "**/*.(spec|test).ts"
+              },
+              {
+                file: "**/node_modules/**/*"
+              }
+            ]
+          },
+          logger: {
+            log() {
+            },
+            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/dist/plugins/wasm.d.ts

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

package/dist/plugins/wasm.js

@@ -1,35 +1,34 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.builderPluginWasm = void 0;
-const path_1 = require("path");
-const builder_shared_1 = require("@modern-js/builder-shared");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "builderPluginWasm", {
+  enumerable: true,
+  get: function() {
+    return builderPluginWasm;
+  }
+});
+const _path = require("path");
+const _buildershared = require("@modern-js/builder-shared");
 const builderPluginWasm = () => ({
-    name: 'builder-plugin-wasm',
-    setup(api) {
-        api.modifyBundlerChain(async (chain, { CHAIN_ID }) => {
-            const config = api.getNormalizedConfig();
-            const distPath = (0, builder_shared_1.getDistPath)(config.output, 'wasm');
-            chain.experiments({
-                ...chain.get('experiments'),
-                asyncWebAssembly: true,
-            });
-            const wasmFilename = (0, path_1.join)(distPath, '[hash].module.wasm');
-            chain.output.merge({
-                webassemblyModuleFilename: wasmFilename,
-            });
-            // support new URL('./xx.wasm', import.meta.url)
-            chain.module
-                .rule(CHAIN_ID.RULE.WASM)
-                .test(/\.wasm$/)
-                // only include assets that came from new URL calls
-                .merge({
-                dependency: 'url',
-            })
-                .type('asset/resource')
-                .set('generator', {
-                filename: wasmFilename,
-            });
-        });
-    },
+  name: "builder-plugin-wasm",
+  setup(api) {
+    api.modifyBundlerChain(async (chain, { CHAIN_ID }) => {
+      const config = api.getNormalizedConfig();
+      const distPath = (0, _buildershared.getDistPath)(config.output, "wasm");
+      chain.experiments({
+        ...chain.get("experiments"),
+        asyncWebAssembly: true
+      });
+      const wasmFilename = (0, _path.join)(distPath, "[hash].module.wasm");
+      chain.output.merge({
+        webassemblyModuleFilename: wasmFilename
+      });
+      chain.module.rule(CHAIN_ID.RULE.WASM).test(/\.wasm$/).merge({
+        dependency: "url"
+      }).type("asset/resource").set("generator", {
+        filename: wasmFilename
+      });
+    });
+  }
 });
-exports.builderPluginWasm = builderPluginWasm;

package/dist/plugins/yaml.d.ts

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

package/dist/plugins/yaml.js

@@ -1,18 +1,19 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.builderPluginYaml = void 0;
-const builder_shared_1 = require("@modern-js/builder-shared");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "builderPluginYaml", {
+  enumerable: true,
+  get: function() {
+    return builderPluginYaml;
+  }
+});
+const _buildershared = require("@modern-js/builder-shared");
 const builderPluginYaml = () => ({
-    name: 'builder-plugin-yaml',
-    setup(api) {
-        api.modifyBundlerChain((chain, { CHAIN_ID }) => {
-            chain.module
-                .rule(CHAIN_ID.RULE.YAML)
-                .type('javascript/auto')
-                .test(/\.ya?ml$/)
-                .use(CHAIN_ID.USE.YAML)
-                .loader((0, builder_shared_1.getSharedPkgCompiledPath)('yaml-loader'));
-        });
-    },
+  name: "builder-plugin-yaml",
+  setup(api) {
+    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
+      chain.module.rule(CHAIN_ID.RULE.YAML).type("javascript/auto").test(/\.ya?ml$/).use(CHAIN_ID.USE.YAML).loader((0, _buildershared.getSharedPkgCompiledPath)("yaml-loader"));
+    });
+  }
 });
-exports.builderPluginYaml = builderPluginYaml;

package/package.json

@@ -18,7 +18,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.26.0",
+  "version": "2.28.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -31,17 +31,19 @@
   },
   "dependencies": {
     "@svgr/webpack": "8.0.1",
-    "@modern-js/builder-shared": "2.26.0",
-    "@modern-js/monorepo-utils": "2.26.0",
-    "@modern-js/utils": "2.26.0"
+    "@swc/helpers": "0.5.1",
+    "@modern-js/builder-shared": "2.28.0",
+    "@modern-js/monorepo-utils": "2.28.0",
+    "@modern-js/utils": "2.28.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.26.0",
-    "@modern-js/builder-rspack-provider": "2.26.0",
-    "@scripts/vitest-config": "2.26.0"
+    "@modern-js/builder-webpack-provider": "2.28.0",
+    "@modern-js/builder-rspack-provider": "2.28.0",
+    "@scripts/build": "2.28.0",
+    "@scripts/vitest-config": "2.28.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -50,8 +52,8 @@
   },
   "scripts": {
     "new": "modern new",
-    "build": "tsc",
-    "dev": "tsc --watch",
+    "build": "modern-lib build",
+    "dev": "modern-lib build --watch",
     "test": "vitest run",
     "test:watch": "vitest dev --no-coverage",
     "test:ui": "vitest --ui"