nuxt-site-config 0.8.2 → 0.8.4

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "site",
-  "version": "0.8.2"
+  "version": "0.8.4"
 }

package/dist/module.mjs

@@ -12,13 +12,6 @@ const module = defineNuxtModule({
   },
   async setup(config, nuxt) {
     const { resolve } = createResolver(import.meta.url);
-    const composables = ["useSiteConfig", "updateSiteConfig", "useNitroOrigin"];
-    composables.forEach((c) => {
-      addImports({
-        from: resolve(`./runtime/composables/${c}`),
-        name: c
-      });
-    });
     await initSiteConfig();
     nuxt.hook("modules:done", async () => {
       await updateSiteConfig({
@@ -29,9 +22,11 @@ const module = defineNuxtModule({
       await nuxt.callHook("site-config:resolve", siteConfig);
       nuxt.options.runtimeConfig.public.site = siteConfig;
     });
-    nuxt.hooks.hook("nitro:init", async (nitro) => {
-      nitro.hooks.hookOnce("prerender:generate", async () => {
-        await assertSiteConfig("prerender");
+    const composables = ["useSiteConfig", "updateSiteConfig", "useNitroOrigin"];
+    composables.forEach((c) => {
+      addImports({
+        from: resolve(`./runtime/composables/${c}`),
+        name: c
       });
     });
     const linkComposables = ["createSitePathResolver", "withSiteTrailingSlash", "withSiteUrl"];
@@ -41,9 +36,10 @@ const module = defineNuxtModule({
         name: c
       });
     });
-    addImports({
-      from: resolve("./runtime/nitro/composables/useNitroOrigin"),
-      name: "useNitroOrigin"
+    nuxt.hooks.hook("nitro:init", async (nitro) => {
+      nitro.hooks.hookOnce("prerender:generate", async () => {
+        await assertSiteConfig("prerender");
+      });
     });
     await addComponent({
       filePath: resolve("./runtime/component/SiteLink.vue"),

package/dist/runtime/composables/utils.d.ts

@@ -1,9 +1,11 @@
 import type { MaybeRef } from '@vue/reactivity';
 export declare function createSitePathResolver(options?: {
+    canonical?: MaybeRef<boolean>;
     absolute?: MaybeRef<boolean>;
     withBase?: MaybeRef<boolean>;
 }): (path: MaybeRef<string>) => any;
 export declare function withSiteTrailingSlash(path: MaybeRef<string>): any;
 export declare function withSiteUrl(path: MaybeRef<string>, options?: {
+    canonical?: MaybeRef<boolean>;
     withBase?: boolean;
 }): any;

package/dist/runtime/composables/utils.mjs

@@ -1,13 +1,14 @@
 import { fixSlashes, resolveSitePath } from "site-config-stack";
-import { computed, unref, useRuntimeConfig, useSiteConfig } from "#imports";
+import { computed, unref, useNitroOrigin, useRuntimeConfig, useSiteConfig } from "#imports";
 export function createSitePathResolver(options = {}) {
   const siteConfig = useSiteConfig();
+  const nitroOrigin = useNitroOrigin();
   const nuxtBase = useRuntimeConfig().app.baseURL || "/";
   return (path) => {
     return computed(() => resolveSitePath(unref(path), {
       absolute: unref(options.absolute),
       withBase: unref(options.withBase),
-      siteUrl: siteConfig.url,
+      siteUrl: unref(options.canonical) !== false || process.env.prerender ? siteConfig.url : nitroOrigin,
       trailingSlash: siteConfig.trailingSlash,
       base: nuxtBase
     }));
@@ -21,11 +22,12 @@ export function withSiteTrailingSlash(path) {
 }
 export function withSiteUrl(path, options = {}) {
   const siteConfig = useSiteConfig();
+  const nitroOrigin = useNitroOrigin();
   const base = useRuntimeConfig().app.baseURL || "/";
   return computed(() => {
     return resolveSitePath(unref(path), {
       absolute: true,
-      siteUrl: siteConfig.url,
+      siteUrl: unref(options.canonical) !== false || process.env.prerender ? siteConfig.url : nitroOrigin,
       trailingSlash: siteConfig.trailingSlash,
       base,
       withBase: options.withBase

package/dist/runtime/nitro/composables/utils.d.ts

@@ -1,5 +1,6 @@
 import type { H3Event } from 'h3';
 export declare function withSiteTrailingSlash(e: H3Event, path: string): string;
 export declare function withSiteUrl(e: H3Event, path: string, options?: {
+    canonical?: boolean;
     withBase?: boolean;
 }): string;

package/dist/runtime/nitro/composables/utils.mjs

@@ -7,7 +7,7 @@ export function withSiteUrl(e, path, options = {}) {
   const siteConfig = e.context.siteConfig?.get();
   return resolveSitePath(path, {
     absolute: true,
-    siteUrl: siteConfig.url || "",
+    siteUrl: options.canonical !== false || process.env.prerender ? siteConfig.url : e.context.siteConfigNitroOrigin,
     trailingSlash: siteConfig.trailingSlash,
     base: e.context.nitro.baseURL,
     withBase: options.withBase

package/dist/runtime/nitro/middleware/init.mjs

@@ -2,10 +2,12 @@ import { eventHandler, updateSiteConfig, useAppConfig, useNitroOrigin, useRuntim
 export default eventHandler((e) => {
   if (!e.context.siteConfig) {
     const appConfig = useAppConfig();
+    const nitroOrigin = useNitroOrigin(e);
+    e.context.siteConfigNitroOrigin = nitroOrigin;
     const { public: publicRuntimeConfig } = useRuntimeConfig();
     updateSiteConfig(e, {
       _context: "nitro:init",
-      url: useNitroOrigin(e)
+      url: nitroOrigin
     });
     updateSiteConfig(e, publicRuntimeConfig.site);
     if (appConfig.site) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config",
   "type": "module",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "packageManager": "pnpm@8.6.5",
   "description": "Shared site configuration for Nuxt 3 modules.",
   "license": "MIT",
@@ -29,8 +29,8 @@
   "dependencies": {
     "@nuxt/kit": "3.6.1",
     "ufo": "^1.1.2",
-    "nuxt-site-config-kit": "0.8.2",
-    "site-config-stack": "0.8.2"
+    "nuxt-site-config-kit": "0.8.4",
+    "site-config-stack": "0.8.4"
   },
   "scripts": {
     "build": "nuxt-module-build --stub && nuxt-module-build prepare && nuxt-module-build",