perf(plugin-sass): defaults to sass-embedded and modern API (#2408)

web-infra-dev · May 22, 2024 · 2fcd6b9 · 2fcd6b9
1 parent 2574e15
commit 2fcd6b9
Show file tree

Hide file tree

Showing 6 changed files with 238 additions and 13 deletions.
diff --git a/packages/plugin-rem/tests/__snapshots__/index.test.ts.snap b/packages/plugin-rem/tests/__snapshots__/index.test.ts.snap
@@ -394,7 +394,8 @@ exports[`plugin-rem > should run rem plugin with default config 1`] = `
           {
             "loader": "<ROOT>/packages/plugin-sass/compiled/sass-loader/index.js",
             "options": {
-              "implementation": "<ROOT>/node_modules/<PNPM_INNER>/sass/sass.node.js",
+              "api": "modern-compiler",
+              "implementation": "<ROOT>/node_modules/<PNPM_INNER>/sass-embedded/dist/lib/index.js",
               "sourceMap": true,
             },
           },

diff --git a/packages/plugin-sass/package.json b/packages/plugin-sass/package.json
@@ -30,7 +30,7 @@
   "dependencies": {
     "@rsbuild/shared": "workspace:*",
     "postcss": "^8.4.38",
-    "sass": "^1.77.1"
+    "sass-embedded": "^1.77.2"
   },
   "devDependencies": {
     "@rsbuild/core": "workspace:*",

diff --git a/packages/plugin-sass/src/index.ts b/packages/plugin-sass/src/index.ts
@@ -46,7 +46,8 @@ const getSassLoaderOptions = (
   const mergedOptions = mergeChainedOptions({
     defaults: {
       sourceMap: isUseCssSourceMap,
-      implementation: require.resolve('sass'),
+      api: 'modern-compiler',
+      implementation: require.resolve('sass-embedded'),
     },
     options: userOptions,
     utils: { addExcludes },

diff --git a/packages/plugin-sass/src/types.ts b/packages/plugin-sass/src/types.ts
@@ -2,7 +2,7 @@ import type { ChainedConfigWithUtils, FileFilterUtil } from '@rsbuild/shared';
 import type {
   LegacyOptions as LegacySassOptions,
   Options as SassOptions,
-} from 'sass';
+} from 'sass-embedded';
 import type SassLoader from '../compiled/sass-loader/index.js';
 
 export type SassLoaderOptions = Omit<SassLoader.Options, 'sassOptions'> &
@@ -12,7 +12,7 @@ export type SassLoaderOptions = Omit<SassLoader.Options, 'sassOptions'> &
         sassOptions?: Partial<LegacySassOptions<'async'>>;
       }
     | {
-        api: 'modern';
+        api: 'modern' | 'modern-compiler';
         sassOptions?: SassOptions<'async'>;
       }
   );

diff --git a/packages/plugin-sass/tests/__snapshots__/index.test.ts.snap b/packages/plugin-sass/tests/__snapshots__/index.test.ts.snap
@@ -69,7 +69,8 @@ exports[`plugin-sass > should add sass-loader 1`] = `
           {
             "loader": "<ROOT>/packages/plugin-sass/compiled/sass-loader/index.js",
             "options": {
-              "implementation": "<ROOT>/node_modules/<PNPM_INNER>/sass/sass.node.js",
+              "api": "modern-compiler",
+              "implementation": "<ROOT>/node_modules/<PNPM_INNER>/sass-embedded/dist/lib/index.js",
               "sourceMap": true,
             },
           },
@@ -149,7 +150,8 @@ exports[`plugin-sass > should add sass-loader and css-loader when injectStyles 1
           {
             "loader": "<ROOT>/packages/plugin-sass/compiled/sass-loader/index.js",
             "options": {
-              "implementation": "<ROOT>/node_modules/<PNPM_INNER>/sass/sass.node.js",
+              "api": "modern-compiler",
+              "implementation": "<ROOT>/node_modules/<PNPM_INNER>/sass-embedded/dist/lib/index.js",
               "sourceMap": true,
             },
           },
@@ -229,7 +231,8 @@ exports[`plugin-sass > should add sass-loader with excludes 1`] = `
           {
             "loader": "<ROOT>/packages/plugin-sass/compiled/sass-loader/index.js",
             "options": {
-              "implementation": "<ROOT>/node_modules/<PNPM_INNER>/sass/sass.node.js",
+              "api": "modern-compiler",
+              "implementation": "<ROOT>/node_modules/<PNPM_INNER>/sass-embedded/dist/lib/index.js",
               "sourceMap": true,
             },
           },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml