@rsbuild/core 2.0.8 → 2.0.9

package/dist-types/types/thirdParty.d.ts

@@ -14,94 +14,75 @@ export interface CSSExtractOptions {
  * A loose PostCSS plugin type that accepts plugins from different
  * PostCSS versions. This helps avoid type conflicts when user
  * projects use different PostCSS versions.
- */
-export type LoosePostCSSPlugin = any;
+ */ export type LoosePostCSSPlugin = any;
 export type PostCSSOptions = ProcessOptions & {
     config?: boolean;
     plugins?: LoosePostCSSPlugin[];
 };
 export type PostCSSLoaderOptions = {
     /**
-     * Enable PostCSS Parser support in CSS-in-JS. If you use JS styles the postcss-js parser, add the execute option.
-     * @default undefined
-     */
-    execute?: boolean;
-    /**
-     * Whether to generate source maps.
-     * @default `rsbuildConfig.output.sourceMap.css`
-     */
-    sourceMap?: boolean;
-    /**
-     * The special implementation option determines which implementation of PostCSS to use.
-     * @default `@rsbuild/core/compiled/postcss`
-     */
-    implementation?: unknown;
-    /**
-     * Allows to set PostCSS options and plugins.
-     * @default undefined
-     */
-    postcssOptions?: PostCSSOptions | ((loaderContext: Rspack.LoaderContext) => PostCSSOptions);
+   * Enable PostCSS Parser support in CSS-in-JS. If you use JS styles the postcss-js parser, add the execute option.
+   * @default undefined
+   */ execute?: boolean;
+    /**
+   * Whether to generate source maps.
+   * @default `rsbuildConfig.output.sourceMap.css`
+   */ sourceMap?: boolean;
+    /**
+   * The special implementation option determines which implementation of PostCSS to use.
+   * @default `@rsbuild/core/compiled/postcss`
+   */ implementation?: unknown;
+    /**
+   * Allows to set PostCSS options and plugins.
+   * @default undefined
+   */ postcssOptions?: PostCSSOptions | ((loaderContext: Rspack.LoaderContext) => PostCSSOptions);
 };
 export type PostCSSPlugin = AcceptedPlugin;
 export type CSSLoaderModulesMode = 'local' | 'global' | 'pure' | 'icss' | ((resourcePath: string) => 'local' | 'global' | 'pure' | 'icss');
 export type CSSLoaderExportLocalsConvention = 'asIs' | 'as-is' | 'camelCase' | 'camel-case' | 'camelCaseOnly' | 'camel-case-only' | 'dashes' | 'dashesOnly' | 'dashes-only' | ((name: string) => string);
 export interface CSSLoaderModulesOptions {
     /**
-     * Allows auto enable CSS Modules/ICSS based on the filename, query or fragment.
-     */
-    auto?: boolean | RegExp | ((resourcePath: string, resourceQuery: string, resourceFragment: string) => boolean);
+   * Allows auto enable CSS Modules/ICSS based on the filename, query or fragment.
+   */ auto?: boolean | RegExp | ((resourcePath: string, resourceQuery: string, resourceFragment: string) => boolean);
     /**
-     * Allow `css-loader` to export names from global class or id, so you can use that as local name.
-     */
-    exportGlobals?: boolean;
+   * Allow `css-loader` to export names from global class or id, so you can use that as local name.
+   */ exportGlobals?: boolean;
     /**
-     * Style of exported class names.
-     */
-    exportLocalsConvention?: CSSLoaderExportLocalsConvention;
+   * Style of exported class names.
+   */ exportLocalsConvention?: CSSLoaderExportLocalsConvention;
     /**
-     * Export only locals.
-     */
-    exportOnlyLocals?: boolean;
+   * Export only locals.
+   */ exportOnlyLocals?: boolean;
     /**
-     * Allows to specify a function to generate the classname.
-     */
-    getLocalIdent?: (context: Rspack.LoaderContext, localIdentName: string, localName: string) => string;
+   * Allows to specify a function to generate the classname.
+   */ getLocalIdent?: (context: Rspack.LoaderContext, localIdentName: string, localName: string) => string;
     /**
-     * Allows to configure the generated local ident name.
-     */
-    localIdentName?: string;
+   * Allows to configure the generated local ident name.
+   */ localIdentName?: string;
     /**
-     * Allows to redefine basic loader context for local ident name.
-     */
-    localIdentContext?: string;
+   * Allows to redefine basic loader context for local ident name.
+   */ localIdentContext?: string;
     /**
-     * Allows to add custom hash to generate more unique classes.
-     */
-    localIdentHashSalt?: string;
+   * Allows to add custom hash to generate more unique classes.
+   */ localIdentHashSalt?: string;
     /**
-     * Allows to specify hash function to generate classes.
-     */
-    localIdentHashFunction?: string;
+   * Allows to specify hash function to generate classes.
+   */ localIdentHashFunction?: string;
     /**
-     * Allows to specify hash digest to generate classes.
-     */
-    localIdentHashDigest?: string;
+   * Allows to specify hash digest to generate classes.
+   */ localIdentHashDigest?: string;
     /**
-     * Allows to specify custom RegExp for local ident name.
-     */
-    localIdentRegExp?: string | RegExp;
+   * Allows to specify custom RegExp for local ident name.
+   */ localIdentRegExp?: string | RegExp;
     /**
-     * Controls the level of compilation applied to the input styles.
-     */
-    mode?: CSSLoaderModulesMode;
+   * Controls the level of compilation applied to the input styles.
+   */ mode?: CSSLoaderModulesMode;
     /**
-     * Enables/disables ES modules named export for locals.
-     */
-    namedExport?: boolean;
+   * Enables/disables ES modules named export for locals.
+   */ namedExport?: boolean;
     /**
-     * Enables a callback to output the CSS Modules mapping JSON.
-     */
-    getJSON?: (context: {
+   * Enables a callback to output the CSS Modules mapping JSON.
+   */ getJSON?: (context: {
         resourcePath: string;
         imports: object[];
         exports: object[];
@@ -110,83 +91,71 @@ export interface CSSLoaderModulesOptions {
 }
 export interface CSSLoaderOptions {
     /**
-     * Allow to enable/disables handling the CSS functions url and image-set.
-     * If set to false, css-loader will not parse any paths specified in url or image-set
-     * @default true
-     */
-    url?: boolean | {
+   * Allow to enable/disables handling the CSS functions url and image-set.
+   * If set to false, css-loader will not parse any paths specified in url or image-set
+   * @default true
+   */ url?: boolean | {
         filter: (url: string, resourcePath: string) => boolean;
     };
     /**
-     * Allows to enables/disables @import at-rules handling.
-     * @default true
-     */
-    import?: boolean | {
+   * Allows to enables/disables @import at-rules handling.
+   * @default true
+   */ import?: boolean | {
         filter: (url: string, media: string, resourcePath: string, supports?: string, layer?: string) => boolean;
     };
     /**
-     * Allows to enable/disable CSS Modules or ICSS and setup configuration:
-     */
-    modules?: boolean | LiteralUnion<'local' | 'global' | 'pure' | 'icss', string> | CSSLoaderModulesOptions;
-    /**
-     * By default generation of source maps depends on the devtool option.
-     */
-    sourceMap?: boolean;
-    /**
-     * Allows to enables/disables or setups number of loaders applied before CSS loader for @import at-rules,
-     * CSS Modules and ICSS imports, i.e. @import/composes/@value value from './values.css'/etc.
-     * @default 0
-     */
-    importLoaders?: number;
-    /**
-     * By default, css-loader generates JS modules that use the ES modules syntax.
-     * There are some cases in which using ES modules is beneficial, like in the case of module concatenation and tree shaking.
-     * @default true
-     */
-    esModule?: boolean;
-    /**
-     * Allows exporting styles as array with modules, string or constructable stylesheet (i.e. CSSStyleSheet)
-     * @default 'array'
-     */
-    exportType?: 'array' | 'string' | 'css-style-sheet';
+   * Allows to enable/disable CSS Modules or ICSS and setup configuration:
+   */ modules?: boolean | LiteralUnion<'local' | 'global' | 'pure' | 'icss', string> | CSSLoaderModulesOptions;
+    /**
+   * By default generation of source maps depends on the devtool option.
+   */ sourceMap?: boolean;
+    /**
+   * Allows to enables/disables or setups number of loaders applied before CSS loader for @import at-rules,
+   * CSS Modules and ICSS imports, i.e. @import/composes/@value value from './values.css'/etc.
+   * @default 0
+   */ importLoaders?: number;
+    /**
+   * By default, css-loader generates JS modules that use the ES modules syntax.
+   * There are some cases in which using ES modules is beneficial, like in the case of module concatenation and tree shaking.
+   * @default true
+   */ esModule?: boolean;
+    /**
+   * Allows exporting styles as array with modules, string or constructable stylesheet (i.e. CSSStyleSheet)
+   * @default 'array'
+   */ exportType?: 'array' | 'string' | 'css-style-sheet';
 }
 export type StyleLoaderInjectType = 'styleTag' | 'singletonStyleTag' | 'lazyStyleTag' | 'lazySingletonStyleTag' | 'linkTag';
 export interface StyleLoaderOptions {
     /**
-     * By default, style-loader generates JS modules that use the ES modules syntax.
-     * There are some cases in which using ES modules is beneficial, like in the case of module concatenation and tree shaking.
-     * @default true
-     */
-    esModule?: boolean;
-    /**
-     * Allows to setup how styles will be injected into the DOM.
-     * @default 'styleTag'
-     */
-    injectType?: StyleLoaderInjectType;
-    /**
-     * If defined, the style-loader will attach given attributes with their values on <style> / <link> element.
-     * @default {}
-     */
-    attributes?: Record<string, string>;
-    /**
-     * By default, style-loader appends <style>/<link> elements to the end of the style target,
-     * which is the <head> tag of the page unless specified by insert.
-     * This will cause CSS created by the loader to take priority over CSS already present in the target.
-     * You can use other values if the standard behavior is not suitable for you, but we do not recommend doing this.
-     * If you target an iframe, make sure you have sufficient access rights.
-     *
-     * Supports:
-     * - a CSS selector where styles are injected
-     * - an absolute path to a custom insert module
-     *
-     * @default 'head'
-     */
-    insert?: LiteralUnion<'head' | 'body', string>;
-    /**
-     * Allows to setup an absolute path to a custom module that overrides
-     * the default styleTagTransform behavior.
-     *
-     * @default undefined
-     */
-    styleTagTransform?: string;
+   * By default, style-loader generates JS modules that use the ES modules syntax.
+   * There are some cases in which using ES modules is beneficial, like in the case of module concatenation and tree shaking.
+   * @default true
+   */ esModule?: boolean;
+    /**
+   * Allows to setup how styles will be injected into the DOM.
+   * @default 'styleTag'
+   */ injectType?: StyleLoaderInjectType;
+    /**
+   * If defined, the style-loader will attach given attributes with their values on <style> / <link> element.
+   * @default {}
+   */ attributes?: Record<string, string>;
+    /**
+   * By default, style-loader appends <style>/<link> elements to the end of the style target,
+   * which is the <head> tag of the page unless specified by insert.
+   * This will cause CSS created by the loader to take priority over CSS already present in the target.
+   * You can use other values if the standard behavior is not suitable for you, but we do not recommend doing this.
+   * If you target an iframe, make sure you have sufficient access rights.
+   *
+   * Supports:
+   * - a CSS selector where styles are injected
+   * - an absolute path to a custom insert module
+   *
+   * @default 'head'
+   */ insert?: LiteralUnion<'head' | 'body', string>;
+    /**
+   * Allows to setup an absolute path to a custom module that overrides
+   * the default styleTagTransform behavior.
+   *
+   * @default undefined
+   */ styleTagTransform?: string;
 }

package/dist-types/types/utils.d.ts

@@ -2,11 +2,11 @@ export type Falsy = false | null | undefined;
 export type OneOrMany<T> = T | T[];
 export type MaybePromise<T> = T | Promise<T>;
 export type Optional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+// https://github.com/microsoft/TypeScript/issues/29729
 export type LiteralUnion<T extends U, U> = T | (U & Record<never, never>);
 /**
  * Creates a type with readonly properties at the first and second levels only.
- */
-export type TwoLevelReadonly<T> = keyof T extends never ? T : {
+ */ export type TwoLevelReadonly<T> = keyof T extends never ? T : {
     readonly [k in keyof T]: T[k] extends object ? {
         readonly [p in keyof T[k]]: T[k][p];
     } : T[k];
@@ -14,6 +14,3 @@ export type TwoLevelReadonly<T> = keyof T extends never ? T : {
 export type ConfigChain<T> = OneOrMany<T | ((config: T) => T | void)>;
 export type ConfigChainWithContext<T, Ctx> = OneOrMany<T | ((config: T, ctx: Ctx) => T | void)>;
 export type ConfigChainAsyncWithContext<T, Ctx> = OneOrMany<T | ((config: T, ctx: Ctx) => MaybePromise<T | void>)>;
-export type ConfigChainMergeContext<T, Ctx> = OneOrMany<T | ((merged: {
-    value: T;
-} & Ctx) => T | void)>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.rs",
   "bugs": {
@@ -50,7 +50,7 @@
   "devDependencies": {
     "@jridgewell/remapping": "^2.3.5",
     "@jridgewell/trace-mapping": "^0.3.31",
-    "@rslib/core": "0.21.5",
+    "@rslib/core": "0.22.0",
     "@types/cors": "^2.8.19",
     "@types/node": "^24.12.4",
     "@types/on-finished": "2.3.5",
@@ -82,7 +82,7 @@
     "rslog": "^2.1.1",
     "rspack-chain": "^2.0.1",
     "rspack-manifest-plugin": "5.2.1",
-    "rspack-merge": "0.1.1",
+    "rspack-merge": "1.0.1",
     "sirv": "^3.0.2",
     "stacktrace-parser": "^0.1.11",
     "style-loader": "^4.0.0",

package/dist-types/client/hmr.d.ts

@@ -1,3 +0,0 @@
-import type { LogLevel, NormalizedClientConfig } from '../types';
-export declare const registerOverlay: (createFn: (title: string, content: string) => void, clearFn: () => void) => void;
-export declare function init(token: string, config: NormalizedClientConfig, serverHost: string, serverPort: number, serverBase: string, liveReload: boolean, browserLogs: boolean, logLevel: LogLevel): void;

package/dist-types/client/log.d.ts

@@ -1,13 +0,0 @@
-import type { LogLevel } from '../types';
-export declare const LOG_LEVEL: {
-    readonly silent: -1;
-    readonly error: 0;
-    readonly warn: 1;
-    readonly info: 2;
-};
-export declare const logger: {
-    level: LogLevel;
-    info(...messages: unknown[]): void;
-    warn(...messages: unknown[]): void;
-    error(...messages: unknown[]): void;
-};

package/dist-types/client/overlay.d.ts

@@ -1 +0,0 @@
-export {};