feat: use modern compiler by default

vuepress · Aug 20, 2024 · 569a3ea · 569a3ea
1 parent 5269931
commit 569a3ea
Show file tree

Hide file tree

Showing 9 changed files with 378 additions and 109 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -32,6 +32,7 @@
     "@vuepress/plugin-cache": "workspace:*",
     "@vuepress/theme-default": "workspace:*",
     "mathjax-full": "3.2.2",
+    "sass-embedded": "1.77.8",
     "sass-loader": "^16.0.1",
     "vue": "^3.4.38",
     "vuepress": "2.0.0-rc.15"

diff --git a/docs/plugins/development/sass-palette/README.md b/docs/plugins/development/sass-palette/README.md
@@ -4,6 +4,15 @@
 
 This plugin is mainly facing plugin and theme developers, it is more powerful than [`@vuepress/plugin-palette`](../palette.md).
 
+::: tip
+
+You should manually install these deps in your project:
+
+- When using Vite bundler: `sass-embedded`
+- When using Webpack bundler: `sass-embedded` and `sass-loader`
+
+:::
+
 ## Usage
 
 You must invoke `useSassPalettePlugin` function during plugin initialization to use this plugin.

diff --git a/docs/zh/plugins/development/sass-palette/README.md b/docs/zh/plugins/development/sass-palette/README.md
@@ -4,6 +4,15 @@
 
 这个插件主要面向插件和主题开发者，相比 [`@vuepress/plugin-palette`](../palette.md) 更加强大。
 
+::: tip
+
+你应该在你的项目中手动安装这些依赖：
+
+- 当使用 Vite 打包工具时：`sass-embedded`
+- 当使用 Webpack 打包工具时：`sass-embedded` 和 `sass-loader`
+
+:::
+
 ## 使用
 
 你必须在插件初始化期间调用 `useSassPalettePlugin` 函数来使用此插件。

diff --git a/e2e/package.json b/e2e/package.json
@@ -28,7 +28,7 @@
     "@vuepress/plugin-theme-data": "workspace:*",
     "@vuepress/plugin-watermark": "workspace:*",
     "@vuepress/theme-default": "workspace:*",
-    "sass": "^1.77.8",
+    "sass-embedded": "1.77.8",
     "sass-loader": "^16.0.1",
     "vue": "^3.4.38",
     "vuepress": "2.0.0-rc.15"

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "eslint": "^9.9.0",
     "eslint-config-vuepress": "^5.1.4",
     "http-server": "^14.1.1",
-    "husky": "^9.1.4",
+    "husky": "^9.1.5",
     "nano-staged": "^0.8.0",
     "postcss-html": "^1.7.0",
     "prettier": "^3.3.3",

diff --git a/plugins/development/plugin-sass-palette/package.json b/plugins/development/plugin-sass-palette/package.json
@@ -47,18 +47,25 @@
   },
   "dependencies": {
     "@vuepress/helper": "workspace:*",
-    "chokidar": "^3.6.0",
-    "sass": "^1.77.8"
+    "chokidar": "^3.6.0"
   },
   "devDependencies": {
     "@vuepress/bundler-vite": "2.0.0-rc.15",
     "@vuepress/bundler-webpack": "2.0.0-rc.15"
   },
   "peerDependencies": {
-    "sass-loader": "^16.0.0",
+    "sass": "^1.77.8",
+    "sass-embedded": "1.77.8",
+    "sass-loader": "^16.0.1",
     "vuepress": "2.0.0-rc.15"
   },
   "peerDependenciesMeta": {
+    "sass": {
+      "optional": true
+    },
+    "sass-embedded": {
+      "optional": true
+    },
     "sass-loader": {
       "optional": true
     }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/themes/theme-default/package.json b/themes/theme-default/package.json
@@ -57,14 +57,21 @@
     "@vuepress/plugin-sitemap": "workspace:*",
     "@vuepress/plugin-theme-data": "workspace:*",
     "@vueuse/core": "^11.0.1",
-    "sass": "^1.77.8",
     "vue": "^3.4.38"
   },
   "peerDependencies": {
-    "sass-loader": "^16.0.0",
+    "sass": "^1.77.8",
+    "sass-embedded": "1.77.8",
+    "sass-loader": "^16.0.1",
     "vuepress": "2.0.0-rc.15"
   },
   "peerDependenciesMeta": {
+    "sass": {
+      "optional": true
+    },
+    "sass-embedded": {
+      "optional": true
+    },
     "sass-loader": {
       "optional": true
     }

diff --git a/themes/theme-default/src/node/defaultTheme.ts b/themes/theme-default/src/node/defaultTheme.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import {
   addViteConfig,
   addViteOptimizeDepsExclude,
@@ -88,26 +87,12 @@ export const defaultTheme = ({
         css: {
           preprocessorOptions: {
             sass: {
-              logger: {
-                warn: (message, { deprecation, deprecationType }) => {
-                  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                  if (deprecation && deprecationType.id === 'mixed-decls')
-                    return
-
-                  console.warn(message)
-                },
-              },
+              api: 'modern-compiler',
+              silenceDeprecations: ['mixed-decls'],
             },
             scss: {
-              logger: {
-                warn: (message, { deprecation, deprecationType }) => {
-                  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                  if (deprecation && deprecationType.id === 'mixed-decls')
-                    return
-
-                  console.warn(message)
-                },
-              },
+              api: 'modern-compiler',
+              silenceDeprecations: ['mixed-decls'],
             },
           },
         },
@@ -120,6 +105,7 @@ export const defaultTheme = ({
             ...options,
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             sassOptions: {
+              api: 'modern-compiler',
               silenceDeprecations: ['mixed-decls'],
               ...options.sassOptions,
             },