chore: update

web-infra-dev · Jan 10, 2025 · 51e29b8 · 51e29b8
1 parent 45848b2
commit 51e29b8
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 38 deletions.
diff --git a/examples/react-component-bundle/rslib.config.ts b/examples/react-component-bundle/rslib.config.ts
@@ -7,7 +7,6 @@ export default defineConfig({
     {
       format: 'esm',
       dts: true,
-      // syntax: 'es5',
       output: {
         distPath: {
           root: './dist/esm',
@@ -16,7 +15,6 @@ export default defineConfig({
     },
     {
       format: 'cjs',
-      syntax: 'es5',
       dts: true,
       output: {
         distPath: {

diff --git a/packages/core/src/asset/assetConfig.ts b/packages/core/src/asset/assetConfig.ts
@@ -2,31 +2,47 @@ import type { EnvironmentConfig, RsbuildPlugin } from '@rsbuild/core';
 import type { Format } from '../types';
 import { LibAssetExtractPlugin } from './LibAssetExtractPlugin';
 
-const PLUGIN_NAME = 'rsbuild:lib-asset-bundleless';
+const PLUGIN_NAME = 'rsbuild:lib-asset';
 
 const RSBUILD_SVGR_PLUGIN_NAME = 'rsbuild:svgr';
 const pluginLibAsset = ({ bundle }: { bundle: boolean }): RsbuildPlugin => ({
   name: PLUGIN_NAME,
   pre: [RSBUILD_SVGR_PLUGIN_NAME],
   setup(api) {
     api.modifyBundlerChain((config, { CHAIN_ID }) => {
-      // only support transform the svg asset to mixedImport svgr file
-      // remove issuer to make every svg asset is transformed
       const isUsingSvgr = Boolean(
         config.module
           .rule(CHAIN_ID.RULE.SVG)
           .oneOf(CHAIN_ID.RULE.SVG)
           .uses.has(CHAIN_ID.USE.SVGR),
       );
-      if (isUsingSvgr) {
+      if (isUsingSvgr && !bundle) {
+        // in bundleless, only support transform the svg asset to mixedImport svgr file
+        // remove issuer to make every svg asset is transformed
         const rule = config.module
           .rule(CHAIN_ID.RULE.SVG)
-          .oneOf(CHAIN_ID.RULE.SVG);
+          .oneOf(CHAIN_ID.ONE_OF.SVG);
         rule.issuer([]);
       }
       config
         .plugin(LibAssetExtractPlugin.name)
         .use(LibAssetExtractPlugin, [{ bundle, isUsingSvgr }]);
+
+      if (bundle) {
+        // preserve './' in css url
+        // https://github.com/web-infra-dev/rspack/pull/8946
+        config.plugins.get(CHAIN_ID.PLUGIN.MINI_CSS_EXTRACT)?.tap((options) => {
+          if (bundle) {
+            return [
+              {
+                ...options[0],
+                enforceRelative: true,
+              },
+            ];
+          }
+          return options;
+        });
+      }
     });
   },
 });
@@ -43,13 +59,7 @@ export const composeAssetConfig = (
           dataUriLimit: 0, // default: no inline asset
           assetPrefix: 'auto',
         },
-        tools: {
-          rspack: {
-            plugins: [
-              new LibAssetExtractPlugin({ bundle: true, isUsingSvgr: false }),
-            ],
-          },
-        },
+        plugins: [pluginLibAsset({ bundle: true })],
       };
     }
     return {

diff --git a/packages/core/src/css/LibCssExtractPlugin.ts b/packages/core/src/css/LibCssExtractPlugin.ts
@@ -67,7 +67,8 @@ class LibCssExtractPlugin implements Rspack.RspackPluginInstance {
             const undoPath = getUndoPath(
               name,
               compilation.outputOptions.path!,
-              false,
+              // https://github.com/web-infra-dev/rspack/pull/8946
+              true,
             );
             replace(`${ABSOLUTE_PUBLIC_PATH}${AUTO_PUBLIC_PATH}`, undoPath);
             replace(ABSOLUTE_PUBLIC_PATH, '');

diff --git a/packages/core/tests/__snapshots__/config.test.ts.snap b/packages/core/tests/__snapshots__/config.test.ts.snap
@@ -114,6 +114,13 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
           "name": "rsbuild:format",
           "setup": [Function],
         },
+        {
+          "name": "rsbuild:lib-asset",
+          "pre": [
+            "rsbuild:svgr",
+          ],
+          "setup": [Function],
+        },
         {
           "name": "rsbuild:lib-entry-chunk",
           "setup": [Function],
@@ -214,17 +221,6 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
           {
             "externalsType": "module-import",
           },
-          {
-            "plugins": [
-              LibAssetExtractPlugin {
-                "name": "LIB_ASSET_EXTRACT_PLUGIN",
-                "options": {
-                  "bundle": true,
-                  "isUsingSvgr": false,
-                },
-              },
-            ],
-          },
           {
             "plugins": [
               EntryChunkPlugin {
@@ -369,6 +365,13 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
           "name": "rsbuild:cjs-import-meta-url-shim",
           "setup": [Function],
         },
+        {
+          "name": "rsbuild:lib-asset",
+          "pre": [
+            "rsbuild:svgr",
+          ],
+          "setup": [Function],
+        },
         {
           "name": "rsbuild:lib-entry-chunk",
           "setup": [Function],
@@ -461,17 +464,6 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
           {
             "externalsType": "commonjs-import",
           },
-          {
-            "plugins": [
-              LibAssetExtractPlugin {
-                "name": "LIB_ASSET_EXTRACT_PLUGIN",
-                "options": {
-                  "bundle": true,
-                  "isUsingSvgr": false,
-                },
-              },
-            ],
-          },
           {
             "plugins": [
               EntryChunkPlugin {

diff --git a/tests/integration/asset/index.test.ts b/tests/integration/asset/index.test.ts
@@ -137,7 +137,6 @@ test('set the assets output path', async () => {
 test('set the assets public path', async () => {
   const fixturePath = join(__dirname, 'public-path');
   const { contents } = await buildAndGetResults({ fixturePath });
-
   // umd should preserve '__webpack_require__.p'
   const { content: indexUmdJs } = queryContent(contents.umd!, /index\.js/);