nuxt-schema-org 6.1.2 → 6.2.0

package/dist/module.cjs

@@ -1,11 +1,14 @@
 'use strict';
 
+const node_url = require('node:url');
 const kit = require('@nuxt/kit');
 const defu = require('defu');
 const kit$1 = require('nuxt-site-config/kit');
 const pkgTypes = require('pkg-types');
 const devtools = require('nuxtseo-shared/devtools');
 const kit$2 = require('nuxtseo-shared/kit');
+const node_fs = require('node:fs');
+const node_path = require('node:path');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function setupDevToolsUI(_options, resolve, nuxt = kit.useNuxt()) {
@@ -17,14 +20,52 @@ function setupDevToolsUI(_options, resolve, nuxt = kit.useNuxt()) {
   }, resolve, nuxt);
 }
 
-async function resolveHostUnheadMajor(rootDir) {
-  const rootUrl = rootDir.endsWith("/") ? rootDir : `${rootDir}/`;
-  const searchUrls = [rootUrl];
-  const nuxtJson = await pkgTypes.resolvePackageJSON("nuxt", { url: rootUrl }).catch(() => {
+function isPlainObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function cloneSerializableIdentityValue(value) {
+  if (typeof value === "function")
     return void 0;
-  });
-  if (nuxtJson)
-    searchUrls.push(nuxtJson.replace(/[^/\\]+$/, ""));
+  if (Array.isArray(value))
+    return value.map(cloneSerializableIdentityValue).filter((value2) => typeof value2 !== "undefined");
+  if (!isPlainObject(value))
+    return value;
+  const result = {};
+  for (const [key, child] of Object.entries(value)) {
+    if (key === "_resolver")
+      continue;
+    const cloned = cloneSerializableIdentityValue(child);
+    if (typeof cloned !== "undefined")
+      result[key] = cloned;
+  }
+  return result;
+}
+function resolveSerializableIdentityConfig(identity) {
+  if (!isPlainObject(identity))
+    return identity;
+  const identityNode = identity;
+  const cloned = cloneSerializableIdentityValue(identityNode);
+  const resolverDefaults = isPlainObject(identityNode._resolver?.defaults) ? identityNode._resolver.defaults : {};
+  const resolvedType = Array.isArray(resolverDefaults["@type"]) ? resolverDefaults["@type"].at(-1) : resolverDefaults["@type"];
+  if (resolvedType && !cloned.type && !cloned["@type"])
+    cloned.type = resolvedType;
+  return cloned;
+}
+function normalizePackageUrl(rootDir) {
+  const url = rootDir.startsWith("file:") ? rootDir : node_url.pathToFileURL(rootDir.endsWith("/") ? rootDir : `${rootDir}/`).href;
+  return url.endsWith("/") ? url : `${url}/`;
+}
+async function resolveHostUnheadMajor(rootDir) {
+  const rootUrl = normalizePackageUrl(rootDir);
+  const searchUrls = [];
+  for (const id of ["@nuxt/nitro-server", "nuxt"]) {
+    const pkgJson = await pkgTypes.resolvePackageJSON(id, { url: rootUrl }).catch(() => {
+      return void 0;
+    });
+    if (pkgJson)
+      searchUrls.push(`${node_path.dirname(pkgJson)}/`);
+  }
+  searchUrls.push(rootUrl);
   for (const id of ["@unhead/vue", "unhead"]) {
     for (const url of searchUrls) {
       const version = await pkgTypes.readPackageJSON(id, { url }).then((pkg) => pkg.version).catch(() => {
@@ -39,9 +80,12 @@ async function resolveHostUnheadMajor(rootDir) {
   }
   return 3;
 }
-function schemaOrgVendor(major) {
+function schemaOrgVendor(major, resolve) {
+  const dir = resolve(`./vendor/schema-org-v${major}`);
+  if (node_fs.existsSync(dir))
+    return { vendored: true, dir, main: `${dir}/index.mjs`, vue: `${dir}/vue.mjs` };
   const pkg = major === 2 ? "@unhead/schema-org-v2" : "@unhead/schema-org";
-  return { main: pkg, vue: `${pkg}/vue` };
+  return { vendored: false, main: pkg, vue: `${pkg}/vue` };
 }
 
 const module$1 = kit.defineNuxtModule({
@@ -92,15 +136,32 @@ const module$1 = kit.defineNuxtModule({
     if (!nuxt.options.ssr && nuxt.options.dev)
       logger.warn("You are using Schema.org with SSR disabled. This is not recommended, Google may not detect your Schema.org, and it adds extra page weight");
     const unheadMajor = await resolveHostUnheadMajor(nuxt.options.rootDir);
-    const vendor = schemaOrgVendor(unheadMajor);
-    const { defineWebPage } = await import(vendor.main);
-    const { schemaOrgAutoImports, schemaOrgComponents } = await import(vendor.vue);
-    if (vendor.main !== "@unhead/schema-org") {
+    const vendor = schemaOrgVendor(unheadMajor, resolve);
+    const { defineWebPage } = await (vendor.vendored ? import(node_url.pathToFileURL(vendor.main).href) : import(vendor.main));
+    const { schemaOrgAutoImports, schemaOrgComponents } = await (vendor.vendored ? import(node_url.pathToFileURL(vendor.vue).href) : import(vendor.vue));
+    if (vendor.vendored) {
+      logger.debug(`Detected unhead v${unheadMajor}, aliasing @unhead/schema-org -> ${vendor.dir}`);
+      nuxt.options.alias["@unhead/schema-org/vue"] = vendor.vue;
+      nuxt.options.alias["@unhead/schema-org"] = vendor.main;
+      nuxt.options.build.transpile.push(vendor.dir);
+      nuxt.hooks.hook("nitro:config", (nitroConfig) => {
+        nitroConfig.alias = nitroConfig.alias || {};
+        nitroConfig.alias["@unhead/schema-org/vue"] = vendor.vue;
+        nitroConfig.alias["@unhead/schema-org"] = vendor.main;
+        nitroConfig.externals = nitroConfig.externals || {};
+        nitroConfig.externals.inline = nitroConfig.externals.inline || [];
+        nitroConfig.externals.inline.push(vendor.dir);
+      });
+    } else if (vendor.main !== "@unhead/schema-org") {
       logger.debug(`Detected unhead v${unheadMajor}, aliasing @unhead/schema-org -> ${vendor.main}`);
       nuxt.options.alias["@unhead/schema-org"] = vendor.main;
+      nuxt.options.build.transpile.push(vendor.main);
       nuxt.hooks.hook("nitro:config", (nitroConfig) => {
         nitroConfig.alias = nitroConfig.alias || {};
         nitroConfig.alias["@unhead/schema-org"] = vendor.main;
+        nitroConfig.externals = nitroConfig.externals || {};
+        nitroConfig.externals.inline = nitroConfig.externals.inline || [];
+        nitroConfig.externals.inline.push(vendor.main);
       });
     }
     await kit$1.installNuxtSiteConfig();
@@ -108,7 +169,7 @@ const module$1 = kit.defineNuxtModule({
       reactive: config.reactive,
       minify: config.minify,
       scriptAttributes: config.scriptAttributes,
-      identity: config.identity,
+      identity: resolveSerializableIdentityConfig(config.identity),
       version
     };
     if (config.reactive)

package/dist/module.d.cts

@@ -1,5 +1,5 @@
 import { NuxtModule } from '@nuxt/schema';
-import { OrganizationSimple, PersonSimple, LocalBusinessSimple } from '@unhead/schema-org';
+import { O as OrganizationSimple, P as PersonSimple, L as LocalBusinessSimple } from './shared/nuxt-schema-org.BQ-jW5j5.cjs';
 import { Script } from '@unhead/vue/types';
 
 type SchemaOrgScriptAttributes = Partial<Script> & Record<string, unknown>;

package/dist/module.d.mts

@@ -1,5 +1,5 @@
 import { NuxtModule } from '@nuxt/schema';
-import { OrganizationSimple, PersonSimple, LocalBusinessSimple } from '@unhead/schema-org';
+import { O as OrganizationSimple, P as PersonSimple, L as LocalBusinessSimple } from './shared/nuxt-schema-org.BQ-jW5j5.mjs';
 import { Script } from '@unhead/vue/types';
 
 type SchemaOrgScriptAttributes = Partial<Script> & Record<string, unknown>;

package/dist/module.d.ts

@@ -1,5 +1,5 @@
 import { NuxtModule } from '@nuxt/schema';
-import { OrganizationSimple, PersonSimple, LocalBusinessSimple } from '@unhead/schema-org';
+import { O as OrganizationSimple, P as PersonSimple, L as LocalBusinessSimple } from './shared/nuxt-schema-org.BQ-jW5j5.js';
 import { Script } from '@unhead/vue/types';
 
 type SchemaOrgScriptAttributes = Partial<Script> & Record<string, unknown>;

package/dist/module.json

@@ -21,7 +21,7 @@
       "optional": true
     }
   },
-  "version": "6.1.2",
+  "version": "6.2.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,9 +1,12 @@
+import { pathToFileURL } from 'node:url';
 import { useNuxt, defineNuxtModule, createResolver, useLogger, hasNuxtModule, addPlugin, addServerPlugin, addComponent, addImports, addServerHandler } from '@nuxt/kit';
 import { defu } from 'defu';
 import { installNuxtSiteConfig } from 'nuxt-site-config/kit';
 import { resolvePackageJSON, readPackageJSON } from 'pkg-types';
 import { setupDevToolsUI as setupDevToolsUI$1 } from 'nuxtseo-shared/devtools';
 import { resolveNuxtContentVersion, extendTypes } from 'nuxtseo-shared/kit';
+import { existsSync } from 'node:fs';
+import { dirname } from 'node:path';
 
 function setupDevToolsUI(_options, resolve, nuxt = useNuxt()) {
   setupDevToolsUI$1({
@@ -14,14 +17,52 @@ function setupDevToolsUI(_options, resolve, nuxt = useNuxt()) {
   }, resolve, nuxt);
 }
 
-async function resolveHostUnheadMajor(rootDir) {
-  const rootUrl = rootDir.endsWith("/") ? rootDir : `${rootDir}/`;
-  const searchUrls = [rootUrl];
-  const nuxtJson = await resolvePackageJSON("nuxt", { url: rootUrl }).catch(() => {
+function isPlainObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function cloneSerializableIdentityValue(value) {
+  if (typeof value === "function")
     return void 0;
-  });
-  if (nuxtJson)
-    searchUrls.push(nuxtJson.replace(/[^/\\]+$/, ""));
+  if (Array.isArray(value))
+    return value.map(cloneSerializableIdentityValue).filter((value2) => typeof value2 !== "undefined");
+  if (!isPlainObject(value))
+    return value;
+  const result = {};
+  for (const [key, child] of Object.entries(value)) {
+    if (key === "_resolver")
+      continue;
+    const cloned = cloneSerializableIdentityValue(child);
+    if (typeof cloned !== "undefined")
+      result[key] = cloned;
+  }
+  return result;
+}
+function resolveSerializableIdentityConfig(identity) {
+  if (!isPlainObject(identity))
+    return identity;
+  const identityNode = identity;
+  const cloned = cloneSerializableIdentityValue(identityNode);
+  const resolverDefaults = isPlainObject(identityNode._resolver?.defaults) ? identityNode._resolver.defaults : {};
+  const resolvedType = Array.isArray(resolverDefaults["@type"]) ? resolverDefaults["@type"].at(-1) : resolverDefaults["@type"];
+  if (resolvedType && !cloned.type && !cloned["@type"])
+    cloned.type = resolvedType;
+  return cloned;
+}
+function normalizePackageUrl(rootDir) {
+  const url = rootDir.startsWith("file:") ? rootDir : pathToFileURL(rootDir.endsWith("/") ? rootDir : `${rootDir}/`).href;
+  return url.endsWith("/") ? url : `${url}/`;
+}
+async function resolveHostUnheadMajor(rootDir) {
+  const rootUrl = normalizePackageUrl(rootDir);
+  const searchUrls = [];
+  for (const id of ["@nuxt/nitro-server", "nuxt"]) {
+    const pkgJson = await resolvePackageJSON(id, { url: rootUrl }).catch(() => {
+      return void 0;
+    });
+    if (pkgJson)
+      searchUrls.push(`${dirname(pkgJson)}/`);
+  }
+  searchUrls.push(rootUrl);
   for (const id of ["@unhead/vue", "unhead"]) {
     for (const url of searchUrls) {
       const version = await readPackageJSON(id, { url }).then((pkg) => pkg.version).catch(() => {
@@ -36,9 +77,12 @@ async function resolveHostUnheadMajor(rootDir) {
   }
   return 3;
 }
-function schemaOrgVendor(major) {
+function schemaOrgVendor(major, resolve) {
+  const dir = resolve(`./vendor/schema-org-v${major}`);
+  if (existsSync(dir))
+    return { vendored: true, dir, main: `${dir}/index.mjs`, vue: `${dir}/vue.mjs` };
   const pkg = major === 2 ? "@unhead/schema-org-v2" : "@unhead/schema-org";
-  return { main: pkg, vue: `${pkg}/vue` };
+  return { vendored: false, main: pkg, vue: `${pkg}/vue` };
 }
 
 const module$1 = defineNuxtModule({
@@ -89,15 +133,32 @@ const module$1 = defineNuxtModule({
     if (!nuxt.options.ssr && nuxt.options.dev)
       logger.warn("You are using Schema.org with SSR disabled. This is not recommended, Google may not detect your Schema.org, and it adds extra page weight");
     const unheadMajor = await resolveHostUnheadMajor(nuxt.options.rootDir);
-    const vendor = schemaOrgVendor(unheadMajor);
-    const { defineWebPage } = await import(vendor.main);
-    const { schemaOrgAutoImports, schemaOrgComponents } = await import(vendor.vue);
-    if (vendor.main !== "@unhead/schema-org") {
+    const vendor = schemaOrgVendor(unheadMajor, resolve);
+    const { defineWebPage } = await (vendor.vendored ? import(pathToFileURL(vendor.main).href) : import(vendor.main));
+    const { schemaOrgAutoImports, schemaOrgComponents } = await (vendor.vendored ? import(pathToFileURL(vendor.vue).href) : import(vendor.vue));
+    if (vendor.vendored) {
+      logger.debug(`Detected unhead v${unheadMajor}, aliasing @unhead/schema-org -> ${vendor.dir}`);
+      nuxt.options.alias["@unhead/schema-org/vue"] = vendor.vue;
+      nuxt.options.alias["@unhead/schema-org"] = vendor.main;
+      nuxt.options.build.transpile.push(vendor.dir);
+      nuxt.hooks.hook("nitro:config", (nitroConfig) => {
+        nitroConfig.alias = nitroConfig.alias || {};
+        nitroConfig.alias["@unhead/schema-org/vue"] = vendor.vue;
+        nitroConfig.alias["@unhead/schema-org"] = vendor.main;
+        nitroConfig.externals = nitroConfig.externals || {};
+        nitroConfig.externals.inline = nitroConfig.externals.inline || [];
+        nitroConfig.externals.inline.push(vendor.dir);
+      });
+    } else if (vendor.main !== "@unhead/schema-org") {
       logger.debug(`Detected unhead v${unheadMajor}, aliasing @unhead/schema-org -> ${vendor.main}`);
       nuxt.options.alias["@unhead/schema-org"] = vendor.main;
+      nuxt.options.build.transpile.push(vendor.main);
       nuxt.hooks.hook("nitro:config", (nitroConfig) => {
         nitroConfig.alias = nitroConfig.alias || {};
         nitroConfig.alias["@unhead/schema-org"] = vendor.main;
+        nitroConfig.externals = nitroConfig.externals || {};
+        nitroConfig.externals.inline = nitroConfig.externals.inline || [];
+        nitroConfig.externals.inline.push(vendor.main);
       });
     }
     await installNuxtSiteConfig();
@@ -105,7 +166,7 @@ const module$1 = defineNuxtModule({
       reactive: config.reactive,
       minify: config.minify,
       scriptAttributes: config.scriptAttributes,
-      identity: config.identity,
+      identity: resolveSerializableIdentityConfig(config.identity),
       version
     };
     if (config.reactive)

package/dist/runtime/app/plugins/defaults.js

@@ -1,7 +1,7 @@
-import { useSiteConfig } from "#site-config/app/composables/useSiteConfig";
 import { defineWebPage, defineWebSite } from "@unhead/schema-org/vue";
 import { defineNuxtPlugin, useError } from "nuxt/app";
 import { toValue } from "vue";
+import { useSiteConfig } from "#site-config/app/composables/useSiteConfig";
 import { useSchemaOrg } from "../composables/useSchemaOrg.js";
 import { maybeAddIdentitySchemaOrg } from "../utils/shared.js";
 export default defineNuxtPlugin({

package/dist/runtime/app/plugins/i18n/defaults.js

@@ -1,11 +1,11 @@
-import { useLocalePath } from "#i18n";
-import { useSiteConfig } from "#site-config/app/composables/useSiteConfig";
-import { createSitePathResolver } from "#site-config/app/composables/utils";
 import { defineWebPage, defineWebSite } from "@unhead/schema-org/vue";
 import { resolveSitePath } from "nuxt-site-config/urls";
 import { defineNuxtPlugin, useError, useRuntimeConfig } from "nuxt/app";
 import { hasProtocol, withHttps } from "ufo";
 import { toValue } from "vue";
+import { useLocalePath } from "#i18n";
+import { useSiteConfig } from "#site-config/app/composables/useSiteConfig";
+import { createSitePathResolver } from "#site-config/app/composables/utils";
 import { useSchemaOrg } from "../../composables/useSchemaOrg.js";
 import { maybeAddIdentitySchemaOrg } from "../../utils/shared.js";
 export default defineNuxtPlugin({

package/dist/runtime/server/routes/__schema-org__/debug.js

@@ -1,6 +1,6 @@
+import { defineEventHandler } from "h3";
 import { getNitroOrigin } from "#site-config/server/composables/getNitroOrigin";
 import { getSiteConfig } from "#site-config/server/composables/getSiteConfig";
-import { defineEventHandler } from "h3";
 import { useSchemaOrgConfig } from "../../utils/config.js";
 export default defineEventHandler(async (e) => {
   const nitroOrigin = getNitroOrigin(e);

package/dist/runtime/server/utils/config.d.ts

@@ -1,3 +1,3 @@
-import type { ModuleRuntimeConfig } from '#schema-org/types';
 import type { H3Event } from 'h3';
+import type { ModuleRuntimeConfig } from '#schema-org/types';
 export declare function useSchemaOrgConfig(e?: H3Event): ModuleRuntimeConfig;