nuxt-schema-org 0.6.2 → 0.6.4

package/dist/module.json

@@ -4,5 +4,5 @@
     "bridge": false
   },
   "name": "nuxt-schema-org",
-  "version": "0.6.2"
+  "version": "0.6.4"
 }

package/dist/module.mjs

@@ -14,9 +14,9 @@ const module = defineNuxtModule({
   },
   async setup(config, nuxt) {
     const { resolve } = createResolver(import.meta.url);
-    const runtimeDir = await resolve("./runtime");
+    const runtimeDir = resolve("./runtime");
     nuxt.options.build.transpile.push(runtimeDir);
-    addPlugin(resolve(runtimeDir, `plugin-${nuxt.options.ssr ? "ssr" : "spa"}.client`));
+    addPlugin(resolve(runtimeDir, "plugin.client"));
     addPlugin(resolve(runtimeDir, "plugin.server"));
     nuxt.options.build.transpile.push("@vueuse/schema-org");
     addTemplate({

package/dist/runtime/{plugin-ssr.client.mjs → plugin.client.mjs}

@@ -13,18 +13,23 @@ export default defineNuxtPlugin((nuxtApp) => {
     ...meta.config
   });
   let _routeChanged = false;
-  const rootCtx = client.setupRouteContext(1);
-  const schemaOrg = document.querySelector('head script[data-id="schema-org-graph"]')?.innerHTML;
-  if (schemaOrg) {
-    for (const node of JSON.parse(schemaOrg)["@graph"])
-      client.addNode(node, rootCtx);
-    client.generateSchema();
+  const { serverRendered } = nuxtApp.payload;
+  if (serverRendered) {
+    const rootCtx = client.setupRouteContext(1);
+    const schemaOrg = document.querySelector('head script[data-id="schema-org-graph"]')?.innerHTML;
+    if (schemaOrg) {
+      for (const node of JSON.parse(schemaOrg)["@graph"])
+        client.addNode(node, rootCtx);
+      client.generateSchema();
+    }
   }
   nuxtApp._useSchemaOrg = (input) => {
     const vm = getCurrentInstance();
     let ctx = client.setupRouteContext(vm.uid);
-    if (_routeChanged) {
+    if (!serverRendered || _routeChanged) {
       client.addNodesAndResolveRelations(ctx, input);
+      if (!serverRendered)
+        client.generateSchema();
     }
     const unwatchRoute = useRouter().afterEach(() => {
       ctx = client.setupRouteContext(vm.uid);
@@ -40,5 +45,8 @@ export default defineNuxtPlugin((nuxtApp) => {
       unwatchRoute();
     });
   };
+  if (!serverRendered) {
+    client.setupDOM();
+  }
   nuxtApp.vueApp.use(client);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-schema-org",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Nuxt module for @vueuse/schema-org",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -25,8 +25,8 @@
   "exports": {
     ".": {
       "types": "./dist/types.d.ts",
-      "import": "./dist/module.mjs",
-      "require": "./dist/module.cjs"
+      "require": "./dist/module.cjs",
+      "import": "./dist/module.mjs"
     }
   },
   "main": "dist/module.cjs",
@@ -35,12 +35,12 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "3.0.0-rc.3",
-    "@vueuse/schema-org": "0.6.2"
+    "@nuxt/kit": "3.0.0-rc.4",
+    "@vueuse/schema-org": "0.6.4"
   },
   "devDependencies": {
     "@nuxt/module-builder": "latest",
-    "@nuxt/schema": "3.0.0-rc.3",
+    "@nuxt/schema": "3.0.0-rc.4",
     "nuxt": "^3.0.0-rc.2"
   },
   "scripts": {

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

@@ -1,35 +0,0 @@
-import { createSchemaOrg, useVueUseHead } from "@vueuse/schema-org";
-import { defineNuxtPlugin } from "#app";
-import { getCurrentInstance, onBeforeUnmount, useRoute, useRouter } from "#imports";
-import meta from "#build/schemaOrg.config.mjs";
-export default defineNuxtPlugin((nuxtApp) => {
-  const head = nuxtApp.vueApp._context.provides.usehead;
-  const client = createSchemaOrg({
-    provider: {
-      useRoute,
-      setupDOM: useVueUseHead(head),
-      name: "nuxt"
-    },
-    ...meta.config
-  });
-  client.setupDOM();
-  nuxtApp._useSchemaOrg = (input) => {
-    const vm = getCurrentInstance();
-    let ctx = client.setupRouteContext(vm.uid);
-    client.addNodesAndResolveRelations(ctx, input);
-    client.generateSchema();
-    const unwatchRoute = useRouter().afterEach(() => {
-      ctx = client.setupRouteContext(vm.uid);
-      client.removeContext(ctx);
-      client.addNodesAndResolveRelations(ctx, input);
-      client.generateSchema();
-      client.setupDOM();
-    });
-    onBeforeUnmount(() => {
-      client.removeContext(ctx);
-      client.generateSchema();
-      unwatchRoute();
-    });
-  };
-  nuxtApp.vueApp.use(client);
-});

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

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