Skip to content

Commit

Permalink
Merge branch 'main' into plugin-demo
Browse files Browse the repository at this point in the history
  • Loading branch information
Mister-Hope committed Jan 8, 2025
2 parents fb5112c + 57bf3dd commit 2d5fd02
Show file tree
Hide file tree
Showing 275 changed files with 7,304 additions and 4,335 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,14 @@
"esbuild",
"execa",
"fflate",
"fontawesome",
"frontmatter",
"fullscreen",
"giscus",
"globby",
"gtag",
"iconfont",
"iconify",
"jsfiddle",
"jsonld",
"katex",
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,33 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.0.0-rc.69](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.68...v2.0.0-rc.69) (2025-01-07)

### Bug Fixes

- fix zh-TW locale ([764a18c](https://github.com/vuepress/ecosystem/commit/764a18cf07638d77d932e8d43cf854f540ecb2ca))

### Features

- **plugin-docsearch:** add built-in locale ([#323](https://github.com/vuepress/ecosystem/issues/323)) ([cc734fb](https://github.com/vuepress/ecosystem/commit/cc734fba5adcd3f003db84d71723066695c501cf))
- **plugin-search:** add built-in locale data ([#325](https://github.com/vuepress/ecosystem/issues/325)) ([bdb9902](https://github.com/vuepress/ecosystem/commit/bdb9902d815cb0f5cb95c3e18469444cebe11b89))
- remove de-AT if possible ([#324](https://github.com/vuepress/ecosystem/issues/324)) ([3c44f45](https://github.com/vuepress/ecosystem/commit/3c44f4500713fb309324fa50ebd7a5ddf6ce3eb9))

# [2.0.0-rc.68](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.67...v2.0.0-rc.68) (2024-12-27)

### Bug Fixes

- **create-vuepress:** wrong registry command ([#312](https://github.com/vuepress/ecosystem/issues/312)) ([3e9cd96](https://github.com/vuepress/ecosystem/commit/3e9cd968e5d0bf9679d24c0e7cf61ab97d7c6a4a))
- **plugin-photo-swipe:** avoid loading multiple instances at startup ([#317](https://github.com/vuepress/ecosystem/issues/317)) ([dae01ac](https://github.com/vuepress/ecosystem/commit/dae01ac99d5804b74158cc0ca69e6cec9686654b))

### Features

- add plugin-icon ([#319](https://github.com/vuepress/ecosystem/issues/319)) ([09fec63](https://github.com/vuepress/ecosystem/commit/09fec63550331388137fabf95bc0d8f8525814fc))
- **plugin-comment:** improve type ([375645f](https://github.com/vuepress/ecosystem/commit/375645fd9dbd0e7f628caca4d2fa0bd5f7e495d5))
- **plugin-git:** improve contributors sorting ([#309](https://github.com/vuepress/ecosystem/issues/309)) ([4fdde2c](https://github.com/vuepress/ecosystem/commit/4fdde2cca2c89344d692ebad7a806a48959a3d46))
- rebuild built-in locale data ([#315](https://github.com/vuepress/ecosystem/issues/315)) ([5308fb4](https://github.com/vuepress/ecosystem/commit/5308fb48310d3f0c6af4adc1a98f2e6747c85f33))
- **vp-update:** bump sass related packages ([52557d7](https://github.com/vuepress/ecosystem/commit/52557d7d4c412e7e7e367d5a26f794148c85249b))

# [2.0.0-rc.67](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.66...v2.0.0-rc.67) (2024-12-16)

### Bug Fixes
Expand Down
2 changes: 2 additions & 0 deletions docs/.vuepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { catalogPlugin } from '@vuepress/plugin-catalog'
import { commentPlugin } from '@vuepress/plugin-comment'
import { docsearchPlugin } from '@vuepress/plugin-docsearch'
import { feedPlugin } from '@vuepress/plugin-feed'
import { iconPlugin } from '@vuepress/plugin-icon'
import { markdownDemoPlugin } from '@vuepress/plugin-markdown-demo'
import { markdownExtPlugin } from '@vuepress/plugin-markdown-ext'
import { markdownImagePlugin } from '@vuepress/plugin-markdown-image'
Expand Down Expand Up @@ -91,6 +92,7 @@ export default defineUserConfig({
json: true,
rss: true,
}),
iconPlugin(),
markdownExtPlugin({
gfm: true,
component: true,
Expand Down
1 change: 1 addition & 0 deletions docs/.vuepress/configs/sidebar/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export const sidebarEn: SidebarOptions = {
'catalog',
'copy-code',
'copyright',
'icon',
'medium-zoom',
'notice',
'nprogress',
Expand Down
1 change: 1 addition & 0 deletions docs/.vuepress/configs/sidebar/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export const sidebarZh: SidebarOptions = {
'catalog',
'copy-code',
'copyright',
'icon',
'medium-zoom',
'notice',
'nprogress',
Expand Down
5 changes: 3 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@vuepress/plugin-markdown-demo": "workspace:*",
"@vuepress/plugin-docsearch": "workspace:*",
"@vuepress/plugin-feed": "workspace:*",
"@vuepress/plugin-icon": "workspace:*",
"@vuepress/plugin-markdown-ext": "workspace:*",
"@vuepress/plugin-markdown-image": "workspace:*",
"@vuepress/plugin-markdown-include": "workspace:*",
Expand All @@ -36,9 +37,9 @@
"@vuepress/plugin-search": "workspace:*",
"@vuepress/plugin-shiki": "workspace:*",
"@vuepress/theme-default": "workspace:*",
"katex": "0.16.15",
"katex": "0.16.19",
"mathjax-full": "3.2.2",
"sass-embedded": "1.83.0",
"sass-embedded": "^1.83.1",
"sass-loader": "^16.0.4",
"vue": "^3.5.13",
"vuepress": "2.0.0-rc.19"
Expand Down
4 changes: 2 additions & 2 deletions docs/plugins/blog/blog/guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ So with node side settings above, you can get information about "tag" and "star"

```vue
<script setup lang="ts">
import { useBlogCategory } from '@vuepress/plugin-blog'
import { useBlogCategory } from '@vuepress/plugin-blog/client'
import { RouteLink } from 'vuepress/client'
const categoryMap = useBlogCategory('tag')
Expand All @@ -194,7 +194,7 @@ const categoryMap = useBlogCategory('tag')

```vue
<script setup lang="ts">
import { useBlogCategory } from '@vuepress/plugin-blog'
import { useBlogCategory } from '@vuepress/plugin-blog/client'
const categoryMap = useBlogCategory('tag')
</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/blog/comment/waline/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@

```ts
interface WalineLocales {
[localePath: string]: WalineLocale
[localePath: string]: Partial<WalineLocale>
}
```

Expand Down
3 changes: 1 addition & 2 deletions docs/plugins/development/reading-time.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const readingTimeLocale = useReadingTimeLocale() // { time: "1 minute", words: "
}

interface ReadingTimePluginLocaleConfig {
[localePath: string]: ReadingTimePluginLocaleData
[localePath: string]: Partial<ReadingTimePluginLocaleData>
}
```

Expand All @@ -116,7 +116,6 @@ const readingTimeLocale = useReadingTimeLocale() // { time: "1 minute", words: "
- **Traditional Chinese** (zh-TW)
- **English (United States)** (en-US)
- **German** (de-DE)
- **German (Australia)** (de-AT)
- **Russian** (ru-RU)
- **Ukrainian** (uk-UA)
- **Vietnamese** (vi-VN)
Expand Down
Binary file added docs/plugins/features/assets/iconfont-add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/plugins/features/assets/iconfont-edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/plugins/features/assets/iconfont-new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions docs/plugins/features/catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ Project with order -1
}

interface CatalogPluginLocaleConfig {
[localePath: string]: CatalogPluginLocaleData
[localePath: string]: Partial<CatalogPluginLocaleData>
}
```

Expand All @@ -168,7 +168,6 @@ Project with order -1
- **Traditional Chinese** (zh-TW)
- **English (United States)** (en-US)
- **German** (de-DE)
- **German (Australia)** (de-AT)
- **Russian** (ru-RU)
- **Ukrainian** (uk-UA)
- **Vietnamese** (vi-VN)
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/features/copy-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export default {
}

interface CopyCodePluginLocaleConfig {
[localePath: string]: CopyCodePluginLocaleData
[localePath: string]: Partial<CopyCodePluginLocaleData>
}
```

Expand Down
3 changes: 1 addition & 2 deletions docs/plugins/features/copyright.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ So copyright message triggered on another site also points to your preferred sit
}

interface CopyrightPluginLocaleConfig {
[localePath: string]: CopyrightPluginLocaleData
[localePath: string]: Partial<CopyrightPluginLocaleData>
}
```

Expand Down Expand Up @@ -192,7 +192,6 @@ So copyright message triggered on another site also points to your preferred sit
- **Traditional Chinese** (zh-TW)
- **English (United States)** (en-US)
- **German** (de-DE)
- **German (Australia)** (de-AT)
- **Russian** (ru-RU)
- **Ukrainian** (uk-UA)
- **Vietnamese** (vi-VN)
Expand Down
Loading

0 comments on commit 2d5fd02

Please sign in to comment.