From c52fceadb74bb303391cd7268ab049630f6195cb Mon Sep 17 00:00:00 2001 From: razorness <684302+razorness@users.noreply.github.com> Date: Sat, 22 Jul 2023 15:21:07 +0200 Subject: [PATCH 1/9] feat: support for vue unhead --- .gitignore | 4 +- examples/vue/package.json | 20 +- examples/vue/src/main.js | 7 +- examples/vue/src/pages/Homepage.vue | 2 +- examples/vue/vite.config.js | 3 + package.json | 15 +- src/core/entry-server.ts | 2 + src/core/types.ts | 8 +- src/utils/html.ts | 22 +- src/vue/entry-server.ts | 8 +- src/vue/types.ts | 4 +- yarn.lock | 3743 +++++++++++++++++++-------- 12 files changed, 2669 insertions(+), 1169 deletions(-) diff --git a/.gitignore b/.gitignore index 6a8271a..61b6e41 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,6 @@ dist-ssr _* **/worker/* -pnpm-lock.yaml \ No newline at end of file +pnpm-lock.yaml +.yarn +.yarnrc.yml \ No newline at end of file diff --git a/examples/vue/package.json b/examples/vue/package.json index b8930b3..b4d0819 100644 --- a/examples/vue/package.json +++ b/examples/vue/package.json @@ -8,12 +8,18 @@ "serve:node": "node ../node-server/index vue" }, "dependencies": { - "@vitejs/plugin-vue": "^4.0.0", - "@vue/compiler-sfc": "^3.2.26", - "@vue/server-renderer": "^3.2.26", - "@vueuse/head": "^0.6.0", - "vite": "4.1.x", - "vue": "^3.2.26", - "vue-router": "^4.0.12" + "@unhead/addons": "^1.1.32", + "@unhead/ssr": "^1.1.32", + "@unhead/vue": "^1.1.32", + "@vitejs/plugin-vue": "^4.2.3", + "@vue/compiler-sfc": "^3.3.4", + "@vue/server-renderer": "^3.3.4", + "unhead": "^1.1.32", + "vite": "^4.4.6", + "vue": "^3.3.4", + "vue-router": "^4.2.4" + }, + "devDependencies": { + "taze": "^0.11.2" } } diff --git a/examples/vue/src/main.js b/examples/vue/src/main.js index 44aec66..35df5b6 100644 --- a/examples/vue/src/main.js +++ b/examples/vue/src/main.js @@ -2,11 +2,14 @@ import './index.css' import App from './App.vue' import routes from './routes' import viteSSR, { ClientOnly } from 'vite-ssr' -import { createHead } from '@vueuse/head' +import { createHead } from '@unhead/vue' export default viteSSR( App, - { routes }, + { + routes, + debug: {mount: false} + }, ({ app, router, isClient, url, initialState, initialRoute, request }) => { const head = createHead() app.use(head) diff --git a/examples/vue/src/pages/Homepage.vue b/examples/vue/src/pages/Homepage.vue index a11dbca..0d0edcb 100644 --- a/examples/vue/src/pages/Homepage.vue +++ b/examples/vue/src/pages/Homepage.vue @@ -9,7 +9,7 @@