nuxt-site-config-kit 0.8.4 → 0.8.10

package/dist/index.cjs

@@ -3,6 +3,7 @@
 const kit = require('@nuxt/kit');
 const pkgTypes = require('pkg-types');
 const siteConfigStack = require('site-config-stack');
+const ufo = require('ufo');
 
 async function getPkgJsonContextConfig(rootDir) {
   const pkgJson = await pkgTypes.readPackageJSON(void 0, { startingFrom: rootDir });
@@ -123,6 +124,24 @@ async function assertSiteConfig(mode, options) {
   };
 }
 
+function useNitroOrigin() {
+  const cert = process.env.NITRO_SSL_CERT;
+  const key = process.env.NITRO_SSL_KEY;
+  let host = process.env.NITRO_HOST || process.env.HOST || false;
+  let port = process.env.NITRO_PORT || process.env.PORT || (process.dev ? 3e3 : false);
+  let protocol = cert && key || !process.dev ? "https" : "http";
+  if ((process.dev || process.env.prerender) && process.env.NUXT_VITE_NODE_OPTIONS) {
+    const origin = JSON.parse(process.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}/`;
+}
 function withSiteUrl(path, options = {}) {
   const siteConfig = useSiteConfig();
   if (!siteConfig.url && options.throwErrorOnMissingSiteUrl)
@@ -141,12 +160,28 @@ function withSiteTrailingSlash(path) {
   const siteConfig = useSiteConfig();
   return siteConfigStack.fixSlashes(siteConfig.trailingSlash, path);
 }
+function createSitePathResolver(options = {}, nuxt = kit.useNuxt()) {
+  const siteConfig = useSiteConfig();
+  const nitroOrigin = useNitroOrigin();
+  const canUseSiteUrl = options.canonical !== false || process.env.prerender && siteConfig.url;
+  const nuxtBase = nuxt.options.app.baseURL || "/";
+  return (path) => {
+    return siteConfigStack.resolveSitePath(path, {
+      ...options,
+      siteUrl: canUseSiteUrl ? siteConfig.url : nitroOrigin,
+      trailingSlash: siteConfig.trailingSlash,
+      base: nuxtBase
+    });
+  };
+}
 
 exports.assertSiteConfig = assertSiteConfig;
+exports.createSitePathResolver = createSitePathResolver;
 exports.initSiteConfig = initSiteConfig;
 exports.installNuxtSiteConfig = installNuxtSiteConfig;
 exports.requireSiteConfig = requireSiteConfig;
 exports.updateSiteConfig = updateSiteConfig;
+exports.useNitroOrigin = useNitroOrigin;
 exports.useSiteConfig = useSiteConfig;
 exports.withSiteTrailingSlash = withSiteTrailingSlash;
 exports.withSiteUrl = withSiteUrl;

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { SiteConfigInput, SiteConfigStack, SiteConfig } from 'site-config-stack';
 export { SiteConfig, SiteConfigInput, SiteConfigStack } from 'site-config-stack';
+import * as _nuxt_schema from '@nuxt/schema';
 import { Nuxt } from '@nuxt/schema';
 
 type AssertionModes = 'prerender' | 'generate' | 'build';
@@ -32,10 +33,16 @@ declare function assertSiteConfig(mode: AssertionModes, options?: {
     messages: string[];
 }>;
 
+declare function useNitroOrigin(): string;
 declare function withSiteUrl(path: string, options?: {
     withBase?: boolean;
     throwErrorOnMissingSiteUrl?: boolean;
 }): string;
 declare function withSiteTrailingSlash(path: string): string;
+declare function createSitePathResolver(options?: {
+    canonical?: boolean;
+    absolute?: boolean;
+    withBase?: boolean;
+}, nuxt?: _nuxt_schema.Nuxt): (path: string) => string;
 
-export { AssertionModes, ModuleAssertion, assertSiteConfig, initSiteConfig, installNuxtSiteConfig, requireSiteConfig, updateSiteConfig, useSiteConfig, withSiteTrailingSlash, withSiteUrl };
+export { AssertionModes, ModuleAssertion, assertSiteConfig, createSitePathResolver, initSiteConfig, installNuxtSiteConfig, requireSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig, withSiteTrailingSlash, withSiteUrl };

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import { tryUseNuxt, installModule, resolvePath, useNuxt, useLogger } from '@nuxt/kit';
 import { readPackageJSON } from 'pkg-types';
 import { createSiteConfigStack, envSiteConfig, resolveSitePath, fixSlashes } from 'site-config-stack';
+import { withoutProtocol } from 'ufo';
 
 async function getPkgJsonContextConfig(rootDir) {
   const pkgJson = await readPackageJSON(void 0, { startingFrom: rootDir });
@@ -121,6 +122,24 @@ async function assertSiteConfig(mode, options) {
   };
 }
 
+function useNitroOrigin() {
+  const cert = process.env.NITRO_SSL_CERT;
+  const key = process.env.NITRO_SSL_KEY;
+  let host = process.env.NITRO_HOST || process.env.HOST || false;
+  let port = process.env.NITRO_PORT || process.env.PORT || (process.dev ? 3e3 : false);
+  let protocol = cert && key || !process.dev ? "https" : "http";
+  if ((process.dev || process.env.prerender) && process.env.NUXT_VITE_NODE_OPTIONS) {
+    const origin = JSON.parse(process.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}/`;
+}
 function withSiteUrl(path, options = {}) {
   const siteConfig = useSiteConfig();
   if (!siteConfig.url && options.throwErrorOnMissingSiteUrl)
@@ -139,5 +158,19 @@ 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 || process.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
+    });
+  };
+}
 
-export { assertSiteConfig, initSiteConfig, installNuxtSiteConfig, requireSiteConfig, updateSiteConfig, useSiteConfig, withSiteTrailingSlash, withSiteUrl };
+export { assertSiteConfig, createSitePathResolver, initSiteConfig, installNuxtSiteConfig, requireSiteConfig, updateSiteConfig, useNitroOrigin, useSiteConfig, withSiteTrailingSlash, withSiteUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config-kit",
   "type": "module",
-  "version": "0.8.4",
+  "version": "0.8.10",
   "description": "Shared site configuration build-time utilities for Nuxt 3 modules.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -27,11 +27,12 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "^3.6.1",
+    "@nuxt/kit": "^3.6.2",
+    "@nuxt/schema": "^3.6.2",
     "defu": "^6.1.2",
     "pkg-types": "^1.0.3",
     "ufo": "^1.1.2",
-    "site-config-stack": "0.8.4"
+    "site-config-stack": "0.8.10"
   },
   "scripts": {
     "lint": "eslint . --fix",