chore: update

web-infra-dev · Dec 22, 2024 · a1141b3 · a1141b3
1 parent 4522637
commit a1141b3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/examples/react-component-bundle-false/src/components/CounterButton/index.module.scss b/examples/react-component-bundle-false/src/components/CounterButton/index.module.scss
@@ -1,3 +1,3 @@
 .button {
-  background: yellow;
+  background: url('../../assets/logo.svg') no-repeat;
 }
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -993,6 +993,7 @@ const composeBundlelessExternalConfig = (
             if (!request || !getResolve || !context || !contextInfo) {
               return callback();
             }
+            console.log(222222, data);
 
             if (!resolver) {
               resolver = (await getResolve()) as RspackResolver;
@@ -1009,6 +1010,7 @@ const composeBundlelessExternalConfig = (
                 jsExtension,
                 cssModulesAuto,
                 isStyleRedirected,
+                contextInfo.issuer,
               );
 
               if (cssExternal !== false) {
@@ -1060,6 +1062,7 @@ const composeBundlelessExternalConfig = (
                       /\.[^.]+$/,
                       jsExtension,
                     );
+                    // return callback();
                   }
                 } else {
                   resolvedRequest = `${resolvedRequest}${jsExtension}`;

diff --git a/packages/core/src/css/LibCssExtractPlugin.ts b/packages/core/src/css/LibCssExtractPlugin.ts
@@ -3,7 +3,7 @@ import { RSLIB_CSS_ENTRY_FLAG } from './cssConfig';
 import {
   ABSOLUTE_PUBLIC_PATH,
   AUTO_PUBLIC_PATH,
-  // BASE_URI,
+  BASE_URI,
   SINGLE_DOT_PATH_SEGMENT,
 } from './libCssExtractLoader';
 import { getUndoPath } from './utils';
@@ -71,7 +71,7 @@ class LibCssExtractPlugin implements Rspack.RspackPluginInstance {
             );
             replace(`${ABSOLUTE_PUBLIC_PATH}${AUTO_PUBLIC_PATH}`, undoPath);
             replace(ABSOLUTE_PUBLIC_PATH, '');
-            // replace(`${BASE_URI}/`, undoPath);
+            replace(`${BASE_URI}/`, undoPath);
 
             return replaceSource;
           });

diff --git a/packages/core/src/css/cssConfig.ts b/packages/core/src/css/cssConfig.ts
@@ -85,14 +85,19 @@ export function cssExternalHandler(
   jsExtension: string,
   auto: CssLoaderOptionsAuto,
   isStyleRedirect: boolean,
+  issuer: string,
 ): void | false {
   const isCssModulesRequest = isCssModulesFile(request, auto);
 
   // cssExtract would execute the file handled by css-loader, so we cannot external the "helper import" from css-loader
-  // do not external @rsbuild/core/compiled/css-loader/noSourceMaps.js, sourceMaps.js, api.mjs etc.
+  // 1. do not external @rsbuild/core/compiled/css-loader/noSourceMaps.js, sourceMaps.js, api.mjs etc.
   if (/compiled\/css-loader\//.test(request)) {
     return callback();
   }
+  // 2.
+  if (isCssFile(issuer) && !isCssFile(request)) {
+    return callback();
+  }
 
   // 1. css modules: import './CounterButton.module.scss' -> import './CounterButton.module.mjs'
   // 2. css global: import './CounterButton.scss' -> import './CounterButton.css'