@rsbuild/core 1.0.18 → 1.0.19

package/dist/index.cjs

@@ -6029,7 +6029,7 @@ async function createContext(options, userConfig, bundlerType) {
   const rsbuildConfig = await withDefaultConfig(rootPath, userConfig);
   const cachePath = (0, import_node_path10.join)(rootPath, "node_modules", ".cache");
   return {
-    version: "1.0.18",
+    version: "1.0.19",
     rootPath,
     distPath: "",
     cachePath,
@@ -9636,7 +9636,7 @@ async function applyCSSRule({
       config,
       root: context.rootPath
     });
-    if (postcssLoaderOptions.postcssOptions?.plugins?.length) {
+    if (typeof postcssLoaderOptions.postcssOptions === "function" || postcssLoaderOptions.postcssOptions?.plugins?.length) {
       importLoaders++;
       rule.use(CHAIN_ID2.USE.POSTCSS).loader(getCompiledPath("postcss-loader")).options(postcssLoaderOptions);
     }
@@ -9660,6 +9660,7 @@ var init_css = __esm({
     import_deepmerge2 = __toESM(require_cjs());
     init_dist2();
     init_constants();
+    init_helpers();
     init_path();
     init_pluginHelper();
     isUseCssExtract = (config, target) => !config.output.injectStyles && target !== "node" && target !== "web-worker";
@@ -9701,35 +9702,57 @@ var init_css = __esm({
       const extraPlugins = [];
       const utils = {
         addPlugins(plugins) {
-          if (Array.isArray(plugins)) {
-            extraPlugins.push(...plugins);
-          } else {
-            extraPlugins.push(plugins);
-          }
+          extraPlugins.push(...castArray(plugins));
         }
       };
-      const userPostcssConfig = await loadUserPostcssrc(root);
-      userPostcssConfig.plugins ||= [];
-      const defaultPostcssConfig = {
+      const userOptions = await loadUserPostcssrc(root);
+      userOptions.plugins ||= [];
+      const defaultOptions2 = {
         implementation: getCompiledPath("postcss"),
-        postcssOptions: userPostcssConfig,
+        postcssOptions: userOptions,
         sourceMap: config.output.sourceMap.css
       };
-      const merged = reduceConfigsWithContext({
-        initial: defaultPostcssConfig,
+      const finalOptions = reduceConfigsWithContext({
+        initial: defaultOptions2,
         config: config.tools.postcss,
         ctx: utils
       });
-      merged.postcssOptions ||= {};
-      merged.postcssOptions.plugins ||= [];
-      if (extraPlugins.length) {
-        merged.postcssOptions.plugins.push(...extraPlugins);
+      finalOptions.postcssOptions ||= {};
+      const updatePostcssOptions = (options) => {
+        options.plugins ||= [];
+        if (extraPlugins.length) {
+          options.plugins.push(...extraPlugins);
+        }
+        options.plugins = options.plugins.map(
+          (plugin) => isPostcssPluginCreator(plugin) ? plugin() : plugin
+        );
+        options.config = false;
+        return options;
+      };
+      const { postcssOptions } = finalOptions;
+      if (typeof postcssOptions === "function") {
+        const postcssOptionsWrapper = (loaderContext) => {
+          const options = postcssOptions(loaderContext);
+          if (typeof options !== "object" || options === null) {
+            throw new Error(
+              `\`postcssOptions\` function must return a PostCSSOptions object, got "${typeof options}".`
+            );
+          }
+          const mergedOptions = {
+            ...userOptions,
+            ...options,
+            plugins: [...userOptions.plugins || [], ...options.plugins || []]
+          };
+          return updatePostcssOptions(mergedOptions);
+        };
+        postcssOptionsWrapper.config = false;
+        return {
+          ...finalOptions,
+          postcssOptions: postcssOptionsWrapper
+        };
       }
-      merged.postcssOptions.plugins = merged.postcssOptions.plugins.map(
-        (plugin) => isPostcssPluginCreator(plugin) ? plugin() : plugin
-      );
-      merged.postcssOptions.config = false;
-      return merged;
+      finalOptions.postcssOptions = updatePostcssOptions(postcssOptions);
+      return finalOptions;
     };
     getCSSLoaderOptions = ({
       config,
@@ -11371,7 +11394,11 @@ function getDefaultSwcConfig(browserslist, cacheRoot) {
         decorators: true
       },
       experimental: {
-        cacheRoot
+        cacheRoot,
+        /**
+         * Preserve `with` in imports and exports.
+         */
+        keepImportAttributes: true
       }
     },
     isModule: "unknown",
@@ -12892,7 +12919,7 @@ var sri_exports = {};
 __export(sri_exports, {
   pluginSri: () => pluginSri
 });
-var import_node_crypto2, getAssetName, pluginSri;
+var import_node_crypto2, getAssetName, isSriLinkRel, pluginSri;
 var init_sri = __esm({
   "src/plugins/sri.ts"() {
     "use strict";
@@ -12906,6 +12933,9 @@ var init_sri = __esm({
       }
       return removeLeadingSlash(url2);
     };
+    isSriLinkRel = (rel) => {
+      return typeof rel === "string" && ["stylesheet", "preload", "modulepreload"].includes(rel);
+    };
     pluginSri = () => ({
       name: "rsbuild:sri",
       setup(api) {
@@ -12936,7 +12966,7 @@ var init_sri = __esm({
               }
               if (tag.tag === "script" && typeof tag.attrs.src === "string") {
                 url2 = tag.attrs.src;
-              } else if (tag.tag === "link" && tag.attrs.rel === "stylesheet" && typeof tag.attrs.href === "string") {
+              } else if (tag.tag === "link" && isSriLinkRel(tag.attrs.rel) && typeof tag.attrs.href === "string") {
                 url2 = tag.attrs.href;
               }
               if (!url2) {
@@ -13610,7 +13640,7 @@ var init_init = __esm({
 
 // src/cli/commands.ts
 function runCli() {
-  program.name("rsbuild").usage("<command> [options]").version("1.0.18");
+  program.name("rsbuild").usage("<command> [options]").version("1.0.19");
   const devCommand = program.command("dev");
   const buildCommand = program.command("build");
   const previewCommand = program.command("preview");
@@ -13719,7 +13749,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js") || npm_execpath.includes(".bun")) {
     console.log();
   }
-  import_rslog.logger.greet(`  ${`Rsbuild v${"1.0.18"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"1.0.19"}`}
 `);
 }
 var import_node_module;
@@ -13806,7 +13836,7 @@ init_logger();
 init_mergeConfig();
 init_helpers();
 init_constants();
-var version = "1.0.18";
+var version = "1.0.19";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,

package/dist/index.js

@@ -46,12 +46,12 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.60.4_typescript@5.6.3/node_modules/@modern-js/module-tools/shims/esm.js
+// ../../node_modules/.pnpm/@modern-js+module-tools@2.60.5_typescript@5.6.3/node_modules/@modern-js/module-tools/shims/esm.js
 import path from "path";
 import { fileURLToPath } from "url";
 var getFilename, getDirname, __dirname, __filename;
 var init_esm = __esm({
-  "../../node_modules/.pnpm/@modern-js+module-tools@2.60.4_typescript@5.6.3/node_modules/@modern-js/module-tools/shims/esm.js"() {
+  "../../node_modules/.pnpm/@modern-js+module-tools@2.60.5_typescript@5.6.3/node_modules/@modern-js/module-tools/shims/esm.js"() {
     "use strict";
     getFilename = () => fileURLToPath(import.meta.url);
     getDirname = () => path.dirname(getFilename());
@@ -6078,7 +6078,7 @@ async function createContext(options, userConfig, bundlerType) {
   const rsbuildConfig = await withDefaultConfig(rootPath, userConfig);
   const cachePath = join6(rootPath, "node_modules", ".cache");
   return {
-    version: "1.0.18",
+    version: "1.0.19",
     rootPath,
     distPath: "",
     cachePath,
@@ -9717,7 +9717,7 @@ async function applyCSSRule({
       config,
       root: context.rootPath
     });
-    if (postcssLoaderOptions.postcssOptions?.plugins?.length) {
+    if (typeof postcssLoaderOptions.postcssOptions === "function" || postcssLoaderOptions.postcssOptions?.plugins?.length) {
       importLoaders++;
       rule.use(CHAIN_ID2.USE.POSTCSS).loader(getCompiledPath("postcss-loader")).options(postcssLoaderOptions);
     }
@@ -9741,6 +9741,7 @@ var init_css = __esm({
     import_deepmerge2 = __toESM(require_cjs());
     init_dist2();
     init_constants();
+    init_helpers();
     init_path();
     init_pluginHelper();
     isUseCssExtract = (config, target) => !config.output.injectStyles && target !== "node" && target !== "web-worker";
@@ -9782,35 +9783,57 @@ var init_css = __esm({
       const extraPlugins = [];
       const utils = {
         addPlugins(plugins) {
-          if (Array.isArray(plugins)) {
-            extraPlugins.push(...plugins);
-          } else {
-            extraPlugins.push(plugins);
-          }
+          extraPlugins.push(...castArray(plugins));
         }
       };
-      const userPostcssConfig = await loadUserPostcssrc(root);
-      userPostcssConfig.plugins ||= [];
-      const defaultPostcssConfig = {
+      const userOptions = await loadUserPostcssrc(root);
+      userOptions.plugins ||= [];
+      const defaultOptions2 = {
         implementation: getCompiledPath("postcss"),
-        postcssOptions: userPostcssConfig,
+        postcssOptions: userOptions,
         sourceMap: config.output.sourceMap.css
       };
-      const merged = reduceConfigsWithContext({
-        initial: defaultPostcssConfig,
+      const finalOptions = reduceConfigsWithContext({
+        initial: defaultOptions2,
         config: config.tools.postcss,
         ctx: utils
       });
-      merged.postcssOptions ||= {};
-      merged.postcssOptions.plugins ||= [];
-      if (extraPlugins.length) {
-        merged.postcssOptions.plugins.push(...extraPlugins);
+      finalOptions.postcssOptions ||= {};
+      const updatePostcssOptions = (options) => {
+        options.plugins ||= [];
+        if (extraPlugins.length) {
+          options.plugins.push(...extraPlugins);
+        }
+        options.plugins = options.plugins.map(
+          (plugin) => isPostcssPluginCreator(plugin) ? plugin() : plugin
+        );
+        options.config = false;
+        return options;
+      };
+      const { postcssOptions } = finalOptions;
+      if (typeof postcssOptions === "function") {
+        const postcssOptionsWrapper = (loaderContext) => {
+          const options = postcssOptions(loaderContext);
+          if (typeof options !== "object" || options === null) {
+            throw new Error(
+              `\`postcssOptions\` function must return a PostCSSOptions object, got "${typeof options}".`
+            );
+          }
+          const mergedOptions = {
+            ...userOptions,
+            ...options,
+            plugins: [...userOptions.plugins || [], ...options.plugins || []]
+          };
+          return updatePostcssOptions(mergedOptions);
+        };
+        postcssOptionsWrapper.config = false;
+        return {
+          ...finalOptions,
+          postcssOptions: postcssOptionsWrapper
+        };
       }
-      merged.postcssOptions.plugins = merged.postcssOptions.plugins.map(
-        (plugin) => isPostcssPluginCreator(plugin) ? plugin() : plugin
-      );
-      merged.postcssOptions.config = false;
-      return merged;
+      finalOptions.postcssOptions = updatePostcssOptions(postcssOptions);
+      return finalOptions;
     };
     getCSSLoaderOptions = ({
       config,
@@ -11468,7 +11491,11 @@ function getDefaultSwcConfig(browserslist, cacheRoot) {
         decorators: true
       },
       experimental: {
-        cacheRoot
+        cacheRoot,
+        /**
+         * Preserve `with` in imports and exports.
+         */
+        keepImportAttributes: true
       }
     },
     isModule: "unknown",
@@ -13006,7 +13033,7 @@ __export(sri_exports, {
   pluginSri: () => pluginSri
 });
 import crypto2 from "crypto";
-var getAssetName, pluginSri;
+var getAssetName, isSriLinkRel, pluginSri;
 var init_sri = __esm({
   "src/plugins/sri.ts"() {
     "use strict";
@@ -13020,6 +13047,9 @@ var init_sri = __esm({
       }
       return removeLeadingSlash(url2);
     };
+    isSriLinkRel = (rel) => {
+      return typeof rel === "string" && ["stylesheet", "preload", "modulepreload"].includes(rel);
+    };
     pluginSri = () => ({
       name: "rsbuild:sri",
       setup(api) {
@@ -13050,7 +13080,7 @@ var init_sri = __esm({
               }
               if (tag.tag === "script" && typeof tag.attrs.src === "string") {
                 url2 = tag.attrs.src;
-              } else if (tag.tag === "link" && tag.attrs.rel === "stylesheet" && typeof tag.attrs.href === "string") {
+              } else if (tag.tag === "link" && isSriLinkRel(tag.attrs.rel) && typeof tag.attrs.href === "string") {
                 url2 = tag.attrs.href;
               }
               if (!url2) {
@@ -13728,7 +13758,7 @@ var init_init = __esm({
 
 // src/cli/commands.ts
 function runCli() {
-  program.name("rsbuild").usage("<command> [options]").version("1.0.18");
+  program.name("rsbuild").usage("<command> [options]").version("1.0.19");
   const devCommand = program.command("dev");
   const buildCommand = program.command("build");
   const previewCommand = program.command("preview");
@@ -13839,7 +13869,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js") || npm_execpath.includes(".bun")) {
     console.log();
   }
-  logger.greet(`  ${`Rsbuild v${"1.0.18"}`}
+  logger.greet(`  ${`Rsbuild v${"1.0.19"}`}
 `);
 }
 var init_prepare = __esm({
@@ -13911,7 +13941,7 @@ init_mergeConfig();
 init_helpers();
 init_constants();
 import { rspack as rspack10 } from "@rspack/core";
-var version = "1.0.18";
+var version = "1.0.19";
 export {
   PLUGIN_CSS_NAME,
   PLUGIN_SWC_NAME,

package/dist-types/types/thirdParty.d.ts

@@ -16,20 +16,24 @@ export type PostCSSOptions = ProcessOptions & {
 export type PostCSSLoaderOptions = {
     /**
      * Enable PostCSS Parser support in CSS-in-JS. If you use JS styles the postcss-js parser, add the execute option.
+     * @default undefined
      */
     execute?: boolean;
     /**
-     * By default generation of source maps depends on the devtool option. All values enable source map generation except eval and false value.
+     * Whether to generate source maps.
+     * @default `rsbuildConfig.output.sourceMap.css`
      */
     sourceMap?: boolean;
     /**
      * The special implementation option determines which implementation of PostCSS to use.
+     * @default `@rsbuild/core/compiled/postcss`
      */
     implementation?: unknown;
     /**
      * Allows to set PostCSS options and plugins.
+     * @default undefined
      */
-    postcssOptions?: PostCSSOptions;
+    postcssOptions?: PostCSSOptions | ((loaderContext: Rspack.LoaderContext) => PostCSSOptions);
 };
 export type { AcceptedPlugin as PostCSSPlugin } from 'postcss';
 export type CSSLoaderModulesMode = 'local' | 'global' | 'pure' | 'icss' | ((resourcePath: string) => 'local' | 'global' | 'pure' | 'icss');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {