Merge branch 'main' into typescript_advanced

Author: pikax

.vitepress/inlined-scripts/restorePreference.js

@@ -8,6 +8,6 @@
   restore('vue-docs-prefer-composition', 'prefer-composition', true)
   restore('vue-docs-prefer-sfc', 'prefer-sfc', true)
 
-  // window.__VUE_BANNER_ID__ = ''
-  // restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
+  window.__VUE_BANNER_ID__ = 'herodevs-vue2-nes'
+  restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
 })()

.vitepress/theme/components/Banner.vue

@@ -9,14 +9,14 @@ import {
 } from './components/preferences'
 import SponsorsAside from './components/SponsorsAside.vue'
 import VueSchoolLink from './components/VueSchoolLink.vue'
-// import Banner from './components/Banner.vue'
+import Banner from './components/Banner.vue'
 // import TextAd from './components/TextAd.vue'
 
 export default Object.assign({}, VPTheme, {
   Layout: () => {
     // @ts-ignore
     return h(VPTheme.Layout, null, {
-      // banner: () => h(Banner),
+      banner: () => h(Banner),
       'sidebar-top': () => h(PreferenceSwitch),
       'aside-mid': () => h(SponsorsAside)
     })

.vitepress/theme/index.ts

@@ -5,8 +5,7 @@
 @import "./utilities.css";
 @import "./style-guide.css";
 
-/* bugfix: https://github.com/vuejs/theme/pull/95 */
-
-.vt-flyout-menu {
-  max-height: calc(100vh - var(--vt-nav-height) - var(--vt-banner-height, 0px)) !important;
+/* vitepress rc.31 migrated to shijiki and need this to apply code styles */
+.vp-code span {
+  color: var(--shiki-dark, inherit);
 }

.vitepress/theme/styles/index.css

@@ -2,23 +2,24 @@
   "engines": {
     "node": ">=14.0.0"
   },
+  "type": "module",
   "scripts": {
     "dev": "vitepress",
     "build": "vitepress build",
     "preview": "vitepress preview",
     "preinstall": "npx only-allow pnpm"
   },
   "dependencies": {
-    "@vue/repl": "^1.5.0",
-    "@vue/theme": "^2.2.4",
+    "@vue/repl": "^3.0.0",
+    "@vue/theme": "^2.2.5",
     "dynamics.js": "^1.1.5",
     "gsap": "^3.9.0",
-    "vitepress": "1.0.0-beta.7",
-    "vue": "^3.3.4"
+    "vitepress": "1.0.0-rc.31",
+    "vue": "^3.4.0-alpha.3"
   },
   "devDependencies": {
     "@types/markdown-it": "^12.2.3",
-    "@types/node": "^16.9.1",
+    "@types/node": "^20.10.1",
     "terser": "^5.14.2"
   },
   "pnpm": {