progress commit

Author: harlan-zw

package.json

@@ -25,7 +25,7 @@
     "playwright": "^1.28.1",
     "typescript": "^4.9.3",
     "unbuild": "^1.0.1",
-    "unhead": "^1.0.9",
+    "unhead": "^1.0.10",
     "utility-types": "^3.10.0",
     "vitest": "^0.25.5"
   }

packages/nuxt/package.json

@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@nuxt/kit": "3.0.0",
-    "@unhead/schema-org-vue": "^0.1.0",
+    "@unhead/schema-org-vue": "^0.1.1",
     "pathe": "^1.0.0"
   },
   "devDependencies": {

packages/schema-org/package.json

@@ -54,6 +54,6 @@
     "vue": ">=3.2.0"
   },
   "dependencies": {
-    "@unhead/schema-org-vue": "^0.1.0"
+    "@unhead/schema-org-vue": "^0.1.1"
   }
 }

playgrounds/nuxt3/nuxt.config.ts

@@ -9,7 +9,6 @@ export default defineNuxtConfig({
   ssr: false,
   alias: {
     'nuxt-schema-org': resolve(__dirname, '../../packages/nuxt/src/module.ts'),
-    '@vueuse/schema-org-vite': resolve(__dirname, '../../packages/vite/src/index.ts'),
   },
   modules: [
     'nuxt-windicss',
@@ -24,7 +23,7 @@ export default defineNuxtConfig({
   },
 
   build: {
-    transpile: ['@vueuse/schema-org', '@vueuse/schema-org-vite', 'nuxt-schema-org', '@vueuse/head'],
+    transpile: ['@vueuse/schema-org', 'nuxt-schema-org', '@vueuse/head'],
   },
 
   ignore: [

playgrounds/vite/package.json

@@ -10,7 +10,6 @@
   },
   "dependencies": {
     "@vueuse/schema-org": "link:../../packages/schema-org",
-    "@vueuse/schema-org-vite": "link:../../packages/vite",
     "vue": "^3.2.37",
     "vue-router": "^4.1.3"
   },

playgrounds/vite/vite.config.ts

@@ -12,7 +12,6 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      '@vueuse/schema-org-vite': resolve(__dirname, '../../packages/vite/dist'),
       '@': fileURLToPath(new URL('./src', import.meta.url)),
     },
   },

playgrounds/vitesse/package.json

@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@vueuse/core": "^9.1.0",
-    "@vueuse/head": "^1.0.20",
+    "@vueuse/head": "^1.0.22",
     "nprogress": "^0.2.0",
     "pinia": "^2.0.17",
     "vue": "^3.2.45",
@@ -32,7 +32,6 @@
     "@vitejs/plugin-vue": "^3.0.1",
     "@vue/test-utils": "^2.0.2",
     "@vueuse/schema-org": "link:../../packages/schema-org",
-    "@vueuse/schema-org-vite": "link:../../packages/vite",
     "critters": "^0.0.16",
     "cross-env": "^7.0.3",
     "cypress": "^10.4.0",

playgrounds/vitesse/pnpm-lock.yaml

@@ -1,13 +1,19 @@
 import { type UserModule } from '~/types'
 
-// Setup @vueuse/schema-org
-// https://schema-org.vueuse.com
+// https://unhead-schema-org.harlanzw.com/
 export const install: UserModule = async (ctx) => {
+  // Disables on client build, allows 0kb runtime
   if (ctx.isClient && import.meta.env.PROD)
     return
 
-  const { installSchemaOrg } = await import('@vueuse/schema-org-vite/vitesse')
-  installSchemaOrg(ctx, {
+  const { SchemaOrgUnheadPlugin } = await import('@vueuse/schema-org')
+  ctx.head?.use(SchemaOrgUnheadPlugin({
+    // config
     host: 'https://vitesse.example.com',
-  })
+  }, () => {
+    return {
+      path: ctx.router.currentRoute.value.path,
+      ...ctx.router.currentRoute.value.meta,
+    }
+  }))
 }

playgrounds/vitesse/src/modules/schema-org.ts

@@ -1,4 +1,4 @@
-import path, { resolve } from 'path'
+import path from 'path'
 import { defineConfig } from 'vite'
 import Vue from '@vitejs/plugin-vue'
 import Pages from 'vite-plugin-pages'
@@ -13,12 +13,11 @@ import Inspect from 'vite-plugin-inspect'
 import LinkAttributes from 'markdown-it-link-attributes'
 import Unocss from 'unocss/vite'
 import Shiki from 'markdown-it-shiki'
-import { SchemaOrgResolver, schemaOrgAutoImports } from '@vueuse/schema-org-vite'
+import { SchemaOrgResolver, schemaAutoImports } from '@vueuse/schema-org'
 
 export default defineConfig({
   resolve: {
     alias: {
-      '@vueuse/schema-org-vite': resolve(__dirname, '../../packages/vite/dist'),
       '~/': `${path.resolve(__dirname, 'src')}/`,
     },
   },
@@ -50,7 +49,9 @@ export default defineConfig({
         'vue/macros',
         '@vueuse/head',
         '@vueuse/core',
-        schemaOrgAutoImports,
+        {
+          '@vueuse/schema-org': schemaAutoImports
+        },
       ],
       dts: 'src/auto-imports.d.ts',
       dirs: [