@rspack/core 0.5.9-canary-4297cec-20240402080759 → 0.5.9-canary-5be4c34-20240403005129

package/dist/Compilation.d.ts

@@ -90,6 +90,7 @@ export declare class Compilation {
             ExecuteModuleContext
         ]>;
         runtimeModule: liteTapable.SyncHook<[JsRuntimeModule, Chunk], void>;
+        afterSeal: liteTapable.AsyncSeriesHook<[], void>;
     };
     options: RspackOptionsNormalized;
     outputOptions: OutputNormalized;

package/dist/Compilation.js

@@ -154,7 +154,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
             statsPrinter: new tapable.SyncHook(["statsPrinter", "options"]),
             buildModule: new liteTapable.SyncHook(["module"]),
             executeModule: new liteTapable.SyncHook(["options", "context"]),
-            runtimeModule: new liteTapable.SyncHook(["module", "chunk"])
+            runtimeModule: new liteTapable.SyncHook(["module", "chunk"]),
+            afterSeal: new liteTapable.AsyncSeriesHook([])
         };
         this.compiler = compiler;
         this.resolverFactory = compiler.resolverFactory;

package/dist/Compiler.d.ts

@@ -42,7 +42,6 @@ declare class Compiler {
     };
     compilation?: Compilation;
     compilationParams?: CompilationParams;
-    first: boolean;
     builtinPlugins: binding.BuiltinPlugin[];
     root: Compiler;
     running: boolean;
@@ -110,14 +109,10 @@ declare class Compiler {
     getInfrastructureLogger(name: string | Function): Logger;
     run(callback: Callback<Error, Stats>): void;
     /**
-     * Safety: This method is only valid to call if the previous rebuild task is finished, or there will be data races.
+     * * Note: This is not a webpack public API, maybe removed in future.
+     * @internal
      */
-    build(callback?: (error: Error | null) => void): void;
-    /**
-     * Safety: This method is only valid to call if the previous rebuild task is finished, or there will be data races.
-     * @deprecated This is a low-level incremental rebuild API, which shouldn't be used intentionally. Use `compiler.build` instead.
-     */
-    rebuild(modifiedFiles?: ReadonlySet<string>, removedFiles?: ReadonlySet<string>, callback?: (error: Error | null) => void): void;
+    __internal__rebuild(modifiedFiles?: ReadonlySet<string>, removedFiles?: ReadonlySet<string>, callback?: (error: Error | null) => void): void;
     compile(callback: Callback<Error, Compilation>): void;
     watch(watchOptions: WatchOptions, handler: Callback<Error, Stats>): Watching;
     purgeInputFileSystem(): void;

package/dist/Compiler.js

@@ -36,7 +36,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _Compiler_instances, _Compiler_instance, _Compiler_disabledHooks, _Compiler_nonSkippableRegisters, _Compiler_registers, _Compiler_moduleExecutionResultsMap, _Compiler_getInstance, _Compiler_updateNonSkippableRegisters, _Compiler_decorateJsTaps, _Compiler_createHookRegisterTaps, _Compiler_createHookMapRegisterTaps, _Compiler_createCompilation, _Compiler_resetThisCompilation, _Compiler_newCompilationParams;
+var _Compiler_instances, _Compiler_instance, _Compiler_initial, _Compiler_disabledHooks, _Compiler_nonSkippableRegisters, _Compiler_registers, _Compiler_moduleExecutionResultsMap, _Compiler_getInstance, _Compiler_updateNonSkippableRegisters, _Compiler_decorateJsTaps, _Compiler_createHookRegisterTaps, _Compiler_createHookMapRegisterTaps, _Compiler_build, _Compiler_createCompilation, _Compiler_resetThisCompilation, _Compiler_newCompilationParams;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Compiler = void 0;
 /**
@@ -84,7 +84,7 @@ class Compiler {
         _Compiler_instance.set(this, void 0);
         this.webpack = index_1.rspack;
         // TODO: remove this after remove rebuild on the rust side.
-        this.first = true;
+        _Compiler_initial.set(this, true);
         _Compiler_disabledHooks.set(this, void 0);
         _Compiler_nonSkippableRegisters.set(this, void 0);
         _Compiler_registers.set(this, void 0);
@@ -386,36 +386,10 @@ class Compiler {
         }
     }
     /**
-     * Safety: This method is only valid to call if the previous rebuild task is finished, or there will be data races.
+     * * Note: This is not a webpack public API, maybe removed in future.
+     * @internal
      */
-    build(callback) {
-        __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_getInstance).call(this, (error, instance) => {
-            if (error) {
-                return callback === null || callback === void 0 ? void 0 : callback(error);
-            }
-            if (!this.first) {
-                instance.rebuild(Array.from(this.modifiedFiles || []), Array.from(this.removedFiles || []), error => {
-                    if (error) {
-                        return callback === null || callback === void 0 ? void 0 : callback(error);
-                    }
-                    callback === null || callback === void 0 ? void 0 : callback(null);
-                });
-                return;
-            }
-            this.first = false;
-            instance.build(error => {
-                if (error) {
-                    return callback === null || callback === void 0 ? void 0 : callback(error);
-                }
-                callback === null || callback === void 0 ? void 0 : callback(null);
-            });
-        });
-    }
-    /**
-     * Safety: This method is only valid to call if the previous rebuild task is finished, or there will be data races.
-     * @deprecated This is a low-level incremental rebuild API, which shouldn't be used intentionally. Use `compiler.build` instead.
-     */
-    rebuild(modifiedFiles, removedFiles, callback) {
+    __internal__rebuild(modifiedFiles, removedFiles, callback) {
         __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_getInstance).call(this, (error, instance) => {
             if (error) {
                 return callback === null || callback === void 0 ? void 0 : callback(error);
@@ -437,7 +411,7 @@ class Compiler {
             }
             this.hooks.compile.call(params);
             __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_resetThisCompilation).call(this);
-            this.build(err => {
+            __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_build).call(this, err => {
                 if (err) {
                     return callback(err);
                 }
@@ -470,7 +444,7 @@ class Compiler {
     }
     close(callback) {
         if (this.watching) {
-            // When there is still an active watching, close this first
+            // When there is still an active watching, close this #initial
             this.watching.close(() => {
                 this.close(callback);
             });
@@ -497,7 +471,7 @@ class Compiler {
     }
 }
 exports.Compiler = Compiler;
-_Compiler_instance = new WeakMap(), _Compiler_disabledHooks = new WeakMap(), _Compiler_nonSkippableRegisters = new WeakMap(), _Compiler_registers = new WeakMap(), _Compiler_moduleExecutionResultsMap = new WeakMap(), _Compiler_instances = new WeakSet(), _Compiler_getInstance = function _Compiler_getInstance(callback) {
+_Compiler_instance = new WeakMap(), _Compiler_initial = new WeakMap(), _Compiler_disabledHooks = new WeakMap(), _Compiler_nonSkippableRegisters = new WeakMap(), _Compiler_registers = new WeakMap(), _Compiler_moduleExecutionResultsMap = new WeakMap(), _Compiler_instances = new WeakSet(), _Compiler_getInstance = function _Compiler_getInstance(callback) {
     const error = (0, bindingVersionCheck_1.checkVersion)();
     if (error) {
         return callback(error);
@@ -599,6 +573,7 @@ _Compiler_instance = new WeakMap(), _Compiler_disabledHooks = new WeakMap(), _Co
         registerCompilationChunkAssetTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationChunkAsset, () => this.compilation.hooks.chunkAsset, queried => ({ chunk, filename }) => queried.call(Chunk_1.Chunk.__from_binding(chunk, this.compilation), filename)),
         registerCompilationProcessAssetsTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationProcessAssets, () => this.compilation.hooks.processAssets, queried => async () => await queried.promise(this.compilation.assets)),
         registerCompilationAfterProcessAssetsTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationAfterProcessAssets, () => this.compilation.hooks.afterProcessAssets, queried => () => queried.call(this.compilation.assets)),
+        registerCompilationAfterSealTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.CompilationAfterSeal, () => this.compilation.hooks.afterSeal, queried => async () => await queried.promise()),
         registerNormalModuleFactoryBeforeResolveTaps: __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_createHookRegisterTaps).call(this, binding.RegisterJsTapKind.NormalModuleFactoryBeforeResolve, () => this.compilationParams.normalModuleFactory.hooks.beforeResolve, queried => async (resolveData) => {
             const normalizedResolveData = {
                 request: resolveData.request,
@@ -751,6 +726,28 @@ _Compiler_instance = new WeakMap(), _Compiler_disabledHooks = new WeakMap(), _Co
     getTaps.registerKind = registerKind;
     getTaps.getHookMap = getHookMap;
     return getTaps;
+}, _Compiler_build = function _Compiler_build(callback) {
+    __classPrivateFieldGet(this, _Compiler_instances, "m", _Compiler_getInstance).call(this, (error, instance) => {
+        if (error) {
+            return callback === null || callback === void 0 ? void 0 : callback(error);
+        }
+        if (!__classPrivateFieldGet(this, _Compiler_initial, "f")) {
+            instance.rebuild(Array.from(this.modifiedFiles || []), Array.from(this.removedFiles || []), error => {
+                if (error) {
+                    return callback === null || callback === void 0 ? void 0 : callback(error);
+                }
+                callback === null || callback === void 0 ? void 0 : callback(null);
+            });
+            return;
+        }
+        __classPrivateFieldSet(this, _Compiler_initial, false, "f");
+        instance.build(error => {
+            if (error) {
+                return callback === null || callback === void 0 ? void 0 : callback(error);
+            }
+            callback === null || callback === void 0 ? void 0 : callback(null);
+        });
+    });
 }, _Compiler_createCompilation = function _Compiler_createCompilation(native) {
     const compilation = new Compilation_1.Compilation(this, native);
     compilation.name = this.name;

package/dist/Stats.js

@@ -103,8 +103,8 @@ function normalizeStatsPreset(options) {
 }
 exports.normalizeStatsPreset = normalizeStatsPreset;
 function presetToOptions(name) {
-    const pn = (typeof name === "string" && name.toLowerCase()) || name;
-    switch (pn) {
+    const preset = (typeof name === "string" && name.toLowerCase()) || name;
+    switch (preset) {
         case "none":
             return {
                 all: false

package/dist/builtin-plugin/{RSCClientEntryPlugin.d.ts → CssModulesPlugin.d.ts}

@@ -1,5 +1,5 @@
 import { BuiltinPluginName } from "@rspack/binding";
-export declare const RSCClientEntryPlugin: {
+export declare const CssModulesPlugin: {
     new (): {
         name: BuiltinPluginName;
         _options: void;

package/dist/builtin-plugin/CssModulesPlugin.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CssModulesPlugin = void 0;
+const binding_1 = require("@rspack/binding");
+const base_1 = require("./base");
+exports.CssModulesPlugin = (0, base_1.create)(binding_1.BuiltinPluginName.CssModulesPlugin, () => { }, "compilation");

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

@@ -9,6 +9,7 @@ export type EntryOptions = {
     baseUri?: string;
     filename?: FilenameTemplate;
     library?: LibraryOptions;
+    dependOn?: string[];
 };
 export declare const EntryPlugin: {
     new (context: string, entry: string, options?: string | EntryOptions | undefined): {

package/dist/builtin-plugin/EntryPlugin.js

@@ -26,6 +26,7 @@ function getRawEntryOptions(entry) {
             : undefined,
         asyncChunks: entry.asyncChunks,
         filename: entry.filename,
-        library: entry.library && (0, config_1.getRawLibrary)(entry.library)
+        library: entry.library && (0, config_1.getRawLibrary)(entry.library),
+        dependOn: entry.dependOn
     };
 }

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

@@ -4,7 +4,7 @@ export declare const ExternalsPlugin: {
         context?: string | undefined;
         dependencyType?: string | undefined;
         request?: string | undefined;
-    }, args_1: (args_0: Error | undefined, args_1: string | boolean | string[] | Record<string, string | string[]> | undefined, args_2: "promise" | "module" | "jsonp" | "import" | "amd" | "commonjs" | "commonjs2" | "var" | "assign" | "this" | "window" | "self" | "global" | "commonjs-module" | "commonjs-static" | "amd-require" | "umd" | "umd2" | "system" | "script" | "node-commonjs" | undefined, ...args_3: unknown[]) => void, ...args_2: unknown[]) => unknown) | ((args_0: {
+    }, args_1: (args_0: Error | undefined, args_1: string | boolean | string[] | Record<string, string | string[]> | undefined, args_2: "module" | "promise" | "script" | "commonjs" | "jsonp" | "import" | "amd" | "commonjs2" | "var" | "assign" | "this" | "window" | "self" | "global" | "commonjs-module" | "commonjs-static" | "amd-require" | "umd" | "umd2" | "system" | "node-commonjs" | undefined, ...args_3: unknown[]) => void, ...args_2: unknown[]) => unknown) | ((args_0: {
         context?: string | undefined;
         dependencyType?: string | undefined;
         request?: string | undefined;
@@ -12,7 +12,7 @@ export declare const ExternalsPlugin: {
         context?: string | undefined;
         dependencyType?: string | undefined;
         request?: string | undefined;
-    }, args_1: (args_0: Error | undefined, args_1: string | boolean | string[] | Record<string, string | string[]> | undefined, args_2: "promise" | "module" | "jsonp" | "import" | "amd" | "commonjs" | "commonjs2" | "var" | "assign" | "this" | "window" | "self" | "global" | "commonjs-module" | "commonjs-static" | "amd-require" | "umd" | "umd2" | "system" | "script" | "node-commonjs" | undefined, ...args_3: unknown[]) => void, ...args_2: unknown[]) => unknown) | ((args_0: {
+    }, args_1: (args_0: Error | undefined, args_1: string | boolean | string[] | Record<string, string | string[]> | undefined, args_2: "module" | "promise" | "script" | "commonjs" | "jsonp" | "import" | "amd" | "commonjs2" | "var" | "assign" | "this" | "window" | "self" | "global" | "commonjs-module" | "commonjs-static" | "amd-require" | "umd" | "umd2" | "system" | "node-commonjs" | undefined, ...args_3: unknown[]) => void, ...args_2: unknown[]) => unknown) | ((args_0: {
         context?: string | undefined;
         dependencyType?: string | undefined;
         request?: string | undefined;

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

@@ -22,7 +22,7 @@ declare const htmlRspackPluginOptions: z.ZodObject<{
     templateParameters?: Record<string, string> | undefined;
     inject?: boolean | "head" | "body" | undefined;
     publicPath?: string | undefined;
-    scriptLoading?: "module" | "blocking" | "defer" | undefined;
+    scriptLoading?: "blocking" | "defer" | "module" | undefined;
     chunks?: string[] | undefined;
     excludedChunks?: string[] | undefined;
     sri?: "sha256" | "sha384" | "sha512" | undefined;
@@ -37,7 +37,7 @@ declare const htmlRspackPluginOptions: z.ZodObject<{
     templateParameters?: Record<string, string> | undefined;
     inject?: boolean | "head" | "body" | undefined;
     publicPath?: string | undefined;
-    scriptLoading?: "module" | "blocking" | "defer" | undefined;
+    scriptLoading?: "blocking" | "defer" | "module" | undefined;
     chunks?: string[] | undefined;
     excludedChunks?: string[] | undefined;
     sri?: "sha256" | "sha384" | "sha512" | undefined;
@@ -55,7 +55,7 @@ export declare const HtmlRspackPlugin: {
         templateParameters?: Record<string, string> | undefined;
         inject?: boolean | "head" | "body" | undefined;
         publicPath?: string | undefined;
-        scriptLoading?: "module" | "blocking" | "defer" | undefined;
+        scriptLoading?: "blocking" | "defer" | "module" | undefined;
         chunks?: string[] | undefined;
         excludedChunks?: string[] | undefined;
         sri?: "sha256" | "sha384" | "sha512" | undefined;

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

@@ -46,21 +46,15 @@ export * from "./FlagDependencyUsagePlugin";
 export * from "./MangleExportsPlugin";
 export * from "./BundlerInfoRspackPlugin";
 export * from "./ModuleConcatenationPlugin";
+export * from "./CssModulesPlugin";
 export * from "./HtmlRspackPlugin";
 export * from "./CopyRspackPlugin";
 export * from "./SwcJsMinimizerPlugin";
 export * from "./SwcCssMinimizerPlugin";
-export * from "./RSCClientEntryPlugin";
-export * from "./RSCClientReferenceManifestRspackPlugin";
 export * from "./JsLoaderRspackPlugin";
-import { RawBuiltins, RawCssModulesConfig } from "@rspack/binding";
+import { RawBuiltins } from "@rspack/binding";
 import { RspackOptionsNormalized } from "..";
-type BuiltinsCssConfig = {
-    modules?: Partial<RawCssModulesConfig>;
-    namedExports?: boolean;
-};
 export interface Builtins {
-    css?: BuiltinsCssConfig;
     treeShaking?: boolean | "module";
 }
 export declare function deprecated_resolveBuiltins(builtins: Builtins, options: RspackOptionsNormalized): RawBuiltins;

package/dist/builtin-plugin/index.js

@@ -64,12 +64,11 @@ __exportStar(require("./FlagDependencyUsagePlugin"), exports);
 __exportStar(require("./MangleExportsPlugin"), exports);
 __exportStar(require("./BundlerInfoRspackPlugin"), exports);
 __exportStar(require("./ModuleConcatenationPlugin"), exports);
+__exportStar(require("./CssModulesPlugin"), exports);
 __exportStar(require("./HtmlRspackPlugin"), exports);
 __exportStar(require("./CopyRspackPlugin"), exports);
 __exportStar(require("./SwcJsMinimizerPlugin"), exports);
 __exportStar(require("./SwcCssMinimizerPlugin"), exports);
-__exportStar(require("./RSCClientEntryPlugin"), exports);
-__exportStar(require("./RSCClientReferenceManifestRspackPlugin"), exports);
 __exportStar(require("./JsLoaderRspackPlugin"), exports);
 function resolveTreeShaking(treeShaking, production) {
     return treeShaking !== undefined
@@ -79,23 +78,8 @@ function resolveTreeShaking(treeShaking, production) {
             : "false";
 }
 function deprecated_resolveBuiltins(builtins, options) {
-    var _a, _b;
     const production = options.mode === "production" || !options.mode;
     return {
-        // TODO: discuss with webpack, this should move to css generator options
-        css: options.experiments.css
-            ? {
-                modules: {
-                    localsConvention: "asIs",
-                    localIdentName: production
-                        ? "[hash]"
-                        : "[path][name][ext]__[local]",
-                    exportsOnly: false,
-                    ...(_a = builtins.css) === null || _a === void 0 ? void 0 : _a.modules
-                },
-                namedExports: (_b = builtins.css) === null || _b === void 0 ? void 0 : _b.namedExports
-            }
-            : undefined,
         treeShaking: resolveTreeShaking(builtins.treeShaking, production)
     };
 }

package/dist/config/adapter.js

@@ -336,7 +336,8 @@ const getRawModuleRule = (rule, path, options) => {
             if (rule.resourceQuery && !tryMatch(query, rule.resourceQuery)) {
                 return false;
             }
-            if (rule.resourceFragment && !tryMatch(fragment, rule.resourceFragment)) {
+            if (rule.resourceFragment &&
+                !tryMatch(fragment, rule.resourceFragment)) {
                 return false;
             }
             return true;
@@ -408,9 +409,26 @@ function getRawParserOptions(parser, type) {
             javascript: getRawJavascriptParserOptions(parser)
         };
     }
-    return {
-        type: "unknown"
-    };
+    else if (type === "css") {
+        return {
+            type: "css",
+            css: getRawCssParserOptions(parser)
+        };
+    }
+    else if (type === "css/auto") {
+        return {
+            type: "css/auto",
+            cssAuto: getRawCssParserOptions(parser)
+        };
+    }
+    else if (type === "css/module") {
+        return {
+            type: "css/module",
+            cssModule: getRawCssParserOptions(parser)
+        };
+    }
+    // FIXME: shouldn't depend on module type, for example: `rules: [{ test: /\.css/, generator: {..} }]` will error
+    throw new Error(`unreachable: unknow module type: ${type}`);
 }
 function getRawJavascriptParserOptions(parser) {
     var _a, _b, _c, _d, _e;
@@ -443,6 +461,11 @@ function getRawAssetParserDataUrl(dataUrlCondition) {
     }
     throw new Error(`unreachable: AssetParserDataUrl type should be one of "options", but got ${dataUrlCondition}`);
 }
+function getRawCssParserOptions(parser) {
+    return {
+        namedExports: parser.namedExports
+    };
+}
 function getRawGeneratorOptions(generator, type) {
     if (type === "asset") {
         return {
@@ -466,9 +489,25 @@ function getRawGeneratorOptions(generator, type) {
                 : undefined
         };
     }
-    return {
-        type: "unknown"
-    };
+    if (type === "css") {
+        return {
+            type: "css",
+            css: getRawCssGeneratorOptions(generator)
+        };
+    }
+    if (type === "css/auto") {
+        return {
+            type: "css/auto",
+            cssAuto: getRawCssAutoOrModuleGeneratorOptions(generator)
+        };
+    }
+    if (type === "css/module") {
+        return {
+            type: "css/module",
+            cssModule: getRawCssAutoOrModuleGeneratorOptions(generator)
+        };
+    }
+    throw new Error(`unreachable: unknow module type: ${type}`);
 }
 function getRawAssetGeneratorOptions(options) {
     return {
@@ -502,6 +541,19 @@ function getRawAssetGeneratorDataUrl(dataUrl) {
     }
     throw new Error(`unreachable: AssetGeneratorDataUrl type should be one of "options", "function", but got ${dataUrl}`);
 }
+function getRawCssGeneratorOptions(options) {
+    return {
+        exportsConvention: options.exportsConvention,
+        exportsOnly: options.exportsOnly
+    };
+}
+function getRawCssAutoOrModuleGeneratorOptions(options) {
+    return {
+        localIdentName: options.localIdentName,
+        exportsConvention: options.exportsConvention,
+        exportsOnly: options.exportsOnly
+    };
+}
 function getRawOptimization(optimization) {
     (0, assert_1.default)(!(0, util_1.isNil)(optimization.removeAvailableModules) &&
         !(0, util_1.isNil)(optimization.sideEffects) &&

package/dist/config/defaults.js

@@ -55,9 +55,9 @@ const applyRspackOptionsDefaults = (options) => {
     });
     applySnapshotDefaults(options.snapshot, { production });
     applyModuleDefaults(options.module, {
-        // syncWebAssembly: options.experiments.syncWebAssembly,
         asyncWebAssembly: options.experiments.asyncWebAssembly,
-        css: options.experiments.css
+        css: options.experiments.css,
+        targetProperties
     });
     applyOutputDefaults(options.output, {
         context: options.context,
@@ -85,7 +85,8 @@ const applyRspackOptionsDefaults = (options) => {
     applyOptimizationDefaults(options.optimization, { production, development });
     options.resolve = (0, cleverMerge_1.cleverMerge)(getResolveDefaults({
         targetProperties,
-        mode: options.mode
+        mode: options.mode,
+        css: options.experiments.css
     }), options.resolve);
     options.resolveLoader = (0, cleverMerge_1.cleverMerge)(getResolveLoaderDefaults(), options.resolveLoader);
 };
@@ -131,8 +132,9 @@ const applySnapshotDefaults = (snapshot, { production }) => {
 const applyJavascriptParserOptionsDefaults = (parserOptions) => {
     D(parserOptions, "dynamicImportMode", "lazy");
 };
-const applyModuleDefaults = (module, { asyncWebAssembly, css }) => {
+const applyModuleDefaults = (module, { asyncWebAssembly, css, targetProperties }) => {
     (0, assertNotNil_1.assertNotNill)(module.parser);
+    (0, assertNotNil_1.assertNotNill)(module.generator);
     F(module.parser, ModuleTypeConstants_1.ASSET_MODULE_TYPE, () => ({}));
     (0, assertNotNil_1.assertNotNill)(module.parser.asset);
     F(module.parser.asset, "dataUrlCondition", () => ({}));
@@ -142,6 +144,31 @@ const applyModuleDefaults = (module, { asyncWebAssembly, css }) => {
     F(module.parser, "javascript", () => ({}));
     (0, assertNotNil_1.assertNotNill)(module.parser.javascript);
     applyJavascriptParserOptionsDefaults(module.parser.javascript);
+    if (css) {
+        F(module.parser, "css", () => ({}));
+        (0, assertNotNil_1.assertNotNill)(module.parser.css);
+        D(module.parser.css, "namedExports", true);
+        F(module.parser, "css/auto", () => ({}));
+        (0, assertNotNil_1.assertNotNill)(module.parser["css/auto"]);
+        D(module.parser["css/auto"], "namedExports", true);
+        F(module.parser, "css/module", () => ({}));
+        (0, assertNotNil_1.assertNotNill)(module.parser["css/module"]);
+        D(module.parser["css/module"], "namedExports", true);
+        F(module.generator, "css", () => ({}));
+        (0, assertNotNil_1.assertNotNill)(module.generator.css);
+        D(module.generator["css"], "exportsOnly", !targetProperties || !targetProperties.document);
+        D(module.generator["css"], "exportsConvention", "as-is");
+        F(module.generator, "css/auto", () => ({}));
+        (0, assertNotNil_1.assertNotNill)(module.generator["css/auto"]);
+        D(module.generator["css/auto"], "exportsOnly", !targetProperties || !targetProperties.document);
+        D(module.generator["css/auto"], "exportsConvention", "as-is");
+        D(module.generator["css/auto"], "localIdentName", "[uniqueName]-[id]-[local]");
+        F(module.generator, "css/module", () => ({}));
+        (0, assertNotNil_1.assertNotNill)(module.generator["css/module"]);
+        D(module.generator["css/module"], "exportsOnly", !targetProperties || !targetProperties.document);
+        D(module.generator["css/module"], "exportsConvention", "as-is");
+        D(module.generator["css/module"], "localIdentName", "[uniqueName]-[id]-[local]");
+    }
     A(module, "defaultRules", () => {
         const esm = {
             type: "javascript/esm",
@@ -222,38 +249,24 @@ const applyModuleDefaults = (module, { asyncWebAssembly, css }) => {
             });
         }
         if (css) {
-            const cssRule = {
-                type: "css",
-                resolve: {
-                    fullySpecified: true,
-                    preferRelative: true
-                }
-            };
-            const cssModulesRule = {
-                type: "css/module",
-                resolve: {
-                    fullySpecified: true
-                }
+            const resolve = {
+                fullySpecified: true,
+                preferRelative: true
             };
             rules.push({
                 test: /\.css$/i,
-                oneOf: [
-                    {
-                        test: /\.module\.css$/i,
-                        ...cssModulesRule
-                    },
-                    {
-                        ...cssRule
-                    }
-                ]
+                type: "css/auto",
+                resolve
             });
             rules.push({
                 mimetype: "text/css+module",
-                ...cssModulesRule
+                type: "css/module",
+                resolve
             });
             rules.push({
                 mimetype: "text/css",
-                ...cssRule
+                type: "css",
+                resolve
             });
         }
         rules.push({
@@ -646,7 +659,7 @@ const getResolveLoaderDefaults = () => {
 };
 // The values are aligned with webpack
 // https://github.com/webpack/webpack/blob/b9fb99c63ca433b24233e0bbc9ce336b47872c08/lib/config/defaults.js#L1431
-const getResolveDefaults = ({ targetProperties, mode }) => {
+const getResolveDefaults = ({ targetProperties, mode, css }) => {
     const conditions = ["webpack"];
     conditions.push(mode === "development" ? "development" : "production");
     if (targetProperties) {
@@ -706,6 +719,22 @@ const getResolveDefaults = ({ targetProperties, mode }) => {
             unknown: cjsDeps()
         }
     };
+    if (css) {
+        const styleConditions = [];
+        styleConditions.push("webpack");
+        styleConditions.push(mode === "development" ? "development" : "production");
+        styleConditions.push("style");
+        resolveOptions.byDependency["css-import"] = {
+            // We avoid using any main files because we have to be consistent with CSS `@import`
+            // and CSS `@import` does not handle `main` files in directories,
+            // you should always specify the full URL for styles
+            mainFiles: [],
+            mainFields: ["style", "..."],
+            conditionNames: styleConditions,
+            extensions: [".css"],
+            preferRelative: true
+        };
+    }
     return resolveOptions;
 };
 const D = (obj, prop, value) => {

package/dist/config/normalization.d.ts

@@ -23,6 +23,7 @@ export interface EntryDescriptionNormalized {
     baseUri?: string;
     filename?: EntryFilename;
     library?: LibraryOptions;
+    dependOn?: string[];
 }
 export interface OutputNormalized {
     path?: Path;

package/dist/config/normalization.js

@@ -233,7 +233,12 @@ const getNormalizedEntryStatic = (entry) => {
                 chunkLoading: value.chunkLoading,
                 asyncChunks: value.asyncChunks,
                 filename: value.filename,
-                library: value.library
+                library: value.library,
+                dependOn: Array.isArray(value.dependOn)
+                    ? value.dependOn
+                    : value.dependOn
+                        ? [value.dependOn]
+                        : undefined
             };
         }
     }