diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4e1b9af33c..63b46bc7ba 100644 --- a/.github/workflows/check.yml +++ b/.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 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 20eb06c6a6..92812af37c 100644 --- a/.github/workflows/coverage.yml +++ b/.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 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index f825b86e47..bc3c47344b 100644 --- a/.github/workflows/e2e.yml +++ b/.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 diff --git a/.vscode/settings.json b/.vscode/settings.json index 0cf8a1b744..6113874ca8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -28,6 +28,7 @@ "frontmatter", "globby", "gtag", + "lightningcss", "mdit", "nprogress", "prefetch", diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e4a6cdfda..fd99ebaecb 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/e2e/docs/.vuepress/config.ts b/e2e/docs/.vuepress/config.ts index 2a7955db87..ca30feae74 100644 --- a/e2e/docs/.vuepress/config.ts +++ b/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: { diff --git a/e2e/docs/.vuepress/theme/client/config.ts b/e2e/docs/.vuepress/theme/client/config.ts index 8bc9a299db..8d35748afe 100644 --- a/e2e/docs/.vuepress/theme/client/config.ts +++ b/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, diff --git a/e2e/docs/.vuepress/theme/client/layouts/CssModulesLayout.vue b/e2e/docs/.vuepress/theme/client/layouts/CssModulesLayout.vue new file mode 100644 index 0000000000..d704c89214 --- /dev/null +++ b/e2e/docs/.vuepress/theme/client/layouts/CssModulesLayout.vue @@ -0,0 +1,16 @@ + + + diff --git a/e2e/docs/.vuepress/theme/client/styles/styles.module.css b/e2e/docs/.vuepress/theme/client/styles/styles.module.css new file mode 100644 index 0000000000..0e5179bc90 --- /dev/null +++ b/e2e/docs/.vuepress/theme/client/styles/styles.module.css @@ -0,0 +1,3 @@ +.greenText { + color: rgb(0, 129, 0); +} diff --git a/e2e/docs/.vuepress/theme/client/styles/variables.module.scss b/e2e/docs/.vuepress/theme/client/styles/variables.module.scss new file mode 100644 index 0000000000..ece375ebbe --- /dev/null +++ b/e2e/docs/.vuepress/theme/client/styles/variables.module.scss @@ -0,0 +1,3 @@ +:export { + fooScss: 234px; +} diff --git a/e2e/docs/components/auto-link.md b/e2e/docs/components/auto-link.md index 08cdbc9e86..d9209f3baa 100644 --- a/e2e/docs/components/auto-link.md +++ b/e2e/docs/components/auto-link.md @@ -1,16 +1,39 @@ # AutoLink
- - + + +
+ +
+ + + +
+ +
+ + slot-text + + + + + + + + + + + +