Merge branch 'main' into route-option

Author: Mister-Hope

.github/workflows/check.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
 
       - name: Use Node.js ${{ matrix.node }}
         uses: actions/setup-node@v4

.github/workflows/coverage.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

.github/workflows/e2e.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
 
       - name: Use Node.js ${{ matrix.node }}
         uses: actions/setup-node@v4

.vscode/settings.json

@@ -28,6 +28,7 @@
     "frontmatter",
     "globby",
     "gtag",
+    "lightningcss",
     "mdit",
     "nprogress",
     "prefetch",

CHANGELOG.md

@@ -1,3 +1,13 @@
+# [2.0.0-rc.11](https://github.com/vuepress/core/compare/v2.0.0-rc.10...v2.0.0-rc.11) (2024-05-16)
+
+
+### Features
+
+* **client:** improve AutoLinkProps ([#1554](https://github.com/vuepress/core/issues/1554)) ([0777d09](https://github.com/vuepress/core/commit/0777d098e420ebc44ed9bb983009ee5d6367bb1d))
+* **client:** support slot props in AutoLink ([630e29a](https://github.com/vuepress/core/commit/630e29a0a64973cf41369b854c0663ea36b12608))
+
+
+
 # [2.0.0-rc.10](https://github.com/vuepress/core/compare/v2.0.0-rc.9...v2.0.0-rc.10) (2024-05-16)
 
 

e2e/docs/.vuepress/config.ts

@@ -41,6 +41,15 @@ export default defineUserConfig({
         ['meta', { name: 'bar', content: 'foobar zh' }],
       ],
     },
+    '/中文/': {
+      lang: '中文',
+      title: 'VuePress E2E',
+      description: 'VuePress E2E 测试站点',
+      head: [
+        ['meta', { name: 'foo-中文', content: 'foo-中文' }],
+        ['meta', { name: 'bar', content: '中文' }],
+      ],
+    },
   },
 
   markdown: {

e2e/docs/.vuepress/theme/client/config.ts

@@ -1,5 +1,6 @@
 import { defineClientConfig } from 'vuepress/client'
 import RootComponentFromTheme from './components/RootComponentFromTheme.vue'
+import CssModulesLayout from './layouts/CssModulesLayout.vue'
 import CustomLayout from './layouts/CustomLayout.vue'
 import Layout from './layouts/Layout.vue'
 import NotFound from './layouts/NotFound.vue'
@@ -16,6 +17,7 @@ export default defineClientConfig({
   },
 
   layouts: {
+    CssModulesLayout,
     CustomLayout,
     Layout,
     NotFound,

e2e/docs/.vuepress/theme/client/layouts/CssModulesLayout.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import styles from '../styles/styles.module.css'
+import variables from '../styles/variables.module.scss'
+</script>
+
+<template>
+  <div class="e2e-theme-css-modules-layout">
+    <main class="e2e-theme-css-modules-layout-content">
+      <div id="e2e-theme-css-modules-scss">{{ variables.fooScss }}</div>
+      <div id="e2e-theme-css-modules-css" :class="styles.greenText">
+        CSS modules green text
+      </div>
+      <Content />
+    </main>
+  </div>
+</template>

e2e/docs/.vuepress/theme/client/styles/styles.module.css

@@ -0,0 +1,3 @@
+.greenText {
+  color: rgb(0, 129, 0);
+}

e2e/docs/.vuepress/theme/client/styles/variables.module.scss

@@ -0,0 +1,3 @@
+:export {
+  fooScss: 234px;
+}