@rspack/core 0.5.9 → 0.6.0-canary-f5973db-20240409131230

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,
@@ -82,10 +82,15 @@ const applyRspackOptionsDefaults = (options) => {
                 : "var";
     });
     applyNodeDefaults(options.node, { targetProperties });
-    applyOptimizationDefaults(options.optimization, { production, development });
+    applyOptimizationDefaults(options.optimization, {
+        production,
+        development,
+        css: options.experiments.css
+    });
     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);
 };
@@ -111,8 +116,7 @@ const applyExperimentsDefaults = (experiments, { cache }) => {
     D(experiments, "topLevelAwait", true);
     D(experiments, "rspackFuture", {});
     if (typeof experiments.rspackFuture === "object") {
-        D(experiments.rspackFuture, "newTreeshaking", false);
-        D(experiments.rspackFuture, "disableApplyEntryLazily", true);
+        D(experiments.rspackFuture, "newTreeshaking", true);
         D(experiments.rspackFuture, "bundlerInfo", {});
         if (typeof experiments.rspackFuture.bundlerInfo === "object") {
             D(experiments.rspackFuture.bundlerInfo, "version", require("../../package.json").version);
@@ -131,8 +135,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 +147,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 +252,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({
@@ -566,7 +582,7 @@ const applyNodeDefaults = (node, { targetProperties }) => {
         return "warn-mock";
     });
 };
-const applyOptimizationDefaults = (optimization, { production, development }) => {
+const applyOptimizationDefaults = (optimization, { production, development, css }) => {
     D(optimization, "removeAvailableModules", true);
     D(optimization, "removeEmptyChunks", true);
     D(optimization, "mergeDuplicateChunks", true);
@@ -604,9 +620,7 @@ const applyOptimizationDefaults = (optimization, { production, development }) =>
     });
     const { splitChunks } = optimization;
     if (splitChunks) {
-        // A(splitChunks, "defaultSizeTypes", () =>
-        // 	css ? ["javascript", "css", "unknown"] : ["javascript", "unknown"]
-        // );
+        A(splitChunks, "defaultSizeTypes", () => css ? ["javascript", "css", "unknown"] : ["javascript", "unknown"]);
         D(splitChunks, "hidePathInfo", production);
         D(splitChunks, "chunks", "async");
         // D(splitChunks, "usedExports", optimization.usedExports === true);
@@ -646,7 +660,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 +720,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

@@ -177,6 +177,9 @@ const getNormalizedRspackOptions = (config) => {
                 runtimeChunk: getNormalizedOptimizationRuntimeChunk(optimization.runtimeChunk),
                 splitChunks: nestedConfig(optimization.splitChunks, splitChunks => splitChunks && {
                     ...splitChunks,
+                    defaultSizeTypes: splitChunks.defaultSizeTypes
+                        ? [...splitChunks.defaultSizeTypes]
+                        : ["..."],
                     cacheGroups: cloneObject(splitChunks.cacheGroups)
                 })
             };
@@ -233,7 +236,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
             };
         }
     }