Skip to content

Commit

Permalink
Merge branch 'main' into plugin-markdown-chart
Browse files Browse the repository at this point in the history
  • Loading branch information
Mister-Hope committed Nov 27, 2024
2 parents d4bad4a + a0241c4 commit 62f68aa
Show file tree
Hide file tree
Showing 298 changed files with 14,810 additions and 3,284 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4

- name: Use Node.js 20
- name: Use Node.js 22
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: pnpm

- name: Install dependencies
Expand Down Expand Up @@ -51,10 +51,10 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4

- name: Use Node.js 20
- name: Use Node.js 22
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: pnpm

- name: Install dependencies
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ jobs:
coverage:
runs-on: ubuntu-latest

env:
NODE_VERSION: '20'

steps:
- uses: actions/checkout@v4

Expand All @@ -25,7 +22,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
node-version: 22
cache: pnpm

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: pnpm

- name: Install deps
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4

- name: Use Node.js 20
- name: Use Node.js 22
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: pnpm

- name: Install dependencies
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: pnpm

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: pnpm

- name: Install deps
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: pnpm

- name: Install deps
Expand Down
22 changes: 21 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,39 +21,58 @@
"cSpell.words": [
"artalk",
"bumpp",
"commitlint",
"chartjs",
"composables",
"darkmode",
"devtool",
"docsearch",
"domhandler",
"echarts",
"envinfo",
"esbuild",
"execa",
"fflate",
"frontmatter",
"fullscreen",
"gantt",
"giscus",
"globby",
"gtag",
"jsonld",
"katex",
"lazyload",
"lightmode",
"katex",
"linkify",
"markmap",
"mathjax",
"mdit",
"meteorlxy",
"mindmap",
"nord",
"npmmirror",
"nprogress",
"pageview",
"pageviews",
"pengzhanbo",
"photoswipe",
"plantuml",
"prefetch",
"preload",
"prismjs",
"reco",
"revealjs",
"shiki",
"shikijs",
"slideend",
"slidestart",
"slimsearch",
"slugify",
"styl",
"stylelint",
"subfolders",
"tasklist",
"trackpad",
"tsbuildinfo",
"twikoo",
"umami",
Expand All @@ -62,6 +81,7 @@
"vuepress",
"vueuse",
"waline",
"websub",
"zoomable"
],
"stylelint.validate": ["css", "html", "scss", "vue"]
Expand Down
39 changes: 39 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,45 @@
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.61](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.60...v2.0.0-rc.61) (2024-11-23)

### Features

- add slimsearch plugin ([#288](https://github.com/vuepress/ecosystem/issues/288)) ([513bca7](https://github.com/vuepress/ecosystem/commit/513bca75d9f8d4e48a0876815adf64493e80c200))
- **helper:** add env helpers ([13daf7e](https://github.com/vuepress/ecosystem/commit/13daf7efbdc34fae2f1287bfcff40d3858660172))
- **helper:** ensure fallback exists in getLocaleConfig ([9648e50](https://github.com/vuepress/ecosystem/commit/9648e507125fd7b70ee51b7db05bcacdce0ebcbc))

# [2.0.0-rc.60](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.58...v2.0.0-rc.60) (2024-11-06)

### Features

- **plugin-git:** add collect of co-authors ([#285](https://github.com/vuepress/ecosystem/issues/285)) ([448d845](https://github.com/vuepress/ecosystem/commit/448d845bc17fefc8943be7103cca653c256fb7fb))
- **plugin-git:** improve performance and tweaks options ([#287](https://github.com/vuepress/ecosystem/issues/287)) ([51b793b](https://github.com/vuepress/ecosystem/commit/51b793bd38007a806c25a4261d09f36985b16aa7))
- **plugin-git:** support changelog and improve performance ([#283](https://github.com/vuepress/ecosystem/issues/283)) ([b526b8c](https://github.com/vuepress/ecosystem/commit/b526b8c330e77589d688758cf03d8ded6d9b1d29))

# [2.0.0-rc.58](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.57...v2.0.0-rc.58) (2024-10-25)

### Features

- **plugin-markdown-tab:** improve fallback color when using shiki ([f6dec37](https://github.com/vuepress/ecosystem/commit/f6dec372f992d5f31cfb615b32b7ce3a53bca00d))

### Reverts

- "fix(plugin-sass-palette): avoid using [@import](https://github.com/import) ([#281](https://github.com/vuepress/ecosystem/issues/281))" ([129bee7](https://github.com/vuepress/ecosystem/commit/129bee7159badaefdb3d5627db247a55d3d20403))

# [2.0.0-rc.57](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.56...v2.0.0-rc.57) (2024-10-24)

### Bug Fixes

- **plugin-sass-palette:** avoid using [@import](https://github.com/import) ([#281](https://github.com/vuepress/ecosystem/issues/281)) ([cc66ae1](https://github.com/vuepress/ecosystem/commit/cc66ae189a5a9d50bb1b1db619730ec692989e52))

### Features

- add plugin-markdown-ext ([#278](https://github.com/vuepress/ecosystem/issues/278)) ([9734a37](https://github.com/vuepress/ecosystem/commit/9734a373f5eb159164369577e78668d0e928f403))
- add plugin-markdown-include ([#280](https://github.com/vuepress/ecosystem/issues/280)) ([c9534f2](https://github.com/vuepress/ecosystem/commit/c9534f27a77b826c1db83284c578301012e6ac90))
- add plugin-markdown-stylize ([#279](https://github.com/vuepress/ecosystem/issues/279)) ([6c24c50](https://github.com/vuepress/ecosystem/commit/6c24c50f1306a06000fab28575814715aa1b50e1))
- **plugin-markdown-ext:** add styles for footnote and tasklist ([4171e82](https://github.com/vuepress/ecosystem/commit/4171e82a806049ef0667794311a395889aebd716))

# [2.0.0-rc.56](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.55...v2.0.0-rc.56) (2024-10-21)

### Features
Expand Down
64 changes: 53 additions & 11 deletions docs/.vuepress/config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import process from 'node:process'
import { footnote } from '@mdit/plugin-footnote'
import { viteBundler } from '@vuepress/bundler-vite'
import { webpackBundler } from '@vuepress/bundler-webpack'
import { getRealPath } from '@vuepress/helper'
Expand All @@ -8,9 +7,12 @@ 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 { markdownExtPlugin } from '@vuepress/plugin-markdown-ext'
import { markdownChartPlugin } from '@vuepress/plugin-markdown-chart'

Check failure on line 11 in docs/.vuepress/config.ts

View workflow job for this annotation

GitHub Actions / build-check

`@vuepress/plugin-markdown-chart` import should occur before import of `@vuepress/plugin-markdown-ext`

Check failure on line 11 in docs/.vuepress/config.ts

View workflow job for this annotation

GitHub Actions / build-check

`@vuepress/plugin-markdown-chart` import should occur before import of `@vuepress/plugin-markdown-ext`

Check failure on line 11 in docs/.vuepress/config.ts

View workflow job for this annotation

GitHub Actions / bundle-check

`@vuepress/plugin-markdown-chart` import should occur before import of `@vuepress/plugin-markdown-ext`

Check failure on line 11 in docs/.vuepress/config.ts

View workflow job for this annotation

GitHub Actions / bundle-check

`@vuepress/plugin-markdown-chart` import should occur before import of `@vuepress/plugin-markdown-ext`
import { markdownImagePlugin } from '@vuepress/plugin-markdown-image'
import { markdownIncludePlugin } from '@vuepress/plugin-markdown-include'
import { markdownMathPlugin } from '@vuepress/plugin-markdown-math'
import { markdownStylizePlugin } from '@vuepress/plugin-markdown-stylize'
import { redirectPlugin } from '@vuepress/plugin-redirect'
import { registerComponentsPlugin } from '@vuepress/plugin-register-components'
import { revealJsPlugin } from '@vuepress/plugin-revealjs'
Expand Down Expand Up @@ -63,21 +65,13 @@ export default defineUserConfig({
),
)

return realPath.endsWith('vars.css')
? realPath
: realPath
.replace('/src/', '/lib/')
.replace(/hotKey\.ts$/, 'hotKey.d.ts')
return realPath
}
return importPath
},
},
},

extendsMarkdown: (md) => {
md.use(footnote)
},

// configure default theme
theme,

Expand All @@ -100,14 +94,45 @@ export default defineUserConfig({
mermaid: true,
plantuml: true,
}),
markdownExtPlugin({
gfm: true,
component: true,
vPre: true,
}),
markdownImagePlugin({
figure: true,
mark: true,
size: true,
}),
markdownIncludePlugin({
deep: true,
}),
markdownMathPlugin({
type: 'katex',
}),
markdownStylizePlugin({
align: true,
attrs: true,
mark: true,
spoiler: true,
sub: true,
sup: true,
custom: [
{
matcher: 'Recommended',
replacer: ({ tag }) => {
if (tag === 'em')
return {
tag: 'Badge',
attrs: { type: 'tip' },
content: 'Recommended',
}

return null
},
},
],
}),
redirectPlugin({
switchLocale: 'modal',
}),
Expand All @@ -134,7 +159,22 @@ export default defineUserConfig({
// only enable shiki plugin in production mode
IS_PROD
? shikiPlugin({
langs: ['bash', 'diff', 'json', 'md', 'scss', 'ts', 'vue'],
langs: [
'bash',
'diff',
'json',
'md',
'scss',
'ts',
'vue',
'less',
'java',
'py',
'vb',
'bat',
'cs',
'cpp',
],
themes: {
light: 'one-light',
dark: 'one-dark-pro',
Expand All @@ -151,4 +191,6 @@ export default defineUserConfig({
: [],
cachePlugin(),
],

pagePatterns: ['**/*.md', '!**/*.snippet.md', '!.vuepress', '!node_modules'],
})
5 changes: 4 additions & 1 deletion docs/.vuepress/configs/sidebar/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,12 @@ export const sidebarEn: SidebarOptions = {
'/plugins/markdown/': [
'append-date',
'markdown-container',
'markdown-ext',
'markdown-image',
'markdown-include',
'markdown-hint',
'markdown-math',
'markdown-stylize',
'markdown-tab',
'links-check',
'prismjs',
Expand Down Expand Up @@ -131,7 +134,7 @@ export const sidebarEn: SidebarOptions = {
'register-components',
],

'/plugins/search/': ['guidelines', 'docsearch', 'search'],
'/plugins/search/': ['guidelines', 'docsearch', 'search', 'slimsearch'],

'/plugins/seo/': [
{
Expand Down
5 changes: 4 additions & 1 deletion docs/.vuepress/configs/sidebar/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,12 @@ export const sidebarZh: SidebarOptions = {
'/zh/plugins/markdown/': [
'append-date',
'markdown-container',
'markdown-ext',
'markdown-image',
'markdown-include',
'markdown-hint',
'markdown-math',
'markdown-stylize',
'markdown-tab',
'links-check',
'prismjs',
Expand Down Expand Up @@ -131,7 +134,7 @@ export const sidebarZh: SidebarOptions = {
'register-components',
],

'/zh/plugins/search/': ['guidelines', 'docsearch', 'search'],
'/zh/plugins/search/': ['guidelines', 'docsearch', 'search', 'slimsearch'],

'/zh/plugins/seo/': [
{
Expand Down
18 changes: 0 additions & 18 deletions docs/.vuepress/styles/index.scss

This file was deleted.

Loading

0 comments on commit 62f68aa

Please sign in to comment.