Skip to content

Commit 78506f2

Browse files
Merge branch 'upstream'
2 parents f3127e5 + 662c7da commit 78506f2

File tree

14 files changed

+1252
-231
lines changed

14 files changed

+1252
-231
lines changed

.vitepress/inlined-scripts/restorePreference.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
restore('vue-docs-prefer-composition', 'prefer-composition', true)
99
restore('vue-docs-prefer-sfc', 'prefer-sfc', true)
1010

11-
// window.__VUE_BANNER_ID__ = ''
12-
// restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
11+
window.__VUE_BANNER_ID__ = 'herodevs-vue2-nes'
12+
restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
1313
})()

.vitepress/theme/components/Banner.vue

Lines changed: 336 additions & 19 deletions
Large diffs are not rendered by default.

.vitepress/theme/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import {
99
} from './components/preferences'
1010
import SponsorsAside from './components/SponsorsAside.vue'
1111
import VueSchoolLink from './components/VueSchoolLink.vue'
12-
// import Banner from './components/Banner.vue'
12+
import Banner from './components/Banner.vue'
1313
// import TextAd from './components/TextAd.vue'
1414

1515
export default Object.assign({}, VPTheme, {
1616
Layout: () => {
1717
// @ts-ignore
1818
return h(VPTheme.Layout, null, {
19-
// banner: () => h(Banner),
19+
banner: () => h(Banner),
2020
'sidebar-top': () => h(PreferenceSwitch),
2121
'aside-mid': () => h(SponsorsAside)
2222
})

.vitepress/theme/styles/index.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@
1818
right: unset;
1919
left: 0;
2020
}
21+
22+
/* vitepress rc.31 migrated to shijiki and need this to apply code styles */
23+
.vp-code span {
24+
color: var(--shiki-dark, inherit);
25+
}

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
22
"engines": {
33
"node": ">=14.0.0"
44
},
5+
"type": "module",
56
"scripts": {
67
"dev": "vitepress",
78
"build": "vitepress build",
89
"preview": "vitepress preview",
910
"preinstall": "npx only-allow pnpm"
1011
},
1112
"dependencies": {
12-
"@vue/repl": "^1.5.0",
13-
"@vue/theme": "^2.2.4",
13+
"@vue/repl": "^3.0.0",
14+
"@vue/theme": "^2.2.5",
1415
"dynamics.js": "^1.1.5",
1516
"gsap": "^3.9.0",
16-
"vitepress": "1.0.0-beta.7",
17-
"vue": "^3.3.4"
17+
"vitepress": "1.0.0-rc.31",
18+
"vue": "^3.4.0-alpha.3"
1819
},
1920
"devDependencies": {
2021
"@types/markdown-it": "^12.2.3",
21-
"@types/node": "^16.9.1",
22+
"@types/node": "^20.10.1",
2223
"terser": "^5.14.2"
2324
},
2425
"pnpm": {

0 commit comments

Comments
 (0)