Skip to content

Commit b09f322

Browse files
Mister-HopeMister-Hope
committed
Merge branch 'plugin-chart' into plugin-markdown-chart
2 parents e5078f6 + 36cace2 commit b09f322

File tree

469 files changed

+14287
-2961
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

469 files changed

+14287
-2961
lines changed

‎.github/workflows/check.yml

+36-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
workflow_dispatch:
1111

1212
jobs:
13-
check:
13+
build-check:
1414
runs-on: ubuntu-latest
1515

1616
steps:
@@ -42,11 +42,45 @@ jobs:
4242
- name: Unit Test
4343
run: pnpm test:unit
4444

45+
bundle-check:
46+
runs-on: ubuntu-latest
47+
48+
steps:
49+
- uses: actions/checkout@v4
50+
51+
- name: Install pnpm
52+
uses: pnpm/action-setup@v4
53+
54+
- name: Use Node.js 20
55+
uses: actions/setup-node@v4
56+
with:
57+
node-version: 20
58+
cache: pnpm
59+
60+
- name: Install dependencies
61+
run: pnpm install --frozen-lockfile
62+
63+
- name: Build
64+
run: pnpm bundle
65+
66+
- name: Linter Test
67+
run: pnpm lint
68+
69+
- name: Docs Test
70+
run: |
71+
pnpm --filter @vuepress/ecosystem-docs docs:build
72+
pnpm --filter @vuepress/ecosystem-docs docs:build-webpack
73+
74+
- name: Unit Test
75+
run: pnpm test:unit
76+
4577
check-result:
4678
if: ${{ always() }}
4779
name: check result
4880
runs-on: ubuntu-latest
49-
needs: [check]
81+
needs:
82+
- build-check
83+
- bundle-check
5084
steps:
5185
- if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
5286
run: exit 1

‎.github/workflows/docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: pnpm install --frozen-lockfile
2929

3030
- name: Build Project
31-
run: pnpm build
31+
run: pnpm bundle
3232

3333
- name: Docs build
3434
env:

‎.github/workflows/e2e.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: e2e
22

33
on:
44
push:
5-
branches:
65
pull_request:
76
branches:
87
- main
@@ -37,7 +36,7 @@ jobs:
3736
run: pnpm playwright install chromium
3837

3938
- name: Build source files
40-
run: pnpm build
39+
run: pnpm bundle
4140

4241
- name: E2E test (base /)
4342
run: pnpm test:e2e

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: pnpm install --frozen-lockfile
2929

3030
- name: Build Project
31-
run: pnpm build
31+
run: pnpm bundle
3232

3333
- name: Update npmrc
3434
run: |

‎CHANGELOG.md

+75
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,81 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.0.0-rc.53](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.52...v2.0.0-rc.53) (2024-09-30)
7+
8+
### Bug Fixes
9+
10+
- **plugin-comment:** fix rollup config ([7ba0244](https://github.com/vuepress/ecosystem/commit/7ba0244ba39ab3abcf0eaf01bd2b98e3a7c3ca57))
11+
12+
# [2.0.0-rc.52](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.51...v2.0.0-rc.52) (2024-09-30)
13+
14+
### Bug Fixes
15+
16+
- **plugin-comment:** add missing style import for Waline ([f976a5c](https://github.com/vuepress/ecosystem/commit/f976a5ca619f0e870e40f7ef87b0b83d199b3e20))
17+
- **plugin-markdown-math:** improve font-size in katex ([4add5f1](https://github.com/vuepress/ecosystem/commit/4add5f14a18a83d352419cd2d3863beb5434fb97))
18+
- **plugin-markdown-math:** prevent scrollbar with mathjax ([c73b86f](https://github.com/vuepress/ecosystem/commit/c73b86f684605fede21b0879c4826baaf2d37bbb))
19+
- **plugin-pwa:** fix config file ([4295c5d](https://github.com/vuepress/ecosystem/commit/4295c5d2bd8e64a51916909337eb9597ef9befb3))
20+
- **plugin-redirect:** respect config option from command line ([790731a](https://github.com/vuepress/ecosystem/commit/790731aafa31a4aa68b720632d2f33453e18bfab))
21+
- **plugin-rtl:** add missing client entry ([da8be48](https://github.com/vuepress/ecosystem/commit/da8be487d81b8b0c5c4e7c5ed455c63667efe369))
22+
- **plugin-rtl:** fix client imports ([39b43f1](https://github.com/vuepress/ecosystem/commit/39b43f10cdef760708575e360ed643fda6a9ba95))
23+
24+
### Features
25+
26+
- **helper:** improve header anchor normalize ([ef2c444](https://github.com/vuepress/ecosystem/commit/ef2c444dd432b89dd49655e11bd678f3d73400bd))
27+
- **helper:** sync mergeViteConfig with vite ([6e17c80](https://github.com/vuepress/ecosystem/commit/6e17c809daf6cd5f633051fbd29b1988e14e82df))
28+
- **plugin-copyright:** provide composables ([a9b6e98](https://github.com/vuepress/ecosystem/commit/a9b6e98ac9300c9a485cb317afb050b0a3e4d9eb))
29+
- **plugin-feed:** add app as second argument in getter ([08dbf87](https://github.com/vuepress/ecosystem/commit/08dbf87df02cd9764bfe09d9316dba9872411254))
30+
- **plugin-markdown-hint:** improve hint container outlook ([#264](https://github.com/vuepress/ecosystem/issues/264)) ([340fff5](https://github.com/vuepress/ecosystem/commit/340fff5ced3f720f2d6204a230ed320031f9faa9))
31+
- **plugin-markdown-math:** add macros option for katex by default, close [#261](https://github.com/vuepress/ecosystem/issues/261) ([c5568ca](https://github.com/vuepress/ecosystem/commit/c5568ca84ed82e05407a38423b900c7782769073))
32+
- **plugin-markdown-tab:** provide client entry ([a1ed50b](https://github.com/vuepress/ecosystem/commit/a1ed50bb738bb8b510a1471c797ffc5d8731f683))
33+
- **plugin-pwa:** improve style tree shaking ([aed3060](https://github.com/vuepress/ecosystem/commit/aed3060c104b872cd6f337202abd36090648faac))
34+
- **plugin-pwa:** prevent defining variables ([ec0d8d0](https://github.com/vuepress/ecosystem/commit/ec0d8d0cc5223b90b53c337079a1a1c5d5dbbf2b))
35+
- **plugin-redirect:** reduce runtime size ([#268](https://github.com/vuepress/ecosystem/issues/268)) ([1adfab9](https://github.com/vuepress/ecosystem/commit/1adfab9dcf5589dd391c387aa46930b836941941))
36+
- **plugin-rtl:** provide composables ([3d0e4a1](https://github.com/vuepress/ecosystem/commit/3d0e4a18263a9daa0a2b49b1d40fccc219357997))
37+
- use rollup to bundle files ([#267](https://github.com/vuepress/ecosystem/issues/267)) ([164252d](https://github.com/vuepress/ecosystem/commit/164252d350b73a9d6d7cbe0e713be4ee2be47c08))
38+
39+
# [2.0.0-rc.51](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.50...v2.0.0-rc.51) (2024-09-23)
40+
41+
### Features
42+
43+
- **plugin-redirect:** add remember my choice, close [#253](https://github.com/vuepress/ecosystem/issues/253) ([#259](https://github.com/vuepress/ecosystem/issues/259)) ([8805d9c](https://github.com/vuepress/ecosystem/commit/8805d9c95611facabc3c02cb50d6ee9dafdac852))
44+
- **plugin-sass-palette:** remove variables staring with underscore in generator ([f329800](https://github.com/vuepress/ecosystem/commit/f329800e357e5a27eb1107252977dd98b29affed))
45+
46+
# [2.0.0-rc.50](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.49...v2.0.0-rc.50) (2024-09-23)
47+
48+
**Note:** Version bump only for package @vuepress/ecosystem
49+
50+
# [2.0.0-rc.49](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.48...v2.0.0-rc.49) (2024-09-23)
51+
52+
### Bug Fixes
53+
54+
- **plugin-markdown-math:** incorrect import css path ([#256](https://github.com/vuepress/ecosystem/issues/256)) ([4e61424](https://github.com/vuepress/ecosystem/commit/4e6142496e2e80472d377d58cfbf538e5a51a981))
55+
56+
### Features
57+
58+
- **plugin-prismjs:** improve highlight color generation ([492cd27](https://github.com/vuepress/ecosystem/commit/492cd2746821e1e3554f8a46de14042c107bb68b))
59+
60+
# [2.0.0-rc.48](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.47...v2.0.0-rc.48) (2024-09-22)
61+
62+
### Bug Fixes
63+
64+
- **plugin-revealjs:** fix embed mode and keyboard events ([5d98506](https://github.com/vuepress/ecosystem/commit/5d985061c232037dc48329e3b8ce28ba15f75e1d))
65+
66+
# [2.0.0-rc.47](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.46...v2.0.0-rc.47) (2024-09-22)
67+
68+
### Bug Fixes
69+
70+
- **plugin-comment:** avoid resolving issues in pnpm ([2e319fe](https://github.com/vuepress/ecosystem/commit/2e319fe75f67419321372c1931419030fa227e1c))
71+
- **theme-default:** fix hero action button color ([12a8d5d](https://github.com/vuepress/ecosystem/commit/12a8d5dc44198f58999c6ad88c750c775aba4950))
72+
73+
### Features
74+
75+
- add plugin-markdown-tab ([#250](https://github.com/vuepress/ecosystem/issues/250)) ([49ea97c](https://github.com/vuepress/ecosystem/commit/49ea97cf10f07ad3e20b2528d17efc3b6576ac7a))
76+
- add plugin-revealjs ([#251](https://github.com/vuepress/ecosystem/issues/251)) ([253b959](https://github.com/vuepress/ecosystem/commit/253b959cca19fd8ef9eff5d90f21a147c916899a))
77+
- **plugin-docsearch:** improve search box appearance ([5282d3b](https://github.com/vuepress/ecosystem/commit/5282d3b3c5ca63170d2c915e76054cb326c00e11))
78+
- **plugin-markdown-hint:** toggle all details block open before print ([4cb99de](https://github.com/vuepress/ecosystem/commit/4cb99dee940441d030d23d92bf9c6749678e3cd6))
79+
- **plugin-redirect:** appear target language first ([4ca960a](https://github.com/vuepress/ecosystem/commit/4ca960a90de9dce54c2b45038eec11e3fe9e5d7e))
80+
681
# [2.0.0-rc.46](https://github.com/vuepress/ecosystem/compare/v2.0.0-rc.45...v2.0.0-rc.46) (2024-09-20)
782

883
### Bug Fixes

‎docs/.vuepress/config.ts

+42-10
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ import { catalogPlugin } from '@vuepress/plugin-catalog'
88
import { commentPlugin } from '@vuepress/plugin-comment'
99
import { docsearchPlugin } from '@vuepress/plugin-docsearch'
1010
import { feedPlugin } from '@vuepress/plugin-feed'
11+
import { markdownChartPlugin } from '@vuepress/plugin-markdown-chart'
1112
import { markdownImagePlugin } from '@vuepress/plugin-markdown-image'
1213
import { markdownMathPlugin } from '@vuepress/plugin-markdown-math'
1314
import { redirectPlugin } from '@vuepress/plugin-redirect'
1415
import { registerComponentsPlugin } from '@vuepress/plugin-register-components'
16+
import { revealJsPlugin } from '@vuepress/plugin-revealjs'
1517
import { shikiPlugin } from '@vuepress/plugin-shiki'
1618
import { defineUserConfig } from 'vuepress'
1719
import { getDirname, path } from 'vuepress/utils'
@@ -54,15 +56,18 @@ export default defineUserConfig({
5456
// handle @vuepress packages import path
5557
if (importPath.startsWith('@vuepress/')) {
5658
const packageName = importPath.match(/^(@vuepress\/[^/]*)/)![1]
57-
return importPath
58-
.replace(
59-
packageName,
60-
path.dirname(
61-
getRealPath(`${packageName}/package.json`, import.meta.url),
62-
),
63-
)
64-
.replace('/src/', '/lib/')
65-
.replace(/hotKey\.ts$/, 'hotKey.d.ts')
59+
const realPath = importPath.replace(
60+
packageName,
61+
path.dirname(
62+
getRealPath(`${packageName}/package.json`, import.meta.url),
63+
),
64+
)
65+
66+
return realPath.endsWith('vars.css')
67+
? realPath
68+
: realPath
69+
.replace('/src/', '/lib/')
70+
.replace(/hotKey\.ts$/, 'hotKey.d.ts')
6671
}
6772
return importPath
6873
},
@@ -87,15 +92,42 @@ export default defineUserConfig({
8792
json: true,
8893
rss: true,
8994
}),
95+
markdownChartPlugin({
96+
chartjs: true,
97+
echarts: true,
98+
flowchart: true,
99+
markmap: true,
100+
mermaid: true,
101+
plantuml: true,
102+
}),
90103
markdownImagePlugin({
91104
figure: true,
92105
mark: true,
93106
size: true,
94107
}),
95-
markdownMathPlugin(),
108+
markdownMathPlugin({
109+
type: 'katex',
110+
}),
96111
redirectPlugin({
97112
switchLocale: 'modal',
98113
}),
114+
revealJsPlugin({
115+
plugins: ['highlight', 'math', 'search', 'notes', 'zoom'],
116+
themes: [
117+
'auto',
118+
'beige',
119+
'black',
120+
'blood',
121+
'league',
122+
'moon',
123+
'night',
124+
'serif',
125+
'simple',
126+
'sky',
127+
'solarized',
128+
'white',
129+
],
130+
}),
99131
registerComponentsPlugin({
100132
componentsDir: path.resolve(__dirname, './components'),
101133
}),

‎docs/.vuepress/configs/sidebar/en.ts

+7
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,15 @@ export const sidebarEn: SidebarOptions = {
102102
'markdown-image',
103103
'markdown-hint',
104104
'markdown-math',
105+
'markdown-tab',
105106
'links-check',
106107
'prismjs',
108+
{
109+
text: 'revealjs',
110+
prefix: 'revealjs/',
111+
link: 'revealjs/',
112+
children: ['', 'demo', 'themes'],
113+
},
107114
'shiki',
108115
],
109116

‎docs/.vuepress/configs/sidebar/zh.ts

+7
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,15 @@ export const sidebarZh: SidebarOptions = {
102102
'markdown-image',
103103
'markdown-hint',
104104
'markdown-math',
105+
'markdown-tab',
105106
'links-check',
106107
'prismjs',
108+
{
109+
text: 'revealjs',
110+
prefix: 'revealjs/',
111+
link: 'revealjs/',
112+
children: ['', 'demo', 'themes'],
113+
},
107114
'shiki',
108115
],
109116

‎docs/package.json

+17-6
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,42 @@
1010
},
1111
"dependencies": {
1212
"@mdit/plugin-footnote": "0.13.1",
13-
"@vuepress/bundler-vite": "2.0.0-rc.15",
14-
"@vuepress/bundler-webpack": "2.0.0-rc.15",
13+
"@vuepress/bundler-vite": "2.0.0-rc.17",
14+
"@vuepress/bundler-webpack": "2.0.0-rc.17",
1515
"@vuepress/plugin-back-to-top": "workspace:*",
1616
"@vuepress/helper": "workspace:*",
1717
"@vuepress/plugin-catalog": "workspace:*",
1818
"@vuepress/plugin-comment": "workspace:*",
1919
"@vuepress/plugin-copy-code": "workspace:*",
2020
"@vuepress/plugin-docsearch": "workspace:*",
2121
"@vuepress/plugin-feed": "workspace:*",
22+
"@vuepress/plugin-markdown-chart": "workspace:*",
2223
"@vuepress/plugin-markdown-image": "workspace:*",
2324
"@vuepress/plugin-markdown-math": "workspace:*",
25+
"@vuepress/plugin-markdown-tab": "workspace:*",
2426
"@vuepress/plugin-medium-zoom": "workspace:*",
2527
"@vuepress/plugin-nprogress": "workspace:*",
2628
"@vuepress/plugin-photo-swipe": "workspace:*",
2729
"@vuepress/plugin-pwa": "workspace:*",
2830
"@vuepress/plugin-redirect": "workspace:*",
2931
"@vuepress/plugin-register-components": "workspace:*",
32+
"@vuepress/plugin-revealjs": "workspace:*",
3033
"@vuepress/plugin-search": "workspace:*",
3134
"@vuepress/plugin-shiki": "workspace:*",
3235
"@vuepress/plugin-cache": "workspace:*",
3336
"@vuepress/theme-default": "workspace:*",
34-
"mathjax-full": "3.2.2",
35-
"sass-embedded": "1.79.2",
37+
"chart.js": "^4.4.4",
38+
"echarts": "^5.5.1",
39+
"flowchart.ts": "^3.0.1",
40+
"katex": "0.16.11",
41+
"markmap-lib": "^0.17.2",
42+
"markmap-toolbar": "^0.17.2",
43+
"markmap-view": "^0.17.2",
44+
"mathjax-full": "^3.2.2",
45+
"mermaid": "^11.2.1",
46+
"sass-embedded": "^1.79.4",
3647
"sass-loader": "^16.0.2",
37-
"vue": "^3.5.7",
38-
"vuepress": "2.0.0-rc.15"
48+
"vue": "^3.5.10",
49+
"vuepress": "2.0.0-rc.17"
3950
}
4051
}

0 commit comments

Comments
 (0)