nuxt-schema-org 0.6.1 → 0.6.5

package/dist/module.json

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

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,9 +27,14 @@ const module = defineNuxtModule({
     autoImportComponents: true
   },
   async setup(config, nuxt) {
-    const { resolve } = createResolver(import.meta.url);
-    addPlugin(resolve("./runtime/plugin"));
-    nuxt.options.build.transpile.push("@vueuse/schema-org");
+    const { resolve, resolvePath } = createResolver(import.meta.url);
+    const runtimeDir = resolve("./runtime");
+    nuxt.options.build.transpile.push(runtimeDir);
+    addPlugin(resolve(runtimeDir, "plugin.client"));
+    addPlugin(resolve(runtimeDir, "plugin.server"));
+    const schemaOrgPath = dirname(await resolvePath("@vueuse/schema-org"));
+    nuxt.options.alias["@vueuse/schema-org"] = schemaOrgPath;
+    nuxt.options.build.transpile.push(schemaOrgPath);
     addTemplate({
       filename: "schemaOrg.config.mjs",
       getContents: () => `export default ${JSON.stringify({ config })}`
@@ -33,7 +52,7 @@ const module = defineNuxtModule({
         addComponent({
           name: component,
           export: component,
-          filePath: "@vueuse/schema-org"
+          filePath: schemaOrgPath
         });
       });
     }

package/dist/runtime/plugin.client.mjs

@@ -0,0 +1,52 @@
+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
+  });
+  let _routeChanged = false;
+  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 (!serverRendered || _routeChanged) {
+      client.addNodesAndResolveRelations(ctx, input);
+      if (!serverRendered)
+        client.generateSchema();
+    }
+    const unwatchRoute = useRouter().afterEach(() => {
+      ctx = client.setupRouteContext(vm.uid);
+      client.removeContext(ctx);
+      client.addNodesAndResolveRelations(ctx, input);
+      client.generateSchema();
+      client.setupDOM();
+      _routeChanged = true;
+    });
+    onBeforeUnmount(() => {
+      client.removeContext(ctx);
+      client.generateSchema();
+      unwatchRoute();
+    });
+  };
+  if (!serverRendered) {
+    client.setupDOM();
+  }
+  nuxtApp.vueApp.use(client);
+});

package/dist/runtime/plugin.server.d.ts

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

package/dist/runtime/plugin.server.mjs

@@ -0,0 +1,44 @@
+import { createSchemaOrg } from "@vueuse/schema-org";
+import { computed } from "vue";
+import { defineNuxtPlugin } from "#app";
+import { getCurrentInstance, useRoute, watchEffect } 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({
+    provider: {
+      useRoute,
+      setupDOM({ schemaRef }) {
+        if (_domSetup)
+          return;
+        head.addHeadObjs(computed(() => {
+          return {
+            script: [
+              {
+                "type": "application/ld+json",
+                "data-id": "schema-org-graph",
+                "key": "schema-org-graph",
+                "children": schemaRef.value
+              }
+            ]
+          };
+        }));
+        _domSetup = true;
+      },
+      name: "nuxt"
+    },
+    ...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();
+    });
+  };
+  nuxtApp.vueApp.use(schemaOrg);
+});

package/package.json

@@ -1,7 +1,19 @@
 {
   "name": "nuxt-schema-org",
-  "version": "0.6.1",
+  "version": "0.6.5",
   "description": "Nuxt module for @vueuse/schema-org",
+  "author": "Harlan Wilton <harlan@harlanzw.com>",
+  "license": "MIT",
+  "funding": "https://github.com/sponsors/harlan-zw",
+  "homepage": "https://github.com/vueuse/schema-org#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vueuse/schema-org.git",
+    "directory": "packages/nuxt"
+  },
+  "bugs": {
+    "url": "https://github.com/vueuse/schema-org/issues"
+  },
   "keywords": [
     "schema-org",
     "nuxt",
@@ -9,39 +21,27 @@
     "nuxt-module",
     "nuxt3"
   ],
-  "license": "MIT",
-  "author": "Harlan Wilton <harlan@harlanzw.com>",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vueuse/schema-org.git",
-    "directory": "packages/nuxt"
-  },
-  "funding": "https://github.com/sponsors/harlan-zw",
-  "main": "dist/module.cjs",
-  "types": "dist/types.d.ts",
+  "sideEffects": false,
   "exports": {
     ".": {
-      "import": "./dist/module.mjs",
+      "types": "./dist/types.d.ts",
       "require": "./dist/module.cjs",
-      "types": "./dist/types.d.ts"
+      "import": "./dist/module.mjs"
     }
   },
+  "main": "dist/module.cjs",
+  "types": "dist/types.d.ts",
   "files": [
     "dist"
   ],
-  "sideEffects": false,
-  "homepage": "https://github.com/vueuse/schema-org#readme",
-  "bugs": {
-    "url": "https://github.com/vueuse/schema-org/issues"
-  },
   "dependencies": {
-    "@nuxt/kit": "3.0.0-rc.2",
-    "@vueuse/schema-org": "0.6.1"
+    "@nuxt/kit": "3.0.0-rc.4",
+    "@vueuse/schema-org": "0.6.5"
   },
   "devDependencies": {
     "@nuxt/module-builder": "latest",
-    "@nuxt/schema": "^3.0.0-rc.2",
-    "nuxt": "^3.0.0-rc.2"
+    "@nuxt/schema": "3.0.0-rc.4",
+    "nuxt": "^3.0.0-rc.4"
   },
   "scripts": {
     "build": "nuxi prepare ../../playgrounds/nuxt3 && nuxt-module-build",

package/dist/runtime/plugin.mjs

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