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

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

@@ -14,7 +14,7 @@ export declare function create<T extends any[], R>(name: binding.BuiltinPluginNa
     new (...args: T): {
         name: binding.BuiltinPluginName;
         _args: T;
-        affectedHooks: "done" | "compilation" | "failed" | "environment" | "emit" | "make" | "compile" | "afterEmit" | "invalid" | "thisCompilation" | "afterDone" | "normalModuleFactory" | "contextModuleFactory" | "initialize" | "shouldEmit" | "infrastructureLog" | "beforeRun" | "run" | "assetEmitted" | "shutdown" | "watchRun" | "watchClose" | "afterEnvironment" | "afterPlugins" | "afterResolvers" | "beforeCompile" | "afterCompile" | "finishMake" | "entryOption" | 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: Compiler): binding.BuiltinPlugin;
         apply(compiler: Compiler): void;
     };

package/dist/builtin-plugin/css-extract/loader.d.ts

@@ -1,8 +1,8 @@
-import type { LoaderDefinition } from "../..";
+import type { LoaderContext, LoaderDefinition } from "../..";
+export declare const BASE_URI = "webpack://";
 export declare const MODULE_TYPE = "css/mini-extract";
 export declare const AUTO_PUBLIC_PATH = "__mini_css_extract_plugin_public_path_auto__";
-export declare const ABSOLUTE_PUBLIC_PATH = "webpack:///mini-css-extract-plugin/";
-export declare const BASE_URI = "webpack://";
+export declare const ABSOLUTE_PUBLIC_PATH: string;
 export declare const SINGLE_DOT_PATH_SEGMENT = "__mini_css_extract_plugin_single_dot_path_segment__";
 export interface CssExtractRspackLoaderOptions {
     publicPath?: string | ((resourcePath: string, context: string) => string);
@@ -11,6 +11,11 @@ export interface CssExtractRspackLoaderOptions {
     layer?: boolean;
     defaultExport?: boolean;
 }
+export declare function hotLoader(content: string, context: {
+    loaderContext: LoaderContext;
+    options?: CssExtractRspackLoaderOptions;
+    locals?: Record<string, string>;
+}): string;
 declare const loader: LoaderDefinition;
 export declare const pitch: LoaderDefinition["pitch"];
 export default loader;

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

@@ -3,33 +3,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pitch = exports.SINGLE_DOT_PATH_SEGMENT = exports.BASE_URI = exports.ABSOLUTE_PUBLIC_PATH = exports.AUTO_PUBLIC_PATH = exports.MODULE_TYPE = void 0;
+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 = "webpack:///mini-css-extract-plugin/";
-exports.BASE_URI = "webpack://";
+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) {
-    const accept = context.locals
-        ? ""
-        : "module.hot.accept(undefined, cssReload);";
+    const localsJsonString = JSON.stringify(JSON.stringify(context.locals));
     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"))}).cssReload(module.id, ${JSON.stringify({
-        ...context.options,
-        locals: !!context.locals
-    })});
-      module.hot.dispose(cssReload);
-      ${accept}
+      (function() {
+        var localsJsonString = ${localsJsonString};
+        // ${Date.now()}
+        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 ?? {})});
+        // only invalidate when locals change
+        if (
+          module.hot.data &&
+          module.hot.data.value &&
+          module.hot.data.value !== localsJsonString
+        ) {
+          module.hot.invalidate();
+        } else {
+          module.hot.accept();
+        }
+        module.hot.dispose(function(data) {
+          data.value = localsJsonString;
+          cssReload();
+        });
+      })();
     }
   `;
 }
+exports.hotLoader = hotLoader;
 const loader = function loader(content) {
     if (this._compiler &&
         this._compiler.options &&

package/dist/builtin-plugin/lazy-compilation/lazyCompilation.d.ts

@@ -17,7 +17,7 @@ export declare const BuiltinLazyCompilationPlugin: {
             data: string;
             client: string;
         }, cacheable: boolean, entries: boolean, imports: boolean, test?: RawRegex | ((m: JsModule) => boolean) | undefined];
-        affectedHooks: "done" | "compilation" | "failed" | "environment" | "emit" | "make" | "compile" | "afterEmit" | "invalid" | "thisCompilation" | "afterDone" | "normalModuleFactory" | "contextModuleFactory" | "initialize" | "shouldEmit" | "infrastructureLog" | "beforeRun" | "run" | "assetEmitted" | "shutdown" | "watchRun" | "watchClose" | "afterEnvironment" | "afterPlugins" | "afterResolvers" | "beforeCompile" | "afterCompile" | "finishMake" | "entryOption" | 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/config/adapter.js

@@ -139,6 +139,7 @@ function getRawOutput(output) {
         strictModuleErrorHandling: output.strictModuleErrorHandling,
         globalObject: output.globalObject,
         importFunctionName: output.importFunctionName,
+        importMetaName: output.importMetaName,
         iife: output.iife,
         module: output.module,
         wasmLoading: wasmLoading === false ? "false" : wasmLoading,
@@ -278,6 +279,9 @@ const getRawModuleRule = (rule, path, options, upperType) => {
         include: rule.include ? getRawRuleSetCondition(rule.include) : undefined,
         exclude: rule.exclude ? getRawRuleSetCondition(rule.exclude) : undefined,
         issuer: rule.issuer ? getRawRuleSetCondition(rule.issuer) : undefined,
+        issuerLayer: rule.issuerLayer
+            ? getRawRuleSetCondition(rule.issuerLayer)
+            : undefined,
         dependency: rule.dependency
             ? getRawRuleSetCondition(rule.dependency)
             : undefined,
@@ -287,6 +291,12 @@ const getRawModuleRule = (rule, path, options, upperType) => {
                 getRawRuleSetCondition(v)
             ]))
             : undefined,
+        with: rule.with
+            ? Object.fromEntries(Object.entries(rule.with).map(([k, v]) => [
+                k,
+                getRawRuleSetCondition(v)
+            ]))
+            : undefined,
         resource: rule.resource ? getRawRuleSetCondition(rule.resource) : undefined,
         resourceQuery: rule.resourceQuery
             ? getRawRuleSetCondition(rule.resourceQuery)
@@ -301,6 +311,7 @@ const getRawModuleRule = (rule, path, options, upperType) => {
             ? funcUse
             : (0, adapterRuleUse_1.createRawModuleRuleUses)(rule.use ?? [], `${path}.use`, options),
         type: rule.type,
+        layer: rule.layer,
         parser: rule.parser
             ? getRawParserOptions(rule.parser, rule.type ?? upperType)
             : undefined,
@@ -458,6 +469,7 @@ function getRawJavascriptParserOptions(parser) {
         dynamicImportPreload: parser.dynamicImportPreload?.toString() ?? "false",
         dynamicImportPrefetch: parser.dynamicImportPrefetch?.toString() ?? "false",
         dynamicImportFetchPriority: parser.dynamicImportFetchPriority?.toString(),
+        importMeta: parser.importMeta ?? true,
         url: parser.url === false
             ? "false"
             : parser.url === "relative"
@@ -629,9 +641,10 @@ function getRawSnapshotOptions(_snapshot) {
     return {};
 }
 function getRawExperiments(experiments) {
-    const { topLevelAwait, rspackFuture } = experiments;
-    (0, node_assert_1.default)(!(0, util_1.isNil)(topLevelAwait) && !(0, util_1.isNil)(rspackFuture));
+    const { topLevelAwait, layers, rspackFuture } = experiments;
+    (0, node_assert_1.default)(!(0, util_1.isNil)(topLevelAwait) && !(0, util_1.isNil)(rspackFuture) && !(0, util_1.isNil)(layers));
     return {
+        layers,
         topLevelAwait,
         rspackFuture: getRawRspackFutureOptions(rspackFuture)
     };

package/dist/config/adapterRuleUse.js

@@ -30,12 +30,12 @@ const getLightningcssLoaderOptions = (o, _) => {
             o.targets = (0, lightningcss_1.browserslistToTargets)(browserslist(o.targets));
         }
         if (o.targets && Array.isArray(o.targets)) {
-            o.targets = (0, lightningcss_1.browserslistToTargets)(o.targets);
+            o.targets = (0, lightningcss_1.browserslistToTargets)(browserslist(o.targets));
         }
-        if (o.include) {
+        if (o.include && typeof o.include === "object") {
             o.include = (0, lightningcss_1.toFeatures)(o.include);
         }
-        if (o.exclude) {
+        if (o.exclude && typeof o.exclude === "object") {
             o.exclude = (0, lightningcss_1.toFeatures)(o.exclude);
         }
     }

package/dist/config/defaults.js

@@ -126,6 +126,7 @@ const applyExperimentsDefaults = (experiments) => {
     D(experiments, "lazyCompilation", false);
     D(experiments, "asyncWebAssembly", experiments.futureDefaults);
     D(experiments, "css", experiments.futureDefaults ? true : undefined);
+    D(experiments, "layers", false);
     D(experiments, "topLevelAwait", true);
     // IGNORE(experiments.rspackFuture): Rspack specific configuration
     D(experiments, "rspackFuture", {});
@@ -152,6 +153,7 @@ const applyJavascriptParserOptionsDefaults = (parserOptions, fallback) => {
     D(parserOptions, "strictExportPresence", fallback?.strictExportPresence ?? false);
     D(parserOptions, "worker", fallback?.worker ?? ["..."]);
     D(parserOptions, "overrideStrict", fallback?.overrideStrict ?? undefined);
+    D(parserOptions, "importMeta", fallback?.importMeta ?? true);
 };
 const applyModuleDefaults = (module, { asyncWebAssembly, css, targetProperties }) => {
     (0, assertNotNil_1.assertNotNill)(module.parser);
@@ -316,16 +318,10 @@ const applyModuleDefaults = (module, { asyncWebAssembly, css, targetProperties }
                     type: "asset/resource"
                 }
             ]
-        }
-        // {
-        // 	assert: { type: "json" },
-        // 	type: "json"
-        // },
-        // {
-        // 	with: { type: "json" },
-        // 	type: "json"
-        // }
-        );
+        }, {
+            with: { type: "json" },
+            type: "json"
+        });
         return rules;
     });
 };
@@ -530,6 +526,7 @@ const applyOutputDefaults = (output, { context, outputModule, targetProperties:
         return "self";
     });
     D(output, "importFunctionName", "import");
+    D(output, "importMetaName", "import.meta");
     // IGNORE(output.clean): The default value of `output.clean` in webpack is undefined, but it has the same effect as false.
     F(output, "clean", () => !!output.clean);
     D(output, "crossOriginLoading", false);

package/dist/config/normalization.d.ts

@@ -8,7 +8,7 @@
  * https://github.com/webpack/webpack/blob/main/LICENSE
  */
 import type { Compilation } from "../Compilation";
-import type { AssetModuleFilename, Bail, CacheOptions, ChunkFilename, ChunkLoading, ChunkLoadingGlobal, Clean, Context, CrossOriginLoading, CssChunkFilename, CssFilename, Dependencies, DevServer, DevTool, DevtoolFallbackModuleFilenameTemplate, DevtoolModuleFilenameTemplate, DevtoolNamespace, EnabledLibraryTypes, EnabledWasmLoadingTypes, EntryFilename, EntryRuntime, Environment, Externals, ExternalsPresets, ExternalsType, Filename, GeneratorOptionsByModuleType, GlobalObject, HashDigest, HashDigestLength, HashFunction, HashSalt, HotUpdateChunkFilename, HotUpdateGlobal, HotUpdateMainFilename, Iife, ImportFunctionName, InfrastructureLogging, LazyCompilationOptions, LibraryOptions, Loader, Mode, Name, NoParseOption, Node, Optimization, OutputModule, ParserOptionsByModuleType, Path, Performance, Plugins, Profile, PublicPath, Resolve, RspackFutureOptions, RspackOptions, RuleSetRules, ScriptType, SnapshotOptions, SourceMapFilename, StatsValue, StrictModuleErrorHandling, Target, TrustedTypes, UniqueName, WasmLoading, Watch, WatchOptions, WebassemblyModuleFilename, WorkerPublicPath } from "./zod";
+import type { AssetModuleFilename, AsyncChunks, Bail, BaseUri, CacheOptions, ChunkFilename, ChunkLoading, ChunkLoadingGlobal, Clean, Context, CrossOriginLoading, CssChunkFilename, CssFilename, Dependencies, DevServer, DevTool, DevtoolFallbackModuleFilenameTemplate, DevtoolModuleFilenameTemplate, DevtoolNamespace, EnabledLibraryTypes, EnabledWasmLoadingTypes, EntryFilename, EntryRuntime, Environment, Externals, ExternalsPresets, ExternalsType, Filename, GeneratorOptionsByModuleType, GlobalObject, HashDigest, HashDigestLength, HashFunction, HashSalt, HotUpdateChunkFilename, HotUpdateGlobal, HotUpdateMainFilename, Iife, ImportFunctionName, ImportMetaName, InfrastructureLogging, Layer, LazyCompilationOptions, LibraryOptions, Loader, Mode, Name, NoParseOption, Node, Optimization, OutputModule, ParserOptionsByModuleType, Path, Performance, Plugins, Profile, PublicPath, Resolve, RspackFutureOptions, RspackOptions, RuleSetRules, ScriptType, SnapshotOptions, SourceMapFilename, StatsValue, StrictModuleErrorHandling, Target, TrustedTypes, UniqueName, WasmLoading, Watch, WatchOptions, WebassemblyModuleFilename, WorkerPublicPath } from "./zod";
 export declare const getNormalizedRspackOptions: (config: RspackOptions) => RspackOptionsNormalized;
 export type EntryDynamicNormalized = () => Promise<EntryStaticNormalized>;
 export type EntryNormalized = EntryDynamicNormalized | EntryStaticNormalized;
@@ -19,12 +19,13 @@ export interface EntryDescriptionNormalized {
     import?: string[];
     runtime?: EntryRuntime;
     chunkLoading?: ChunkLoading;
-    asyncChunks?: boolean;
+    asyncChunks?: AsyncChunks;
     publicPath?: PublicPath;
-    baseUri?: string;
+    baseUri?: BaseUri;
     filename?: EntryFilename;
     library?: LibraryOptions;
     dependOn?: string[];
+    layer?: Layer;
 }
 export interface OutputNormalized {
     path?: Path;
@@ -48,6 +49,7 @@ export interface OutputNormalized {
     strictModuleErrorHandling?: StrictModuleErrorHandling;
     globalObject?: GlobalObject;
     importFunctionName?: ImportFunctionName;
+    importMetaName?: ImportMetaName;
     iife?: Iife;
     wasmLoading?: WasmLoading;
     enabledWasmLoadingTypes?: EnabledWasmLoadingTypes;
@@ -86,6 +88,7 @@ export interface ExperimentsNormalized {
     outputModule?: boolean;
     topLevelAwait?: boolean;
     css?: boolean;
+    layers?: boolean;
     futureDefaults?: boolean;
     rspackFuture?: RspackFutureOptions;
 }

package/dist/config/normalization.js

@@ -75,6 +75,7 @@ const getNormalizedRspackOptions = (config) => {
                     : ["..."],
                 globalObject: output.globalObject,
                 importFunctionName: output.importFunctionName,
+                importMetaName: output.importMetaName,
                 iife: output.iife,
                 module: output.module,
                 sourceMapFilename: output.sourceMapFilename,
@@ -240,6 +241,7 @@ const getNormalizedEntryStatic = (entry) => {
                 asyncChunks: value.asyncChunks,
                 filename: value.filename,
                 library: value.library,
+                layer: value.layer,
                 dependOn: Array.isArray(value.dependOn)
                     ? value.dependOn
                     : value.dependOn