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

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;
     });
 };
@@ -407,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"));
@@ -431,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";
@@ -444,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");
     });
@@ -530,6 +521,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);
@@ -595,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));
@@ -605,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", () => {
@@ -652,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";
     });
@@ -775,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

@@ -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;
@@ -72,6 +74,7 @@ export interface OutputNormalized {
     environment?: Environment;
     charset?: boolean;
     chunkLoadTimeout?: number;
+    cssHeadDataCompression?: boolean;
 }
 export interface ModuleOptionsNormalized {
     defaultRules?: RuleSetRules;
@@ -86,6 +89,7 @@ export interface ExperimentsNormalized {
     outputModule?: boolean;
     topLevelAwait?: boolean;
     css?: boolean;
+    layers?: boolean;
     futureDefaults?: boolean;
     rspackFuture?: RspackFutureOptions;
 }

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,
@@ -75,6 +76,7 @@ const getNormalizedRspackOptions = (config) => {
                     : ["..."],
                 globalObject: output.globalObject,
                 importFunctionName: output.importFunctionName,
+                importMetaName: output.importMetaName,
                 iife: output.iife,
                 module: output.module,
                 sourceMapFilename: output.sourceMapFilename,
@@ -240,6 +242,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
@@ -280,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)) {