@rspack/core 1.0.0-alpha.5 → 1.0.0-beta.0

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

@@ -1,45 +1,29 @@
 "use strict";
-/* eslint-env browser */
-/*
-  eslint-disable
-  no-console,
-  func-names
-*/
-/** @typedef {any} TODO */
-const normalizeUrl = require("./normalize-url");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cssReload = void 0;
+const normalizeUrl_1 = require("./normalizeUrl");
 const srcByModuleId = Object.create(null);
 const noDocument = typeof document === "undefined";
 const { forEach } = Array.prototype;
-/**
- * @param {function} fn
- * @param {number} time
- * @returns {(function(): void)|*}
- */
 function debounce(fn, time) {
     let timeout = 0;
     return function () {
         // @ts-ignore
         const self = this;
-        // eslint-disable-next-line prefer-rest-params
         const args = arguments;
         const functionCall = function functionCall() {
             return fn.apply(self, args);
         };
         clearTimeout(timeout);
-        // @ts-ignore
         timeout = setTimeout(functionCall, time);
     };
 }
 function noop() { }
-/**
- * @param {TODO} moduleId
- * @returns {TODO}
- */
 function getCurrentScriptUrl(moduleId) {
     let src = srcByModuleId[moduleId];
     if (!src) {
         if (document.currentScript) {
-            ({ src } = /** @type {HTMLScriptElement} */ (document.currentScript));
+            ({ src } = document.currentScript);
         }
         else {
             const scripts = document.getElementsByTagName("script");
@@ -50,10 +34,6 @@ function getCurrentScriptUrl(moduleId) {
         }
         srcByModuleId[moduleId] = src;
     }
-    /**
-     * @param {string} fileMap
-     * @returns {null | string[]}
-     */
     return function (fileMap) {
         if (!src) {
             return null;
@@ -68,23 +48,18 @@ function getCurrentScriptUrl(moduleId) {
         }
         return fileMap.split(",").map(mapRule => {
             const reg = new RegExp(`${filename}\\.js$`, "g");
-            return normalizeUrl(src.replace(reg, `${mapRule.replace(/{fileName}/g, filename)}.css`));
+            return (0, normalizeUrl_1.normalizeUrl)(src.replace(reg, `${mapRule.replace(/{fileName}/g, filename)}.css`));
         });
     };
 }
-/**
- * @param {TODO} el
- * @param {string} [url]
- */
 function updateCss(el, url) {
     if (!url) {
         if (!el.href) {
             return;
         }
-        // eslint-disable-next-line
         url = el.href.split("?")[0];
     }
-    if (!isUrlRequest(/** @type {string} */ (url))) {
+    if (!isUrlRequest(url)) {
         return;
     }
     if (el.isLoaded === false) {
@@ -95,7 +70,6 @@ function updateCss(el, url) {
     if (!url || !(url.indexOf(".css") > -1)) {
         return;
     }
-    // eslint-disable-next-line no-param-reassign
     el.visited = true;
     const newEl = el.cloneNode();
     newEl.isLoaded = false;
@@ -104,48 +78,33 @@ function updateCss(el, url) {
             return;
         }
         newEl.isLoaded = true;
-        el.parentNode.removeChild(el);
+        el.parentNode?.removeChild(el);
     });
     newEl.addEventListener("error", () => {
         if (newEl.isLoaded) {
             return;
         }
         newEl.isLoaded = true;
-        el.parentNode.removeChild(el);
+        el.parentNode?.removeChild(el);
     });
     newEl.href = `${url}?${Date.now()}`;
     if (el.nextSibling) {
-        el.parentNode.insertBefore(newEl, el.nextSibling);
+        el.parentNode?.insertBefore(newEl, el.nextSibling);
     }
     else {
-        el.parentNode.appendChild(newEl);
+        el.parentNode?.appendChild(newEl);
     }
 }
-/**
- * @param {string} href
- * @param {TODO} src
- * @returns {TODO}
- */
 function getReloadUrl(href, src) {
-    let ret;
-    // eslint-disable-next-line no-param-reassign
-    href = normalizeUrl(href);
-    src.some(
-    /**
-     * @param {string} url
-     */
-    // eslint-disable-next-line array-callback-return
-    url => {
+    let ret = "";
+    href = (0, normalizeUrl_1.normalizeUrl)(href);
+    src.some(url => {
         if (href.indexOf(src) > -1) {
             ret = url;
         }
     });
     return ret;
 }
-/**
- * @param {string} [src]
- * @returns {boolean}
- */
 function reloadStyle(src) {
     if (!src) {
         return false;
@@ -179,10 +138,6 @@ function reloadAll() {
         updateCss(el);
     });
 }
-/**
- * @param {string} url
- * @returns {boolean}
- */
 function isUrlRequest(url) {
     // An URL is not an request if
     // It is not http or https
@@ -191,12 +146,7 @@ function isUrlRequest(url) {
     }
     return true;
 }
-/**
- * @param {TODO} moduleId
- * @param {TODO} options
- * @returns {TODO}
- */
-module.exports = function (moduleId, options) {
+function cssReload(moduleId, options) {
     if (noDocument) {
         console.log("no window.document found, will not HMR CSS");
         return noop;
@@ -211,7 +161,7 @@ module.exports = function (moduleId, options) {
             return;
         }
         if (reloaded) {
-            console.log("[HMR] css reload %s", src.join(" "));
+            console.log("[HMR] css reload %s", src?.join(" "));
         }
         else {
             console.log("[HMR] Reload all css");
@@ -219,4 +169,5 @@ module.exports = function (moduleId, options) {
         }
     }
     return debounce(update, 50);
-};
+}
+exports.cssReload = cssReload;

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

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

package/dist/builtin-plugin/css-extract/hmr/{normalize-url.js → normalizeUrl.js}

@@ -1,11 +1,16 @@
 "use strict";
-/* eslint-disable */
-/**
- * @param {string[]} pathComponents
- * @returns {string}
- */
-function normalizeUrl(pathComponents) {
-    return pathComponents
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeUrl = void 0;
+function normalizeUrl(urlString) {
+    urlString = urlString.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(/\.$/, "");
+    components[0] = "";
+    var path = components
         .reduce(function (accumulator, item) {
         switch (item) {
             case "..":
@@ -17,22 +22,8 @@ function normalizeUrl(pathComponents) {
                 accumulator.push(item);
         }
         return accumulator;
-    }, /** @type {string[]} */ ([]))
+    }, [])
         .join("/");
-}
-/**
- * @param {string} urlString
- * @returns {string}
- */
-module.exports = function (urlString) {
-    urlString = urlString.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(/\.$/, "");
-    components[0] = "";
-    var path = normalizeUrl(components);
     return protocol + host + path;
-};
+}
+exports.normalizeUrl = normalizeUrl;

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

@@ -21,7 +21,7 @@ function hotLoader(content, context) {
     return `${content}
     if(module.hot) {
       // ${Date.now()}
-      var cssReload = require(${(0, utils_1.stringifyRequest)(context.loaderContext, node_path_1.default.join(__dirname, "./hmr/hotModuleReplacement.js"))})(module.id, ${JSON.stringify({
+      var cssReload = require(${(0, utils_1.stringifyRequest)(context.loaderContext, node_path_1.default.join(__dirname, "./hmr/hotModuleReplacement.js"))}).cssReload(module.id, ${JSON.stringify({
         ...context.options,
         locals: !!context.locals
     })});
@@ -101,14 +101,14 @@ const pitch = function (request, _, data) {
                 originalExports.__esModule &&
                     (!originalExports.default || !("locals" in originalExports.default));
             if (namedExport) {
-                Object.keys(originalExports).forEach(key => {
+                for (const key of Object.keys(originalExports)) {
                     if (key !== "default") {
                         if (!locals) {
                             locals = {};
                         }
                         /** @type {Locals} */ locals[key] = originalExports[key];
                     }
-                });
+                }
             }
             else {
                 locals = exports && exports.locals;
@@ -171,7 +171,7 @@ const pitch = function (request, _, data) {
                 }
                 return `\n${esModule ? "export default" : "module.exports = "} ${JSON.stringify(locals)};`;
             }
-            else if (esModule) {
+            if (esModule) {
                 return "\nexport {};";
             }
             return "";
@@ -202,7 +202,7 @@ const pitch = function (request, _, data) {
         callback(null, resultSource, undefined, additionalData);
     };
     this.importModule(`${this.resourcePath}.webpack[javascript/auto]!=!!!${request}`, {
-        publicPath: /** @type {string} */ publicPathForExtract,
+        publicPath: /** @type {Filename} */ publicPathForExtract,
         baseUri: `${exports.BASE_URI}/`
     }, (error, exports) => {
         if (error) {

package/dist/config/adapter.d.ts

@@ -1,4 +1,4 @@
-import type { RawLibraryOptions, RawOptions } from "@rspack/binding";
+import { type RawLibraryOptions, type RawOptions } from "@rspack/binding";
 import type { Compiler } from "../Compiler";
 import { type LoaderContext, type LoaderDefinition, type LoaderDefinitionFunction } from "./adapterRuleUse";
 import type { RspackOptionsNormalized } from "./normalization";

package/dist/config/adapter.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRawChunkLoading = exports.getRawLibrary = exports.getRawResolve = exports.getRawOptions = void 0;
 const node_assert_1 = __importDefault(require("node:assert"));
+const binding_1 = require("@rspack/binding");
 const Stats_1 = require("../Stats");
 const util_1 = require("../util");
 const identifier_1 = require("../util/identifier");
@@ -68,9 +69,7 @@ function getRawExtensionAlias(alias = {}) {
         if (Array.isArray(value)) {
             return [key, value];
         }
-        else {
-            return [key, [value]];
-        }
+        return [key, [value]];
     });
     return Object.fromEntries(entries);
 }
@@ -92,8 +91,8 @@ function getRawTsConfig(tsConfig) {
     const { configFile, references } = tsConfig;
     return {
         configFile,
-        referencesType: references == "auto" ? "auto" : references ? "manual" : "disabled",
-        references: references == "auto" ? undefined : references
+        referencesType: references === "auto" ? "auto" : references ? "manual" : "disabled",
+        references: references === "auto" ? undefined : references
     };
 }
 function getRawResolve(resolve) {
@@ -157,6 +156,8 @@ function getRawOutput(output) {
         workerWasmLoading: workerWasmLoading === false ? "false" : workerWasmLoading,
         workerPublicPath: output.workerPublicPath,
         scriptType: output.scriptType === false ? "false" : output.scriptType,
+        charset: output.charset,
+        chunkLoadTimeout: output.chunkLoadTimeout,
         environment: output.environment
     };
 }
@@ -331,7 +332,7 @@ const getRawModuleRule = (rule, path, options, upperType) => {
             if (rule.test && !tryMatch(path, rule.test)) {
                 return false;
             }
-            else if (rule.resource && !tryMatch(path, rule.resource)) {
+            if (rule.resource && !tryMatch(path, rule.resource)) {
                 return false;
             }
             if (rule.resourceQuery && !tryMatch(query, rule.resourceQuery)) {
@@ -349,14 +350,14 @@ const getRawModuleRule = (rule, path, options, upperType) => {
 function getRawRuleSetCondition(condition) {
     if (typeof condition === "string") {
         return {
-            type: "string",
-            stringMatcher: condition
+            type: binding_1.RawRuleSetConditionType.string,
+            string: condition
         };
     }
     if (condition instanceof RegExp) {
         return {
-            type: "regexp",
-            regexpMatcher: {
+            type: binding_1.RawRuleSetConditionType.regexp,
+            regexp: {
                 source: condition.source,
                 flags: condition.flags
             }
@@ -364,20 +365,20 @@ function getRawRuleSetCondition(condition) {
     }
     if (typeof condition === "function") {
         return {
-            type: "function",
-            funcMatcher: condition
+            type: binding_1.RawRuleSetConditionType.func,
+            func: condition
         };
     }
     if (Array.isArray(condition)) {
         return {
-            type: "array",
-            arrayMatcher: condition.map(i => getRawRuleSetCondition(i))
+            type: binding_1.RawRuleSetConditionType.array,
+            array: condition.map(i => getRawRuleSetCondition(i))
         };
     }
     if (typeof condition === "object" && condition !== null) {
         return {
-            type: "logical",
-            logicalMatcher: [getRawRuleSetLogicalConditions(condition)]
+            type: binding_1.RawRuleSetConditionType.logical,
+            logical: [getRawRuleSetLogicalConditions(condition)]
         };
     }
     throw new Error("unreachable: condition should be one of string, RegExp, Array, Object");
@@ -408,41 +409,41 @@ function getRawParserOptions(parser, type) {
             asset: getRawAssetParserOptions(parser)
         };
     }
-    else if (type === "javascript") {
+    if (type === "javascript") {
         // Filter this out, since `parser["javascript"]` already merge into `parser["javascript/*"]` in default.ts
         return;
     }
-    else if (type === "javascript/auto") {
+    if (type === "javascript/auto") {
         return {
             type: "javascript/auto",
             javascript: getRawJavascriptParserOptions(parser)
         };
     }
-    else if (type === "javascript/dynamic") {
+    if (type === "javascript/dynamic") {
         return {
             type: "javascript/dynamic",
             javascript: getRawJavascriptParserOptions(parser)
         };
     }
-    else if (type === "javascript/esm") {
+    if (type === "javascript/esm") {
         return {
             type: "javascript/esm",
             javascript: getRawJavascriptParserOptions(parser)
         };
     }
-    else if (type === "css") {
+    if (type === "css") {
         return {
             type: "css",
             css: getRawCssParserOptions(parser)
         };
     }
-    else if (type === "css/auto") {
+    if (type === "css/auto") {
         return {
             type: "css/auto",
             cssAuto: getRawCssParserOptions(parser)
         };
     }
-    else if (type === "css/module") {
+    if (type === "css/module") {
         return {
             type: "css/module",
             cssModule: getRawCssParserOptions(parser)

package/dist/config/adapterRuleUse.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="node" />
 import type { JsAssetInfo, RawModuleRuleUse, RawOptions } from "@rspack/binding";
 import type { ResolveRequest } from "../../compiled/enhanced-resolve";
-import type { Compiler } from "../Compiler";
-import type { Logger } from "../logging/Logger";
-import Hash = require("../util/hash");
 import type { Compilation } from "../Compilation";
+import type { Compiler } from "../Compiler";
 import type { Module } from "../Module";
 import { type LoaderObject } from "../loader-runner";
-import type { Mode, Resolve, RuleSetUseItem, Target } from "./zod";
+import type { Logger } from "../logging/Logger";
+import type Hash from "../util/hash";
+import type { Mode, PublicPath, Resolve, RuleSetUseItem, Target } from "./zod";
 export declare const BUILTIN_LOADER_PREFIX = "builtin:";
 export interface ComposeJsUseOptions {
     devtool: RawOptions["devtool"];
@@ -87,7 +87,7 @@ export interface LoaderContext<OptionsType = {}> {
     getMissingDependencies(): string[];
     addBuildDependency(file: string): void;
     importModule(request: string, options: {
-        publicPath?: string;
+        publicPath?: PublicPath;
         baseUri?: string;
     }, callback: (err?: Error, res?: any) => void): void;
     fs: any;

package/dist/config/adapterRuleUse.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isUseSimpleSourceMap = exports.isUseSourceMap = exports.createRawModuleRuleUses = exports.BUILTIN_LOADER_PREFIX = void 0;
 const builtin_loader_1 = require("../builtin-loader");
+const lightningcss_1 = require("../builtin-loader/lightningcss");
 const loader_runner_1 = require("../loader-runner");
 const util_1 = require("../util");
+const browserslist = require("../../compiled/browserslist");
 exports.BUILTIN_LOADER_PREFIX = "builtin:";
 function createRawModuleRuleUses(uses, path, options) {
     const normalizeRuleSetUseItem = (item) => typeof item === "string" ? { loader: item } : item;
@@ -13,7 +15,7 @@ function createRawModuleRuleUses(uses, path, options) {
     return createRawModuleRuleUsesImpl(allUses, path, options);
 }
 exports.createRawModuleRuleUses = createRawModuleRuleUses;
-const getSwcLoaderOptions = (o, options) => {
+const getSwcLoaderOptions = (o, _) => {
     if (o && typeof o === "object" && o.rspackExperiments) {
         const expr = o.rspackExperiments;
         if (expr.import || expr.pluginImport) {
@@ -22,10 +24,30 @@ const getSwcLoaderOptions = (o, options) => {
     }
     return o;
 };
+const getLightningcssLoaderOptions = (o, _) => {
+    if (o && typeof o === "object") {
+        if (o.targets && typeof o.targets === "string") {
+            o.targets = (0, lightningcss_1.browserslistToTargets)(browserslist(o.targets));
+        }
+        if (o.targets && Array.isArray(o.targets)) {
+            o.targets = (0, lightningcss_1.browserslistToTargets)(o.targets);
+        }
+        if (o.include) {
+            o.include = (0, lightningcss_1.toFeatures)(o.include);
+        }
+        if (o.exclude) {
+            o.exclude = (0, lightningcss_1.toFeatures)(o.exclude);
+        }
+    }
+    return o;
+};
 function getBuiltinLoaderOptions(identifier, o, options) {
     if (identifier.startsWith(`${exports.BUILTIN_LOADER_PREFIX}swc-loader`)) {
         return getSwcLoaderOptions(o, options);
     }
+    if (identifier.startsWith(`${exports.BUILTIN_LOADER_PREFIX}lightningcss-loader`)) {
+        return getLightningcssLoaderOptions(o, options);
+    }
     return o;
 }
 function createRawModuleRuleUsesImpl(uses, path, options) {

package/dist/config/browserslistTargetHandler.d.ts

@@ -1,19 +1,21 @@
-export type ApiTargetProperties = import("./target").ApiTargetProperties;
-export type EcmaTargetProperties = import("./target").EcmaTargetProperties;
-export type PlatformTargetProperties = import("./target").PlatformTargetProperties;
-export type BrowserslistHandlerConfig = {
-    configPath?: string | undefined;
-    env?: string | undefined;
-    query?: string | undefined;
-};
 /**
- * @param {string[]} browsers supported browsers list
- * @returns {EcmaTargetProperties & PlatformTargetProperties & ApiTargetProperties} target properties
+ * The following code is modified based on
+ * https://github.com/webpack/webpack/blob/4b4ca3b/lib/config/browserslistTargetHandler.js
+ *
+ * MIT Licensed
+ * Author Sergey Melyukov @smelukov
+ * Copyright (c) JS Foundation and other contributors
+ * https://github.com/webpack/webpack/blob/main/LICENSE
  */
-export function resolve(browsers: string[]): EcmaTargetProperties & PlatformTargetProperties & ApiTargetProperties;
+import type { ApiTargetProperties, EcmaTargetProperties, PlatformTargetProperties } from "./target";
 /**
- * @param {string | null | undefined} input input string
- * @param {string} context the context directory
- * @returns {string[] | undefined} selected browsers
+ * @param input input string
+ * @param context the context directory
+ * @returns selected browsers
  */
-export function load(input: string | null | undefined, context: string): string[] | undefined;
+export declare const load: (input: string | null | undefined, context: string) => string[] | undefined;
+/**
+ * @param browsers supported browsers list
+ * @returns target properties
+ */
+export declare const resolve: (browsers: string[]) => EcmaTargetProperties & PlatformTargetProperties & ApiTargetProperties;

package/dist/config/browserslistTargetHandler.js

@@ -1,3 +1,4 @@
+"use strict";
 /**
  * The following code is modified based on
  * https://github.com/webpack/webpack/blob/4b4ca3b/lib/config/browserslistTargetHandler.js
@@ -7,43 +8,38 @@
  * Copyright (c) JS Foundation and other contributors
  * https://github.com/webpack/webpack/blob/main/LICENSE
  */
-"use strict";
-const browserslist = require("../../compiled/browserslist");
-const path = require("node:path");
-/** @typedef {import("./target").ApiTargetProperties} ApiTargetProperties */
-/** @typedef {import("./target").EcmaTargetProperties} EcmaTargetProperties */
-/** @typedef {import("./target").PlatformTargetProperties} PlatformTargetProperties */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolve = exports.load = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const browserslist_1 = __importDefault(require("../../compiled/browserslist"));
 // [[C:]/path/to/config][:env]
 const inputRx = /^(?:((?:[A-Z]:)?[/\\].*?))?(?::(.+?))?$/i;
 /**
- * @typedef {Object} BrowserslistHandlerConfig
- * @property {string=} configPath
- * @property {string=} env
- * @property {string=} query
- */
-/**
- * @param {string | null | undefined} input input string
- * @param {string} context the context directory
- * @returns {BrowserslistHandlerConfig} config
+ * @param input input string
+ * @param context the context directory
+ * @returns config
  */
 const parse = (input, context) => {
     if (!input) {
         return {};
     }
-    if (path.isAbsolute(input)) {
+    if (node_path_1.default.isAbsolute(input)) {
         const [, configPath, env] = inputRx.exec(input) || [];
         return { configPath, env };
     }
-    const config = browserslist.findConfig(context);
+    const config = browserslist_1.default.findConfig(context);
     if (config && Object.keys(config).includes(input)) {
         return { env: input };
     }
     return { query: input };
 };
 /**
- * @param {string | null | undefined} input input string
- * @param {string} context the context directory
- * @returns {string[] | undefined} selected browsers
+ * @param input input string
+ * @param context the context directory
+ * @returns selected browsers
  */
 const load = (input, context) => {
     const { configPath, env, query } = parse(input, context);
@@ -53,26 +49,27 @@ const load = (input, context) => {
     const config = query
         ? query
         : configPath
-            ? browserslist.loadConfig({
+            ? browserslist_1.default.loadConfig({
                 config: configPath,
                 env
             })
-            : browserslist.loadConfig({ path: context, env });
+            : browserslist_1.default.loadConfig({ path: context, env });
     if (!config)
         return;
-    return browserslist(config);
+    return (0, browserslist_1.default)(config);
 };
+exports.load = load;
 /**
- * @param {string[]} browsers supported browsers list
- * @returns {EcmaTargetProperties & PlatformTargetProperties & ApiTargetProperties} target properties
+ * @param browsers supported browsers list
+ * @returns target properties
  */
-const resolve = browsers => {
+const resolve = (browsers) => {
     /**
      * Checks all against a version number
-     * @param {Record<string, number | [number, number]>} versions first supported version
-     * @returns {boolean} true if supports
+     * @param versions first supported version
+     * @returns true if supports
      */
-    const rawChecker = versions => {
+    const rawChecker = (versions) => {
         return browsers.every(v => {
             const [name, parsedVersion] = v.split(" ");
             if (!name)
@@ -344,7 +341,4 @@ const resolve = browsers => {
         require: nodeProperty
     };
 };
-module.exports = {
-    resolve,
-    load
-};
+exports.resolve = resolve;