nuxt-schema-org 0.6.2 → 0.7.0-beta.0

package/dist/module.json

@@ -4,5 +4,5 @@
     "bridge": false
   },
   "name": "nuxt-schema-org",
-  "version": "0.6.2"
+  "version": "0.7.0-beta.0"
 }

package/dist/module.mjs

@@ -1,6 +1,20 @@
 import { defineNuxtModule, createResolver, addPlugin, addTemplate, addComponent } from '@nuxt/kit';
 import { schemaOrgAutoImports, schemaOrgComponents } from '@vueuse/schema-org';
 
+function normalizeWindowsPath(input = "") {
+  if (!input.includes("\\")) {
+    return input;
+  }
+  return input.replace(/\\/g, "/");
+}
+const _IS_ABSOLUTE_RE = /^\/|^\\|^[a-zA-Z]:[/\\]/;
+const isAbsolute = function(p) {
+  return _IS_ABSOLUTE_RE.test(p);
+};
+const dirname = function(p) {
+  return normalizeWindowsPath(p).replace(/\/$/, "").split("/").slice(0, -1).join("/") || (isAbsolute(p) ? "/" : ".");
+};
+
 const module = defineNuxtModule({
   meta: {
     configKey: "schemaOrg",
@@ -13,12 +27,19 @@ const module = defineNuxtModule({
     autoImportComponents: true
   },
   async setup(config, nuxt) {
-    const { resolve } = createResolver(import.meta.url);
-    const runtimeDir = await resolve("./runtime");
+    const { resolve, resolvePath } = createResolver(import.meta.url);
+    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");
+    const schemaOrgPath = dirname(await resolvePath("@vueuse/schema-org"));
+    nuxt.options.alias["@vueuse/schema-org"] = schemaOrgPath;
+    nuxt.hook("vite:extend", ({ config: config2 }) => {
+      config2.optimizeDeps = config2.optimizeDeps || {};
+      config2.optimizeDeps.exclude = config2.optimizeDeps.exclude || [];
+      config2.optimizeDeps.exclude.push(...[schemaOrgPath, "@vueuse/schema-org"]);
+    });
+    nuxt.options.build.transpile.push(...[schemaOrgPath, "@vueuse/schema-org"]);
     addTemplate({
       filename: "schemaOrg.config.mjs",
       getContents: () => `export default ${JSON.stringify({ config })}`
@@ -36,7 +57,7 @@ const module = defineNuxtModule({
         addComponent({
           name: component,
           export: component,
-          filePath: "@vueuse/schema-org"
+          filePath: schemaOrgPath
         });
       });
     }

package/dist/runtime/composables.d.ts

@@ -1,2 +1,2 @@
 export * from '@vueuse/schema-org';
-export declare function useSchemaOrg(schema: any): void;
+export declare function useSchemaOrg(input: any): void;

package/dist/runtime/composables.mjs

@@ -2,7 +2,7 @@ import { isFunction } from "@vue/shared";
 import { computed } from "vue";
 import { useNuxtApp } from "#app";
 export * from "@vueuse/schema-org";
-export function useSchemaOrg(schema) {
-  const resolvedSchema = isFunction(schema) ? computed(schema) : schema;
-  useNuxtApp()._useSchemaOrg(resolvedSchema);
+export function useSchemaOrg(input) {
+  const resolveInput = isFunction(input) ? computed(input) : input;
+  useNuxtApp()._useSchemaOrg(resolveInput);
 }

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

@@ -1,6 +1,5 @@
-import { createSchemaOrg, useVueUseHead } from "@vueuse/schema-org";
 import { defineNuxtPlugin } from "#app";
-import { getCurrentInstance, onBeforeUnmount, useRoute, useRouter } from "#imports";
+import { createSchemaOrg, getCurrentInstance, onBeforeUnmount, ref, useRoute, useRouter, useVueUseHead } from "#imports";
 import meta from "#build/schemaOrg.config.mjs";
 export default defineNuxtPlugin((nuxtApp) => {
   const head = nuxtApp.vueApp._context.provides.usehead;
@@ -13,32 +12,31 @@ 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();
-  }
   nuxtApp._useSchemaOrg = (input) => {
+    const ids = ref(/* @__PURE__ */ new Set());
     const vm = getCurrentInstance();
     let ctx = client.setupRouteContext(vm.uid);
-    if (_routeChanged) {
-      client.addNodesAndResolveRelations(ctx, input);
+    if (!client.serverRendered || _routeChanged) {
+      ids.value = client.addNodesAndResolveRelations(ctx, input);
+      if (!client.serverRendered)
+        client.generateSchema();
     }
-    const unwatchRoute = useRouter().afterEach(() => {
+    const handleRouteChange = () => {
       ctx = client.setupRouteContext(vm.uid);
       client.removeContext(ctx);
-      client.addNodesAndResolveRelations(ctx, input);
+      ids.value = client.addNodesAndResolveRelations(ctx, input);
       client.generateSchema();
       client.setupDOM();
       _routeChanged = true;
-    });
+    };
+    const unwatchRoute = useRouter().afterEach(handleRouteChange);
     onBeforeUnmount(() => {
       client.removeContext(ctx);
+      ids.value = /* @__PURE__ */ new Set();
       client.generateSchema();
       unwatchRoute();
     });
+    return ids;
   };
   nuxtApp.vueApp.use(client);
 });

package/dist/runtime/plugin.server.mjs

@@ -1,12 +1,12 @@
-import { createSchemaOrg } from "@vueuse/schema-org";
+import { createSchemaOrg, handleNodesSSR } from "@vueuse/schema-org";
 import { computed } from "vue";
 import { defineNuxtPlugin } from "#app";
-import { getCurrentInstance, useRoute, watchEffect } from "#imports";
+import { useRoute } from "#imports";
 import meta from "#build/schemaOrg.config.mjs";
 export default defineNuxtPlugin((nuxtApp) => {
   const head = nuxtApp.vueApp._context.provides.usehead;
   let _domSetup = false;
-  const schemaOrg = createSchemaOrg({
+  const client = createSchemaOrg({
     provider: {
       useRoute,
       setupDOM({ schemaRef }) {
@@ -30,15 +30,9 @@ export default defineNuxtPlugin((nuxtApp) => {
     },
     ...meta.config
   });
-  schemaOrg.setupDOM();
-  let _uid = 0;
   nuxtApp._useSchemaOrg = (input) => {
-    const vm = getCurrentInstance();
-    const ctx = schemaOrg.setupRouteContext(vm?.uid || _uid++);
-    schemaOrg.addNodesAndResolveRelations(ctx, input);
-    watchEffect(() => {
-      schemaOrg.generateSchema();
-    });
+    return handleNodesSSR(client, input);
   };
-  nuxtApp.vueApp.use(schemaOrg);
+  client.setupDOM();
+  nuxtApp.vueApp.use(client);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-schema-org",
-  "version": "0.6.2",
+  "version": "0.7.0-beta.0",
   "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,13 +35,13 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "3.0.0-rc.3",
-    "@vueuse/schema-org": "0.6.2"
+    "@nuxt/kit": "3.0.0-rc.5",
+    "@vueuse/schema-org": "0.7.0-beta.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "latest",
-    "@nuxt/schema": "3.0.0-rc.3",
-    "nuxt": "^3.0.0-rc.2"
+    "@nuxt/schema": "3.0.0-rc.5",
+    "nuxt": "^3.0.0-rc.5"
   },
   "scripts": {
     "build": "nuxi prepare ../../playgrounds/nuxt3 && nuxt-module-build",

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;