Skip to content

Commit 09bac79

Browse files
committed
test: update the test case
1 parent 638a47e commit 09bac79

File tree

20 files changed

+307
-164
lines changed

20 files changed

+307
-164
lines changed

packages/core/src/css/cssConfig.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ export async function cssExternalHandler(
9797
let resolvedRequest = request;
9898

9999
if (styleRedirectPath) {
100-
const redirectedPath = await redirectPath(request);
101-
if (redirectedPath === undefined) {
102-
return callback(undefined, request);
100+
const resolved = await redirectPath(resolvedRequest);
101+
console.log(resolvedRequest, resolved, 2222)
102+
if (resolved) {
103+
resolvedRequest = resolved;
103104
}
104-
resolvedRequest = redirectedPath;
105105
}
106106

107107
if (!isCssFile(resolvedRequest)) {
@@ -110,11 +110,7 @@ export async function cssExternalHandler(
110110

111111
// 1. css modules: import './CounterButton.module.scss' -> import './CounterButton.module.mjs'
112112
// 2. css global: import './CounterButton.scss' -> import './CounterButton.css'
113-
if (resolvedRequest[0] === '.') {
114-
// preserve import './CounterButton.module.scss'
115-
if (!styleRedirectExtension) {
116-
return callback(undefined, resolvedRequest);
117-
}
113+
if (styleRedirectExtension) {
118114
const isCssModulesRequest = isCssModulesFile(resolvedRequest, auto);
119115
if (isCssModulesRequest) {
120116
return callback(
@@ -125,7 +121,7 @@ export async function cssExternalHandler(
125121
return callback(undefined, resolvedRequest.replace(/\.[^.]+$/, '.css'));
126122
}
127123

128-
return callback(undefined, request);
124+
return callback(undefined, resolvedRequest);
129125
}
130126

131127
const PLUGIN_NAME = 'rsbuild:lib-css';

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/integration/redirect/style-extension/rslib.config.ts

Lines changed: 0 additions & 32 deletions
This file was deleted.

tests/integration/redirect/style-extension/src/less/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/integration/redirect/style-extension/src/module/index.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

tests/integration/redirect/style-path/rslib.config.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

tests/integration/redirect/style-path/src/css/index.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/integration/redirect/style-path/src/css/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/integration/redirect/style-path/src/module/index.module.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/integration/redirect/style-path/src/module/index.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)