@modern-js/builder 2.33.1 → 2.35.0

package/dist/cli/commands.d.ts

@@ -0,0 +1,2 @@
+import type { BuilderInstance } from '..';
+export declare function setupProgram(builder: BuilderInstance): void;

package/dist/cli/commands.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "setupProgram", {
+  enumerable: true,
+  get: function() {
+    return setupProgram;
+  }
+});
+const _path = require("path");
+const _utils = require("@modern-js/utils");
+const _commander = require("@modern-js/utils/commander");
+function setupProgram(builder) {
+  const pkgJson = (0, _path.join)(__dirname, "../../package.json");
+  const { version } = _utils.fs.readJSONSync(pkgJson);
+  _commander.program.name("builder").usage("<command> [options]").version(version);
+  _commander.program.command("dev").description("starting the dev server").action(async () => {
+    await builder.startDevServer();
+  });
+  _commander.program.command("build").description("build the app for production").action(async () => {
+    await builder.build();
+  });
+  _commander.program.command("serve").description("preview the production build locally").action(async () => {
+    await builder.serve();
+  });
+  _commander.program.parse();
+}

package/dist/cli/config.d.ts

@@ -0,0 +1,14 @@
+import type { BuilderEntry, BuilderPlugin } from '@modern-js/builder-shared';
+import type { BuilderConfig as WebpackBuilderConfig } from '@modern-js/builder-webpack-provider';
+import type { BuilderConfig as RspackBuilderConfig } from '@modern-js/builder-rspack-provider';
+export type BuilderConfig<Bundler extends 'rspack' | 'webpack' = 'webpack'> = (Bundler extends 'webpack' ? WebpackBuilderConfig : RspackBuilderConfig) & {
+  source?: {
+    entries?: BuilderEntry;
+  };
+  builderPlugins?: BuilderPlugin[];
+};
+export declare const defineConfig: <Bundler extends "webpack" | "rspack" = "webpack">(config: BuilderConfig<Bundler>) => BuilderConfig<Bundler>;
+export declare function loadConfig(): Promise<BuilderConfig>;
+export declare function getDefaultEntries(): {
+  index: string;
+};

package/dist/cli/config.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  defineConfig: function() {
+    return defineConfig;
+  },
+  loadConfig: function() {
+    return loadConfig;
+  },
+  getDefaultEntries: function() {
+    return getDefaultEntries;
+  }
+});
+const _path = require("path");
+const _utils = require("@modern-js/utils");
+const _fsextra = require("@modern-js/utils/fs-extra");
+const _nodebundlerequire = require("@modern-js/node-bundle-require");
+const defineConfig = (config) => config;
+async function loadConfig() {
+  const configFile = (0, _path.join)(process.cwd(), "builder.config.ts");
+  if ((0, _fsextra.existsSync)(configFile)) {
+    const mod = await (0, _nodebundlerequire.bundleRequire)(configFile);
+    return mod.default || mod;
+  }
+  return {};
+}
+function getDefaultEntries() {
+  const cwd = process.cwd();
+  const files = [
+    "ts",
+    "tsx",
+    "js",
+    "jsx"
+  ].map((ext) => (0, _path.join)(cwd, `src/index.${ext}`));
+  const entryFile = (0, _utils.findExists)(files);
+  if (entryFile) {
+    return {
+      index: entryFile
+    };
+  }
+  throw new Error("Could not find the entry file, please make sure that `src/index.(js|ts|tsx|jsx)` exists, or customize entry through the `source.entries` configuration.");
+}

package/dist/cli/index.d.ts

@@ -0,0 +1,6 @@
+import { BuilderPlugin } from '..';
+export { defineConfig } from './config';
+type RunCliOptions = {
+  defaultPlugins?: BuilderPlugin[];
+};
+export declare function runCli(options?: RunCliOptions): Promise<void>;

package/dist/cli/index.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  defineConfig: function() {
+    return _config.defineConfig;
+  },
+  runCli: function() {
+    return runCli;
+  }
+});
+const _ = require("..");
+const _commands = require("./commands");
+const _provider = require("./provider");
+const _config = require("./config");
+async function runCli(options = {}) {
+  var _config_source;
+  const provider = await (0, _provider.loadProvider)();
+  const config = await (0, _config.loadConfig)();
+  const builder = await (0, _.createBuilder)(provider({
+    builderConfig: config
+  }), {
+    entry: ((_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.entries) || (0, _config.getDefaultEntries)()
+  });
+  if (options.defaultPlugins) {
+    builder.addPlugins(options.defaultPlugins);
+  }
+  if (config.builderPlugins) {
+    builder.addPlugins(config.builderPlugins);
+  }
+  (0, _commands.setupProgram)(builder);
+}

package/dist/cli/provider.d.ts

@@ -0,0 +1,2 @@
+export declare function getProviderType(): "webpack" | "rspack";
+export declare function loadProvider(): Promise<typeof import("@modern-js/builder-rspack-provider").builderRspackProvider | typeof import("@modern-js/builder-webpack-provider").builderWebpackProvider>;

package/dist/cli/provider.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  getProviderType: function() {
+    return getProviderType;
+  },
+  loadProvider: function() {
+    return loadProvider;
+  }
+});
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _buildershared = require("@modern-js/builder-shared");
+const _utils = require("@modern-js/utils");
+function getProviderType() {
+  const root = process.cwd();
+  if ((0, _utils.isPackageInstalled)(_buildershared.RSPACK_PROVIDER, root)) {
+    return "rspack";
+  }
+  if ((0, _utils.isPackageInstalled)(_buildershared.WEBPACK_PROVIDER, root)) {
+    return "webpack";
+  }
+  throw new Error(`Failed to load builder provider, please check if you have "${_buildershared.RSPACK_PROVIDER}" or "${_buildershared.WEBPACK_PROVIDER}" installed`);
+}
+async function loadProvider() {
+  const providerType = getProviderType();
+  if (providerType === "rspack") {
+    const { builderRspackProvider } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/builder-rspack-provider")));
+    return builderRspackProvider;
+  }
+  const { builderWebpackProvider } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/builder-webpack-provider")));
+  return builderWebpackProvider;
+}

package/dist/plugins/cache.js

@@ -8,7 +8,9 @@ Object.defineProperty(exports, "builderPluginCache", {
     return builderPluginCache;
   }
 });
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _crypto = /* @__PURE__ */ _interop_require_default._(require("crypto"));
 const _path = require("path");
 const _buildershared = require("@modern-js/builder-shared");
 async function validateCache(cacheDirectory, buildDependencies) {
@@ -23,6 +25,11 @@ async function validateCache(cacheDirectory, buildDependencies) {
   }
   await fs.outputJSON(configFile, buildDependencies);
 }
+function getDigestHash(digest) {
+  const fsHash = _crypto.default.createHash("md5");
+  const md5 = fsHash.update(JSON.stringify(digest)).digest("hex").slice(0, 8);
+  return md5;
+}
 function getCacheDirectory({ cacheDirectory }, context) {
   if (cacheDirectory) {
     return (0, _path.isAbsolute)(cacheDirectory) ? cacheDirectory : (0, _path.join)(context.rootPath, cacheDirectory);
@@ -33,11 +40,12 @@ async function getBuildDependencies(context) {
   const { findExists } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils")));
   const rootPackageJson = (0, _path.join)(context.rootPath, "package.json");
   const browserslistConfig = (0, _path.join)(context.rootPath, ".browserslistrc");
-  const buildDependencies = {
-    packageJson: [
+  const buildDependencies = {};
+  if (await (0, _buildershared.isFileExists)(rootPackageJson)) {
+    buildDependencies.packageJson = [
       rootPackageJson
-    ]
-  };
+    ];
+  }
   if (context.configPath) {
     buildDependencies.config = [
       context.configPath
@@ -82,10 +90,11 @@ const builderPluginCache = () => ({
       const cacheDirectory = getCacheDirectory(cacheConfig, context);
       const buildDependencies = await getBuildDependencies(context);
       await validateCache(cacheDirectory, buildDependencies);
+      const useDigest = Array.isArray(cacheConfig.cacheDigest) && cacheConfig.cacheDigest.length;
       chain.cache({
         // The default cache name of webpack is '${name}-${env}', and the `name` is `default` by default.
         // We set cache name to avoid cache conflicts of different targets.
-        name: `${target}-${env}`,
+        name: useDigest ? `${target}-${env}-${getDigestHash(cacheConfig.cacheDigest)}` : `${target}-${env}`,
         type: "filesystem",
         cacheDirectory,
         buildDependencies

package/dist/plugins/checkSyntax.js

@@ -28,6 +28,7 @@ function builderPluginCheckSyntax() {
         chain.plugin(CheckSyntaxPlugin.name).use(CheckSyntaxPlugin, [
           {
             targets,
+            rootPath: api.context.rootPath,
             ...typeof checkSyntax === "object" ? checkSyntax : {}
           }
         ]);

package/dist/plugins/inlineChunk.js

@@ -25,15 +25,16 @@ const builderPluginInlineChunk = () => ({
         // todo: not support enableInlineScripts in Rspack yet, which will take unknown build error
         enableInlineScripts
       } = config.output;
-      const tests = [];
+      const scriptTests = [];
+      const styleTests = [];
       if (enableInlineScripts) {
-        tests.push(enableInlineScripts === true ? /\.js$/ : enableInlineScripts);
+        scriptTests.push(enableInlineScripts === true ? _buildershared.JS_REGEX : enableInlineScripts);
       }
       if (enableInlineStyles) {
-        tests.push(enableInlineStyles === true ? /\.css$/ : enableInlineStyles);
+        styleTests.push(enableInlineStyles === true ? _buildershared.CSS_REGEX : enableInlineStyles);
       }
       if (!disableInlineRuntimeChunk) {
-        tests.push(
+        scriptTests.push(
           // RegExp like /builder-runtime([.].+)?\.js$/
           // matches builder-runtime.js and builder-runtime.123456.js
           new RegExp(`${_buildershared.RUNTIME_CHUNK_NAME}([.].+)?\\.js$`)
@@ -42,7 +43,8 @@ const builderPluginInlineChunk = () => ({
       chain.plugin(CHAIN_ID.PLUGIN.INLINE_HTML).use(InlineChunkHtmlPlugin, [
         HtmlPlugin,
         {
-          tests,
+          styleTests,
+          scriptTests,
           distPath: (0, _buildershared.pick)(config.output.distPath, [
             "js",
             "css"

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/package.json

@@ -18,32 +18,46 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.33.1",
+  "version": "2.35.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "jsnext:source": "./src/index.ts",
       "default": "./dist/index.js"
+    },
+    "./cli": {
+      "types": "./dist/cli/index.d.ts",
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/cli/index.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "cli": [
+        "./dist/cli/index.d.ts"
+      ]
     }
   },
   "dependencies": {
     "@svgr/webpack": "8.0.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/builder-shared": "2.33.1",
-    "@modern-js/utils": "2.33.1",
-    "@modern-js/monorepo-utils": "2.33.1"
+    "@modern-js/builder-shared": "2.35.0",
+    "@modern-js/monorepo-utils": "2.35.0",
+    "@modern-js/node-bundle-require": "2.35.0",
+    "@modern-js/utils": "2.35.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.33.1",
-    "@modern-js/builder-rspack-provider": "2.33.1",
-    "@scripts/build": "2.33.1",
-    "@scripts/vitest-config": "2.33.1"
+    "@modern-js/builder-webpack-provider": "2.35.0",
+    "@modern-js/builder-rspack-provider": "2.35.0",
+    "@scripts/build": "2.35.0",
+    "@scripts/vitest-config": "2.35.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",