@rsbuild/core 0.4.6 → 0.4.7

package/dist/cli/commands.d.ts

@@ -1,4 +1,4 @@
-import type { RsbuildMode } from '..';
+import { type RsbuildMode } from '@rsbuild/shared';
 export type CommonOptions = {
     config?: string;
     envMode?: string;
@@ -16,8 +16,4 @@ export type InspectOptions = CommonOptions & {
 };
 export type DevOptions = CommonOptions;
 export type PreviewOptions = CommonOptions;
-export declare function init({ cliOptions, isRestart, }: {
-    cliOptions?: CommonOptions;
-    isRestart?: boolean;
-}): Promise<import("@rsbuild/shared").RsbuildInstance | undefined>;
 export declare function runCli(): void;

package/dist/cli/commands.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,18 +15,9 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var commands_exports = {};
 __export(commands_exports, {
-  init: () => init,
   runCli: () => runCli
 });
 module.exports = __toCommonJS(commands_exports);
@@ -36,69 +25,7 @@ var import_node_path = require("node:path");
 var import_node_fs = require("node:fs");
 var import_shared = require("@rsbuild/shared");
 var import_commander = require("@rsbuild/shared/commander");
-var import_loadEnv = require("../loadEnv");
-var import_config = require("./config");
-var import_restart = require("../server/restart");
-let commonOpts = {};
-async function init({
-  cliOptions,
-  isRestart
-}) {
-  if (cliOptions) {
-    commonOpts = cliOptions;
-  }
-  try {
-    const root = process.cwd();
-    const envs = (0, import_loadEnv.loadEnv)({
-      cwd: root,
-      mode: cliOptions?.envMode
-    });
-    if ((0, import_shared.isDev)()) {
-      (0, import_restart.onBeforeRestartServer)(envs.cleanup);
-    }
-    const { content: config, filePath: configFilePath } = await (0, import_config.loadConfig)({
-      cwd: root,
-      path: commonOpts.config,
-      envMode: commonOpts.envMode
-    });
-    const command = process.argv[2];
-    if (command === "dev") {
-      const files = [...envs.filePaths];
-      if (configFilePath) {
-        files.push(configFilePath);
-      }
-      (0, import_config.watchFiles)(files);
-    }
-    const { createRsbuild } = await Promise.resolve().then(() => __toESM(require("../createRsbuild")));
-    config.source || (config.source = {});
-    config.source.define = {
-      ...envs.publicVars,
-      ...config.source.define
-    };
-    if (commonOpts.open && !config.dev?.startUrl) {
-      config.dev || (config.dev = {});
-      config.dev.startUrl = commonOpts.open;
-    }
-    if (commonOpts.host) {
-      config.server || (config.server = {});
-      config.server.host = commonOpts.host;
-    }
-    if (commonOpts.port) {
-      config.server || (config.server = {});
-      config.server.port = commonOpts.port;
-    }
-    return await createRsbuild({
-      cwd: root,
-      rsbuildConfig: config
-    });
-  } catch (err) {
-    if (isRestart) {
-      import_shared.logger.error(err);
-    } else {
-      throw err;
-    }
-  }
-}
+var import_init = require("./init");
 const applyCommonOptions = (command) => {
   command.option(
     "-c --config <config>",
@@ -112,7 +39,7 @@ const applyServerOptions = (command) => {
   command.option("-o --open [url]", "open the page in browser on startup").option("--port <port>", "specify a port number for server to listen").option("--host <host>", "specify the host that the server listens to");
 };
 function runCli() {
-  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.4.6");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.4.7");
   const devCommand = import_commander.program.command("dev");
   const buildCommand = import_commander.program.command("build");
   const previewCommand = import_commander.program.command("preview");
@@ -123,7 +50,7 @@ function runCli() {
   [devCommand, previewCommand].forEach(applyServerOptions);
   devCommand.description("starting the dev server").action(async (options) => {
     try {
-      const rsbuild = await init({ cliOptions: options });
+      const rsbuild = await (0, import_init.init)({ cliOptions: options });
       await rsbuild?.startDevServer();
     } catch (err) {
       import_shared.logger.error("Failed to start dev server.");
@@ -133,7 +60,7 @@ function runCli() {
   });
   buildCommand.option("-w --watch", "turn on watch mode, watch for changes and rebuild").description("build the app for production").action(async (options) => {
     try {
-      const rsbuild = await init({ cliOptions: options });
+      const rsbuild = await (0, import_init.init)({ cliOptions: options });
       await rsbuild?.build({
         watch: options.watch
       });
@@ -145,7 +72,7 @@ function runCli() {
   });
   previewCommand.description("preview the production build locally").action(async (options) => {
     try {
-      const rsbuild = await init({ cliOptions: options });
+      const rsbuild = await (0, import_init.init)({ cliOptions: options });
       if (rsbuild && !(0, import_node_fs.existsSync)(rsbuild.context.distPath)) {
         throw new Error(
           `The output directory ${import_shared.color.yellow(
@@ -162,7 +89,7 @@ function runCli() {
   });
   inspectCommand.description("inspect the Rspack and Rsbuild configs").option("--env <env>", "specify env mode", "development").option("--output <output>", "specify inspect content output path", "/").option("--verbose", "show full function definitions in output").action(async (options) => {
     try {
-      const rsbuild = await init({ cliOptions: options });
+      const rsbuild = await (0, import_init.init)({ cliOptions: options });
       await rsbuild?.inspectConfig({
         env: options.env,
         verbose: options.verbose,
@@ -179,6 +106,5 @@ function runCli() {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  init,
   runCli
 });

package/dist/cli/init.d.ts

@@ -0,0 +1,5 @@
+import type { CommonOptions } from './commands';
+export declare function init({ cliOptions, isRestart, }: {
+    cliOptions?: CommonOptions;
+    isRestart?: boolean;
+}): Promise<import("@rsbuild/shared").RsbuildInstance | undefined>;

package/dist/cli/init.js

@@ -0,0 +1,101 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var init_exports = {};
+__export(init_exports, {
+  init: () => init
+});
+module.exports = __toCommonJS(init_exports);
+var import_shared = require("@rsbuild/shared");
+var import_loadEnv = require("../loadEnv");
+var import_config = require("../config");
+var import_restart = require("../server/restart");
+let commonOpts = {};
+async function init({
+  cliOptions,
+  isRestart
+}) {
+  if (cliOptions) {
+    commonOpts = cliOptions;
+  }
+  try {
+    const root = process.cwd();
+    const envs = (0, import_loadEnv.loadEnv)({
+      cwd: root,
+      mode: cliOptions?.envMode
+    });
+    if ((0, import_shared.isDev)()) {
+      (0, import_restart.onBeforeRestartServer)(envs.cleanup);
+    }
+    const { content: config, filePath: configFilePath } = await (0, import_config.loadConfig)({
+      cwd: root,
+      path: commonOpts.config,
+      envMode: commonOpts.envMode
+    });
+    const command = process.argv[2];
+    if (command === "dev") {
+      const files = [...envs.filePaths];
+      if (configFilePath) {
+        files.push(configFilePath);
+      }
+      (0, import_config.watchFiles)(files);
+    }
+    const { createRsbuild } = await Promise.resolve().then(() => __toESM(require("../createRsbuild")));
+    config.source || (config.source = {});
+    config.source.define = {
+      ...envs.publicVars,
+      ...config.source.define
+    };
+    if (commonOpts.open && !config.dev?.startUrl) {
+      config.dev || (config.dev = {});
+      config.dev.startUrl = commonOpts.open;
+    }
+    if (commonOpts.host) {
+      config.server || (config.server = {});
+      config.server.host = commonOpts.host;
+    }
+    if (commonOpts.port) {
+      config.server || (config.server = {});
+      config.server.port = commonOpts.port;
+    }
+    return createRsbuild({
+      cwd: root,
+      rsbuildConfig: config
+    });
+  } catch (err) {
+    if (isRestart) {
+      import_shared.logger.error(err);
+    } else {
+      throw err;
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  init
+});

package/dist/cli/prepare.js

@@ -34,7 +34,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js")) {
     console.log();
   }
-  import_rslog.logger.greet(`  ${`Rsbuild v${"0.4.6"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"0.4.7"}`}
 `);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/{cli/config.js → config.js}

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(config_exports);
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = require("node:path");
 var import_shared = require("@rsbuild/shared");
-var import_restart = require("../server/restart");
+var import_restart = require("./server/restart");
 function defineConfig(config) {
   return config;
 }
@@ -93,13 +93,17 @@ async function loadConfig({
   path,
   envMode
 }) {
-  const configFile = resolveConfigPath(cwd, path);
-  if (!configFile) {
+  const configFilePath = resolveConfigPath(cwd, path);
+  if (!configFilePath) {
     return {
       content: {},
-      filePath: configFile
+      filePath: configFilePath
     };
   }
+  const applyMetaInfo = (config) => {
+    config._privateMeta = { configFilePath };
+    return config;
+  };
   try {
     const { default: jiti } = await Promise.resolve().then(() => __toESM(require("@rsbuild/shared/jiti")));
     const loadConfig2 = jiti(__filename, {
@@ -108,7 +112,7 @@ async function loadConfig({
       requireCache: false,
       interopDefault: true
     });
-    const configExport = loadConfig2(configFile);
+    const configExport = loadConfig2(configFilePath);
     if (typeof configExport === "function") {
       const command = process.argv[2];
       const params = {
@@ -121,8 +125,8 @@ async function loadConfig({
         throw new Error("Rsbuild config function must return a config object.");
       }
       return {
-        content: result,
-        filePath: configFile
+        content: applyMetaInfo(result),
+        filePath: configFilePath
       };
     }
     if (!(0, import_shared.isObject)(configExport)) {
@@ -133,11 +137,11 @@ async function loadConfig({
       );
     }
     return {
-      content: configExport,
-      filePath: configFile
+      content: applyMetaInfo(configExport),
+      filePath: configFilePath
     };
   } catch (err) {
-    import_shared.logger.error(`Failed to load file: ${import_shared.color.dim(configFile)}`);
+    import_shared.logger.error(`Failed to load file: ${import_shared.color.dim(configFilePath)}`);
     throw err;
   }
 }

package/dist/createRsbuild.js

@@ -94,7 +94,8 @@ async function createRsbuild(options) {
     context: publicContext
   };
   if (rsbuildConfig.plugins) {
-    rsbuild.addPlugins(rsbuildConfig.plugins);
+    const plugins2 = await Promise.all(rsbuildConfig.plugins);
+    rsbuild.addPlugins(plugins2);
   }
   return rsbuild;
 }

package/dist/index.d.ts

@@ -4,7 +4,7 @@
  */
 export { loadEnv } from './loadEnv';
 export { createRsbuild } from './createRsbuild';
-export { loadConfig, defineConfig } from './cli/config';
+export { loadConfig, defineConfig } from './config';
 export declare const version: any;
 export { logger, mergeRsbuildConfig } from '@rsbuild/shared';
 export { PLUGIN_SWC_NAME, PLUGIN_CSS_NAME, PLUGIN_SASS_NAME, PLUGIN_LESS_NAME, PLUGIN_STYLUS_NAME, } from './constants';

package/dist/index.js

@@ -34,10 +34,10 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_loadEnv = require("./loadEnv");
 var import_createRsbuild = require("./createRsbuild");
-var import_config = require("./cli/config");
+var import_config = require("./config");
 var import_shared = require("@rsbuild/shared");
 var import_constants = require("./constants");
-const version = "0.4.6";
+const version = "0.4.7";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,

package/dist/loadEnv.js

@@ -67,9 +67,13 @@ function loadEnv({
   });
   let cleaned = false;
   const cleanup = () => {
-    if (cleaned)
+    if (cleaned) {
       return;
+    }
     Object.keys(parsed).forEach((key) => {
+      if (key === "NODE_ENV") {
+        return;
+      }
       if (process.env[key] === parsed[key]) {
         delete process.env[key];
       }

package/dist/plugins/cache.js

@@ -57,7 +57,7 @@ function getCacheDirectory({ cacheDirectory }, context) {
   }
   return (0, import_node_path.join)(context.cachePath, context.bundlerType);
 }
-async function getBuildDependencies(context) {
+async function getBuildDependencies(context, config) {
   const rootPackageJson = (0, import_node_path.join)(context.rootPath, "package.json");
   const browserslistConfig = (0, import_node_path.join)(context.rootPath, ".browserslistrc");
   const buildDependencies = {};
@@ -67,6 +67,9 @@ async function getBuildDependencies(context) {
   if (context.tsconfigPath) {
     buildDependencies.tsconfig = [context.tsconfigPath];
   }
+  if (config._privateMeta?.configFilePath) {
+    buildDependencies.rsbuildConfig = [config._privateMeta.configFilePath];
+  }
   if (await (0, import_shared2.isFileExists)(browserslistConfig)) {
     buildDependencies.browserslistrc = [browserslistConfig];
   }
@@ -84,7 +87,8 @@ const pluginCache = () => ({
   name: "rsbuild:cache",
   setup(api) {
     api.modifyBundlerChain(async (chain, { target, env }) => {
-      const { buildCache } = api.getNormalizedConfig().performance;
+      const config = api.getNormalizedConfig();
+      const { buildCache } = config.performance;
       if (buildCache === false) {
         chain.cache(false);
         return;
@@ -92,7 +96,7 @@ const pluginCache = () => ({
       const { context } = api;
       const cacheConfig = typeof buildCache === "boolean" ? {} : buildCache;
       const cacheDirectory = getCacheDirectory(cacheConfig, context);
-      const buildDependencies = await getBuildDependencies(context);
+      const buildDependencies = await getBuildDependencies(context, config);
       await validateCache(cacheDirectory, buildDependencies);
       const useDigest = Array.isArray(cacheConfig.cacheDigest) && cacheConfig.cacheDigest.length;
       chain.cache({

package/dist/provider/createContext.js

@@ -44,7 +44,7 @@ async function createContextByConfig(options, bundlerType, config = {}) {
   const context = {
     entry: (0, import_entry.getEntryObject)(config, "web"),
     targets: config.output?.targets || [],
-    version: "0.4.6",
+    version: "0.4.7",
     rootPath,
     distPath,
     cachePath,

package/dist/provider/plugins/progress.js

@@ -42,10 +42,11 @@ const pluginProgress = () => ({
       if (!options) {
         return;
       }
+      const prefix = options !== true && options.id !== void 0 ? options.id : import_shared.TARGET_ID_MAP[target];
       const { ProgressPlugin } = await Promise.resolve().then(() => __toESM(require("@rspack/core")));
       chain.plugin(CHAIN_ID.PLUGIN.PROGRESS).use(ProgressPlugin, [
         {
-          prefix: import_shared.TARGET_ID_MAP[target],
+          prefix,
           ...options === true ? {} : options
         }
       ]);

package/dist/provider/plugins/swc.js

@@ -131,6 +131,7 @@ function applySwcDecoratorConfig(swcConfig, config) {
     case "legacy":
       swcConfig.jsc.transform.legacyDecorator = true;
       swcConfig.jsc.transform.decoratorMetadata = true;
+      swcConfig.jsc.transform.useDefineForClassFields = false;
       break;
     case "2022-03":
       swcConfig.jsc.transform.legacyDecorator = false;

package/dist/rspack/HtmlCrossOriginPlugin.d.ts

@@ -1,4 +1,4 @@
-import type { CrossOrigin } from '@rsbuild/shared';
+import { type CrossOrigin } from '@rsbuild/shared';
 import type { Compiler, RspackPluginInstance } from '@rspack/core';
 type CrossOriginOptions = {
     crossOrigin: CrossOrigin;

package/dist/rspack/HtmlCrossOriginPlugin.js

@@ -26,6 +26,7 @@ __export(HtmlCrossOriginPlugin_exports, {
   HtmlCrossOriginPlugin: () => HtmlCrossOriginPlugin
 });
 module.exports = __toCommonJS(HtmlCrossOriginPlugin_exports);
+var import_shared = require("@rsbuild/shared");
 var import_htmlPluginUtil = require("../provider/htmlPluginUtil");
 class HtmlCrossOriginPlugin {
   constructor(options) {
@@ -36,11 +37,15 @@ class HtmlCrossOriginPlugin {
     this.crossOrigin = crossOrigin;
   }
   apply(compiler) {
-    if (!this.crossOrigin || // align with crossOriginLoading logic
-    // https://github.com/web-infra-dev/rspack/blob/bc8e67b5419adda15c2b389517c9b37d02c8240f/crates/rspack_plugin_runtime/src/runtime_module/load_script.rs#L39
-    compiler.options.output.publicPath === "/" && this.crossOrigin !== "use-credentials") {
+    if (!this.crossOrigin) {
       return;
     }
+    if (this.crossOrigin !== "use-credentials") {
+      const { publicPath } = compiler.options.output;
+      if (!publicPath || publicPath === import_shared.DEFAULT_ASSET_PREFIX || publicPath === "auto") {
+        return;
+      }
+    }
     compiler.hooks.compilation.tap(this.name, (compilation) => {
       (0, import_htmlPluginUtil.getHTMLPlugin)().getHooks(compilation).alterAssetTags.tap(this.name, (alterAssetTags) => {
         const {

package/dist/server/restart.js

@@ -34,7 +34,7 @@ __export(restart_exports, {
 module.exports = __toCommonJS(restart_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_shared = require("@rsbuild/shared");
-var import_commands = require("../cli/commands");
+var import_init = require("../cli/init");
 let cleaners = [];
 const onBeforeRestartServer = (cleaner) => {
   cleaners.push(cleaner);
@@ -53,7 +53,7 @@ const restartDevServer = async ({ filePath }) => {
     await cleaner();
     cleaners = [];
   }
-  const rsbuild = await (0, import_commands.init)({ isRestart: true });
+  const rsbuild = await (0, import_init.init)({ isRestart: true });
   if (!rsbuild) {
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -57,7 +57,7 @@
     "core-js": "~3.32.2",
     "html-webpack-plugin": "npm:html-rspack-plugin@5.6.0",
     "postcss": "^8.4.33",
-    "@rsbuild/shared": "0.4.6"
+    "@rsbuild/shared": "0.4.7"
   },
   "devDependencies": {
     "@types/node": "16.x",