nuxt-site-config-kit 3.2.11 → 3.2.13

package/dist/index.cjs

@@ -1,12 +1,12 @@
 'use strict';
 
-const urls = require('./shared/nuxt-site-config-kit.DDQMwTkP.cjs');
+const urls = require('./shared/nuxt-site-config-kit.DmVknu3-.cjs');
+const util = require('./util.cjs');
 require('@nuxt/kit');
 require('site-config-stack/urls');
 require('std-env');
 require('pkg-types');
 require('site-config-stack');
-require('ufo');
 
 
 
@@ -15,7 +15,8 @@ exports.getSiteConfigStack = urls.getSiteConfigStack;
 exports.initSiteConfig = urls.initSiteConfig;
 exports.installNuxtSiteConfig = urls.installNuxtSiteConfig;
 exports.updateSiteConfig = urls.updateSiteConfig;
-exports.useNitroOrigin = urls.useNitroOrigin;
 exports.useSiteConfig = urls.useSiteConfig;
 exports.withSiteTrailingSlash = urls.withSiteTrailingSlash;
 exports.withSiteUrl = urls.withSiteUrl;
+exports.getNitroOrigin = util.getNitroOrigin;
+exports.useNitroOrigin = util.useNitroOrigin;

package/dist/index.d.cts

@@ -2,6 +2,7 @@ import { Nuxt } from '@nuxt/schema';
 import { SiteConfigStack, SiteConfigInput, SiteConfigResolved } from 'site-config-stack';
 export * from 'site-config-stack';
 export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './urls.cjs';
+export { NitroOriginContext, getNitroOrigin, useNitroOrigin } from './util.cjs';
 
 declare function initSiteConfig(nuxt?: Nuxt | null): Promise<SiteConfigStack | undefined>;
 declare function installNuxtSiteConfig(nuxt?: Nuxt | null): Promise<void>;
@@ -21,7 +22,5 @@ declare module '@nuxt/schema' {
     }
 }
 
-declare function useNitroOrigin(): string;
-
-export { getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig };
+export { getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useSiteConfig };
 export type { AssertionModes, ModuleAssertion };

package/dist/index.d.mts

@@ -2,6 +2,7 @@ import { Nuxt } from '@nuxt/schema';
 import { SiteConfigStack, SiteConfigInput, SiteConfigResolved } from 'site-config-stack';
 export * from 'site-config-stack';
 export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './urls.mjs';
+export { NitroOriginContext, getNitroOrigin, useNitroOrigin } from './util.mjs';
 
 declare function initSiteConfig(nuxt?: Nuxt | null): Promise<SiteConfigStack | undefined>;
 declare function installNuxtSiteConfig(nuxt?: Nuxt | null): Promise<void>;
@@ -21,7 +22,5 @@ declare module '@nuxt/schema' {
     }
 }
 
-declare function useNitroOrigin(): string;
-
-export { getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig };
+export { getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useSiteConfig };
 export type { AssertionModes, ModuleAssertion };

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { Nuxt } from '@nuxt/schema';
 import { SiteConfigStack, SiteConfigInput, SiteConfigResolved } from 'site-config-stack';
 export * from 'site-config-stack';
 export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './urls.js';
+export { NitroOriginContext, getNitroOrigin, useNitroOrigin } from './util.js';
 
 declare function initSiteConfig(nuxt?: Nuxt | null): Promise<SiteConfigStack | undefined>;
 declare function installNuxtSiteConfig(nuxt?: Nuxt | null): Promise<void>;
@@ -21,7 +22,5 @@ declare module '@nuxt/schema' {
     }
 }
 
-declare function useNitroOrigin(): string;
-
-export { getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig };
+export { getSiteConfigStack, initSiteConfig, installNuxtSiteConfig, updateSiteConfig, useSiteConfig };
 export type { AssertionModes, ModuleAssertion };

package/dist/index.mjs

@@ -1,7 +1,7 @@
-export { c as createSitePathResolver, g as getSiteConfigStack, i as initSiteConfig, a as installNuxtSiteConfig, u as updateSiteConfig, e as useNitroOrigin, b as useSiteConfig, w as withSiteTrailingSlash, d as withSiteUrl } from './shared/nuxt-site-config-kit.Brr2J4co.mjs';
+export { c as createSitePathResolver, g as getSiteConfigStack, i as initSiteConfig, a as installNuxtSiteConfig, u as updateSiteConfig, b as useSiteConfig, w as withSiteTrailingSlash, d as withSiteUrl } from './shared/nuxt-site-config-kit.CNTokPxh.mjs';
+export { getNitroOrigin, useNitroOrigin } from './util.mjs';
 import '@nuxt/kit';
 import 'site-config-stack/urls';
 import 'std-env';
 import 'pkg-types';
 import 'site-config-stack';
-import 'ufo';

package/dist/shared/{nuxt-site-config-kit.Brr2J4co.mjs → nuxt-site-config-kit.CNTokPxh.mjs}

@@ -1,9 +1,9 @@
 import { tryUseNuxt, installModule, resolvePath, useNuxt } from '@nuxt/kit';
 import { fixSlashes, resolveSitePath } from 'site-config-stack/urls';
-import { env, isDevelopment } from 'std-env';
+import { env } from 'std-env';
 import { readPackageJSON } from 'pkg-types';
 import { createSiteConfigStack, envSiteConfig } from 'site-config-stack';
-import { withoutProtocol } from 'ufo';
+import { getNitroOrigin } from '../util.mjs';
 
 async function initSiteConfig(nuxt = tryUseNuxt()) {
   if (!nuxt)
@@ -87,32 +87,13 @@ function useSiteConfig(nuxt = tryUseNuxt()) {
   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] || false;
-  }
-  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 nitroOrigin = getNitroOrigin();
   const canUseSiteUrl = (options.canonical !== false || env.prerender) && siteConfig.url;
   const nuxtBase = nuxt.options.app.baseURL || "/";
   return (path) => {
@@ -139,4 +120,4 @@ function withSiteUrl(path, options = {}) {
   });
 }
 
-export { installNuxtSiteConfig as a, useSiteConfig as b, createSitePathResolver as c, withSiteUrl as d, useNitroOrigin as e, getSiteConfigStack as g, initSiteConfig as i, updateSiteConfig as u, withSiteTrailingSlash as w };
+export { installNuxtSiteConfig as a, useSiteConfig as b, createSitePathResolver as c, withSiteUrl as d, getSiteConfigStack as g, initSiteConfig as i, updateSiteConfig as u, withSiteTrailingSlash as w };

package/dist/shared/{nuxt-site-config-kit.DDQMwTkP.cjs → nuxt-site-config-kit.DmVknu3-.cjs}

@@ -5,7 +5,7 @@ const urls = require('site-config-stack/urls');
 const stdEnv = require('std-env');
 const pkgTypes = require('pkg-types');
 const siteConfigStack = require('site-config-stack');
-const ufo = require('ufo');
+const util = require('../util.cjs');
 
 async function initSiteConfig(nuxt = kit.tryUseNuxt()) {
   if (!nuxt)
@@ -89,32 +89,13 @@ function useSiteConfig(nuxt = kit.tryUseNuxt()) {
   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] || false;
-  }
-  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 nitroOrigin = util.getNitroOrigin();
   const canUseSiteUrl = (options.canonical !== false || stdEnv.env.prerender) && siteConfig.url;
   const nuxtBase = nuxt.options.app.baseURL || "/";
   return (path) => {
@@ -146,7 +127,6 @@ 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/urls.cjs

@@ -3,10 +3,10 @@
 require('@nuxt/kit');
 require('site-config-stack/urls');
 require('std-env');
-const urls = require('./shared/nuxt-site-config-kit.DDQMwTkP.cjs');
+const urls = require('./shared/nuxt-site-config-kit.DmVknu3-.cjs');
+require('./util.cjs');
 require('pkg-types');
 require('site-config-stack');
-require('ufo');
 
 
 

package/dist/urls.mjs

@@ -1,7 +1,7 @@
 import '@nuxt/kit';
 import 'site-config-stack/urls';
 import 'std-env';
-export { c as createSitePathResolver, w as withSiteTrailingSlash, d as withSiteUrl } from './shared/nuxt-site-config-kit.Brr2J4co.mjs';
+export { c as createSitePathResolver, w as withSiteTrailingSlash, d as withSiteUrl } from './shared/nuxt-site-config-kit.CNTokPxh.mjs';
+import './util.mjs';
 import 'pkg-types';
 import 'site-config-stack';
-import 'ufo';

package/dist/util.cjs

@@ -0,0 +1,49 @@
+'use strict';
+
+const stdEnv = require('std-env');
+
+function getNitroOrigin(ctx = {}) {
+  const isDev = ctx.isDev ?? stdEnv.isDevelopment;
+  const isPrerender = ctx.isPrerender ?? !!stdEnv.env.prerender;
+  let host = "";
+  let port = "";
+  let protocol = stdEnv.env.NITRO_SSL_CERT && stdEnv.env.NITRO_SSL_KEY ? "https" : "http";
+  if (isDev || isPrerender) {
+    const devEnv = stdEnv.env.__NUXT_DEV__ || stdEnv.env.NUXT_VITE_NODE_OPTIONS;
+    if (devEnv) {
+      const parsed = JSON.parse(devEnv);
+      const origin = parsed.proxy?.url || parsed.baseURL?.replace("/__nuxt_vite_node__", "");
+      host = origin.replace(/^https?:\/\//, "");
+      protocol = origin.startsWith("https") ? "https" : "http";
+    }
+  }
+  if (!host && ctx.requestHost) {
+    host = ctx.requestHost;
+    protocol = ctx.requestProtocol || protocol;
+  }
+  if (!host) {
+    host = stdEnv.env.NITRO_HOST || stdEnv.env.HOST || "";
+    if (isDev)
+      port = stdEnv.env.NITRO_PORT || stdEnv.env.PORT || "3000";
+  }
+  if (host.includes(":")) {
+    const i = host.lastIndexOf(":");
+    port = host.slice(i + 1);
+    host = host.slice(0, i);
+  }
+  host = stdEnv.env.NUXT_SITE_HOST_OVERRIDE || host;
+  port = stdEnv.env.NUXT_SITE_PORT_OVERRIDE || port;
+  if (host.startsWith("http://") || host.startsWith("https://")) {
+    protocol = host.startsWith("https://") ? "https" : "http";
+    host = host.replace(/^https?:\/\//, "");
+  } else if (!host.includes("localhost") && !host.startsWith("127.")) {
+    protocol = "https";
+  }
+  return `${protocol}://${host}${port ? `:${port}` : ""}/`;
+}
+function useNitroOrigin() {
+  return getNitroOrigin();
+}
+
+exports.getNitroOrigin = getNitroOrigin;
+exports.useNitroOrigin = useNitroOrigin;

package/dist/util.d.cts

@@ -0,0 +1,14 @@
+interface NitroOriginContext {
+    isDev?: boolean;
+    isPrerender?: boolean;
+    requestHost?: string;
+    requestProtocol?: 'http' | 'https';
+}
+declare function getNitroOrigin(ctx?: NitroOriginContext): string;
+/**
+ * @deprecated use getNitroOrigin instead
+ */
+declare function useNitroOrigin(): string;
+
+export { getNitroOrigin, useNitroOrigin };
+export type { NitroOriginContext };

package/dist/util.d.mts

@@ -0,0 +1,14 @@
+interface NitroOriginContext {
+    isDev?: boolean;
+    isPrerender?: boolean;
+    requestHost?: string;
+    requestProtocol?: 'http' | 'https';
+}
+declare function getNitroOrigin(ctx?: NitroOriginContext): string;
+/**
+ * @deprecated use getNitroOrigin instead
+ */
+declare function useNitroOrigin(): string;
+
+export { getNitroOrigin, useNitroOrigin };
+export type { NitroOriginContext };

package/dist/util.d.ts

@@ -0,0 +1,14 @@
+interface NitroOriginContext {
+    isDev?: boolean;
+    isPrerender?: boolean;
+    requestHost?: string;
+    requestProtocol?: 'http' | 'https';
+}
+declare function getNitroOrigin(ctx?: NitroOriginContext): string;
+/**
+ * @deprecated use getNitroOrigin instead
+ */
+declare function useNitroOrigin(): string;
+
+export { getNitroOrigin, useNitroOrigin };
+export type { NitroOriginContext };

package/dist/util.mjs

@@ -0,0 +1,46 @@
+import { isDevelopment, env } from 'std-env';
+
+function getNitroOrigin(ctx = {}) {
+  const isDev = ctx.isDev ?? isDevelopment;
+  const isPrerender = ctx.isPrerender ?? !!env.prerender;
+  let host = "";
+  let port = "";
+  let protocol = env.NITRO_SSL_CERT && env.NITRO_SSL_KEY ? "https" : "http";
+  if (isDev || isPrerender) {
+    const devEnv = env.__NUXT_DEV__ || env.NUXT_VITE_NODE_OPTIONS;
+    if (devEnv) {
+      const parsed = JSON.parse(devEnv);
+      const origin = parsed.proxy?.url || parsed.baseURL?.replace("/__nuxt_vite_node__", "");
+      host = origin.replace(/^https?:\/\//, "");
+      protocol = origin.startsWith("https") ? "https" : "http";
+    }
+  }
+  if (!host && ctx.requestHost) {
+    host = ctx.requestHost;
+    protocol = ctx.requestProtocol || protocol;
+  }
+  if (!host) {
+    host = env.NITRO_HOST || env.HOST || "";
+    if (isDev)
+      port = env.NITRO_PORT || env.PORT || "3000";
+  }
+  if (host.includes(":")) {
+    const i = host.lastIndexOf(":");
+    port = host.slice(i + 1);
+    host = host.slice(0, i);
+  }
+  host = env.NUXT_SITE_HOST_OVERRIDE || host;
+  port = env.NUXT_SITE_PORT_OVERRIDE || port;
+  if (host.startsWith("http://") || host.startsWith("https://")) {
+    protocol = host.startsWith("https://") ? "https" : "http";
+    host = host.replace(/^https?:\/\//, "");
+  } else if (!host.includes("localhost") && !host.startsWith("127.")) {
+    protocol = "https";
+  }
+  return `${protocol}://${host}${port ? `:${port}` : ""}/`;
+}
+function useNitroOrigin() {
+  return getNitroOrigin();
+}
+
+export { getNitroOrigin, useNitroOrigin };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config-kit",
   "type": "module",
-  "version": "3.2.11",
+  "version": "3.2.13",
   "description": "Shared site configuration build-time utilities for Nuxt 3 modules.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -24,6 +24,10 @@
       "import": "./dist/urls.mjs",
       "require": "./dist/urls.cjs"
     },
+    "./util": {
+      "import": "./dist/util.mjs",
+      "require": "./dist/util.cjs"
+    },
     "./dist/urls": {
       "import": "./dist/urls.mjs",
       "require": "./dist/urls.cjs"
@@ -34,17 +38,18 @@
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
-    "urls.d.ts"
+    "urls.d.ts",
+    "util.d.ts"
   ],
   "dependencies": {
-    "@nuxt/kit": "^4.1.3",
+    "@nuxt/kit": "^4.2.2",
     "pkg-types": "^2.3.0",
     "std-env": "^3.10.0",
     "ufo": "^1.6.1",
-    "site-config-stack": "3.2.11"
+    "site-config-stack": "3.2.13"
   },
   "devDependencies": {
-    "@nuxt/schema": "^4.1.3"
+    "@nuxt/schema": "^4.2.2"
   },
   "scripts": {
     "lint": "eslint . --fix",

package/util.d.ts

@@ -0,0 +1 @@
+export * from './dist/util'