nuxt-site-config-kit 3.0.5 → 3.0.7

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Harlan Wilton
+Copyright (c) 2023-Present - Harlan Wilton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/dist/index.cjs

@@ -1,49 +1,152 @@
 'use strict';
 
-const util = require('./shared/nuxt-site-config-kit.469a004d.cjs');
 const kit = require('@nuxt/kit');
-require('pkg-types');
-require('site-config-stack');
-require('ufo');
-require('std-env');
+const pkgTypes = require('pkg-types');
+const siteConfigStack = require('site-config-stack');
+const urls = require('site-config-stack/urls');
+const stdEnv = require('std-env');
+const ufo = require('ufo');
 
-function requireSiteConfig() {
-}
-function assertSiteConfig(module, requirements, options) {
-  const siteConfig = util.useSiteConfig();
-  let valid = true;
-  const messages = [];
-  const logger = kit.useLogger("nuxt-site-config");
-  Object.keys(requirements).forEach((k) => {
-    const key = k;
-    if (!siteConfig[key]) {
-      const reason = (requirements[key] || "").split("\n");
-      const msg = [
-        `The \`${module}\` module requires a \`site.${key}\` to be set:`,
-        ...reason.map((r) => `  - ${r}`),
-        "",
-        `You can fix this by adding a \`site.${key}\` to your \`nuxt.config\` or a \`NUXT_PUBLIC_SITE_${key.toUpperCase()}\` to your .env. Learn more at https://nuxtseo.com/site-config/getting-started/how-it-works`
-      ];
-      messages.push(msg.join("\n"));
-      valid = false;
+async function initSiteConfig(nuxt = kit.tryUseNuxt()) {
+  if (!nuxt)
+    return;
+  let siteConfig = nuxt._siteConfig;
+  if (siteConfig)
+    return siteConfig;
+  siteConfig = siteConfigStack.createSiteConfigStack();
+  const rootDir = nuxt?.options.rootDir || process.cwd?.() || false;
+  siteConfig.push({
+    _context: "system",
+    _priority: -15,
+    name: rootDir ? rootDir.split("/").pop() : void 0,
+    env: process.env.NODE_ENV
+  });
+  if (rootDir) {
+    const pkgJson = await pkgTypes.readPackageJSON(void 0, { startingFrom: rootDir });
+    if (pkgJson) {
+      siteConfig.push({
+        _context: "package.json",
+        _priority: -10,
+        name: pkgJson.name,
+        description: pkgJson.description
+      });
     }
+  }
+  siteConfig.push({
+    _context: "vendorEnv",
+    _priority: -5,
+    url: [
+      // vercel
+      process.env.VERCEL_URL,
+      process.env.NUXT_ENV_VERCEL_URL,
+      // netlify
+      process.env.URL,
+      // cloudflare pages
+      process.env.CF_PAGES_URL
+    ].find((k) => Boolean(k)),
+    name: [
+      // vercel
+      process.env.NUXT_ENV_VERCEL_GIT_REPO_SLUG,
+      // netlify
+      process.env.SITE_NAME
+    ].find((k) => Boolean(k))
+  });
+  const runtimeConfig = nuxt.options.runtimeConfig;
+  const runtimeConfigEnvKeys = [
+    ...Object.entries(runtimeConfig.site || {}).filter(([k]) => k.startsWith("site")).map(([k, v]) => [k.replace(/^site/, ""), v]),
+    ...Object.entries([...Object.entries(runtimeConfig), ...Object.entries(runtimeConfig.public)]).filter(([k]) => k.startsWith("site")).map(([k, v]) => [k.replace(/^site/, ""), v])
+  ];
+  siteConfig.push({
+    _priority: -2,
+    _context: "legacyRuntimeConfig",
+    ...Object.fromEntries(runtimeConfigEnvKeys)
+  });
+  siteConfig.push({
+    _context: "buildEnv",
+    _priority: -1,
+    ...siteConfigStack.envSiteConfig(process.env)
   });
-  if (!valid) {
-    logger.error(messages.join("\n"));
-    if (options?.throwError)
-      throw new Error();
+  nuxt._siteConfig = siteConfig;
+  return siteConfig;
+}
+async function installNuxtSiteConfig(nuxt = kit.tryUseNuxt()) {
+  await kit.installModule(await kit.resolvePath("nuxt-site-config"));
+  await initSiteConfig(nuxt);
+}
+function getSiteConfigStack(nuxt = kit.tryUseNuxt()) {
+  if (!nuxt)
+    throw new Error("Nuxt context is missing.");
+  if (!nuxt._siteConfig)
+    throw new Error("Site config is not initialized. Make sure you are running your module after nuxt-site-config.");
+  return nuxt._siteConfig;
+}
+function updateSiteConfig(input, nuxt = kit.tryUseNuxt()) {
+  const container = getSiteConfigStack(nuxt);
+  container.push(input);
+}
+function useSiteConfig(nuxt = kit.tryUseNuxt()) {
+  const container = getSiteConfigStack(nuxt);
+  return container.get();
+}
+
+function useNitroOrigin() {
+  const cert = stdEnv.env.NITRO_SSL_CERT;
+  const key = stdEnv.env.NITRO_SSL_KEY;
+  let host = stdEnv.env.NITRO_HOST || stdEnv.env.HOST || false;
+  let port = stdEnv.env.NITRO_PORT || stdEnv.env.PORT || (stdEnv.isDevelopment ? 3e3 : false);
+  let protocol = cert && key || !stdEnv.isDevelopment ? "https" : "http";
+  if ((stdEnv.isDevelopment || stdEnv.env.prerender) && stdEnv.env.NUXT_VITE_NODE_OPTIONS) {
+    const origin = JSON.parse(stdEnv.env.NUXT_VITE_NODE_OPTIONS).baseURL.replace("/__nuxt_vite_node__", "");
+    host = ufo.withoutProtocol(origin);
+    protocol = origin.includes("https") ? "https" : "http";
   }
-  return {
-    valid,
-    messages
+  if (typeof host === "string" && host.includes(":")) {
+    port = host.split(":").pop();
+    host = host.split(":")[0];
+  }
+  port = port ? `:${port}` : "";
+  return `${protocol}://${host}${port}/`;
+}
+
+function withSiteTrailingSlash(path) {
+  const siteConfig = useSiteConfig();
+  return urls.fixSlashes(siteConfig.trailingSlash, path);
+}
+function createSitePathResolver(options = {}, nuxt = kit.useNuxt()) {
+  const siteConfig = useSiteConfig();
+  const nitroOrigin = useNitroOrigin();
+  const canUseSiteUrl = (options.canonical !== false || stdEnv.env.prerender) && siteConfig.url;
+  const nuxtBase = nuxt.options.app.baseURL || "/";
+  return (path) => {
+    return urls.resolveSitePath(path, {
+      ...options,
+      siteUrl: canUseSiteUrl ? siteConfig.url : nitroOrigin,
+      trailingSlash: siteConfig.trailingSlash,
+      base: nuxtBase
+    });
   };
 }
+function withSiteUrl(path, options = {}) {
+  const siteConfig = useSiteConfig();
+  if (!siteConfig.url && options.throwErrorOnMissingSiteUrl)
+    throw new Error("Missing url in site config. Please add `{ site: { url: <url> } }` to nuxt.config.ts.");
+  const nuxt = kit.useNuxt();
+  const base = nuxt.options.app.baseURL || nuxt.options.nitro.baseURL || "/";
+  return urls.resolveSitePath(path, {
+    absolute: true,
+    siteUrl: siteConfig.url || "",
+    trailingSlash: siteConfig.trailingSlash,
+    base,
+    withBase: options.withBase
+  });
+}
 
-exports.getSiteConfigStack = util.getSiteConfigStack;
-exports.initSiteConfig = util.initSiteConfig;
-exports.installNuxtSiteConfig = util.installNuxtSiteConfig;
-exports.updateSiteConfig = util.updateSiteConfig;
-exports.useNitroOrigin = util.useNitroOrigin;
-exports.useSiteConfig = util.useSiteConfig;
-exports.assertSiteConfig = assertSiteConfig;
-exports.requireSiteConfig = requireSiteConfig;
+exports.createSitePathResolver = createSitePathResolver;
+exports.getSiteConfigStack = getSiteConfigStack;
+exports.initSiteConfig = initSiteConfig;
+exports.installNuxtSiteConfig = installNuxtSiteConfig;
+exports.updateSiteConfig = updateSiteConfig;
+exports.useNitroOrigin = useNitroOrigin;
+exports.useSiteConfig = useSiteConfig;
+exports.withSiteTrailingSlash = withSiteTrailingSlash;
+exports.withSiteUrl = withSiteUrl;

package/dist/index.d.cts

@@ -1,5 +1,6 @@
 import { Nuxt } from '@nuxt/schema';
 import { SiteConfigStack, SiteConfigInput, SiteConfigResolved } from 'site-config-stack';
+export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './urls.cjs';
 
 declare function initSiteConfig(nuxt?: Nuxt | null): Promise<SiteConfigStack | undefined>;
 declare function installNuxtSiteConfig(nuxt?: Nuxt | null): Promise<void>;
@@ -7,27 +8,12 @@ declare function getSiteConfigStack(nuxt?: Nuxt | null): SiteConfigStack;
 declare function updateSiteConfig(input: SiteConfigInput, nuxt?: Nuxt | null): void;
 declare function useSiteConfig(nuxt?: Nuxt | null): SiteConfigResolved;
 
-/**
- * @deprecated No longer used
- */
-declare function requireSiteConfig(): void;
-declare function assertSiteConfig(module: string, requirements: Partial<Record<keyof SiteConfigResolved, string>>, options?: {
-    throwError?: boolean;
-}): {
-    valid: boolean;
-    messages: string[];
-};
-
 type AssertionModes = 'prerender' | 'generate' | 'build';
 interface ModuleAssertion {
     context: string;
     requirements: Partial<Record<keyof SiteConfigInput, string>>;
 }
 declare module '@nuxt/schema' {
-    interface AppConfigInput {
-        /** Theme configuration */
-        site?: SiteConfigInput;
-    }
     interface Nuxt {
         _siteConfig?: SiteConfigStack;
         _siteConfigAsserts?: Partial<Record<Partial<AssertionModes>, ModuleAssertion[]>>;
@@ -36,4 +22,4 @@ declare module '@nuxt/schema' {
 
 declare function useNitroOrigin(): string;
 
-export { type AssertionModes, type ModuleAssertion, assertSiteConfig, getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, requireSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig };
+export { type AssertionModes, type ModuleAssertion, getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig };

package/dist/index.d.mts

@@ -1,5 +1,6 @@
 import { Nuxt } from '@nuxt/schema';
 import { SiteConfigStack, SiteConfigInput, SiteConfigResolved } from 'site-config-stack';
+export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './urls.mjs';
 
 declare function initSiteConfig(nuxt?: Nuxt | null): Promise<SiteConfigStack | undefined>;
 declare function installNuxtSiteConfig(nuxt?: Nuxt | null): Promise<void>;
@@ -7,27 +8,12 @@ declare function getSiteConfigStack(nuxt?: Nuxt | null): SiteConfigStack;
 declare function updateSiteConfig(input: SiteConfigInput, nuxt?: Nuxt | null): void;
 declare function useSiteConfig(nuxt?: Nuxt | null): SiteConfigResolved;
 
-/**
- * @deprecated No longer used
- */
-declare function requireSiteConfig(): void;
-declare function assertSiteConfig(module: string, requirements: Partial<Record<keyof SiteConfigResolved, string>>, options?: {
-    throwError?: boolean;
-}): {
-    valid: boolean;
-    messages: string[];
-};
-
 type AssertionModes = 'prerender' | 'generate' | 'build';
 interface ModuleAssertion {
     context: string;
     requirements: Partial<Record<keyof SiteConfigInput, string>>;
 }
 declare module '@nuxt/schema' {
-    interface AppConfigInput {
-        /** Theme configuration */
-        site?: SiteConfigInput;
-    }
     interface Nuxt {
         _siteConfig?: SiteConfigStack;
         _siteConfigAsserts?: Partial<Record<Partial<AssertionModes>, ModuleAssertion[]>>;
@@ -36,4 +22,4 @@ declare module '@nuxt/schema' {
 
 declare function useNitroOrigin(): string;
 
-export { type AssertionModes, type ModuleAssertion, assertSiteConfig, getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, requireSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig };
+export { type AssertionModes, type ModuleAssertion, getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { Nuxt } from '@nuxt/schema';
 import { SiteConfigStack, SiteConfigInput, SiteConfigResolved } from 'site-config-stack';
+export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './urls.js';
 
 declare function initSiteConfig(nuxt?: Nuxt | null): Promise<SiteConfigStack | undefined>;
 declare function installNuxtSiteConfig(nuxt?: Nuxt | null): Promise<void>;
@@ -7,27 +8,12 @@ declare function getSiteConfigStack(nuxt?: Nuxt | null): SiteConfigStack;
 declare function updateSiteConfig(input: SiteConfigInput, nuxt?: Nuxt | null): void;
 declare function useSiteConfig(nuxt?: Nuxt | null): SiteConfigResolved;
 
-/**
- * @deprecated No longer used
- */
-declare function requireSiteConfig(): void;
-declare function assertSiteConfig(module: string, requirements: Partial<Record<keyof SiteConfigResolved, string>>, options?: {
-    throwError?: boolean;
-}): {
-    valid: boolean;
-    messages: string[];
-};
-
 type AssertionModes = 'prerender' | 'generate' | 'build';
 interface ModuleAssertion {
     context: string;
     requirements: Partial<Record<keyof SiteConfigInput, string>>;
 }
 declare module '@nuxt/schema' {
-    interface AppConfigInput {
-        /** Theme configuration */
-        site?: SiteConfigInput;
-    }
     interface Nuxt {
         _siteConfig?: SiteConfigStack;
         _siteConfigAsserts?: Partial<Record<Partial<AssertionModes>, ModuleAssertion[]>>;
@@ -36,4 +22,4 @@ declare module '@nuxt/schema' {
 
 declare function useNitroOrigin(): string;
 
-export { type AssertionModes, type ModuleAssertion, assertSiteConfig, getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, requireSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig };
+export { type AssertionModes, type ModuleAssertion, getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig };

package/dist/index.mjs

@@ -1,41 +1,142 @@
-import { u as useSiteConfig } from './shared/nuxt-site-config-kit.8664a57b.mjs';
-export { g as getSiteConfigStack, i as initSiteConfig, a as installNuxtSiteConfig, b as updateSiteConfig, c as useNitroOrigin } from './shared/nuxt-site-config-kit.8664a57b.mjs';
-import { useLogger } from '@nuxt/kit';
-import 'pkg-types';
-import 'site-config-stack';
-import 'ufo';
-import 'std-env';
+import { tryUseNuxt, installModule, resolvePath, useNuxt } from '@nuxt/kit';
+import { readPackageJSON } from 'pkg-types';
+import { createSiteConfigStack, envSiteConfig } from 'site-config-stack';
+import { fixSlashes, resolveSitePath } from 'site-config-stack/urls';
+import { env, isDevelopment } from 'std-env';
+import { withoutProtocol } from 'ufo';
 
-function requireSiteConfig() {
-}
-function assertSiteConfig(module, requirements, options) {
-  const siteConfig = useSiteConfig();
-  let valid = true;
-  const messages = [];
-  const logger = useLogger("nuxt-site-config");
-  Object.keys(requirements).forEach((k) => {
-    const key = k;
-    if (!siteConfig[key]) {
-      const reason = (requirements[key] || "").split("\n");
-      const msg = [
-        `The \`${module}\` module requires a \`site.${key}\` to be set:`,
-        ...reason.map((r) => `  - ${r}`),
-        "",
-        `You can fix this by adding a \`site.${key}\` to your \`nuxt.config\` or a \`NUXT_PUBLIC_SITE_${key.toUpperCase()}\` to your .env. Learn more at https://nuxtseo.com/site-config/getting-started/how-it-works`
-      ];
-      messages.push(msg.join("\n"));
-      valid = false;
+async function initSiteConfig(nuxt = tryUseNuxt()) {
+  if (!nuxt)
+    return;
+  let siteConfig = nuxt._siteConfig;
+  if (siteConfig)
+    return siteConfig;
+  siteConfig = createSiteConfigStack();
+  const rootDir = nuxt?.options.rootDir || process.cwd?.() || false;
+  siteConfig.push({
+    _context: "system",
+    _priority: -15,
+    name: rootDir ? rootDir.split("/").pop() : void 0,
+    env: process.env.NODE_ENV
+  });
+  if (rootDir) {
+    const pkgJson = await readPackageJSON(void 0, { startingFrom: rootDir });
+    if (pkgJson) {
+      siteConfig.push({
+        _context: "package.json",
+        _priority: -10,
+        name: pkgJson.name,
+        description: pkgJson.description
+      });
     }
+  }
+  siteConfig.push({
+    _context: "vendorEnv",
+    _priority: -5,
+    url: [
+      // vercel
+      process.env.VERCEL_URL,
+      process.env.NUXT_ENV_VERCEL_URL,
+      // netlify
+      process.env.URL,
+      // cloudflare pages
+      process.env.CF_PAGES_URL
+    ].find((k) => Boolean(k)),
+    name: [
+      // vercel
+      process.env.NUXT_ENV_VERCEL_GIT_REPO_SLUG,
+      // netlify
+      process.env.SITE_NAME
+    ].find((k) => Boolean(k))
+  });
+  const runtimeConfig = nuxt.options.runtimeConfig;
+  const runtimeConfigEnvKeys = [
+    ...Object.entries(runtimeConfig.site || {}).filter(([k]) => k.startsWith("site")).map(([k, v]) => [k.replace(/^site/, ""), v]),
+    ...Object.entries([...Object.entries(runtimeConfig), ...Object.entries(runtimeConfig.public)]).filter(([k]) => k.startsWith("site")).map(([k, v]) => [k.replace(/^site/, ""), v])
+  ];
+  siteConfig.push({
+    _priority: -2,
+    _context: "legacyRuntimeConfig",
+    ...Object.fromEntries(runtimeConfigEnvKeys)
+  });
+  siteConfig.push({
+    _context: "buildEnv",
+    _priority: -1,
+    ...envSiteConfig(process.env)
   });
-  if (!valid) {
-    logger.error(messages.join("\n"));
-    if (options?.throwError)
-      throw new Error();
+  nuxt._siteConfig = siteConfig;
+  return siteConfig;
+}
+async function installNuxtSiteConfig(nuxt = tryUseNuxt()) {
+  await installModule(await resolvePath("nuxt-site-config"));
+  await initSiteConfig(nuxt);
+}
+function getSiteConfigStack(nuxt = tryUseNuxt()) {
+  if (!nuxt)
+    throw new Error("Nuxt context is missing.");
+  if (!nuxt._siteConfig)
+    throw new Error("Site config is not initialized. Make sure you are running your module after nuxt-site-config.");
+  return nuxt._siteConfig;
+}
+function updateSiteConfig(input, nuxt = tryUseNuxt()) {
+  const container = getSiteConfigStack(nuxt);
+  container.push(input);
+}
+function useSiteConfig(nuxt = tryUseNuxt()) {
+  const container = getSiteConfigStack(nuxt);
+  return container.get();
+}
+
+function useNitroOrigin() {
+  const cert = env.NITRO_SSL_CERT;
+  const key = env.NITRO_SSL_KEY;
+  let host = env.NITRO_HOST || env.HOST || false;
+  let port = env.NITRO_PORT || env.PORT || (isDevelopment ? 3e3 : false);
+  let protocol = cert && key || !isDevelopment ? "https" : "http";
+  if ((isDevelopment || env.prerender) && env.NUXT_VITE_NODE_OPTIONS) {
+    const origin = JSON.parse(env.NUXT_VITE_NODE_OPTIONS).baseURL.replace("/__nuxt_vite_node__", "");
+    host = withoutProtocol(origin);
+    protocol = origin.includes("https") ? "https" : "http";
+  }
+  if (typeof host === "string" && host.includes(":")) {
+    port = host.split(":").pop();
+    host = host.split(":")[0];
   }
-  return {
-    valid,
-    messages
+  port = port ? `:${port}` : "";
+  return `${protocol}://${host}${port}/`;
+}
+
+function withSiteTrailingSlash(path) {
+  const siteConfig = useSiteConfig();
+  return fixSlashes(siteConfig.trailingSlash, path);
+}
+function createSitePathResolver(options = {}, nuxt = useNuxt()) {
+  const siteConfig = useSiteConfig();
+  const nitroOrigin = useNitroOrigin();
+  const canUseSiteUrl = (options.canonical !== false || env.prerender) && siteConfig.url;
+  const nuxtBase = nuxt.options.app.baseURL || "/";
+  return (path) => {
+    return resolveSitePath(path, {
+      ...options,
+      siteUrl: canUseSiteUrl ? siteConfig.url : nitroOrigin,
+      trailingSlash: siteConfig.trailingSlash,
+      base: nuxtBase
+    });
   };
 }
+function withSiteUrl(path, options = {}) {
+  const siteConfig = useSiteConfig();
+  if (!siteConfig.url && options.throwErrorOnMissingSiteUrl)
+    throw new Error("Missing url in site config. Please add `{ site: { url: <url> } }` to nuxt.config.ts.");
+  const nuxt = useNuxt();
+  const base = nuxt.options.app.baseURL || nuxt.options.nitro.baseURL || "/";
+  return resolveSitePath(path, {
+    absolute: true,
+    siteUrl: siteConfig.url || "",
+    trailingSlash: siteConfig.trailingSlash,
+    base,
+    withBase: options.withBase
+  });
+}
 
-export { assertSiteConfig, requireSiteConfig, useSiteConfig };
+export { createSitePathResolver, getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig, withSiteTrailingSlash, withSiteUrl };

package/dist/urls.cjs

@@ -1,46 +1,15 @@
 'use strict';
 
-const urls = require('site-config-stack/urls');
-const kit = require('@nuxt/kit');
-const stdEnv = require('std-env');
-const util = require('./shared/nuxt-site-config-kit.469a004d.cjs');
+require('@nuxt/kit');
+require('site-config-stack/urls');
+require('std-env');
+const urls = require('./index.cjs');
 require('pkg-types');
 require('site-config-stack');
 require('ufo');
 
-function withSiteTrailingSlash(path) {
-  const siteConfig = util.useSiteConfig();
-  return urls.fixSlashes(siteConfig.trailingSlash, path);
-}
-function createSitePathResolver(options = {}, nuxt = kit.useNuxt()) {
-  const siteConfig = util.useSiteConfig();
-  const nitroOrigin = util.useNitroOrigin();
-  const canUseSiteUrl = (options.canonical !== false || stdEnv.env.prerender) && siteConfig.url;
-  const nuxtBase = nuxt.options.app.baseURL || "/";
-  return (path) => {
-    return urls.resolveSitePath(path, {
-      ...options,
-      siteUrl: canUseSiteUrl ? siteConfig.url : nitroOrigin,
-      trailingSlash: siteConfig.trailingSlash,
-      base: nuxtBase
-    });
-  };
-}
-function withSiteUrl(path, options = {}) {
-  const siteConfig = util.useSiteConfig();
-  if (!siteConfig.url && options.throwErrorOnMissingSiteUrl)
-    throw new Error("Missing url in site config. Please add `{ site: { url: <url> } }` to nuxt.config.ts.");
-  const nuxt = kit.useNuxt();
-  const base = nuxt.options.app.baseURL || nuxt.options.nitro.baseURL || "/";
-  return urls.resolveSitePath(path, {
-    absolute: true,
-    siteUrl: siteConfig.url || "",
-    trailingSlash: siteConfig.trailingSlash,
-    base,
-    withBase: options.withBase
-  });
-}
 
-exports.createSitePathResolver = createSitePathResolver;
-exports.withSiteTrailingSlash = withSiteTrailingSlash;
-exports.withSiteUrl = withSiteUrl;
+
+exports.createSitePathResolver = urls.createSitePathResolver;
+exports.withSiteTrailingSlash = urls.withSiteTrailingSlash;
+exports.withSiteUrl = urls.withSiteUrl;

package/dist/urls.mjs

@@ -1,42 +1,7 @@
-import { fixSlashes, resolveSitePath } from 'site-config-stack/urls';
-import { useNuxt } from '@nuxt/kit';
-import { env } from 'std-env';
-import { u as useSiteConfig, c as useNitroOrigin } from './shared/nuxt-site-config-kit.8664a57b.mjs';
+import '@nuxt/kit';
+import 'site-config-stack/urls';
+import 'std-env';
+export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './index.mjs';
 import 'pkg-types';
 import 'site-config-stack';
 import 'ufo';
-
-function withSiteTrailingSlash(path) {
-  const siteConfig = useSiteConfig();
-  return fixSlashes(siteConfig.trailingSlash, path);
-}
-function createSitePathResolver(options = {}, nuxt = useNuxt()) {
-  const siteConfig = useSiteConfig();
-  const nitroOrigin = useNitroOrigin();
-  const canUseSiteUrl = (options.canonical !== false || env.prerender) && siteConfig.url;
-  const nuxtBase = nuxt.options.app.baseURL || "/";
-  return (path) => {
-    return resolveSitePath(path, {
-      ...options,
-      siteUrl: canUseSiteUrl ? siteConfig.url : nitroOrigin,
-      trailingSlash: siteConfig.trailingSlash,
-      base: nuxtBase
-    });
-  };
-}
-function withSiteUrl(path, options = {}) {
-  const siteConfig = useSiteConfig();
-  if (!siteConfig.url && options.throwErrorOnMissingSiteUrl)
-    throw new Error("Missing url in site config. Please add `{ site: { url: <url> } }` to nuxt.config.ts.");
-  const nuxt = useNuxt();
-  const base = nuxt.options.app.baseURL || nuxt.options.nitro.baseURL || "/";
-  return resolveSitePath(path, {
-    absolute: true,
-    siteUrl: siteConfig.url || "",
-    trailingSlash: siteConfig.trailingSlash,
-    base,
-    withBase: options.withBase
-  });
-}
-
-export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config-kit",
   "type": "module",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "Shared site configuration build-time utilities for Nuxt 3 modules.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -38,12 +38,14 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "^3.13.2",
-    "@nuxt/schema": "^3.13.2",
-    "pkg-types": "^1.2.1",
-    "std-env": "^3.7.0",
+    "@nuxt/kit": "^3.15.4",
+    "pkg-types": "^1.3.1",
+    "std-env": "^3.8.0",
     "ufo": "^1.5.4",
-    "site-config-stack": "3.0.5"
+    "site-config-stack": "3.0.7"
+  },
+  "devDependencies": {
+    "@nuxt/schema": "^3.15.4"
   },
   "scripts": {
     "lint": "eslint . --fix",

package/dist/shared/nuxt-site-config-kit.469a004d.cjs

@@ -1,115 +0,0 @@
-'use strict';
-
-const kit = require('@nuxt/kit');
-const pkgTypes = require('pkg-types');
-const siteConfigStack = require('site-config-stack');
-const ufo = require('ufo');
-const stdEnv = require('std-env');
-
-async function initSiteConfig(nuxt = kit.tryUseNuxt()) {
-  if (!nuxt)
-    return;
-  let siteConfig = nuxt._siteConfig;
-  if (siteConfig)
-    return siteConfig;
-  siteConfig = siteConfigStack.createSiteConfigStack();
-  const rootDir = nuxt?.options.rootDir || process.cwd?.() || false;
-  siteConfig.push({
-    _context: "system",
-    _priority: -15,
-    name: rootDir ? rootDir.split("/").pop() : void 0,
-    env: process.env.NODE_ENV
-  });
-  if (rootDir) {
-    const pkgJson = await pkgTypes.readPackageJSON(void 0, { startingFrom: rootDir });
-    if (pkgJson) {
-      siteConfig.push({
-        _context: "package.json",
-        _priority: -10,
-        name: pkgJson.name,
-        description: pkgJson.description
-      });
-    }
-  }
-  siteConfig.push({
-    _context: "vendorEnv",
-    _priority: -5,
-    url: [
-      // vercel
-      process.env.VERCEL_URL,
-      process.env.NUXT_ENV_VERCEL_URL,
-      // netlify
-      process.env.URL,
-      // cloudflare pages
-      process.env.CF_PAGES_URL
-    ].find((k) => Boolean(k)),
-    name: [
-      // vercel
-      process.env.NUXT_ENV_VERCEL_GIT_REPO_SLUG,
-      // netlify
-      process.env.SITE_NAME
-    ].find((k) => Boolean(k))
-  });
-  const runtimeConfig = nuxt.options.runtimeConfig;
-  const runtimeConfigEnvKeys = [
-    ...Object.entries(runtimeConfig.site || {}).filter(([k]) => k.startsWith("site")).map(([k, v]) => [k.replace(/^site/, ""), v]),
-    ...Object.entries([...Object.entries(runtimeConfig), ...Object.entries(runtimeConfig.public)]).filter(([k]) => k.startsWith("site")).map(([k, v]) => [k.replace(/^site/, ""), v])
-  ];
-  siteConfig.push({
-    _priority: -2,
-    _context: "legacyRuntimeConfig",
-    ...Object.fromEntries(runtimeConfigEnvKeys)
-  });
-  siteConfig.push({
-    _context: "buildEnv",
-    _priority: -1,
-    ...siteConfigStack.envSiteConfig(process.env)
-  });
-  nuxt._siteConfig = siteConfig;
-  return siteConfig;
-}
-async function installNuxtSiteConfig(nuxt = kit.tryUseNuxt()) {
-  await kit.installModule(await kit.resolvePath("nuxt-site-config"));
-  await initSiteConfig(nuxt);
-}
-function getSiteConfigStack(nuxt = kit.tryUseNuxt()) {
-  if (!nuxt)
-    throw new Error("Nuxt context is missing.");
-  if (!nuxt._siteConfig)
-    throw new Error("Site config is not initialized. Make sure you are running your module after nuxt-site-config.");
-  return nuxt._siteConfig;
-}
-function updateSiteConfig(input, nuxt = kit.tryUseNuxt()) {
-  const container = getSiteConfigStack(nuxt);
-  container.push(input);
-}
-function useSiteConfig(nuxt = kit.tryUseNuxt()) {
-  const container = getSiteConfigStack(nuxt);
-  return container.get();
-}
-
-function useNitroOrigin() {
-  const cert = stdEnv.env.NITRO_SSL_CERT;
-  const key = stdEnv.env.NITRO_SSL_KEY;
-  let host = stdEnv.env.NITRO_HOST || stdEnv.env.HOST || false;
-  let port = stdEnv.env.NITRO_PORT || stdEnv.env.PORT || (stdEnv.isDevelopment ? 3e3 : false);
-  let protocol = cert && key || !stdEnv.isDevelopment ? "https" : "http";
-  if ((stdEnv.isDevelopment || stdEnv.env.prerender) && stdEnv.env.NUXT_VITE_NODE_OPTIONS) {
-    const origin = JSON.parse(stdEnv.env.NUXT_VITE_NODE_OPTIONS).baseURL.replace("/__nuxt_vite_node__", "");
-    host = ufo.withoutProtocol(origin);
-    protocol = origin.includes("https") ? "https" : "http";
-  }
-  if (typeof host === "string" && host.includes(":")) {
-    port = host.split(":").pop();
-    host = host.split(":")[0];
-  }
-  port = port ? `:${port}` : "";
-  return `${protocol}://${host}${port}/`;
-}
-
-exports.getSiteConfigStack = getSiteConfigStack;
-exports.initSiteConfig = initSiteConfig;
-exports.installNuxtSiteConfig = installNuxtSiteConfig;
-exports.updateSiteConfig = updateSiteConfig;
-exports.useNitroOrigin = useNitroOrigin;
-exports.useSiteConfig = useSiteConfig;

package/dist/shared/nuxt-site-config-kit.8664a57b.mjs

@@ -1,108 +0,0 @@
-import { tryUseNuxt, installModule, resolvePath } from '@nuxt/kit';
-import { readPackageJSON } from 'pkg-types';
-import { createSiteConfigStack, envSiteConfig } from 'site-config-stack';
-import { withoutProtocol } from 'ufo';
-import { env, isDevelopment } from 'std-env';
-
-async function initSiteConfig(nuxt = tryUseNuxt()) {
-  if (!nuxt)
-    return;
-  let siteConfig = nuxt._siteConfig;
-  if (siteConfig)
-    return siteConfig;
-  siteConfig = createSiteConfigStack();
-  const rootDir = nuxt?.options.rootDir || process.cwd?.() || false;
-  siteConfig.push({
-    _context: "system",
-    _priority: -15,
-    name: rootDir ? rootDir.split("/").pop() : void 0,
-    env: process.env.NODE_ENV
-  });
-  if (rootDir) {
-    const pkgJson = await readPackageJSON(void 0, { startingFrom: rootDir });
-    if (pkgJson) {
-      siteConfig.push({
-        _context: "package.json",
-        _priority: -10,
-        name: pkgJson.name,
-        description: pkgJson.description
-      });
-    }
-  }
-  siteConfig.push({
-    _context: "vendorEnv",
-    _priority: -5,
-    url: [
-      // vercel
-      process.env.VERCEL_URL,
-      process.env.NUXT_ENV_VERCEL_URL,
-      // netlify
-      process.env.URL,
-      // cloudflare pages
-      process.env.CF_PAGES_URL
-    ].find((k) => Boolean(k)),
-    name: [
-      // vercel
-      process.env.NUXT_ENV_VERCEL_GIT_REPO_SLUG,
-      // netlify
-      process.env.SITE_NAME
-    ].find((k) => Boolean(k))
-  });
-  const runtimeConfig = nuxt.options.runtimeConfig;
-  const runtimeConfigEnvKeys = [
-    ...Object.entries(runtimeConfig.site || {}).filter(([k]) => k.startsWith("site")).map(([k, v]) => [k.replace(/^site/, ""), v]),
-    ...Object.entries([...Object.entries(runtimeConfig), ...Object.entries(runtimeConfig.public)]).filter(([k]) => k.startsWith("site")).map(([k, v]) => [k.replace(/^site/, ""), v])
-  ];
-  siteConfig.push({
-    _priority: -2,
-    _context: "legacyRuntimeConfig",
-    ...Object.fromEntries(runtimeConfigEnvKeys)
-  });
-  siteConfig.push({
-    _context: "buildEnv",
-    _priority: -1,
-    ...envSiteConfig(process.env)
-  });
-  nuxt._siteConfig = siteConfig;
-  return siteConfig;
-}
-async function installNuxtSiteConfig(nuxt = tryUseNuxt()) {
-  await installModule(await resolvePath("nuxt-site-config"));
-  await initSiteConfig(nuxt);
-}
-function getSiteConfigStack(nuxt = tryUseNuxt()) {
-  if (!nuxt)
-    throw new Error("Nuxt context is missing.");
-  if (!nuxt._siteConfig)
-    throw new Error("Site config is not initialized. Make sure you are running your module after nuxt-site-config.");
-  return nuxt._siteConfig;
-}
-function updateSiteConfig(input, nuxt = tryUseNuxt()) {
-  const container = getSiteConfigStack(nuxt);
-  container.push(input);
-}
-function useSiteConfig(nuxt = tryUseNuxt()) {
-  const container = getSiteConfigStack(nuxt);
-  return container.get();
-}
-
-function useNitroOrigin() {
-  const cert = env.NITRO_SSL_CERT;
-  const key = env.NITRO_SSL_KEY;
-  let host = env.NITRO_HOST || env.HOST || false;
-  let port = env.NITRO_PORT || env.PORT || (isDevelopment ? 3e3 : false);
-  let protocol = cert && key || !isDevelopment ? "https" : "http";
-  if ((isDevelopment || env.prerender) && env.NUXT_VITE_NODE_OPTIONS) {
-    const origin = JSON.parse(env.NUXT_VITE_NODE_OPTIONS).baseURL.replace("/__nuxt_vite_node__", "");
-    host = withoutProtocol(origin);
-    protocol = origin.includes("https") ? "https" : "http";
-  }
-  if (typeof host === "string" && host.includes(":")) {
-    port = host.split(":").pop();
-    host = host.split(":")[0];
-  }
-  port = port ? `:${port}` : "";
-  return `${protocol}://${host}${port}/`;
-}
-
-export { installNuxtSiteConfig as a, updateSiteConfig as b, useNitroOrigin as c, getSiteConfigStack as g, initSiteConfig as i, useSiteConfig as u };