nuxt-site-config-kit 3.2.18 → 3.2.20

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const urls = require('./shared/nuxt-site-config-kit.DmVknu3-.cjs');
+const urls = require('./shared/nuxt-site-config-kit.C9rm3WhC.cjs');
 const util = require('./util.cjs');
 require('@nuxt/kit');
 require('site-config-stack/urls');

package/dist/index.mjs

@@ -1,4 +1,4 @@
-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 { 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.Bk-djAYB.mjs';
 export { getNitroOrigin, useNitroOrigin } from './util.mjs';
 import '@nuxt/kit';
 import 'site-config-stack/urls';

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

@@ -1,5 +1,5 @@
 import { tryUseNuxt, installModule, resolvePath, useNuxt } from '@nuxt/kit';
-import { fixSlashes, resolveSitePath } from 'site-config-stack/urls';
+import { resolveSitePath, fixSlashes } from 'site-config-stack/urls';
 import { env } from 'std-env';
 import { readPackageJSON } from 'pkg-types';
 import { createSiteConfigStack, envSiteConfig } from 'site-config-stack';
@@ -62,7 +62,7 @@ async function initSiteConfig(nuxt = tryUseNuxt()) {
   siteConfig.push({
     _context: "buildEnv",
     _priority: -1,
-    ...envSiteConfig(process.env)
+    ...envSiteConfig(process.env || {})
   });
   nuxt._siteConfig = siteConfig;
   return siteConfig;
@@ -110,7 +110,7 @@ function withSiteUrl(path, options = {}) {
   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 || "/";
+  const base = nuxt.options.app.baseURL || "/";
   return resolveSitePath(path, {
     absolute: true,
     siteUrl: siteConfig.url || "",

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

@@ -64,7 +64,7 @@ async function initSiteConfig(nuxt = kit.tryUseNuxt()) {
   siteConfig.push({
     _context: "buildEnv",
     _priority: -1,
-    ...siteConfigStack.envSiteConfig(process.env)
+    ...siteConfigStack.envSiteConfig(process.env || {})
   });
   nuxt._siteConfig = siteConfig;
   return siteConfig;
@@ -112,7 +112,7 @@ function withSiteUrl(path, options = {}) {
   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 || "/";
+  const base = nuxt.options.app.baseURL || "/";
   return urls.resolveSitePath(path, {
     absolute: true,
     siteUrl: siteConfig.url || "",

package/dist/urls.cjs

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

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.CNTokPxh.mjs';
+export { c as createSitePathResolver, w as withSiteTrailingSlash, d as withSiteUrl } from './shared/nuxt-site-config-kit.Bk-djAYB.mjs';
 import './util.mjs';
 import 'pkg-types';
 import 'site-config-stack';

package/dist/util.cjs

@@ -2,6 +2,37 @@
 
 const stdEnv = require('std-env');
 
+function isLocalhostHost(host) {
+  if (!host || host.startsWith("localhost") || host.startsWith("127."))
+    return true;
+  const hostname = host.startsWith("[") ? host.slice(0, host.indexOf("]") + 1) : host;
+  return hostname === "[::1]" || hostname === "::1";
+}
+function extractHostname(host) {
+  if (host.startsWith("[")) {
+    const close = host.indexOf("]");
+    return close !== -1 ? host.slice(0, close + 1) : host;
+  }
+  const colonCount = host.split(":").length - 1;
+  return colonCount === 1 ? host.slice(0, host.indexOf(":")) : host;
+}
+function splitHostPort(host) {
+  if (host.startsWith("[")) {
+    const close = host.indexOf("]");
+    const hostname = close !== -1 ? host.slice(0, close + 1) : host;
+    const port = close !== -1 && host[close + 1] === ":" ? host.slice(close + 2) : "";
+    return { host: hostname === "[::1]" ? "localhost" : hostname, port };
+  }
+  const colonCount = host.split(":").length - 1;
+  if (colonCount === 1) {
+    const i = host.indexOf(":");
+    return { host: host.slice(0, i), port: host.slice(i + 1) };
+  }
+  if (colonCount > 1) {
+    return { host: host === "::1" ? "localhost" : `[${host}]`, port: "" };
+  }
+  return { host, port: "" };
+}
 function getNitroOrigin(ctx = {}) {
   const isDev = ctx.isDev ?? stdEnv.isDevelopment;
   const isPrerender = ctx.isPrerender ?? !!stdEnv.env.prerender;
@@ -17,10 +48,9 @@ function getNitroOrigin(ctx = {}) {
       protocol = origin.startsWith("https") ? "https" : "http";
     }
   }
-  const hostIsLocalhost = !host || host.startsWith("localhost") || host.startsWith("127.");
-  if (isDev && hostIsLocalhost && ctx.requestHost) {
-    const reqHost = ctx.requestHost.split(":")[0] || "";
-    if (reqHost && !reqHost.startsWith("localhost") && !reqHost.startsWith("127.")) {
+  if (isDev && isLocalhostHost(host) && ctx.requestHost) {
+    const reqHost = extractHostname(ctx.requestHost);
+    if (reqHost && !isLocalhostHost(reqHost)) {
       host = ctx.requestHost;
       protocol = ctx.requestProtocol || protocol;
     }
@@ -34,17 +64,16 @@ function getNitroOrigin(ctx = {}) {
     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);
-  }
+  const split = splitHostPort(host);
+  host = split.host;
+  if (split.port)
+    port = split.port;
   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.")) {
+  } else if (!host || !isLocalhostHost(host)) {
     protocol = "https";
   }
   return `${protocol}://${host}${port ? `:${port}` : ""}/`;

package/dist/util.mjs

@@ -1,5 +1,36 @@
 import { isDevelopment, env } from 'std-env';
 
+function isLocalhostHost(host) {
+  if (!host || host.startsWith("localhost") || host.startsWith("127."))
+    return true;
+  const hostname = host.startsWith("[") ? host.slice(0, host.indexOf("]") + 1) : host;
+  return hostname === "[::1]" || hostname === "::1";
+}
+function extractHostname(host) {
+  if (host.startsWith("[")) {
+    const close = host.indexOf("]");
+    return close !== -1 ? host.slice(0, close + 1) : host;
+  }
+  const colonCount = host.split(":").length - 1;
+  return colonCount === 1 ? host.slice(0, host.indexOf(":")) : host;
+}
+function splitHostPort(host) {
+  if (host.startsWith("[")) {
+    const close = host.indexOf("]");
+    const hostname = close !== -1 ? host.slice(0, close + 1) : host;
+    const port = close !== -1 && host[close + 1] === ":" ? host.slice(close + 2) : "";
+    return { host: hostname === "[::1]" ? "localhost" : hostname, port };
+  }
+  const colonCount = host.split(":").length - 1;
+  if (colonCount === 1) {
+    const i = host.indexOf(":");
+    return { host: host.slice(0, i), port: host.slice(i + 1) };
+  }
+  if (colonCount > 1) {
+    return { host: host === "::1" ? "localhost" : `[${host}]`, port: "" };
+  }
+  return { host, port: "" };
+}
 function getNitroOrigin(ctx = {}) {
   const isDev = ctx.isDev ?? isDevelopment;
   const isPrerender = ctx.isPrerender ?? !!env.prerender;
@@ -15,10 +46,9 @@ function getNitroOrigin(ctx = {}) {
       protocol = origin.startsWith("https") ? "https" : "http";
     }
   }
-  const hostIsLocalhost = !host || host.startsWith("localhost") || host.startsWith("127.");
-  if (isDev && hostIsLocalhost && ctx.requestHost) {
-    const reqHost = ctx.requestHost.split(":")[0] || "";
-    if (reqHost && !reqHost.startsWith("localhost") && !reqHost.startsWith("127.")) {
+  if (isDev && isLocalhostHost(host) && ctx.requestHost) {
+    const reqHost = extractHostname(ctx.requestHost);
+    if (reqHost && !isLocalhostHost(reqHost)) {
       host = ctx.requestHost;
       protocol = ctx.requestProtocol || protocol;
     }
@@ -32,17 +62,16 @@ function getNitroOrigin(ctx = {}) {
     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);
-  }
+  const split = splitHostPort(host);
+  host = split.host;
+  if (split.port)
+    port = split.port;
   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.")) {
+  } else if (!host || !isLocalhostHost(host)) {
     protocol = "https";
   }
   return `${protocol}://${host}${port ? `:${port}` : ""}/`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config-kit",
   "type": "module",
-  "version": "3.2.18",
+  "version": "3.2.20",
   "description": "Shared site configuration build-time utilities for Nuxt 3 modules.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -42,14 +42,14 @@
     "util.d.ts"
   ],
   "dependencies": {
-    "@nuxt/kit": "^4.2.2",
+    "@nuxt/kit": "^4.3.1",
     "pkg-types": "^2.3.0",
     "std-env": "^3.10.0",
     "ufo": "^1.6.3",
-    "site-config-stack": "3.2.18"
+    "site-config-stack": "3.2.20"
   },
   "devDependencies": {
-    "@nuxt/schema": "^4.2.2"
+    "@nuxt/schema": "^4.3.1"
   },
   "scripts": {
     "lint": "eslint . --fix",