@rsbuild/core 0.4.8 → 0.4.9

package/dist/cli/commands.js

@@ -39,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.8");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.4.9");
   const devCommand = import_commander.program.command("dev");
   const buildCommand = import_commander.program.command("build");
   const previewCommand = import_commander.program.command("preview");

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.8"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"0.4.9"}`}
 `);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.d.ts

@@ -6,7 +6,8 @@ export { loadEnv } from './loadEnv';
 export { createRsbuild } from './createRsbuild';
 export { loadConfig, defineConfig } from './config';
 export declare const version: any;
-export { logger, mergeRsbuildConfig } from '@rsbuild/shared';
+export { logger } from '@rsbuild/shared';
+export { mergeRsbuildConfig } from './mergeConfig';
 export { PLUGIN_SWC_NAME, PLUGIN_CSS_NAME, PLUGIN_SASS_NAME, PLUGIN_LESS_NAME, PLUGIN_STYLUS_NAME, } from './constants';
 export type { Rspack } from './provider';
 export type { RsbuildConfig, DevConfig, HtmlConfig, ToolsConfig, SourceConfig, ServerConfig, OutputConfig, SecurityConfig, PerformanceConfig, ModuleFederationConfig, NormalizedConfig, NormalizedDevConfig, NormalizedHtmlConfig, NormalizedToolsConfig, NormalizedSourceConfig, NormalizedServerConfig, NormalizedOutputConfig, NormalizedSecurityConfig, NormalizedPerformanceConfig, NormalizedModuleFederationConfig, RsbuildPlugin, RsbuildPlugins, RsbuildPluginAPI, } from './types';

package/dist/index.js

@@ -28,7 +28,7 @@ __export(src_exports, {
   loadConfig: () => import_config.loadConfig,
   loadEnv: () => import_loadEnv.loadEnv,
   logger: () => import_shared.logger,
-  mergeRsbuildConfig: () => import_shared.mergeRsbuildConfig,
+  mergeRsbuildConfig: () => import_mergeConfig.mergeRsbuildConfig,
   version: () => version
 });
 module.exports = __toCommonJS(src_exports);
@@ -36,8 +36,9 @@ var import_loadEnv = require("./loadEnv");
 var import_createRsbuild = require("./createRsbuild");
 var import_config = require("./config");
 var import_shared = require("@rsbuild/shared");
+var import_mergeConfig = require("./mergeConfig");
 var import_constants = require("./constants");
-const version = "0.4.8";
+const version = "0.4.9";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,

package/dist/initHooks.d.ts

@@ -0,0 +1,23 @@
+import type { OnExitFn, AsyncHook, OnAfterBuildFn, OnBeforeBuildFn, OnCloseDevServerFn, OnDevCompileDoneFn, ModifyBundlerChainFn, ModifyRspackConfigFn, ModifyWebpackChainFn, ModifyWebpackConfigFn, ModifyRsbuildConfigFn, OnAfterStartDevServerFn, OnBeforeStartDevServerFn, OnAfterStartProdServerFn, OnBeforeStartProdServerFn, OnAfterCreateCompilerFn, OnBeforeCreateCompilerFn } from '@rsbuild/shared';
+export declare function createAsyncHook<Callback extends (...args: any[]) => any>(): AsyncHook<Callback>;
+export declare function initHooks(): {
+    /** parameters are not bundler-related */
+    onExit: AsyncHook<OnExitFn>;
+    onDevCompileDone: AsyncHook<OnDevCompileDoneFn>;
+    onCloseDevServer: AsyncHook<OnCloseDevServerFn>;
+    onAfterStartDevServer: AsyncHook<OnAfterStartDevServerFn>;
+    onBeforeStartDevServer: AsyncHook<OnBeforeStartDevServerFn>;
+    onAfterStartProdServer: AsyncHook<OnAfterStartProdServerFn>;
+    onBeforeStartProdServer: AsyncHook<OnBeforeStartProdServerFn>;
+    /** parameters are bundler-related */
+    onAfterBuild: AsyncHook<OnAfterBuildFn>;
+    onBeforeBuild: AsyncHook<OnBeforeBuildFn>;
+    modifyRspackConfig: AsyncHook<ModifyRspackConfigFn>;
+    modifyBundlerChain: AsyncHook<ModifyBundlerChainFn>;
+    modifyWebpackChain: AsyncHook<ModifyWebpackChainFn>;
+    modifyWebpackConfig: AsyncHook<ModifyWebpackConfigFn>;
+    modifyRsbuildConfig: AsyncHook<ModifyRsbuildConfigFn>;
+    onAfterCreateCompiler: AsyncHook<OnAfterCreateCompilerFn>;
+    onBeforeCreateCompiler: AsyncHook<OnBeforeCreateCompilerFn>;
+};
+export type Hooks = ReturnType<typeof initHooks>;

package/dist/initHooks.js

@@ -0,0 +1,83 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var initHooks_exports = {};
+__export(initHooks_exports, {
+  createAsyncHook: () => createAsyncHook,
+  initHooks: () => initHooks
+});
+module.exports = __toCommonJS(initHooks_exports);
+var import_shared = require("@rsbuild/shared");
+function createAsyncHook() {
+  const preGroup = [];
+  const postGroup = [];
+  const defaultGroup = [];
+  const tap = (cb) => {
+    if ((0, import_shared.isFunction)(cb)) {
+      defaultGroup.push(cb);
+    } else if (cb.order === "pre") {
+      preGroup.push(cb.handler);
+    } else if (cb.order === "post") {
+      postGroup.push(cb.handler);
+    } else {
+      defaultGroup.push(cb.handler);
+    }
+  };
+  const call = async (...args) => {
+    const params = args.slice(0);
+    const callbacks = [...preGroup, ...defaultGroup, ...postGroup];
+    for (const callback of callbacks) {
+      const result = await callback(...params);
+      if (result !== void 0) {
+        params[0] = result;
+      }
+    }
+    return params;
+  };
+  return {
+    tap,
+    call
+  };
+}
+function initHooks() {
+  return {
+    /** parameters are not bundler-related */
+    onExit: createAsyncHook(),
+    onDevCompileDone: createAsyncHook(),
+    onCloseDevServer: createAsyncHook(),
+    onAfterStartDevServer: createAsyncHook(),
+    onBeforeStartDevServer: createAsyncHook(),
+    onAfterStartProdServer: createAsyncHook(),
+    onBeforeStartProdServer: createAsyncHook(),
+    /** parameters are bundler-related */
+    onAfterBuild: createAsyncHook(),
+    onBeforeBuild: createAsyncHook(),
+    modifyRspackConfig: createAsyncHook(),
+    modifyBundlerChain: createAsyncHook(),
+    modifyWebpackChain: createAsyncHook(),
+    modifyWebpackConfig: createAsyncHook(),
+    modifyRsbuildConfig: createAsyncHook(),
+    onAfterCreateCompiler: createAsyncHook(),
+    onBeforeCreateCompiler: createAsyncHook()
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createAsyncHook,
+  initHooks
+});

package/dist/mergeConfig.d.ts

@@ -0,0 +1,2 @@
+import { type RsbuildConfig } from '@rsbuild/shared';
+export declare const mergeRsbuildConfig: (...configs: RsbuildConfig[]) => RsbuildConfig;

package/dist/mergeConfig.js

@@ -0,0 +1,79 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var mergeConfig_exports = {};
+__export(mergeConfig_exports, {
+  mergeRsbuildConfig: () => mergeRsbuildConfig
+});
+module.exports = __toCommonJS(mergeConfig_exports);
+var import_shared = require("@rsbuild/shared");
+const OVERRIDE_PATH = [
+  "performance.removeConsole",
+  "output.inlineScripts",
+  "output.inlineStyles",
+  "output.cssModules.auto",
+  "output.targets",
+  "server.printUrls",
+  "dev.startUrl",
+  "provider"
+];
+const isOverridePath = (key) => OVERRIDE_PATH.includes(key);
+const merge = (x, y, path = "") => {
+  if (isOverridePath(path)) {
+    return y ?? x;
+  }
+  if (x === void 0) {
+    return y;
+  }
+  if (y === void 0) {
+    return x;
+  }
+  const pair = [x, y];
+  if (pair.some(Array.isArray)) {
+    return [...(0, import_shared.castArray)(x), ...(0, import_shared.castArray)(y)];
+  }
+  if (pair.some(import_shared.isFunction)) {
+    return pair;
+  }
+  if (!(0, import_shared.isPlainObject)(x) || !(0, import_shared.isPlainObject)(y)) {
+    return y;
+  }
+  const merged = {};
+  const keys = /* @__PURE__ */ new Set([...Object.keys(x), ...Object.keys(y)]);
+  keys.forEach((key) => {
+    const childPath = path ? `${path}.${key}` : key;
+    merged[key] = merge(x[key], y[key], childPath);
+  });
+  return merged;
+};
+const mergeRsbuildConfig = (...configs) => {
+  if (configs.length === 2) {
+    return merge(configs[0], configs[1]);
+  }
+  if (configs.length < 2) {
+    return configs[0];
+  }
+  return configs.reduce(
+    (result, config) => merge(result, config),
+    {}
+  );
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  mergeRsbuildConfig
+});

package/dist/provider/config.js

@@ -24,6 +24,7 @@ __export(config_exports, {
 module.exports = __toCommonJS(config_exports);
 var import_node_path = require("node:path");
 var import_shared = require("@rsbuild/shared");
+var import_mergeConfig = require("../mergeConfig");
 const getDefaultDevConfig = () => ({
   hmr: true,
   liveReload: true,
@@ -153,7 +154,7 @@ function getDefaultEntry(root) {
   return {};
 }
 const withDefaultConfig = async (rootPath, config) => {
-  const merged = (0, import_shared.mergeRsbuildConfig)(createDefaultConfig(), config);
+  const merged = (0, import_mergeConfig.mergeRsbuildConfig)(createDefaultConfig(), config);
   merged.source || (merged.source = {});
   if (!merged.source.entry) {
     merged.source.entry = getDefaultEntry(rootPath);
@@ -166,7 +167,7 @@ const withDefaultConfig = async (rootPath, config) => {
   }
   return merged;
 };
-const normalizeConfig = (config) => (0, import_shared.mergeRsbuildConfig)(createDefaultConfig(), config);
+const normalizeConfig = (config) => (0, import_mergeConfig.mergeRsbuildConfig)(createDefaultConfig(), config);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   normalizeConfig,

package/dist/provider/createContext.js

@@ -25,7 +25,7 @@ __export(createContext_exports, {
 module.exports = __toCommonJS(createContext_exports);
 var import_node_path = require("node:path");
 var import_shared = require("@rsbuild/shared");
-var import_initHooks = require("./initHooks");
+var import_initHooks = require("../initHooks");
 var import_config = require("./config");
 var import_entry = require("../plugins/entry");
 function getAbsolutePath(root, filepath) {
@@ -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.8",
+    version: "0.4.9",
     rootPath,
     distPath,
     cachePath,

package/dist/provider/index.d.ts

@@ -2,7 +2,7 @@ export { rspackProvider } from './provider';
 export type { Rspack, RspackConfig } from '@rsbuild/shared';
 export { createContext, createPublicContext } from './createContext';
 export { initPlugins, createPluginManager } from '../pluginManager';
-export { initHooks, type Hooks } from './initHooks';
+export { initHooks, type Hooks } from '../initHooks';
 export { initRsbuildConfig } from './initConfigs';
 export { getPluginAPI } from './initPlugins';
 export { applyBaseCSSRule, applyCSSModuleRule } from './plugins/css';

package/dist/provider/index.js

@@ -38,7 +38,7 @@ module.exports = __toCommonJS(provider_exports);
 var import_provider = require("./provider");
 var import_createContext = require("./createContext");
 var import_pluginManager = require("../pluginManager");
-var import_initHooks = require("./initHooks");
+var import_initHooks = require("../initHooks");
 var import_initConfigs = require("./initConfigs");
 var import_initPlugins = require("./initPlugins");
 var import_css = require("./plugins/css");

package/dist/provider/initConfigs.js

@@ -23,6 +23,7 @@ __export(initConfigs_exports, {
 });
 module.exports = __toCommonJS(initConfigs_exports);
 var import_shared = require("@rsbuild/shared");
+var import_mergeConfig = require("../mergeConfig");
 var import_createContext = require("./createContext");
 var import_inspectConfig = require("./inspectConfig");
 var import_rspackConfig = require("./rspackConfig");
@@ -32,7 +33,7 @@ async function modifyRsbuildConfig(context) {
   (0, import_shared.debug)("modify Rsbuild config");
   const [modified] = await context.hooks.modifyRsbuildConfig.call(
     context.config,
-    { mergeRsbuildConfig: import_shared.mergeRsbuildConfig }
+    { mergeRsbuildConfig: import_mergeConfig.mergeRsbuildConfig }
   );
   context.config = modified;
   (0, import_shared.debug)("modify Rsbuild config done");

package/dist/provider/plugins/output.js

@@ -49,12 +49,13 @@ const pluginOutput = () => ({
     api.modifyRspackConfig(async (rspackConfig, { isProd }) => {
       const config = api.getNormalizedConfig();
       const cssPath = (0, import_shared.getDistPath)(config, "css");
+      const cssAsyncPath = (0, import_shared.getDistPath)(config, "cssAsync");
       const cssFilename = (0, import_shared.getFilename)(config, "css", isProd);
       rspackConfig.output || (rspackConfig.output = {});
       rspackConfig.output.cssFilename = import_node_path.posix.join(cssPath, cssFilename);
       rspackConfig.output.cssChunkFilename = import_node_path.posix.join(
-        cssPath,
-        `async/${cssFilename}`
+        cssAsyncPath,
+        cssFilename
       );
     });
   }

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import type { RsbuildConfig, RsbuildPlugin, RsbuildPlugins, RsbuildContext, NormalizedConfig, RsbuildPluginAPI } from '@rsbuild/shared';
-import type { Hooks } from './provider/initHooks';
+import type { Hooks } from './initHooks';
 export type { RsbuildPlugin, RsbuildPlugins, RsbuildPluginAPI };
 /** The inner context. */
 export type InternalContext = RsbuildContext & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "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.1",
     "postcss": "^8.4.33",
-    "@rsbuild/shared": "0.4.8"
+    "@rsbuild/shared": "0.4.9"
   },
   "devDependencies": {
     "@types/node": "16.x",

package/dist/provider/initHooks.d.ts

@@ -1,22 +0,0 @@
-import type { OnExitFn, OnAfterBuildFn, OnBeforeBuildFn, OnCloseDevServerFn, OnDevCompileDoneFn, ModifyBundlerChainFn, ModifyRspackConfigFn, ModifyWebpackChainFn, ModifyWebpackConfigFn, ModifyRsbuildConfigFn, OnAfterStartDevServerFn, OnBeforeStartDevServerFn, OnAfterStartProdServerFn, OnBeforeStartProdServerFn, OnAfterCreateCompilerFn, OnBeforeCreateCompilerFn } from '@rsbuild/shared';
-export declare function initHooks(): {
-    /** parameters are not bundler-related */
-    onExit: import("@rsbuild/shared").AsyncHook<OnExitFn>;
-    onDevCompileDone: import("@rsbuild/shared").AsyncHook<OnDevCompileDoneFn>;
-    onCloseDevServer: import("@rsbuild/shared").AsyncHook<OnCloseDevServerFn>;
-    onAfterStartDevServer: import("@rsbuild/shared").AsyncHook<OnAfterStartDevServerFn>;
-    onBeforeStartDevServer: import("@rsbuild/shared").AsyncHook<OnBeforeStartDevServerFn>;
-    onAfterStartProdServer: import("@rsbuild/shared").AsyncHook<OnAfterStartProdServerFn>;
-    onBeforeStartProdServer: import("@rsbuild/shared").AsyncHook<OnBeforeStartProdServerFn>;
-    /** parameters are bundler-related */
-    onAfterBuild: import("@rsbuild/shared").AsyncHook<OnAfterBuildFn>;
-    onBeforeBuild: import("@rsbuild/shared").AsyncHook<OnBeforeBuildFn>;
-    modifyRspackConfig: import("@rsbuild/shared").AsyncHook<ModifyRspackConfigFn>;
-    modifyBundlerChain: import("@rsbuild/shared").AsyncHook<ModifyBundlerChainFn>;
-    modifyWebpackChain: import("@rsbuild/shared").AsyncHook<ModifyWebpackChainFn>;
-    modifyWebpackConfig: import("@rsbuild/shared").AsyncHook<ModifyWebpackConfigFn>;
-    modifyRsbuildConfig: import("@rsbuild/shared").AsyncHook<ModifyRsbuildConfigFn>;
-    onAfterCreateCompiler: import("@rsbuild/shared").AsyncHook<OnAfterCreateCompilerFn>;
-    onBeforeCreateCompiler: import("@rsbuild/shared").AsyncHook<OnBeforeCreateCompilerFn>;
-};
-export type Hooks = ReturnType<typeof initHooks>;

package/dist/provider/initHooks.js

@@ -1,50 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var initHooks_exports = {};
-__export(initHooks_exports, {
-  initHooks: () => initHooks
-});
-module.exports = __toCommonJS(initHooks_exports);
-var import_shared = require("@rsbuild/shared");
-function initHooks() {
-  return {
-    /** parameters are not bundler-related */
-    onExit: (0, import_shared.createAsyncHook)(),
-    onDevCompileDone: (0, import_shared.createAsyncHook)(),
-    onCloseDevServer: (0, import_shared.createAsyncHook)(),
-    onAfterStartDevServer: (0, import_shared.createAsyncHook)(),
-    onBeforeStartDevServer: (0, import_shared.createAsyncHook)(),
-    onAfterStartProdServer: (0, import_shared.createAsyncHook)(),
-    onBeforeStartProdServer: (0, import_shared.createAsyncHook)(),
-    /** parameters are bundler-related */
-    onAfterBuild: (0, import_shared.createAsyncHook)(),
-    onBeforeBuild: (0, import_shared.createAsyncHook)(),
-    modifyRspackConfig: (0, import_shared.createAsyncHook)(),
-    modifyBundlerChain: (0, import_shared.createAsyncHook)(),
-    modifyWebpackChain: (0, import_shared.createAsyncHook)(),
-    modifyWebpackConfig: (0, import_shared.createAsyncHook)(),
-    modifyRsbuildConfig: (0, import_shared.createAsyncHook)(),
-    onAfterCreateCompiler: (0, import_shared.createAsyncHook)(),
-    onBeforeCreateCompiler: (0, import_shared.createAsyncHook)()
-  };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  initHooks
-});