chore: save

SoonIter · SoonIter · commit 4232b76d484e · 2024-09-24T10:52:20.000+08:00
diff --git a/e2e/cases/style/css/__fixtures__/src/import.css b/e2e/cases/style/css/__fixtures__/src/import.css
@@ -0,0 +1,8 @@
+@import 'https://cdnjs.cloudflare.com/ajax/libs/modern-normalize/1.1.0/modern-normalize.css';
+@import url('https://cdnjs.cloudflare.com/ajax/libs/modern-normalize/1.1.0/modern-normalize.css');
+@import url('lib1.css'); 
+@import 'lib2.css';  
+
+.import {
+  background-image: url('https://cdnjs.cloudflare.com/ajax/libs/modern-normalize/1.1.0/modern-normalize.css')
+}
diff --git a/e2e/cases/style/css/__fixtures__/src/lib1.css b/e2e/cases/style/css/__fixtures__/src/lib1.css
@@ -0,0 +1,3 @@
+.lib1 {
+  color: red;
+}
diff --git a/e2e/cases/style/css/__fixtures__/src/lib2.css b/e2e/cases/style/css/__fixtures__/src/lib2.css
@@ -0,0 +1,3 @@
+.lib2 {
+  color: green;
+}
diff --git a/e2e/cases/style/css/__fixtures__/tsconfig.json b/e2e/cases/style/css/__fixtures__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "@rslib/tsconfig/base",
+  "compilerOptions": {
+    "baseUrl": "./"
+  },
+  "include": ["src"]
+}
diff --git a/e2e/cases/style/css/bundle-false/package.json b/e2e/cases/style/css/bundle-false/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "css-bundle-false-test",
+  "version": "1.0.0",
+  "private": true,
+    "type": "module"
+}
diff --git a/e2e/cases/style/css/bundle-false/rslib.config.ts b/e2e/cases/style/css/bundle-false/rslib.config.ts
@@ -0,0 +1,13 @@
+import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  lib: [generateBundleEsmConfig({bundle: false}), 
+    // generateBundleCjsConfig({bundle: false})
+  ],
+  source: {
+    entry: {
+      index: ['../__fixtures__/src/**/*.css'],
+    },
+  },
+});
diff --git a/e2e/cases/style/css/bundle/package.json b/e2e/cases/style/css/bundle/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "css-bundle-test",
+  "version": "1.0.0",
+  "private": true,
+    "type": "module"
+}
diff --git a/e2e/cases/style/css/bundle/rslib.config.ts b/e2e/cases/style/css/bundle/rslib.config.ts
@@ -0,0 +1,11 @@
+import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  lib: [generateBundleEsmConfig(), generateBundleCjsConfig()],
+  source: {
+    entry: {
+      index: '../__fixtures__/src/import.css',
+    },
+  },
+});
diff --git a/e2e/cases/style/sass/bundle/.gitignore b/e2e/cases/style/sass/bundle/.gitignore
@@ -0,0 +1,2 @@
+!node_modules
+node_modules/.*
diff --git a/e2e/cases/style/sass/bundle/foundation/_code.scss b/e2e/cases/style/sass/bundle/foundation/_code.scss
@@ -0,0 +1,4 @@
+code {
+  padding: 0.25em;
+  line-height: 0;
+}
diff --git a/e2e/cases/style/sass/bundle/foundation/_lists.scss b/e2e/cases/style/sass/bundle/foundation/_lists.scss
@@ -0,0 +1,11 @@
+ul,
+ol {
+  text-align: left;
+
+  & & {
+    padding: {
+      bottom: 0;
+      left: 0;
+    }
+  }
+}
diff --git a/e2e/cases/style/sass/bundle/foundation/index.scss b/e2e/cases/style/sass/bundle/foundation/index.scss
@@ -0,0 +1,3 @@
+body {
+  background: url(./logo.svg);
+}
diff --git a/e2e/cases/style/sass/bundle/foundation/logo.svg b/e2e/cases/style/sass/bundle/foundation/logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
+    <g fill="#61DAFB">
+        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
+        <circle cx="420.9" cy="296.5" r="45.7"/>
+        <path d="M520.5 78.1z"/>
+    </g>
+</svg>
diff --git a/e2e/cases/style/sass/bundle/index.scss b/e2e/cases/style/sass/bundle/index.scss
@@ -0,0 +1,14 @@
+@import 'foundation/code', 'foundation/lists';
+@import '~lib1/index.css';
+@import './foundation/index.scss';
+
+$url: './foundation/logo.svg';
+$border-dark: rgba($base-color, 0.88);
+
+.url-variable {
+  background: url($url);
+}
+
+.alert {
+  border: 1px solid $border-dark;
+}
diff --git a/e2e/cases/style/sass/bundle/node_modules/lib1/index.css b/e2e/cases/style/sass/bundle/node_modules/lib1/index.css
diff --git a/e2e/cases/style/sass/bundle/node_modules/lib1/package.json b/e2e/cases/style/sass/bundle/node_modules/lib1/package.json
diff --git a/e2e/cases/style/sass/bundle/package.json b/e2e/cases/style/sass/bundle/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "sass-test",
+  "version": "1.0.0",
+  "private": true
+}
diff --git a/e2e/cases/style/sass/bundle/rslib.config.ts b/e2e/cases/style/sass/bundle/rslib.config.ts
@@ -0,0 +1,36 @@
+// import { defineConfig } from '';
+
+export default defineConfig({
+  buildConfig: {
+    buildType: 'bundle',
+    style: {
+      sass: {
+        sassOptions: {},
+        additionalData: '$base-color: #c6538c;',
+      },
+    },
+    asset: {
+      limit: 0,
+    },
+    input: ['index.scss'],
+  },
+});
+
+
+import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  lib: [generateBundleEsmConfig({bundle: false}), 
+    // generateBundleCjsConfig({bundle: false})
+  ],
+  tools: {
+
+  },
+  source: {
+    entry: {
+      index: ['../__fixtures__/src/**/*.css'],
+    },
+  },
+  plugins: [pluginSass()]
+});
diff --git a/e2e/package.json b/e2e/package.json
@@ -12,6 +12,7 @@
     "@e2e/helper": "workspace:*",
     "@playwright/test": "1.47.1",
     "@rsbuild/core": "1.0.4",
+    "@rsbuild/plugin-sass": "1.0.1",
     "@rslib/core": "workspace:*",
     "@rslib/tsconfig": "workspace:*",
     "@types/fs-extra": "^11.0.4",
diff --git a/examples/react-component-bundle-false-sass/README.md b/examples/react-component-bundle-false-sass/README.md
@@ -0,0 +1,3 @@
+# @examples/react-component
+
+This example demonstrates how to use Rslib to build a simple React component.
diff --git a/examples/react-component-bundle-false-sass/package.json b/examples/react-component-bundle-false-sass/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@examples/react-component-bundle-false-sass",
+  "private": true,
+  "scripts": {
+    "build": "rslib build"
+  },
+  "devDependencies": {
+    "@rsbuild/plugin-react": "1.0.2",
+    "@rsbuild/plugin-sass": "1.0.1",
+    "@rslib/core": "workspace:*",
+    "@types/react": "^18.3.5",
+    "react": "^18.3.1"
+  },
+  "peerDependencies": {
+    "react": "*"
+  }
+}
diff --git a/examples/react-component-bundle-false-sass/rslib.config.ts b/examples/react-component-bundle-false-sass/rslib.config.ts
@@ -0,0 +1,52 @@
+import { pluginReact } from '@rsbuild/plugin-react';
+import { type LibConfig, defineConfig } from '@rslib/core';
+import { pluginSass } from '@rsbuild/plugin-sass'
+
+const shared: LibConfig = {
+  bundle: false,
+};
+
+export default defineConfig({
+  source: {
+    entry: {
+      index: ['./src/**', '!./src/env.d.ts'],
+    },
+  },
+  lib: [
+    {
+      ...shared,
+      format: 'esm',
+      output: {
+        distPath: {
+          root: './dist/esm',
+          // css: '.',
+          // cssAsync: '.',
+        },
+      },
+      bundle: false,
+    },
+    // {
+    //   ...shared,
+    //   format: 'cjs',
+    //   output: {
+    //     distPath: {
+    //       root: './dist/cjs',
+    //       css: '.',
+    //       cssAsync: '.',
+    //     },
+    //   },
+    //   bundle: false,
+    // },
+  ],
+  plugins: [pluginReact(), pluginSass()],
+  output: {
+    cssModules: {
+      localIdentName: '[hash:base64:4]',
+    },
+  },
+  tools: {
+    cssLoader: {
+      import: false
+    }
+  },
+});
diff --git a/examples/react-component-bundle-false-sass/src/CounterButton.module.scss b/examples/react-component-bundle-false-sass/src/CounterButton.module.scss
@@ -0,0 +1,3 @@
+.button {
+  background: blue;
+}
diff --git a/examples/react-component-bundle-false-sass/src/CounterButton.tsx b/examples/react-component-bundle-false-sass/src/CounterButton.tsx
@@ -0,0 +1,14 @@
+import styles from './CounterButton.module.scss';
+interface CounterButtonProps {
+  onClick: () => void;
+  label: string;
+}
+
+export const CounterButton: React.FC<CounterButtonProps> = ({
+  onClick,
+  label,
+}) => (
+  <button type="button" className={styles.button} onClick={onClick}>
+    {label}
+  </button>
+);
diff --git a/examples/react-component-bundle-false-sass/src/env.d.ts b/examples/react-component-bundle-false-sass/src/env.d.ts
@@ -0,0 +1,9 @@
+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-false-sass/src/index.tsx b/examples/react-component-bundle-false-sass/src/index.tsx
@@ -0,0 +1,15 @@
+import { CounterButton } from './CounterButton';
+import { useCounter } from './useCounter';
+import './reset.css';
+
+export const Counter: React.FC = () => {
+  const { count, increment, decrement } = useCounter();
+
+  return (
+    <div>
+      <h2>Counter: {count}</h2>
+      <CounterButton onClick={decrement} label="-" />
+      <CounterButton onClick={increment} label="+" />
+    </div>
+  );
+};
diff --git a/examples/react-component-bundle-false-sass/src/reset.scss b/examples/react-component-bundle-false-sass/src/reset.scss
@@ -0,0 +1,3 @@
+.body {
+  background: red;
+}
diff --git a/examples/react-component-bundle-false-sass/src/useCounter.tsx b/examples/react-component-bundle-false-sass/src/useCounter.tsx
@@ -0,0 +1,10 @@
+import { useState } from 'react';
+
+export const useCounter = (initialValue = 0) => {
+  const [count, setCount] = useState(initialValue);
+
+  const increment = () => setCount((prev) => prev + 1);
+  const decrement = () => setCount((prev) => prev - 1);
+
+  return { count, increment, decrement };
+};
diff --git a/examples/react-component-bundle-false-sass/tsconfig.json b/examples/react-component-bundle-false-sass/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "strict": true
+  },
+  "include": ["src/**/*"]
+}
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -642,6 +642,14 @@ const pluginLibCss = (rootDir: string): RsbuildPlugin => ({
 const composeCssConfig = (rootDir: string): RsbuildConfig => {
   return {
     plugins: [pluginLibCss(rootDir)],
+    tools: {
+      cssLoader: {
+        // Otherwise, external variables will be executed by css-extract and cause an error.
+        // e.g: `@import url('./a.css');`
+        import: false,
+        sourceMap: false
+      }
+    }
   };
 };
 
@@ -740,31 +748,21 @@ const composeBundleConfig = (
             // This may result in a change in semantics,
             // user should use copy to keep origin file or use another separate entry to deal this
             let request: string = data.request;
+            if(request[0] === '!') {
+              return callback(null, request.slice(1));
+            }
             if (request[0] === '.') {
-              if (request.includes('compiled/css-loader')) {
+              // @rsbuild/core/compiled/css-loader/noSourceMaps.js sourceMaps.js api.mjs etc.
+              if (/compiled\/css-loader\//.test(request)) {
                 return callback();
               }
 
-              const isCssModuleEmitted = request.endsWith('_module.css');
-              if (isCssModuleEmitted) {
-                return callback(null, request);
-              }
-
               const ext = extname(request);
               const isCssExt = ext === 'css';
               if (isCssExt && !isStyleRedirect) {
                 return callback(null, request);
               }
 
-              // const jsExtensions = ['js', 'cjs', 'mjs', 'ts', 'mts', 'cts', 'jsx', 'tsx'];
-              // const isNotJsExt = ext && !jsExtensions.includes(ext)
-
-              // 1. not js: css svg asset
-              // if(isNotJsExt) {
-              //   return callback(null, request)
-              // }
-
-              // 2. js or no ext
               request = ext
                 ? request.replace(/\.[^.]+$/, jsExtension)
                 : `${request}${jsExtension}`;
diff --git a/packages/lib-css-extract-loader/src/index.ts b/packages/lib-css-extract-loader/src/index.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +code {
 +  padding: 0.25em;
 +  line-height: 0;
 +}