@modern-js/builder 2.34.0 → 2.35.1

package/dist/plugins/arco.js

@@ -16,14 +16,13 @@ const builderPluginArco = () => ({
     const ARCO_NAME = "@arco-design/web-react";
     const ARCO_ICON = `${ARCO_NAME}/icon`;
     api.modifyBuilderConfig((builderConfig) => {
-      var _transformImport, _transformImport1;
       var _builderConfig;
       const { transformImport = [] } = builderConfig.source || {};
       if (transformImport === false || !(0, _utils.isPackageInstalled)(ARCO_NAME, api.context.rootPath)) {
         return;
       }
       const isUseSSR = (0, _antd.useSSR)(api.context.target);
-      if (!((_transformImport = transformImport) === null || _transformImport === void 0 ? void 0 : _transformImport.some((item) => item.libraryName === ARCO_NAME))) {
+      if (!(transformImport === null || transformImport === void 0 ? void 0 : transformImport.some((item) => item.libraryName === ARCO_NAME))) {
         transformImport.push({
           libraryName: ARCO_NAME,
           libraryDirectory: isUseSSR ? "lib" : "es",
@@ -31,7 +30,7 @@ const builderPluginArco = () => ({
           style: true
         });
       }
-      if (!((_transformImport1 = transformImport) === null || _transformImport1 === void 0 ? void 0 : _transformImport1.some((item) => item.libraryName === ARCO_ICON))) {
+      if (!(transformImport === null || transformImport === void 0 ? void 0 : transformImport.some((item) => item.libraryName === ARCO_ICON))) {
         transformImport.push({
           libraryName: ARCO_ICON,
           libraryDirectory: isUseSSR ? "react-icon-cjs" : "react-icon",

package/dist/plugins/fileSize.js

@@ -62,8 +62,12 @@ async function printFileSizes(stats, distPath) {
       folder: _path.default.join(_path.default.basename(distPath), _path.default.dirname(asset.name)),
       name: _path.default.basename(asset.name),
       gzippedSize,
-      sizeLabel: filesize(size),
-      gzipSizeLabel: getAssetColor(gzippedSize)(filesize(gzippedSize))
+      sizeLabel: filesize(size, {
+        round: 1
+      }),
+      gzipSizeLabel: getAssetColor(gzippedSize)(filesize(gzippedSize, {
+        round: 1
+      }))
     };
   };
   const multiStats = "stats" in stats ? stats.stats : [
@@ -89,7 +93,7 @@ async function printFileSizes(stats, distPath) {
   assets.sort((a, b) => b.size - a.size);
   const longestLabelLength = Math.max(...assets.map((a) => stripAnsi(a.sizeLabel).length));
   const longestFileLength = Math.max(...assets.map((a) => stripAnsi(a.folder + _path.default.sep + a.name).length));
-  _buildershared.logger.info(`File sizes after production build:
+  _buildershared.logger.info(`Production file sizes:
 `);
   printHeader(longestFileLength, longestLabelLength);
   let totalSize = 0;

package/dist/plugins/html.js

@@ -23,12 +23,11 @@ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _buildershared = require("@modern-js/builder-shared");
 const _lodash = /* @__PURE__ */ _interop_require_default._(require("@modern-js/utils/lodash"));
 async function getTemplateParameters(entryName, config, assetPrefix) {
-  var _templateParametersByEntries;
   const { applyOptionsChain } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils")));
   const { mountId, templateParameters, templateParametersByEntries } = config.html;
   const meta = await (0, _buildershared.getMetaTags)(entryName, config);
   const title = (0, _buildershared.getTitle)(entryName, config);
-  const templateParams = ((_templateParametersByEntries = templateParametersByEntries) === null || _templateParametersByEntries === void 0 ? void 0 : _templateParametersByEntries[entryName]) || templateParameters;
+  const templateParams = (templateParametersByEntries === null || templateParametersByEntries === void 0 ? void 0 : templateParametersByEntries[entryName]) || templateParameters;
   const baseParameters = {
     meta,
     title,

package/dist/plugins/nodeAddons.js

@@ -26,10 +26,9 @@ const builderPluginNodeAddons = () => ({
           throw new Error(`Failed to compile Node.js addons, couldn't find the package.json of ${chalk.yellow(resource)}.`);
         }
         const getFilename = (resource2, pkgName2) => {
-          var _match;
           const reg = new RegExp(`node_modules/${pkgName2}/(.+)`);
           const match = resource2.match(reg);
-          const filename = (_match = match) === null || _match === void 0 ? void 0 : _match[1];
+          const filename = match === null || match === void 0 ? void 0 : match[1];
           if (!filename) {
             return "[name].[ext]";
           }

package/dist/plugins/sourceBuild.d.ts

@@ -1,13 +1,11 @@
-import type { BuilderPlugin } from '@modern-js/builder-shared';
+import { type BuilderPlugin } from '@modern-js/builder-shared';
 import type { BuilderPluginAPI as WebpackBuilderPluginAPI } from '@modern-js/builder-webpack-provider';
 import type { BuilderPluginAPI as RspackBuilderPluginAPI } from '@modern-js/builder-rspack-provider';
-import { type ExtraMonorepoStrategies } from '@modern-js/monorepo-utils';
+import { type Project, type ExtraMonorepoStrategies } from '@modern-js/monorepo-utils';
 export declare const pluginName = "builder-plugin-source-build";
 export declare const getSourceInclude: (options: {
-  projectNameOrRootPath: string;
-  findMonorepoStartPath: string;
+  projects: Project[];
   sourceField: string;
-  extraMonorepoStrategies?: ExtraMonorepoStrategies;
 }) => Promise<string[]>;
 export interface PluginSourceBuildOptions {
   projectName?: string;

package/dist/plugins/sourceBuild.js

@@ -20,18 +20,15 @@ _export(exports, {
     return builderPluginSourceBuild;
   }
 });
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _buildershared = require("@modern-js/builder-shared");
 const _monorepoutils = require("@modern-js/monorepo-utils");
 const _utils = require("@modern-js/utils");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const log = (0, _utils.debug)("BUILDER_PLUGIN_SOURCE_BUILD");
 const pluginName = "builder-plugin-source-build";
 const getSourceInclude = async (options) => {
-  const { projectNameOrRootPath, sourceField, extraMonorepoStrategies, findMonorepoStartPath } = options;
-  const projects = await (0, _monorepoutils.getDependentProjects)(projectNameOrRootPath, {
-    cwd: findMonorepoStartPath,
-    recursive: true,
-    filter: (0, _monorepoutils.filterByField)(sourceField),
-    extraMonorepoStrategies
-  });
+  const { projects, sourceField } = options;
   const includes = [];
   for (const project of projects) {
     includes.push(...project.getSourceEntryPaths({
@@ -47,19 +44,24 @@ function builderPluginSourceBuild(options) {
     name: pluginName,
     async setup(api) {
       const projectRootPath = api.context.rootPath;
+      let projects = [];
       if (api.context.bundlerType === "webpack") {
         api.modifyBuilderConfig(async (config) => {
           var _config_experiments;
-          const { sourceBuild = true } = (_config_experiments = config.experiments) !== null && _config_experiments !== void 0 ? _config_experiments : {};
+          const { sourceBuild } = (_config_experiments = config.experiments) !== null && _config_experiments !== void 0 ? _config_experiments : {};
           if (!sourceBuild) {
             return;
           }
-          const includes = await getSourceInclude({
-            projectNameOrRootPath: projectName || projectRootPath,
-            sourceField,
-            findMonorepoStartPath: projectRootPath,
+          projects = await (0, _monorepoutils.getDependentProjects)(projectName || projectRootPath, {
+            cwd: projectRootPath,
+            recursive: true,
+            filter: (0, _monorepoutils.filterByField)(sourceField),
             extraMonorepoStrategies
           });
+          const includes = await getSourceInclude({
+            projects,
+            sourceField
+          });
           var _config_source;
           config.source = (_config_source = config.source) !== null && _config_source !== void 0 ? _config_source : {};
           var _config_source_include;
@@ -68,7 +70,7 @@ function builderPluginSourceBuild(options) {
             ...includes
           ];
         });
-        api.modifyBundlerChain((chain, { CHAIN_ID }) => {
+        api.modifyWebpackChain((chain, { CHAIN_ID }) => {
           const { experiments: { sourceBuild }, tools: { tsLoader } } = api.getNormalizedConfig();
           if (!sourceBuild) {
             return;
@@ -84,6 +86,16 @@ function builderPluginSourceBuild(options) {
               sourceField
             ]
           });
+          const { TS_CONFIG_PATHS } = CHAIN_ID.RESOLVE_PLUGIN;
+          if (chain.resolve.plugins.has(TS_CONFIG_PATHS)) {
+            chain.resolve.plugin(TS_CONFIG_PATHS).tap((options2) => {
+              const references = projects.map((project) => _path.default.join(project.dir, _buildershared.TS_CONFIG_FILE)).filter((filePath) => _utils.fs.existsSync(filePath)).map((filePath) => _path.default.relative(projectRootPath, filePath));
+              return options2.map((option) => ({
+                ...option,
+                references
+              }));
+            });
+          }
         });
       }
     }

package/dist/plugins/splitChunks.js

@@ -49,7 +49,7 @@ async function splitByExperience(ctx) {
   const { override, polyfill, rootPath, defaultConfig, userDefinedCacheGroups } = ctx;
   const experienceCacheGroup = {};
   const packageRegExps = {
-    react: createDependenciesRegExp("react", "react-dom"),
+    react: createDependenciesRegExp("react", "react-dom", "scheduler"),
     router: createDependenciesRegExp("react-router", "react-router-dom", "@remix-run/router", "history"),
     lodash: createDependenciesRegExp("lodash", "lodash-es"),
     axios: createDependenciesRegExp("axios", /axios-.+/)

package/dist/plugins/tsChecker.js

@@ -15,7 +15,6 @@ const builderPluginTsChecker = () => {
     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;
@@ -38,7 +37,7 @@ const builderPluginTsChecker = () => {
         }
         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 enableSourceBuild = (_experiments_sourceBuild = experiments === null || experiments === void 0 ? void 0 : experiments.sourceBuild) !== null && _experiments_sourceBuild !== void 0 ? _experiments_sourceBuild : false;
         const tsCheckerOptions = applyOptionsChain({
           typescript: {
             // avoid OOM issue

package/package.json

@@ -18,7 +18,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.34.0",
+  "version": "2.35.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -45,19 +45,19 @@
   "dependencies": {
     "@svgr/webpack": "8.0.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/monorepo-utils": "2.34.0",
-    "@modern-js/builder-shared": "2.34.0",
-    "@modern-js/node-bundle-require": "2.34.0",
-    "@modern-js/utils": "2.34.0"
+    "@modern-js/builder-shared": "2.35.1",
+    "@modern-js/monorepo-utils": "2.35.1",
+    "@modern-js/utils": "2.35.1",
+    "@modern-js/node-bundle-require": "2.35.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.34.0",
-    "@modern-js/builder-rspack-provider": "2.34.0",
-    "@scripts/build": "2.34.0",
-    "@scripts/vitest-config": "2.34.0"
+    "@modern-js/builder-webpack-provider": "2.35.1",
+    "@modern-js/builder-rspack-provider": "2.35.1",
+    "@scripts/vitest-config": "2.35.1",
+    "@scripts/build": "2.35.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",