nuxt-schema-org 1.1.0-beta.5 → 2.0.0-beta.0

package/dist/module.d.ts

@@ -1,12 +1,11 @@
-import { UserConfig } from '@vueuse/schema-org';
+import { MetaInput, UserConfig } from '@unhead/schema-org-vue';
 import { NuxtModule } from '@nuxt/schema';
-import { MetaInput } from 'schema-org-graph-js';
 
 interface ModuleOptions extends UserConfig {
 }
 interface ModuleHooks {
 }
-declare module 'nuxt' {
+declare module '@nuxt/schema' {
     interface RuntimeNuxtHooks {
         'schema-org:meta': (meta: MetaInput) => void;
     }

package/dist/module.json

@@ -1,9 +1,9 @@
 {
   "configKey": "schemaOrg",
   "compatibility": {
-    "nuxt": ">=3.0.0-rc.9",
+    "nuxt": "3.0.0",
     "bridge": false
   },
   "name": "nuxt-schema-org",
-  "version": "1.1.0-beta.5"
+  "version": "2.0.0-beta.0"
 }

package/dist/module.mjs

@@ -1,73 +1,41 @@
-import { defineNuxtModule, createResolver, addPlugin, addTemplate, addComponent, importModule, extendWebpackConfig } from '@nuxt/kit';
-import { resolveUserConfig, AliasRuntime, schemaOrgComponents, schemaOrgAutoImports } from '@vueuse/schema-org';
-import { dirname } from 'pathe';
+import { defineNuxtModule, createResolver, addPlugin, addTemplate, addComponent } from '@nuxt/kit';
+import { schemaOrgComponents, schemaOrgAutoImports } from '@unhead/schema-org-vue';
 
-const Pkg = "@vueuse/schema-org";
 const module = defineNuxtModule({
   meta: {
     configKey: "schemaOrg",
     compatibility: {
-      nuxt: ">=3.0.0-rc.9",
+      nuxt: "3.0.0",
       bridge: false
     }
   },
-  async setup(moduleOptions, nuxt) {
-    const { resolve, resolvePath } = createResolver(import.meta.url);
-    moduleOptions = resolveUserConfig(moduleOptions);
-    if (nuxt.options.ssr && !moduleOptions.canonicalHost && !moduleOptions.meta?.host) {
-      console.warn("WARN [nuxt-schema-org] Please provide a `canonicalHost` to use this module with SSR enabled.");
-      return;
-    }
-    if (!nuxt.options.ssr)
-      moduleOptions.client = true;
-    if (typeof moduleOptions.client === "undefined")
-      moduleOptions.client = !!nuxt.options.dev;
-    const pkgPath = dirname(await resolvePath(Pkg));
-    nuxt.options.alias[AliasRuntime] = `${pkgPath}/runtime-${moduleOptions.full ? "schema-dts" : "simple"}`;
+  async setup(config, nuxt) {
+    const { resolve } = createResolver(import.meta.url);
     const moduleRuntimeDir = resolve("./runtime");
-    nuxt.options.build.transpile.push(...[moduleRuntimeDir, AliasRuntime]);
-    if (!moduleOptions.client)
-      addPlugin(resolve(moduleRuntimeDir, "plugin-fallback.client"));
+    nuxt.options.build.transpile.push(...[
+      moduleRuntimeDir,
+      "@vueuse/schema-org",
+      "@unhead/schema-org-vue"
+    ]);
     addPlugin({
       src: resolve(moduleRuntimeDir, "plugin"),
-      mode: moduleOptions.client ? "all" : "server"
+      mode: nuxt.options.dev || !nuxt.options.ssr ? "all" : "server"
     });
-    addTemplate({
+    nuxt.options.alias["#nuxt-schema-org/config"] = addTemplate({
       filename: "nuxt-schema-org-config.mjs",
-      getContents: () => `export default ${JSON.stringify(moduleOptions)}`
-    });
+      getContents: () => `export default ${JSON.stringify(config)}`
+    }).dst;
     for (const component of schemaOrgComponents) {
       await addComponent({
         name: component,
         export: component,
         chunkName: "nuxt-schema-org/components",
-        filePath: AliasRuntime
+        filePath: "@unhead/schema-org-vue"
       });
     }
     nuxt.hooks.hook("imports:sources", (autoImports) => {
       autoImports.unshift(...schemaOrgAutoImports);
     });
-    nuxt.hooks.hook("vite:extendConfig", async (config, { isClient }) => {
-      config.plugins = config.plugins || [];
-      const SchemaOrgVite = await importModule(`${pkgPath}/vite`, { interopDefault: true });
-      config.plugins.push(SchemaOrgVite({
-        root: nuxt.options.rootDir,
-        dts: false,
-        mock: !moduleOptions.client && isClient,
-        full: moduleOptions.full
-      }));
-    });
-    extendWebpackConfig(async (config) => {
-      config.plugins = config.plugins || [];
-      const SchemaOrgWebpack = await importModule(`${pkgPath}/webpack`, { interopDefault: true });
-      const plugins = SchemaOrgWebpack({
-        root: nuxt.options.rootDir,
-        dts: false,
-        mock: !moduleOptions.client && config.name === "client",
-        full: moduleOptions.full
-      });
-      config.plugins.push(...plugins);
-    });
   }
 });
 

package/dist/runtime/plugin.mjs

@@ -1,41 +1,18 @@
-import { createSchemaOrg } from "@vueuse/schema-org";
-import { defineNuxtPlugin } from "#app";
-import { unref, watch } from "#imports";
-import config from "#build/nuxt-schema-org-config.mjs";
-export default defineNuxtPlugin(async (nuxtApp) => {
-  const ssr = !!nuxtApp.ssrContext?.url;
-  const client = createSchemaOrg({
-    updateHead(fn) {
-      nuxtApp._useHead(unref(fn));
-    },
-    async meta() {
-      const head = nuxtApp.vueApp._context.provides.usehead;
-      const inferredMeta = {};
-      const headTag = head.headTags.reverse().filter((t) => t.tag === "title" && (!!t.props.children || !!t.children));
-      if (headTag.length)
-        inferredMeta.title = headTag[0].props.children || headTag[0].children;
-      const descTag = head.headTags.reverse().filter((t) => t.tag === "meta" && t.props.name === "description" && !!t.props.content);
-      if (descTag.length)
-        inferredMeta.description = descTag[0].props.content;
-      const imageTag = head.headTags.reverse().filter((t) => t.tag === "meta" && t.props.property === "og:image" && !!t.props.content);
-      if (imageTag.length)
-        inferredMeta.image = imageTag[0].props.content;
-      const schemaOrgMeta = {
-        path: nuxtApp._route.path,
-        ...inferredMeta,
-        ...nuxtApp._route.meta,
-        ...config.meta || {}
-      };
-      await nuxtApp.hooks.callHook("schema-org:meta", schemaOrgMeta);
-      return schemaOrgMeta;
-    }
-  });
-  nuxtApp.vueApp.use(client);
-  if (ssr) {
-    await client.forceRefresh();
-    return;
-  }
-  watch(() => nuxtApp._route.path, () => {
-    client.forceRefresh();
-  });
+import { SchemaOrgUnheadPlugin } from "@unhead/schema-org-vue";
+import config from "#nuxt-schema-org/config";
+import { defineNuxtPlugin, useRouter } from "#app";
+export default defineNuxtPlugin((nuxtApp) => {
+  const head = nuxtApp.vueApp._context.provides.usehead;
+  const router = useRouter();
+  const currentRoute = router.currentRoute;
+  head.use(SchemaOrgUnheadPlugin(config, async () => {
+    const route = currentRoute.value;
+    const meta = {
+      ...config,
+      path: route.path,
+      ...route.meta
+    };
+    await nuxtApp.hooks.callHook("schema-org:meta", meta);
+    return meta;
+  }));
 });

package/dist/types.d.ts

@@ -8,4 +8,4 @@ declare module '@nuxt/schema' {
 }
 
 
-export { default } from './module'
+export { ModuleHooks, ModuleOptions, default } from './module'

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "nuxt-schema-org",
   "type": "module",
-  "version": "1.1.0-beta.5",
   "description": "Nuxt module for @vueuse/schema-org",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -34,20 +33,20 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "3.0.0-rc.11",
-    "@vueuse/schema-org": "1.1.0-beta.5",
-    "@vueuse/schema-org-vite": "1.1.0-beta.5",
-    "pathe": "^0.3.9",
-    "schema-org-graph-js": "0.5.1"
+    "@nuxt/kit": "3.0.0",
+    "@unhead/schema-org-vue": "latest",
+    "pathe": "^1.0.0"
   },
   "devDependencies": {
-    "@nuxt/module-builder": "^0.1.7",
-    "@nuxt/schema": "3.0.0-rc.11"
+    "@nuxt/module-builder": "^0.2.1",
+    "@nuxt/schema": "3.0.0",
+    "nuxt": "3.0.0"
   },
+  "version": "2.0.0-beta.0",
   "scripts": {
-    "build": "npm run -C ../../test/fixtures/nuxt nuxt:prepare && nuxt-module-build",
+    "build": "nuxi prepare ../../test/fixtures/nuxt && nuxt-module-build",
     "stub": "nuxt-module-build --stub && nuxi prepare ../../test/fixtures/nuxt",
-    "play": "nuxi dev ../../playgrounds/nuxt3",
-    "play:build": "nuxi build ../../playgrounds/nuxt3"
+    "play": "nuxi dev ../../test/fixtures/nuxt",
+    "play:build": "nuxi build ../../test/fixtures/nuxt"
   }
 }

package/dist/runtime/plugin-fallback.client.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/dist/runtime/plugin-fallback.client.mjs

@@ -1,7 +0,0 @@
-import { defineNuxtPlugin } from "#app";
-import { watch } from "#imports";
-export default defineNuxtPlugin((nuxtApp) => {
-  watch(() => nuxtApp._route.path, () => {
-    document.querySelector('script[data-id="schema-org-graph"]')?.remove();
-  });
-});