chore: rebase

SoonIter · SoonIter · commit c3fed95d80c4 · 2024-09-30T17:18:30.000+08:00
diff --git a/examples/react-component-bundle-false/src/index.scss b/examples/react-component-bundle-false/src/index.scss
@@ -1,3 +1,3 @@
-h2 {
+.counter-text {
   font-size: 50px;
 }
diff --git a/examples/react-component-bundle-false/src/index.tsx b/examples/react-component-bundle-false/src/index.tsx
@@ -1,4 +1,4 @@
-import { CounterButton } from './components/CounterButton';
+import { CounterButton } from './components/CounterButton/index';
 import { useCounter } from './useCounter';
 import './index.scss';
 
@@ -7,7 +7,7 @@ export const Counter: React.FC = () => {
 
   return (
     <div>
-      <h2>Counter: {count}</h2>
+      <h2 className="counter-text">Counter: {count}</h2>
       <CounterButton onClick={decrement} label="-" />
       <CounterButton onClick={increment} label="+" />
     </div>
diff --git a/examples/react-component-bundle/src/env.d.ts b/examples/react-component-bundle/src/env.d.ts
@@ -1,8 +1,3 @@
-declare module '*.module.css' {
-  const classes: { [key: string]: string };
-  export default classes;
-}
-
 declare module '*.module.scss' {
   const classes: { [key: string]: string };
   export default classes;
diff --git a/examples/react-component-bundle/src/index.scss b/examples/react-component-bundle/src/index.scss
@@ -1,3 +1,3 @@
-h2 {
+.counter-text {
   font-size: 50px;
 }
diff --git a/examples/react-component-bundle/src/index.tsx b/examples/react-component-bundle/src/index.tsx
@@ -1,4 +1,4 @@
-import { CounterButton } from './components/CounterButton';
+import { CounterButton } from './components/CounterButton/index';
 import { useCounter } from './useCounter';
 import './index.scss';
 
@@ -7,7 +7,7 @@ export const Counter: React.FC = () => {
 
   return (
     <div>
-      <h2>Counter: {count}</h2>
+      <h2 className="counter-text">Counter: {count}</h2>
       <CounterButton onClick={decrement} label="-" />
       <CounterButton onClick={increment} label="+" />
     </div>
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -702,14 +702,13 @@ const composeEntryConfig = async (
 };
 
 const composeBundleConfig = (
-  config: RsbuildConfig,
   jsExtension: string,
   redirect: Redirect,
+  cssModulesAuto: CssLoaderOptionsAuto,
   bundle = true,
 ): RsbuildConfig => {
   if (bundle) return {};
 
-  const cssModulesAuto = config.output?.cssModules?.auto ?? true;
   const isStyleRedirect = redirect.style ?? true;
 
   return {
@@ -918,9 +917,9 @@ async function composeLibRsbuildConfig(config: LibConfig, configPath: string) {
     dtsExtension,
   } = composeAutoExtensionConfig(config, autoExtension, pkgJson);
   const bundleConfig = composeBundleConfig(
-    config,
     jsExtension,
     redirect,
+    cssModulesAuto,
     config.bundle,
   );
   const targetConfig = composeTargetConfig(config.output?.target);
diff --git a/tests/benchmark/index.bench.ts b/tests/benchmark/index.bench.ts
@@ -11,9 +11,9 @@ describe('run rslib in examples', () => {
     { time: 5 },
   );
   bench(
-    'examples/react-component',
+    'examples/react-component-bundle',
     async () => {
-      const cwd = getCwdByExample('react-component');
+      const cwd = getCwdByExample('react-component-bundle');
       await rslibBuild(cwd);
     },
     { time: 5 },
diff --git a/tests/integration/style/css-modules/__fixtures__/basic/src/button/index.module.scss b/tests/integration/style/css-modules/__fixtures__/basic/src/button/index.module.scss
@@ -0,0 +1,3 @@
+.content-wrapper {
+  background-color: #fff;
+}
diff --git a/tests/integration/style/css-modules/__fixtures__/basic/src/button/index.tsx b/tests/integration/style/css-modules/__fixtures__/basic/src/button/index.tsx
@@ -0,0 +1,3 @@
+import styles from './index.module.scss';
+
+export default styles;
diff --git a/tests/integration/style/css-modules/__fixtures__/basic/src/env.d.ts b/tests/integration/style/css-modules/__fixtures__/basic/src/env.d.ts
@@ -0,0 +1 @@
+/// <reference types="@rsbuild/core/types" />
diff --git a/tests/integration/style/css-modules/__fixtures__/basic/src/index.ts b/tests/integration/style/css-modules/__fixtures__/basic/src/index.ts
@@ -0,0 +1,5 @@
+import button from './button/index';
+// @ts-ignore
+import stylesAuto from './reset.scss';
+
+export { stylesAuto, button };
diff --git a/tests/integration/style/css-modules/__fixtures__/basic/src/reset.scss b/tests/integration/style/css-modules/__fixtures__/basic/src/reset.scss
@@ -0,0 +1,3 @@
+.outer {
+  color: red;
+}
diff --git a/tests/integration/style/css-modules/__fixtures__/basic/tsconfig.json b/tests/integration/style/css-modules/__fixtures__/basic/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "@rslib/tsconfig/base",
+  "compilerOptions": {
+    "baseUrl": "./"
+  },
+  "include": ["src"]
+}
diff --git a/tests/integration/style/css-modules/bundle-false-auto/package.json b/tests/integration/style/css-modules/bundle-false-auto/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "css-bundle-false-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}
diff --git a/tests/integration/style/css-modules/bundle-false-auto/rslib.config.ts b/tests/integration/style/css-modules/bundle-false-auto/rslib.config.ts
@@ -0,0 +1,27 @@
+import { pluginSass } from '@rsbuild/plugin-sass';
+import { defineConfig } from '@rslib/core';
+import { generateBundleCjsConfig, generateBundleEsmConfig } from 'test-helper';
+
+export default defineConfig({
+  lib: [
+    generateBundleEsmConfig({ bundle: false }),
+    generateBundleCjsConfig({ bundle: false }),
+  ],
+  source: {
+    entry: {
+      index: ['../__fixtures__/basic/src/**', '!../__fixtures__/**/*.d.ts'],
+    },
+  },
+  plugins: [
+    pluginSass({
+      sassLoaderOptions: {
+        additionalData: '$base-color: #c6538c;',
+      },
+    }),
+  ],
+  output: {
+    cssModules: {
+      auto: /\.scss/,
+    },
+  },
+});
diff --git a/tests/integration/style/css-modules/bundle-false/package.json b/tests/integration/style/css-modules/bundle-false/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "css-bundle-false-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}
diff --git a/tests/integration/style/css-modules/bundle-false/rslib.config.ts b/tests/integration/style/css-modules/bundle-false/rslib.config.ts
@@ -0,0 +1,22 @@
+import { pluginSass } from '@rsbuild/plugin-sass';
+import { defineConfig } from '@rslib/core';
+import { generateBundleCjsConfig, generateBundleEsmConfig } from 'test-helper';
+
+export default defineConfig({
+  lib: [
+    generateBundleEsmConfig({ bundle: false }),
+    generateBundleCjsConfig({ bundle: false }),
+  ],
+  source: {
+    entry: {
+      index: ['../__fixtures__/basic/src/**'],
+    },
+  },
+  plugins: [
+    pluginSass({
+      sassLoaderOptions: {
+        additionalData: '$base-color: #c6538c;',
+      },
+    }),
+  ],
+});
diff --git a/tests/integration/style/css/bundle-false/rslib.config.ts b/tests/integration/style/css/bundle-false/rslib.config.ts
@@ -1,5 +1,5 @@
-import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
 import { defineConfig } from '@rslib/core';
+import { generateBundleCjsConfig, generateBundleEsmConfig } from 'test-helper';
 
 export default defineConfig({
   lib: [
diff --git a/tests/integration/style/css/bundle/rslib.config.ts b/tests/integration/style/css/bundle/rslib.config.ts
@@ -1,5 +1,5 @@
-import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
 import { defineConfig } from '@rslib/core';
+import { generateBundleCjsConfig, generateBundleEsmConfig } from 'test-helper';
 
 export default defineConfig({
   lib: [generateBundleEsmConfig(), generateBundleCjsConfig()],
diff --git a/tests/integration/style/css/index.test.ts b/tests/integration/style/css/index.test.ts
@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { buildAndGetResults } from '@e2e/helper';
+import { buildAndGetResults } from 'test-helper';
 import { expect, test } from 'vitest';
 
 test('should run build successfully when set bundle: true', async () => {
diff --git a/tests/integration/style/sass/bundle-false/rslib.config.ts b/tests/integration/style/sass/bundle-false/rslib.config.ts
@@ -1,13 +1,12 @@
-import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
 import { pluginSass } from '@rsbuild/plugin-sass';
 import { defineConfig } from '@rslib/core';
+import { generateBundleCjsConfig, generateBundleEsmConfig } from 'test-helper';
 
 export default defineConfig({
   lib: [
     generateBundleEsmConfig({ bundle: false }),
     generateBundleCjsConfig({ bundle: false }),
   ],
-  tools: {},
   source: {
     entry: {
       index: [
diff --git a/tests/integration/style/sass/bundle/rslib.config.ts b/tests/integration/style/sass/bundle/rslib.config.ts
@@ -1,6 +1,6 @@
-import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
 import { pluginSass } from '@rsbuild/plugin-sass';
 import { defineConfig } from '@rslib/core';
+import { generateBundleCjsConfig, generateBundleEsmConfig } from 'test-helper';
 
 export default defineConfig({
   lib: [generateBundleEsmConfig(), generateBundleCjsConfig()],
diff --git a/tests/integration/style/sass/index.test.ts b/tests/integration/style/sass/index.test.ts
@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { buildAndGetResults } from '@e2e/helper';
+import { buildAndGetResults } from 'test-helper';
 import { expect, test } from 'vitest';
 
 test('should extract css with pluginSass when set bundle: true', async () => {
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
@@ -5,7 +5,8 @@
     "composite": true
   },
   "include": [
-    "e2e/cases/**/*.ts",
+    "e2e/**/*.ts",
+    "integration/**/*.ts",
     "benchmark/**/*.ts",
     "playwright.config.ts",
     "scripts"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-h2 {`
	`1`	`+.counter-text {`
`2`	`2`	`font-size: 50px;`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.content-wrapper {`
	`2`	`+ background-color: #fff;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import styles from './index.module.scss';`
	`2`	`+`
	`3`	`+export default styles;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/// <reference types="@rsbuild/core/types" />`