test: update the test case

Author: SoonIter

packages/core/src/css/cssConfig.ts

@@ -97,11 +97,11 @@ export async function cssExternalHandler(
   let resolvedRequest = request;
 
   if (styleRedirectPath) {
-    const redirectedPath = await redirectPath(request);
-    if (redirectedPath === undefined) {
-      return callback(undefined, request);
+    const resolved = await redirectPath(resolvedRequest);
+    console.log(resolvedRequest, resolved, 2222)
+    if (resolved) {
+      resolvedRequest = resolved;
     }
-    resolvedRequest = redirectedPath;
   }
 
   if (!isCssFile(resolvedRequest)) {
@@ -110,11 +110,7 @@ export async function cssExternalHandler(
 
   // 1. css modules: import './CounterButton.module.scss' -> import './CounterButton.module.mjs'
   // 2. css global: import './CounterButton.scss' -> import './CounterButton.css'
-  if (resolvedRequest[0] === '.') {
-    // preserve import './CounterButton.module.scss'
-    if (!styleRedirectExtension) {
-      return callback(undefined, resolvedRequest);
-    }
+  if (styleRedirectExtension) {
     const isCssModulesRequest = isCssModulesFile(resolvedRequest, auto);
     if (isCssModulesRequest) {
       return callback(
@@ -125,7 +121,7 @@ export async function cssExternalHandler(
     return callback(undefined, resolvedRequest.replace(/\.[^.]+$/, '.css'));
   }
 
-  return callback(undefined, request);
+  return callback(undefined, resolvedRequest);
 }
 
 const PLUGIN_NAME = 'rsbuild:lib-css';

tests/integration/redirect/style-extension/package.json

@@ -0,0 +1,135 @@
+import path from 'node:path';
+import { buildAndGetResults, queryContent } from 'test-helper';
+import { beforeAll, expect, test } from 'vitest';
+
+let contents: Awaited<ReturnType<typeof buildAndGetResults>>['contents'];
+
+beforeAll(async () => {
+  const fixturePath = path.resolve(__dirname, './style');
+  contents = (await buildAndGetResults({ fixturePath })).contents;
+});
+
+test('0. default', async () => {
+  const { content: cssIndexJs } = queryContent(
+    contents.esm0!,
+    /esm\/less\/index\.js/,
+  );
+  const { content: cssIndexCjs } = queryContent(
+    contents.cjs0!,
+    /cjs\/less\/index\.cjs/,
+  );
+  expect(cssIndexJs).toMatchInlineSnapshot(`
+    "import "./index.css";
+    "
+  `);
+  expect(cssIndexCjs).toContain('require("./index.css");');
+
+  const { content: cssModuleIndexJs } = queryContent(
+    contents.esm0!,
+    /esm\/module\/index\.js/,
+  );
+  const { content: cssModuleIndexCjs } = queryContent(
+    contents.cjs0!,
+    /cjs\/module\/index\.cjs/,
+  );
+  expect(cssModuleIndexJs).toMatchInlineSnapshot(`
+    "import * as __WEBPACK_EXTERNAL_MODULE__index_module_js__ from "./index.module.js";
+    __WEBPACK_EXTERNAL_MODULE__index_module_js__["default"];
+    "
+  `);
+  expect(cssModuleIndexCjs).toContain('const external_index_module_cjs_namespaceObject = require("./index.module.cjs");');
+});
+
+test('1. style.path: false', () => {
+  const { content: cssIndexJs } = queryContent(
+    contents.esm1!,
+    /esm\/less\/index\.js/,
+  );
+  const { content: cssIndexCjs } = queryContent(
+    contents.cjs1!,
+    /cjs\/less\/index\.cjs/,
+  );
+  expect(cssIndexJs).toMatchInlineSnapshot(`
+    "import "@/less/index.css";
+    "
+  `);
+  expect(cssIndexCjs).toContain('require("@/less/index.css");');
+
+  const { content: cssModuleIndexJs } = queryContent(
+    contents.esm1!,
+    /esm\/module\/index\.js/,
+  );
+  const { content: cssModuleIndexCjs } = queryContent(
+    contents.cjs1!,
+    /cjs\/module\/index\.cjs/,
+  );
+  expect(cssModuleIndexJs).toMatchInlineSnapshot(`
+    "import * as __WEBPACK_EXTERNAL_MODULE__module_index_module_js__ from "@/module/index.module.js";
+    __WEBPACK_EXTERNAL_MODULE__module_index_module_js__["default"];
+    "
+  `);
+  expect(cssModuleIndexCjs).toContain('const index_module_cjs_namespaceObject = require("@/module/index.module.cjs");');
+});
+
+test('2. style.extension: false', async () => {
+  const { content: cssIndexJs } = queryContent(
+    contents.esm2!,
+    /esm\/less\/index\.js/,
+  );
+  const { content: cssIndexCjs } = queryContent(
+    contents.cjs2!,
+    /cjs\/less\/index\.cjs/,
+  );
+  expect(cssIndexJs).toMatchInlineSnapshot(`
+    "import "./index.less";
+    "
+  `);
+  expect(cssIndexCjs).toContain('require("./index.less");');
+
+  const { content: cssModuleIndexJs } = queryContent(
+    contents.esm2!,
+    /esm\/module\/index\.js/,
+  );
+  const { content: cssModuleIndexCjs } = queryContent(
+    contents.cjs2!,
+    /cjs\/module\/index\.cjs/,
+  );
+  expect(cssModuleIndexJs).toMatchInlineSnapshot(`
+    "import * as __WEBPACK_EXTERNAL_MODULE__index_module_less__ from "./index.module.less";
+    __WEBPACK_EXTERNAL_MODULE__index_module_less__["default"];
+    "
+  `);
+  expect(cssModuleIndexCjs).toContain('const external_index_module_less_namespaceObject = require("./index.module.less");');
+});
+
+test('3. style.path: false, style.extension: false', async () => {
+  const { content: cssIndexJs } = queryContent(
+    contents.esm3!,
+    /esm\/less\/index\.js/,
+  );
+  const { content: cssIndexCjs } = queryContent(
+    contents.cjs3!,
+    /cjs\/less\/index\.cjs/,
+  );
+  expect(cssIndexJs).toMatchInlineSnapshot(`
+    "import "@/less/index.less";
+    "
+  `);
+  expect(cssIndexCjs).toContain('require("@/less/index.css");');
+
+  const { content: cssModuleIndexJs } = queryContent(
+    contents.esm3!,
+    /esm\/module\/index\.js/,
+  );
+  const { content: cssModuleIndexCjs } = queryContent(
+    contents.cjs3!,
+    /cjs\/module\/index\.cjs/,
+  );
+  expect(cssModuleIndexJs).toMatchInlineSnapshot(`
+    "import * as __WEBPACK_EXTERNAL_MODULE__module_index_module_less__ from "@/module/index.module.less";
+    __WEBPACK_EXTERNAL_MODULE__module_index_module_less__["default"];
+    "
+  `);
+  expect(cssModuleIndexCjs).toContain('const index_module_cjs_namespaceObject = require("@/module/index.module.cjs");');
+
+});