nuxt-site-config-kit 3.2.21 → 4.0.0

package/dist/index.cjs

@@ -1,12 +1,11 @@
 'use strict';
 
-const urls = require('./shared/nuxt-site-config-kit.C9rm3WhC.cjs');
+const urls = require('./shared/nuxt-site-config-kit.CNhfnq5e.cjs');
 const util = require('./util.cjs');
+const siteConfigStack = require('site-config-stack');
 require('@nuxt/kit');
 require('site-config-stack/urls');
 require('std-env');
-require('pkg-types');
-require('site-config-stack');
 
 
 
@@ -20,3 +19,4 @@ exports.withSiteTrailingSlash = urls.withSiteTrailingSlash;
 exports.withSiteUrl = urls.withSiteUrl;
 exports.getNitroOrigin = util.getNitroOrigin;
 exports.useNitroOrigin = util.useNitroOrigin;
+exports.SiteConfigPriority = siteConfigStack.SiteConfigPriority;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { Nuxt } from '@nuxt/schema';
 import { SiteConfigStack, SiteConfigInput, SiteConfigResolved } from 'site-config-stack';
-export * from 'site-config-stack';
+export { GetSiteConfigOptions, MaybeComputedRef, MaybeComputedRefEntries, SiteConfig, SiteConfigInput, SiteConfigPriority, SiteConfigResolved, SiteConfigStack } from 'site-config-stack';
 export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './urls.cjs';
 export { NitroOriginContext, getNitroOrigin, useNitroOrigin } from './util.cjs';
 

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { Nuxt } from '@nuxt/schema';
 import { SiteConfigStack, SiteConfigInput, SiteConfigResolved } from 'site-config-stack';
-export * from 'site-config-stack';
+export { GetSiteConfigOptions, MaybeComputedRef, MaybeComputedRefEntries, SiteConfig, SiteConfigInput, SiteConfigPriority, SiteConfigResolved, SiteConfigStack } from 'site-config-stack';
 export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './urls.mjs';
 export { NitroOriginContext, getNitroOrigin, useNitroOrigin } from './util.mjs';
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Nuxt } from '@nuxt/schema';
 import { SiteConfigStack, SiteConfigInput, SiteConfigResolved } from 'site-config-stack';
-export * from 'site-config-stack';
+export { GetSiteConfigOptions, MaybeComputedRef, MaybeComputedRefEntries, SiteConfig, SiteConfigInput, SiteConfigPriority, SiteConfigResolved, SiteConfigStack } from 'site-config-stack';
 export { createSitePathResolver, withSiteTrailingSlash, withSiteUrl } from './urls.js';
 export { NitroOriginContext, getNitroOrigin, useNitroOrigin } from './util.js';
 

package/dist/index.mjs

@@ -1,7 +1,6 @@
-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 { 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.B3lHsM_-.mjs';
 export { getNitroOrigin, useNitroOrigin } from './util.mjs';
+export { SiteConfigPriority } from 'site-config-stack';
 import '@nuxt/kit';
 import 'site-config-stack/urls';
 import 'std-env';
-import 'pkg-types';
-import 'site-config-stack';

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

@@ -1,8 +1,7 @@
 import { tryUseNuxt, installModule, resolvePath, useNuxt } from '@nuxt/kit';
 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';
+import { createSiteConfigStack, SiteConfigPriority, envSiteConfig } from 'site-config-stack';
 import { getNitroOrigin } from '../util.mjs';
 
 async function initSiteConfig(nuxt = tryUseNuxt()) {
@@ -12,27 +11,14 @@ async function initSiteConfig(nuxt = tryUseNuxt()) {
   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,
+    _priority: SiteConfigPriority.system,
     env: process.env.NODE_ENV
   });
-  if (rootDir) {
-    const pkgJson = await readPackageJSON(rootDir);
-    if (pkgJson) {
-      siteConfig.push({
-        _context: "package.json",
-        _priority: -10,
-        name: pkgJson.name,
-        description: pkgJson.description
-      });
-    }
-  }
   siteConfig.push({
     _context: "vendorEnv",
-    _priority: -5,
+    _priority: SiteConfigPriority.vendor,
     url: [
       // vercel
       process.env.VERCEL_URL,
@@ -49,19 +35,9 @@ async function initSiteConfig(nuxt = tryUseNuxt()) {
       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,
+    _priority: SiteConfigPriority.build,
     ...envSiteConfig(process.env || {})
   });
   nuxt._siteConfig = siteConfig;

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

@@ -3,7 +3,6 @@
 const kit = require('@nuxt/kit');
 const urls = require('site-config-stack/urls');
 const stdEnv = require('std-env');
-const pkgTypes = require('pkg-types');
 const siteConfigStack = require('site-config-stack');
 const util = require('../util.cjs');
 
@@ -14,27 +13,14 @@ async function initSiteConfig(nuxt = kit.tryUseNuxt()) {
   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,
+    _priority: siteConfigStack.SiteConfigPriority.system,
     env: process.env.NODE_ENV
   });
-  if (rootDir) {
-    const pkgJson = await pkgTypes.readPackageJSON(rootDir);
-    if (pkgJson) {
-      siteConfig.push({
-        _context: "package.json",
-        _priority: -10,
-        name: pkgJson.name,
-        description: pkgJson.description
-      });
-    }
-  }
   siteConfig.push({
     _context: "vendorEnv",
-    _priority: -5,
+    _priority: siteConfigStack.SiteConfigPriority.vendor,
     url: [
       // vercel
       process.env.VERCEL_URL,
@@ -51,19 +37,9 @@ async function initSiteConfig(nuxt = kit.tryUseNuxt()) {
       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,
+    _priority: siteConfigStack.SiteConfigPriority.build,
     ...siteConfigStack.envSiteConfig(process.env || {})
   });
   nuxt._siteConfig = siteConfig;

package/dist/urls.cjs

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

package/dist/urls.mjs

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

package/dist/util.cjs

@@ -2,6 +2,8 @@
 
 const stdEnv = require('std-env');
 
+const PROTOCOL_RE = /^https?:\/\//;
+const TRAILING_SLASH_RE = /\/$/;
 function isLocalhostHost(host) {
   if (!host || host.startsWith("localhost") || host.startsWith("127.") || host.startsWith("0.0.0.0"))
     return true;
@@ -41,16 +43,16 @@ function splitHostPort(host) {
 }
 function getNitroOrigin(ctx = {}) {
   const isDev = ctx.isDev ?? stdEnv.isDevelopment;
-  const isPrerender = ctx.isPrerender ?? !!stdEnv.env.prerender;
+  const isPrerender = ctx.isPrerender ?? !!process.env.prerender;
   let host = "";
   let port = "";
-  let protocol = stdEnv.env.NITRO_SSL_CERT && stdEnv.env.NITRO_SSL_KEY ? "https" : "http";
+  let protocol = process.env.NITRO_SSL_CERT && process.env.NITRO_SSL_KEY ? "https" : "http";
   if (isDev || isPrerender) {
-    const devEnv = stdEnv.env.__NUXT_DEV__ || stdEnv.env.NUXT_VITE_NODE_OPTIONS;
+    const devEnv = process.env.__NUXT_DEV__ || process.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?:\/\//, "").replace(/\/$/, "");
+      host = origin.replace(PROTOCOL_RE, "").replace(TRAILING_SLASH_RE, "");
       protocol = origin.startsWith("https") ? "https" : "http";
     }
   }
@@ -66,19 +68,19 @@ function getNitroOrigin(ctx = {}) {
     protocol = ctx.requestProtocol || protocol;
   }
   if (!host) {
-    host = stdEnv.env.NITRO_HOST || stdEnv.env.HOST || "";
+    host = process.env.NITRO_HOST || process.env.HOST || "";
     if (isDev)
-      port = stdEnv.env.NITRO_PORT || stdEnv.env.PORT || "3000";
+      port = process.env.NITRO_PORT || process.env.PORT || "3000";
   }
   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;
+  host = process.env.NUXT_SITE_HOST_OVERRIDE || host;
+  port = process.env.NUXT_SITE_PORT_OVERRIDE || port;
   if (host.startsWith("http://") || host.startsWith("https://")) {
     protocol = host.startsWith("https://") ? "https" : "http";
-    host = host.replace(/^https?:\/\//, "");
+    host = host.replace(PROTOCOL_RE, "");
   } else if (!isDev && (!host || !isLocalhostHost(host))) {
     protocol = "https";
   }

package/dist/util.mjs

@@ -1,5 +1,7 @@
-import { isDevelopment, env } from 'std-env';
+import { isDevelopment } from 'std-env';
 
+const PROTOCOL_RE = /^https?:\/\//;
+const TRAILING_SLASH_RE = /\/$/;
 function isLocalhostHost(host) {
   if (!host || host.startsWith("localhost") || host.startsWith("127.") || host.startsWith("0.0.0.0"))
     return true;
@@ -39,16 +41,16 @@ function splitHostPort(host) {
 }
 function getNitroOrigin(ctx = {}) {
   const isDev = ctx.isDev ?? isDevelopment;
-  const isPrerender = ctx.isPrerender ?? !!env.prerender;
+  const isPrerender = ctx.isPrerender ?? !!process.env.prerender;
   let host = "";
   let port = "";
-  let protocol = env.NITRO_SSL_CERT && env.NITRO_SSL_KEY ? "https" : "http";
+  let protocol = process.env.NITRO_SSL_CERT && process.env.NITRO_SSL_KEY ? "https" : "http";
   if (isDev || isPrerender) {
-    const devEnv = env.__NUXT_DEV__ || env.NUXT_VITE_NODE_OPTIONS;
+    const devEnv = process.env.__NUXT_DEV__ || process.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?:\/\//, "").replace(/\/$/, "");
+      host = origin.replace(PROTOCOL_RE, "").replace(TRAILING_SLASH_RE, "");
       protocol = origin.startsWith("https") ? "https" : "http";
     }
   }
@@ -64,19 +66,19 @@ function getNitroOrigin(ctx = {}) {
     protocol = ctx.requestProtocol || protocol;
   }
   if (!host) {
-    host = env.NITRO_HOST || env.HOST || "";
+    host = process.env.NITRO_HOST || process.env.HOST || "";
     if (isDev)
-      port = env.NITRO_PORT || env.PORT || "3000";
+      port = process.env.NITRO_PORT || process.env.PORT || "3000";
   }
   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;
+  host = process.env.NUXT_SITE_HOST_OVERRIDE || host;
+  port = process.env.NUXT_SITE_PORT_OVERRIDE || port;
   if (host.startsWith("http://") || host.startsWith("https://")) {
     protocol = host.startsWith("https://") ? "https" : "http";
-    host = host.replace(/^https?:\/\//, "");
+    host = host.replace(PROTOCOL_RE, "");
   } else if (!isDev && (!host || !isLocalhostHost(host))) {
     protocol = "https";
   }

package/package.json

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