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

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

@@ -7,10 +7,8 @@ const noDocument = typeof document === "undefined";
 const { forEach } = Array.prototype;
 function debounce(fn, time) {
     let timeout = 0;
-    return function () {
-        // @ts-ignore
+    return function (...args) {
         const self = this;
-        const args = arguments;
         const functionCall = function functionCall() {
             return fn.apply(self, args);
         };
@@ -34,12 +32,12 @@ function getCurrentScriptUrl(moduleId) {
         }
         srcByModuleId[moduleId] = src;
     }
-    return function (fileMap) {
+    return (fileMap) => {
         if (!src) {
             return null;
         }
         const splitResult = src.split(/([^\\/]+)\.js$/);
-        const filename = splitResult && splitResult[1];
+        const filename = splitResult?.[1];
         if (!filename) {
             return [src.replace(".js", ".css")];
         }
@@ -53,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) {
@@ -67,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;
@@ -87,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);
     }
@@ -97,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,17 +1,19 @@
 "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;
     }
-    var protocol = urlString.indexOf("//") !== -1 ? urlString.split("//")[0] + "//" : "";
-    var components = urlString.replace(new RegExp(protocol, "i"), "").split("/");
-    var host = components[0].toLowerCase().replace(/\.$/, "");
+    const protocol = urlString.indexOf("//") !== -1 ? `${urlString.split("//")[0]}//` : "";
+    const components = urlString
+        .replace(new RegExp(protocol, "i"), "")
+        .split("/");
+    const host = components[0].toLowerCase().replace(/\.$/, "");
     components[0] = "";
-    var path = components
-        .reduce(function (accumulator, item) {
+    const path = components
+        .reduce((accumulator, item) => {
         switch (item) {
             case "..":
                 accumulator.pop();

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

@@ -6,12 +6,11 @@ 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";
 exports.AUTO_PUBLIC_PATH = "__mini_css_extract_plugin_public_path_auto__";
-exports.ABSOLUTE_PUBLIC_PATH = exports.BASE_URI + "/mini-css-extract-plugin/";
+exports.ABSOLUTE_PUBLIC_PATH = `${exports.BASE_URI}/mini-css-extract-plugin/`;
 exports.SINGLE_DOT_PATH_SEGMENT = "__mini_css_extract_plugin_single_dot_path_segment__";
 const SERIALIZE_SEP = "__RSPACK_CSS_EXTRACT_SEP__";
 function hotLoader(content, context) {
@@ -42,10 +41,7 @@ function hotLoader(content, context) {
 }
 exports.hotLoader = hotLoader;
 const loader = function loader(content) {
-    if (this._compiler &&
-        this._compiler.options &&
-        this._compiler.options.experiments &&
-        this._compiler.options.experiments.css &&
+    if (this._compiler?.options?.experiments?.css &&
         this._module &&
         (this._module.type === "css" ||
             this._module.type === "css/auto" ||
@@ -55,10 +51,7 @@ const loader = function loader(content) {
     }
 };
 const pitch = function (request, _, data) {
-    if (this._compiler &&
-        this._compiler.options &&
-        this._compiler.options.experiments &&
-        this._compiler.options.experiments.css &&
+    if (this._compiler?.options?.experiments?.css &&
         this._module &&
         (this._module.type === "css" ||
             this._module.type === "css/auto" ||
@@ -69,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;
@@ -122,7 +115,7 @@ const pitch = function (request, _, data) {
                 }
             }
             else {
-                locals = exports && exports.locals;
+                locals = exports?.locals;
             }
             if (Array.isArray(exports) && emit) {
                 const identifierCountMap = new Map();

package/dist/builtin-plugin/lazy-compilation/backend.js

@@ -1,8 +1,8 @@
-/*
-    MIT License http://www.opensource.org/licenses/mit-license.php
-    Author Tobias Koppers @sokra
-*/
 "use strict";
+/*
+ * MIT License http://www.opensource.org/licenses/mit-license.php
+ * Author Tobias Koppers @sokra
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleImpl = exports.dispose = void 0;
 const getBackend = (options) => (compiler, callback) => {

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;

package/dist/config/adapter.js

@@ -129,6 +129,7 @@ function getRawOutput(output) {
         crossOriginLoading: getRawCrossOriginLoading(output.crossOriginLoading),
         cssFilename: output.cssFilename,
         cssChunkFilename: output.cssChunkFilename,
+        cssHeadDataCompression: output.cssHeadDataCompression,
         hotUpdateChunkFilename: output.hotUpdateChunkFilename,
         hotUpdateMainFilename: output.hotUpdateMainFilename,
         hotUpdateGlobal: output.hotUpdateGlobal,

package/dist/config/adapterRuleUse.d.ts

@@ -102,12 +102,8 @@ export interface LoaderContext<OptionsType = {}> {
     _compilation: Compilation;
     _module: Module;
 }
-export interface LoaderDefinitionFunction<OptionsType = {}, ContextAdditions = {}> {
-    (this: LoaderContext<OptionsType> & ContextAdditions, content: string, sourceMap?: string | SourceMap, additionalData?: AdditionalData): string | void | Buffer | Promise<string | Buffer>;
-}
-export interface PitchLoaderDefinitionFunction<OptionsType = {}, ContextAdditions = {}> {
-    (this: LoaderContext<OptionsType> & ContextAdditions, remainingRequest: string, previousRequest: string, data: object): string | void | Buffer | Promise<string | Buffer>;
-}
+export type LoaderDefinitionFunction<OptionsType = {}, ContextAdditions = {}> = (this: LoaderContext<OptionsType> & ContextAdditions, content: string, sourceMap?: string | SourceMap, additionalData?: AdditionalData) => string | void | Buffer | Promise<string | Buffer>;
+export type PitchLoaderDefinitionFunction<OptionsType = {}, ContextAdditions = {}> = (this: LoaderContext<OptionsType> & ContextAdditions, remainingRequest: string, previousRequest: string, data: object) => string | void | Buffer | Promise<string | Buffer>;
 export type LoaderDefinition<OptionsType = {}, ContextAdditions = {}> = LoaderDefinitionFunction<OptionsType, ContextAdditions> & {
     raw?: false;
     pitch?: PitchLoaderDefinitionFunction;

package/dist/config/adapterRuleUse.js

@@ -55,7 +55,8 @@ function createRawModuleRuleUsesImpl(uses, path, options) {
         return [];
     }
     return uses.map((use, index) => {
-        let o, isBuiltin = false;
+        let o;
+        let isBuiltin = false;
         if (use.loader.startsWith(exports.BUILTIN_LOADER_PREFIX)) {
             o = getBuiltinLoaderOptions(use.loader, use.options, options);
             o = (0, util_1.isNil)(o) ? undefined : typeof o === "string" ? o : JSON.stringify(o);
@@ -75,15 +76,15 @@ function resolveStringifyLoaders(use, path, compiler, isBuiltin) {
     else if (use.options === undefined) {
     }
     else if (typeof use.options === "string")
-        obj.query = "?" + use.options;
+        obj.query = `?${use.options}`;
     else if (use.ident)
-        obj.query = "??" + (ident = use.ident);
+        obj.query = `??${(ident = use.ident)}`;
     else if (typeof use.options === "object" && use.options.ident)
-        obj.query = "??" + (ident = use.options.ident);
+        obj.query = `??${(ident = use.options.ident)}`;
     else if (typeof use.options === "object")
-        obj.query = "??" + (ident = path);
+        obj.query = `??${(ident = path)}`;
     else
-        obj.query = "?" + JSON.stringify(use.options);
+        obj.query = `?${JSON.stringify(use.options)}`;
     if (use.options && typeof use.options === "object") {
         if (!ident)
             ident = "[[missing ident]]";

package/dist/config/defaults.js

@@ -403,8 +403,9 @@ const applyOutputDefaults = (output, { context, outputModule, targetProperties:
     D(output, "hotUpdateChunkFilename", `[id].[fullhash].hot-update.${output.module ? "mjs" : "js"}`);
     D(output, "hotUpdateMainFilename", "[runtime].[fullhash].hot-update.json");
     const uniqueNameId = Template_1.Template.toIdentifier(output.uniqueName);
-    F(output, "hotUpdateGlobal", () => "webpackHotUpdate" + uniqueNameId);
-    F(output, "chunkLoadingGlobal", () => "webpackChunk" + uniqueNameId);
+    F(output, "hotUpdateGlobal", () => `webpackHotUpdate${uniqueNameId}`);
+    F(output, "chunkLoadingGlobal", () => `webpackChunk${uniqueNameId}`);
+    D(output, "cssHeadDataCompression", !development);
     D(output, "assetModuleFilename", "[hash][ext][query]");
     D(output, "webassemblyModuleFilename", "[hash].module.wasm");
     F(output, "path", () => node_path_1.default.join(process.cwd(), "dist"));
@@ -427,10 +428,7 @@ const applyOutputDefaults = (output, { context, outputModule, targetProperties:
                     return "module";
                 if (tp.document)
                     return "array-push";
-                throw new Error("For the selected environment is no default ESM chunk format available:\n" +
-                    "ESM exports can be chosen when 'import()' is available.\n" +
-                    "JSONP Array push can be chosen when 'document' is available.\n" +
-                    helpMessage);
+                throw new Error(`For the selected environment is no default ESM chunk format available:\nESM exports can be chosen when 'import()' is available.\nJSONP Array push can be chosen when 'document' is available.\n${helpMessage}`);
             }
             if (tp.document)
                 return "array-push";
@@ -440,10 +438,7 @@ const applyOutputDefaults = (output, { context, outputModule, targetProperties:
                 return "commonjs";
             if (tp.importScripts)
                 return "array-push";
-            throw new Error("For the selected environment is no default script chunk format available:\n" +
-                "JSONP Array push can be chosen when 'document' or 'importScripts' is available.\n" +
-                "CommonJs exports can be chosen when 'require' or node builtins are available.\n" +
-                helpMessage);
+            throw new Error(`For the selected environment is no default script chunk format available:\nJSONP Array push can be chosen when 'document' or 'importScripts' is available.\nCommonJs exports can be chosen when 'require' or node builtins are available.\n${helpMessage}`);
         }
         throw new Error("Chunk format can't be selected by default when no target is specified");
     });
@@ -592,8 +587,8 @@ const applyOutputDefaults = (output, { context, outputModule, targetProperties:
     const environment = output.environment;
     const optimistic = (v) => v || v === undefined;
     const conditionallyOptimistic = (v, c) => (v === undefined && c) || v;
-    F(environment, "globalThis", () => tp && tp.globalThis);
-    F(environment, "bigIntLiteral", () => tp && tp.bigIntLiteral);
+    F(environment, "globalThis", () => tp?.globalThis);
+    F(environment, "bigIntLiteral", () => tp?.bigIntLiteral);
     F(environment, "const", () => tp && optimistic(tp.const));
     F(environment, "arrowFunction", () => tp && optimistic(tp.arrowFunction));
     F(environment, "asyncFunction", () => tp && optimistic(tp.asyncFunction));
@@ -602,25 +597,19 @@ const applyOutputDefaults = (output, { context, outputModule, targetProperties:
     F(environment, "optionalChaining", () => tp && optimistic(tp.optionalChaining));
     F(environment, "nodePrefixForCoreModules", () => tp && optimistic(tp.nodePrefixForCoreModules));
     F(environment, "templateLiteral", () => tp && optimistic(tp.templateLiteral));
-    F(environment, "dynamicImport", () => conditionallyOptimistic(tp && tp.dynamicImport, output.module));
-    F(environment, "dynamicImportInWorker", () => conditionallyOptimistic(tp && tp.dynamicImportInWorker, output.module));
-    F(environment, "module", () => conditionallyOptimistic(tp && tp.module, output.module));
+    F(environment, "dynamicImport", () => conditionallyOptimistic(tp?.dynamicImport, output.module));
+    F(environment, "dynamicImportInWorker", () => conditionallyOptimistic(tp?.dynamicImportInWorker, output.module));
+    F(environment, "module", () => conditionallyOptimistic(tp?.module, output.module));
     F(environment, "document", () => tp && optimistic(tp.document));
 };
 const applyExternalsPresetsDefaults = (externalsPresets, { targetProperties }) => {
-    D(externalsPresets, "web", targetProperties && targetProperties.web);
-    D(externalsPresets, "node", targetProperties && targetProperties.node);
-    D(externalsPresets, "electron", targetProperties && targetProperties.electron);
-    D(externalsPresets, "electronMain", targetProperties &&
-        targetProperties.electron &&
-        targetProperties.electronMain);
-    D(externalsPresets, "electronPreload", targetProperties &&
-        targetProperties.electron &&
-        targetProperties.electronPreload);
-    D(externalsPresets, "electronRenderer", targetProperties &&
-        targetProperties.electron &&
-        targetProperties.electronRenderer);
-    D(externalsPresets, "nwjs", targetProperties && targetProperties.nwjs);
+    D(externalsPresets, "web", targetProperties?.web);
+    D(externalsPresets, "node", targetProperties?.node);
+    D(externalsPresets, "electron", targetProperties?.electron);
+    D(externalsPresets, "electronMain", targetProperties?.electron && targetProperties.electronMain);
+    D(externalsPresets, "electronPreload", targetProperties?.electron && targetProperties.electronPreload);
+    D(externalsPresets, "electronRenderer", targetProperties?.electron && targetProperties.electronRenderer);
+    D(externalsPresets, "nwjs", targetProperties?.nwjs);
 };
 const applyLoaderDefaults = (loader, { targetProperties, environment }) => {
     F(loader, "target", () => {
@@ -649,19 +638,19 @@ const applyNodeDefaults = (node, { targetProperties }) => {
         return;
     // IGNORE(node.global): The default value of `global` is determined by `futureDefaults` in webpack.
     F(node, "global", () => {
-        if (targetProperties && targetProperties.global)
+        if (targetProperties?.global)
             return false;
         return "warn";
     });
     // IGNORE(node.__dirname): The default value of `__dirname` is determined by `futureDefaults` in webpack.
     F(node, "__dirname", () => {
-        if (targetProperties && targetProperties.node)
+        if (targetProperties?.node)
             return "eval-only";
         return "warn-mock";
     });
     // IGNORE(node.__filename): The default value of `__filename` is determined by `futureDefaults` in webpack.
     F(node, "__filename", () => {
-        if (targetProperties && targetProperties.node)
+        if (targetProperties?.node)
             return "eval-only";
         return "warn-mock";
     });
@@ -772,7 +761,7 @@ const getResolveDefaults = ({ context, targetProperties, mode, css }) => {
     }
     const jsExtensions = [".js", ".json", ".wasm"];
     const tp = targetProperties;
-    const browserField = tp && tp.web && (!tp.node || (tp.electron && tp.electronRenderer));
+    const browserField = tp?.web && (!tp.node || (tp.electron && tp.electronRenderer));
     const aliasFields = browserField ? ["browser"] : [];
     const mainFields = browserField
         ? ["browser", "module", "..."]

package/dist/config/normalization.d.ts

@@ -74,6 +74,7 @@ export interface OutputNormalized {
     environment?: Environment;
     charset?: boolean;
     chunkLoadTimeout?: number;
+    cssHeadDataCompression?: boolean;
 }
 export interface ModuleOptionsNormalized {
     defaultRules?: RuleSetRules;

package/dist/config/normalization.js

@@ -54,6 +54,7 @@ const getNormalizedRspackOptions = (config) => {
                 chunkLoading: output.chunkLoading,
                 chunkFilename: output.chunkFilename,
                 crossOriginLoading: output.crossOriginLoading,
+                cssHeadDataCompression: output.cssHeadDataCompression,
                 cssFilename: output.cssFilename,
                 cssChunkFilename: output.cssChunkFilename,
                 hotUpdateMainFilename: output.hotUpdateMainFilename,
@@ -282,8 +283,10 @@ const cloneObject = (value) => ({ ...value });
 const keyedNestedConfig = (value, fn, customKeys) => {
     const result = value === undefined
         ? {}
-        : Object.keys(value).reduce((obj, key) => ((obj[key] = (customKeys && key in customKeys ? customKeys[key] : fn)(value[key])),
-            obj), {});
+        : Object.keys(value).reduce((obj, key) => {
+            obj[key] = (customKeys && key in customKeys ? customKeys[key] : fn)(value[key]);
+            return obj;
+        }, {});
     if (customKeys) {
         for (const key of Object.keys(customKeys)) {
             if (!(key in result)) {