@rspack/core 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/Watching.js

@@ -171,12 +171,10 @@ class Watching {
             // this.compiler.cache.beginIdle();
             // this.compiler.idle = true;
             this.handler(err, stats);
-            if (!cbs) {
-                cbs = this.callbacks;
-                this.callbacks = [];
-            }
-            for (const cb of cbs)
+            const callbacksToExecute = cbs || this.callbacks.splice(0);
+            for (const cb of callbacksToExecute) {
                 cb(err);
+            }
         };
         const cbs = this.callbacks;
         this.callbacks = [];

package/dist/builtin-plugin/DynamicEntryPlugin.d.ts

@@ -1,11 +1,12 @@
-import { BuiltinPluginName } from "@rspack/binding";
+import { type BuiltinPlugin, BuiltinPluginName } from "@rspack/binding";
+import type { Compiler } from "../Compiler";
 import type { EntryDynamicNormalized } from "../config";
-export declare const DynamicEntryPlugin: {
-    new (context: string, entry: EntryDynamicNormalized): {
-        name: BuiltinPluginName;
-        _args: [context: string, entry: EntryDynamicNormalized];
-        affectedHooks: "done" | "make" | "compile" | "emit" | "afterEmit" | "invalid" | "thisCompilation" | "afterDone" | "compilation" | "normalModuleFactory" | "contextModuleFactory" | "initialize" | "shouldEmit" | "infrastructureLog" | "beforeRun" | "run" | "assetEmitted" | "failed" | "shutdown" | "watchRun" | "watchClose" | "environment" | "afterEnvironment" | "afterPlugins" | "afterResolvers" | "beforeCompile" | "afterCompile" | "finishMake" | "entryOption" | undefined;
-        raw(compiler: import("../Compiler").Compiler): import("@rspack/binding").BuiltinPlugin;
-        apply(compiler: import("../Compiler").Compiler): void;
-    };
-};
+import { RspackBuiltinPlugin } from "./base";
+export declare class DynamicEntryPlugin extends RspackBuiltinPlugin {
+    private context;
+    private entry;
+    name: BuiltinPluginName;
+    affectedHooks: "make";
+    constructor(context: string, entry: EntryDynamicNormalized);
+    raw(compiler: Compiler): BuiltinPlugin | undefined;
+}

package/dist/builtin-plugin/DynamicEntryPlugin.js

@@ -8,18 +8,29 @@ const binding_1 = require("@rspack/binding");
 const EntryOptionPlugin_1 = __importDefault(require("../lib/EntryOptionPlugin"));
 const EntryPlugin_1 = require("./EntryPlugin");
 const base_1 = require("./base");
-exports.DynamicEntryPlugin = (0, base_1.create)(binding_1.BuiltinPluginName.DynamicEntryPlugin, (context, entry) => {
-    return {
-        context,
-        entry: async () => {
-            const result = await entry();
-            return Object.entries(result).map(([name, desc]) => {
-                const options = EntryOptionPlugin_1.default.entryDescriptionToOptions({}, name, desc);
-                return {
-                    import: desc.import,
-                    options: (0, EntryPlugin_1.getRawEntryOptions)(options)
-                };
-            });
-        }
-    };
-}, "make");
+class DynamicEntryPlugin extends base_1.RspackBuiltinPlugin {
+    constructor(context, entry) {
+        super();
+        this.context = context;
+        this.entry = entry;
+        this.name = binding_1.BuiltinPluginName.DynamicEntryPlugin;
+        this.affectedHooks = "make";
+    }
+    raw(compiler) {
+        const raw = {
+            context: this.context,
+            entry: async () => {
+                const result = await this.entry();
+                return Object.entries(result).map(([name, desc]) => {
+                    const options = EntryOptionPlugin_1.default.entryDescriptionToOptions(compiler, name, desc);
+                    return {
+                        import: desc.import,
+                        options: (0, EntryPlugin_1.getRawEntryOptions)(options)
+                    };
+                });
+            }
+        };
+        return (0, base_1.createBuiltinPlugin)(this.name, raw);
+    }
+}
+exports.DynamicEntryPlugin = DynamicEntryPlugin;

package/dist/builtin-plugin/EntryPlugin.d.ts

@@ -1,4 +1,4 @@
-import { BuiltinPluginName, type RawEntryOptions } from "@rspack/binding";
+import { BuiltinPluginName, type JsEntryOptions } from "@rspack/binding";
 import { type ChunkLoading, type EntryRuntime, type Filename, type Layer, type LibraryOptions, type PublicPath } from "../config";
 export type EntryOptions = {
     name?: string;
@@ -21,4 +21,4 @@ export declare const EntryPlugin: {
         apply(compiler: import("../Compiler").Compiler): void;
     };
 };
-export declare function getRawEntryOptions(entry: EntryOptions): RawEntryOptions;
+export declare function getRawEntryOptions(entry: EntryOptions): JsEntryOptions;

package/dist/builtin-plugin/LightningCssMiminizerRspackPlugin.d.ts

@@ -1,9 +1,26 @@
-import { BuiltinPluginName, type RawLightningCssMinimizerRspackPluginOptions } from "@rspack/binding";
-export type LightningCssMinimizerRspackPluginOptions = Partial<RawLightningCssMinimizerRspackPluginOptions>;
+import { BuiltinPluginName } from "@rspack/binding";
+import { type Drafts, type FeatureOptions, type NonStandard, type PseudoClasses, type Targets } from "../builtin-loader/lightningcss";
+import type { AssetConditions } from "../util/assetCondition";
+export type LightningCssMinimizerRspackPluginOptions = {
+    test?: AssetConditions;
+    include?: AssetConditions;
+    exclude?: AssetConditions;
+    removeUnusedLocalIdents?: boolean;
+    minimizerOptions?: {
+        errorRecovery?: boolean;
+        targets?: Targets | string[] | string;
+        include?: FeatureOptions;
+        exclude?: FeatureOptions;
+        draft?: Drafts;
+        nonStandard?: NonStandard;
+        pseudoClasses?: PseudoClasses;
+        unusedSymbols?: string[];
+    };
+};
 export declare const LightningCssMinimizerRspackPlugin: {
-    new (options?: Partial<RawLightningCssMinimizerRspackPluginOptions> | undefined): {
+    new (options?: LightningCssMinimizerRspackPluginOptions | undefined): {
         name: BuiltinPluginName;
-        _args: [options?: Partial<RawLightningCssMinimizerRspackPluginOptions> | undefined];
+        _args: [options?: LightningCssMinimizerRspackPluginOptions | undefined];
         affectedHooks: "done" | "make" | "compile" | "emit" | "afterEmit" | "invalid" | "thisCompilation" | "afterDone" | "compilation" | "normalModuleFactory" | "contextModuleFactory" | "initialize" | "shouldEmit" | "infrastructureLog" | "beforeRun" | "run" | "assetEmitted" | "failed" | "shutdown" | "watchRun" | "watchClose" | "environment" | "afterEnvironment" | "afterPlugins" | "afterResolvers" | "beforeCompile" | "afterCompile" | "finishMake" | "entryOption" | undefined;
         raw(compiler: import("../Compiler").Compiler): import("@rspack/binding").BuiltinPlugin;
         apply(compiler: import("../Compiler").Compiler): void;

package/dist/builtin-plugin/LightningCssMiminizerRspackPlugin.js

@@ -1,16 +1,40 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LightningCssMinimizerRspackPlugin = void 0;
 const binding_1 = require("@rspack/binding");
+const browserslist_1 = __importDefault(require("../../compiled/browserslist"));
+const lightningcss_1 = require("../builtin-loader/lightningcss");
 const base_1 = require("./base");
 exports.LightningCssMinimizerRspackPlugin = (0, base_1.create)(binding_1.BuiltinPluginName.LightningCssMinimizerRspackPlugin, (options) => {
+    const { include, exclude, draft, nonStandard, pseudoClasses } = options?.minimizerOptions ?? {};
+    const targets = options?.minimizerOptions?.targets ?? "fully supports es6"; // last not support es module chrome version
     return {
-        errorRecovery: options?.errorRecovery ?? true,
-        unusedSymbols: options?.unusedSymbols ?? [],
-        removeUnusedLocalIdents: options?.removeUnusedLocalIdents ?? true,
-        browserslist: options?.browserslist ?? ["defaults"],
         test: options?.test,
         include: options?.include,
-        exclude: options?.exclude
+        exclude: options?.exclude,
+        removeUnusedLocalIdents: options?.removeUnusedLocalIdents ?? true,
+        minimizerOptions: {
+            errorRecovery: options?.minimizerOptions?.errorRecovery ?? true,
+            unusedSymbols: options?.minimizerOptions?.unusedSymbols ?? [],
+            include: include ? (0, lightningcss_1.toFeatures)(include) : undefined,
+            exclude: exclude
+                ? (0, lightningcss_1.toFeatures)(exclude)
+                : // exclude all features, avoid downgrade css syntax when minimize
+                    // 1048575 = Features.Empty | Features.Nesting | ... | Features.LogicalProperties
+                    1048575,
+            targets: typeof targets === "string" || Array.isArray(targets)
+                ? (0, lightningcss_1.browserslistToTargets)((0, browserslist_1.default)(targets))
+                : targets,
+            draft: draft ? { customMedia: draft.customMedia ?? false } : undefined,
+            nonStandard: nonStandard
+                ? {
+                    deepSelectorCombinator: nonStandard.deepSelectorCombinator ?? false
+                }
+                : undefined,
+            pseudoClasses
+        }
     };
 });

package/dist/builtin-plugin/SwcCssMinimizerPlugin.d.ts

@@ -1,10 +1,9 @@
 import { BuiltinPluginName } from "@rspack/binding";
-type MinifyCondition = string | RegExp;
-type MinifyConditions = MinifyCondition | MinifyCondition[];
+import type { AssetConditions } from "../util/assetCondition";
 export type SwcCssMinimizerRspackPluginOptions = {
-    test?: MinifyConditions;
-    exclude?: MinifyConditions;
-    include?: MinifyConditions;
+    test?: AssetConditions;
+    exclude?: AssetConditions;
+    include?: AssetConditions;
 };
 export declare const SwcCssMinimizerRspackPlugin: {
     new (options?: SwcCssMinimizerRspackPluginOptions | undefined): {
@@ -15,4 +14,3 @@ export declare const SwcCssMinimizerRspackPlugin: {
         apply(compiler: import("../Compiler").Compiler): void;
     };
 };
-export {};

package/dist/builtin-plugin/SwcJsMinimizerPlugin.d.ts

@@ -1,6 +1,5 @@
 import { BuiltinPluginName } from "@rspack/binding";
-type MinifyCondition = string | RegExp;
-type MinifyConditions = MinifyCondition | MinifyCondition[];
+import type { AssetConditions } from "../util/assetCondition";
 type ExtractCommentsCondition = boolean | RegExp;
 type ExtractCommentsBanner = string | boolean;
 type ExtractCommentsObject = {
@@ -9,14 +8,16 @@ type ExtractCommentsObject = {
 };
 type ExtractCommentsOptions = ExtractCommentsCondition | ExtractCommentsObject;
 export type SwcJsMinimizerRspackPluginOptions = {
+    test?: AssetConditions;
+    exclude?: AssetConditions;
+    include?: AssetConditions;
     extractComments?: ExtractCommentsOptions | undefined;
-    compress?: TerserCompressOptions | boolean;
-    mangle?: TerserMangleOptions | boolean;
-    format?: JsFormatOptions & ToSnakeCaseProperties<JsFormatOptions>;
-    module?: boolean;
-    test?: MinifyConditions;
-    exclude?: MinifyConditions;
-    include?: MinifyConditions;
+    minimizerOptions?: {
+        compress?: TerserCompressOptions | boolean;
+        mangle?: TerserMangleOptions | boolean;
+        format?: JsFormatOptions & ToSnakeCaseProperties<JsFormatOptions>;
+        module?: boolean;
+    };
 };
 /**
  * @example ToSnakeCase<'indentLevel'> == 'indent_level'
@@ -202,7 +203,12 @@ export type TerserManglePropertiesOptions = {};
 export declare const SwcJsMinimizerRspackPlugin: {
     new (options?: SwcJsMinimizerRspackPluginOptions | undefined): {
         name: BuiltinPluginName;
-        _args: [options?: SwcJsMinimizerRspackPluginOptions | undefined];
+        _args: [options?: SwcJsMinimizerRspackPluginOptions | undefined]; /**
+         * - `false`: removes all comments
+         * - `'some'`: preserves some comments
+         * - `'all'`: preserves all comments
+         * @default false
+         */
         affectedHooks: "done" | "make" | "compile" | "emit" | "afterEmit" | "invalid" | "thisCompilation" | "afterDone" | "compilation" | "normalModuleFactory" | "contextModuleFactory" | "initialize" | "shouldEmit" | "infrastructureLog" | "beforeRun" | "run" | "assetEmitted" | "failed" | "shutdown" | "watchRun" | "watchClose" | "environment" | "afterEnvironment" | "afterPlugins" | "afterResolvers" | "beforeCompile" | "afterCompile" | "finishMake" | "entryOption" | undefined;
         raw(compiler: import("../Compiler").Compiler): import("@rspack/binding").BuiltinPlugin;
         apply(compiler: import("../Compiler").Compiler): void;

package/dist/builtin-plugin/SwcJsMinimizerPlugin.js

@@ -47,11 +47,11 @@ function getRawExtractCommentsOptions(extractComments) {
     return undefined;
 }
 exports.SwcJsMinimizerRspackPlugin = (0, base_1.create)(binding_1.BuiltinPluginName.SwcJsMinimizerRspackPlugin, (options) => {
-    let compress = options?.compress ?? true;
-    const mangle = options?.mangle ?? true;
+    let compress = options?.minimizerOptions?.compress ?? true;
+    const mangle = options?.minimizerOptions?.mangle ?? true;
     const format = {
         comments: false,
-        ...options?.format
+        ...options?.minimizerOptions?.format
     };
     if (compress && typeof compress === "object") {
         compress = {
@@ -65,13 +65,15 @@ exports.SwcJsMinimizerRspackPlugin = (0, base_1.create)(binding_1.BuiltinPluginN
         };
     }
     return {
-        extractComments: getRawExtractCommentsOptions(options?.extractComments),
-        compress,
-        mangle,
-        format,
-        module: options?.module,
         test: options?.test,
         include: options?.include,
-        exclude: options?.exclude
+        exclude: options?.exclude,
+        extractComments: getRawExtractCommentsOptions(options?.extractComments),
+        minimizerOptions: {
+            compress,
+            mangle,
+            format,
+            module: options?.minimizerOptions?.module
+        }
     };
 }, "compilation");

package/dist/builtin-plugin/css-extract/hmr/hotModuleReplacement.js

@@ -51,13 +51,17 @@ function getCurrentScriptUrl(moduleId) {
     };
 }
 function updateCss(el, url) {
+    let normalizedUrl;
     if (!url) {
         if (!el.href) {
             return;
         }
-        url = el.href.split("?")[0];
+        normalizedUrl = el.href.split("?")[0];
     }
-    if (!isUrlRequest(url)) {
+    else {
+        normalizedUrl = url;
+    }
+    if (!isUrlRequest(normalizedUrl)) {
         return;
     }
     if (el.isLoaded === false) {
@@ -65,7 +69,7 @@ function updateCss(el, url) {
         // We're probably changing the same file more than once.
         return;
     }
-    if (!url || !(url.indexOf(".css") > -1)) {
+    if (!normalizedUrl || !(normalizedUrl.indexOf(".css") > -1)) {
         return;
     }
     el.visited = true;
@@ -85,7 +89,7 @@ function updateCss(el, url) {
         newEl.isLoaded = true;
         el.parentNode?.removeChild(el);
     });
-    newEl.href = `${url}?${Date.now()}`;
+    newEl.href = `${normalizedUrl}?${Date.now()}`;
     if (el.nextSibling) {
         el.parentNode?.insertBefore(newEl, el.nextSibling);
     }
@@ -95,9 +99,9 @@ function updateCss(el, url) {
 }
 function getReloadUrl(href, src) {
     let ret = "";
-    href = (0, normalizeUrl_1.normalizeUrl)(href);
+    const normalizedHref = (0, normalizeUrl_1.normalizeUrl)(href);
     src.some(url => {
-        if (href.indexOf(src) > -1) {
+        if (normalizedHref.indexOf(src) > -1) {
             ret = url;
         }
     });

package/dist/builtin-plugin/css-extract/hmr/normalizeUrl.d.ts

@@ -1,2 +1,2 @@
-declare function normalizeUrl(urlString: string): string;
+declare function normalizeUrl(url: string): string;
 export { normalizeUrl };

package/dist/builtin-plugin/css-extract/hmr/normalizeUrl.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeUrl = void 0;
-function normalizeUrl(urlString) {
-    urlString = urlString.trim();
+function normalizeUrl(url) {
+    const urlString = url.trim();
     if (/^data:/i.test(urlString)) {
         return urlString;
     }

package/dist/builtin-plugin/css-extract/loader.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pitch = exports.hotLoader = exports.SINGLE_DOT_PATH_SEGMENT = exports.ABSOLUTE_PUBLIC_PATH = exports.AUTO_PUBLIC_PATH = exports.MODULE_TYPE = exports.BASE_URI = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const index_1 = require("./index");
-const loader_options_json_1 = __importDefault(require("./loader-options.json"));
 const utils_1 = require("./utils");
 exports.BASE_URI = "webpack://";
 exports.MODULE_TYPE = "css/mini-extract";
@@ -63,7 +62,7 @@ const pitch = function (request, _, data) {
         this.emitWarning(e);
         return;
     }
-    const options = this.getOptions(loader_options_json_1.default);
+    const options = this.getOptions();
     const emit = typeof options.emit !== "undefined" ? options.emit : true;
     const callback = this.async();
     const filepath = this.resourcePath;

package/dist/config/adapter.d.ts

@@ -1,4 +1,4 @@
-import { type RawLibraryOptions, type RawOptions } from "@rspack/binding";
+import { type JsLibraryOptions, type RawOptions } from "@rspack/binding";
 import type { Compiler } from "../Compiler";
 import { type LoaderContext, type LoaderDefinition, type LoaderDefinitionFunction } from "./adapterRuleUse";
 import type { RspackOptionsNormalized } from "./normalization";
@@ -6,5 +6,5 @@ import type { ChunkLoading, LibraryOptions, Resolve } from "./zod";
 export type { LoaderContext, LoaderDefinition, LoaderDefinitionFunction };
 export declare const getRawOptions: (options: RspackOptionsNormalized, compiler: Compiler) => RawOptions;
 export declare function getRawResolve(resolve: Resolve): RawOptions["resolve"];
-export declare function getRawLibrary(library: LibraryOptions): RawLibraryOptions;
+export declare function getRawLibrary(library: LibraryOptions): JsLibraryOptions;
 export declare function getRawChunkLoading(chunkLoading: ChunkLoading): string;