Skip to content

Commit 7ffd80a

Browse files
committed
chore: save
1 parent c3fc11e commit 7ffd80a

File tree

13 files changed

+179
-24
lines changed

13 files changed

+179
-24
lines changed

examples/react-component-bundle-false/rslib.config.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ export default defineConfig({
1818
output: {
1919
distPath: {
2020
root: './dist/esm',
21-
css: '.',
22-
cssAsync: '.',
2321
},
2422
},
2523
bundle: false,
@@ -30,8 +28,6 @@ export default defineConfig({
3028
output: {
3129
distPath: {
3230
root: './dist/cjs',
33-
css: '.',
34-
cssAsync: '.',
3531
},
3632
},
3733
bundle: false,

examples/react-component-bundle-false-sass/package.json renamed to examples/react-component-sass-bundle-false/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@examples/react-component-bundle-false-sass",
2+
"name": "@examples/react-component-sass-bundle-false",
33
"private": true,
44
"scripts": {
55
"build": "rslib build"

examples/react-component-bundle-false-sass/rslib.config.ts renamed to examples/react-component-sass-bundle-false/rslib.config.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ export default defineConfig({
1919
output: {
2020
distPath: {
2121
root: './dist/esm',
22-
// css: '.',
23-
// cssAsync: '.',
2422
},
2523
},
2624
bundle: false,
@@ -31,17 +29,10 @@ export default defineConfig({
3129
output: {
3230
distPath: {
3331
root: './dist/cjs',
34-
css: '.',
35-
cssAsync: '.',
3632
},
3733
},
3834
bundle: false,
3935
},
4036
],
4137
plugins: [pluginReact(), pluginSass()],
42-
output: {
43-
cssModules: {
44-
localIdentName: '[hash:base64:4]',
45-
},
46-
},
4738
});

examples/react-component-bundle-false-sass/src/index.tsx renamed to examples/react-component-sass-bundle-false/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { CounterButton } from './CounterButton';
22
import { useCounter } from './useCounter';
3-
import './reset.css';
3+
import './reset.scss';
44

55
export const Counter: React.FC = () => {
66
const { count, increment, decrement } = useCounter();

packages/core/src/config.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
DEFAULT_CONFIG_EXTENSIONS,
1717
DEFAULT_CONFIG_NAME,
1818
ENTRY_EXTENSIONS_PATTERN,
19-
JS_EXTENSIONS_PATTERN,
2019
SWC_HELPERS,
2120
} from './constant';
2221
import { pluginCjsShim } from './plugins/cjsShim';
@@ -735,10 +734,11 @@ const composeEntryConfig = async (
735734

736735
const composeBundleConfig = (
737736
jsExtension: string,
738-
_redirect: Redirect,
737+
redirect: Redirect,
739738
bundle = true,
740739
): RsbuildConfig => {
741740
if (bundle) return {};
741+
const { style: isStyleRedirect = true } = redirect;
742742

743743
return {
744744
output: {
@@ -759,17 +759,23 @@ const composeBundleConfig = (
759759
return callback(null, request.slice(1));
760760
}
761761

762+
// @rsbuild/core/compiled/css-loader/noSourceMaps.js sourceMaps.js api.mjs etc.
763+
if (/compiled\/css-loader\//.test(request)) {
764+
return callback();
765+
}
766+
762767
if (request[0] === '.') {
763-
// @rsbuild/core/compiled/css-loader/noSourceMaps.js sourceMaps.js api.mjs etc.
764-
if (/compiled\/css-loader\//.test(request)) {
765-
return callback();
768+
const ext = extname(request);
769+
const isCssExt = ext === 'css';
770+
if (isCssExt && !isStyleRedirect) {
771+
return callback(null, request);
766772
}
767773

768-
if (extname(request)) {
769-
if (JS_EXTENSIONS_PATTERN.test(request)) {
774+
if (ext) {
775+
if (ENTRY_EXTENSIONS_PATTERN.test(request)) {
770776
request = request.replace(/\.[^.]+$/, jsExtension);
771777
} else {
772-
// If it does not match jsExtensionsPattern, we should do nothing, eg: ./foo.png
778+
// If it does not match jsExtensionsPattern or cssExtensionsPattern, we should do nothing, eg: ./foo.png
773779
return callback();
774780
}
775781
} else {

pnpm-lock.yaml

Lines changed: 163 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)