nuxt-site-config 1.5.0 → 1.5.2

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "site",
-  "version": "1.5.0"
+  "version": "1.5.2"
 }

package/dist/module.mjs

@@ -1,8 +1,8 @@
-import { useNuxt, createResolver, addTemplate, defineNuxtModule, useLogger, addImports, addComponent, addPlugin, hasNuxtModule, addServerHandler, addPrerenderRoutes } from '@nuxt/kit';
+import { useNuxt, createResolver, addTemplate, defineNuxtModule, useLogger, addImports, addComponent, addPlugin, hasNuxtModule, addServerHandler, addPrerenderRoutes, addServerPlugin } from '@nuxt/kit';
 import { initSiteConfig, updateSiteConfig, getSiteConfigStack } from 'nuxt-site-config-kit';
 import { relative } from 'pathe';
 
-const version = "1.5.0";
+const version = "1.5.2";
 
 function extendTypes(module, template) {
   const nuxt = useNuxt();
@@ -180,6 +180,7 @@ declare module '@nuxt/schema' {
       });
       addPrerenderRoutes("/api/__site-config__/debug");
     }
+    addServerPlugin(resolve("./runtime/nitro/plugins/injectState"));
   }
 });
 

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

@@ -1,4 +1,3 @@
+import type { GetSiteConfigOptions } from 'site-config-stack';
 import type { NuxtSiteConfig } from '../types';
-export declare function useSiteConfig(options?: {
-    debug?: boolean;
-}): NuxtSiteConfig;
+export declare function useSiteConfig(options?: GetSiteConfigOptions): NuxtSiteConfig;

package/dist/runtime/composables/useSiteConfig.mjs

@@ -6,11 +6,9 @@ import {
 export function useSiteConfig(options) {
   let stack;
   if (process.server)
-    stack = useRequestEvent().context.siteConfig.get();
+    stack = useRequestEvent().context.siteConfig.get(options);
   else
-    stack = useNuxtApp().$nuxtSiteConfig.get();
-  if (!options?.debug)
-    delete stack._context;
+    stack = useNuxtApp().$nuxtSiteConfig.get(options);
   Object.entries(stack).forEach(([k, v]) => {
     stack[k] = toValue(v);
   });

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

@@ -1,3 +1,4 @@
 import type { H3Event } from 'h3';
+import type { GetSiteConfigOptions } from 'site-config-stack';
 import type { NuxtSiteConfig } from '../../types';
-export declare function useSiteConfig(e: H3Event): NuxtSiteConfig;
+export declare function useSiteConfig(e: H3Event, _options?: GetSiteConfigOptions): NuxtSiteConfig;

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

@@ -1,5 +1,8 @@
 import { createSiteConfigStack } from "site-config-stack";
-export function useSiteConfig(e) {
+import defu from "defu";
+import { useRuntimeConfig } from "#imports";
+export function useSiteConfig(e, _options) {
   e.context.siteConfig = e.context.siteConfig || createSiteConfigStack();
-  return e.context.siteConfig.get();
+  const options = defu(_options, useRuntimeConfig()["nuxt-site-config"], { debug: false });
+  return e.context.siteConfig.get(options);
 }

package/dist/runtime/nitro/plugins/injectState.d.ts

@@ -0,0 +1,3 @@
+import type { NitroAppPlugin } from 'nitropack';
+declare const InjectStatePlugin: NitroAppPlugin;
+export default InjectStatePlugin;

package/dist/runtime/nitro/plugins/injectState.mjs

@@ -0,0 +1,20 @@
+import devalue from "@nuxt/devalue";
+import { toValue } from "vue";
+import { getRouteRules } from "#internal/nitro";
+import { useSiteConfig } from "#imports";
+const PRERENDER_NO_SSR_ROUTES = /* @__PURE__ */ new Set(["/index.html", "/200.html", "/404.html"]);
+const InjectStatePlugin = async (nitroApp) => {
+  nitroApp.hooks.hook("render:html", async (ctx, { event }) => {
+    const routeOptions = getRouteRules(event);
+    const isIsland = process.env.NUXT_COMPONENT_ISLANDS && event.path.startsWith("/__nuxt_island");
+    const url = event.path;
+    const noSSR = !!process.env.NUXT_NO_SSR || event.context.nuxt?.noSSR || routeOptions.ssr === false && !isIsland || (import.meta.prerender ? PRERENDER_NO_SSR_ROUTES.has(url) : false);
+    if (noSSR) {
+      const siteConfig = Object.fromEntries(
+        Object.entries(useSiteConfig(event)).map(([k, v]) => [k, toValue(v)])
+      );
+      ctx.body.push(`<script>window.__NUXT_SITE_CONFIG__=${devalue(siteConfig)}<\/script>`);
+    }
+  });
+};
+export default InjectStatePlugin;

package/dist/runtime/plugins/0.siteConfig.mjs

@@ -1,34 +1,39 @@
 import { createSiteConfigStack } from "site-config-stack";
-import { defineNuxtPlugin, useRequestEvent, useRuntimeConfig, useState } from "#imports";
+import { parse } from "devalue";
+import { defineNuxtPlugin, useNuxtApp, useRequestEvent, useRuntimeConfig, useState } from "#imports";
 export default defineNuxtPlugin({
   name: "nuxt-site-config",
   enforce: "pre",
   async setup(nuxtApp) {
     const config = useRuntimeConfig()["nuxt-site-config"] || { debug: false };
-    let siteConfigStack;
+    let stack;
+    const state = useState("site-config");
     if (process.server) {
-      siteConfigStack = useRequestEvent().context.siteConfig;
+      stack = useRequestEvent().context.siteConfig;
       nuxtApp.hooks.hook("app:rendered", () => {
-        useState("site-config", () => useRequestEvent().context.siteConfig.get());
+        state.value = useRequestEvent().context.siteConfig.get();
       });
     }
-    if (!siteConfigStack) {
-      siteConfigStack = createSiteConfigStack({
+    if (!stack) {
+      stack = createSiteConfigStack({
         debug: config.debug
       });
     }
     if (process.client) {
-      siteConfigStack.push({
+      stack.push({
         _context: "window",
         url: window.location.origin
       });
-      const state = useState("site-config");
-      if (state.value)
-        siteConfigStack.push(state.value);
+      const nuxt = useNuxtApp();
+      if (nuxt.payload.serverRendered) {
+        stack.push(state.value);
+      } else {
+        stack.push(parse(window.__NUXT_SITE_CONFIG__));
+      }
     }
     return {
       provide: {
-        nuxtSiteConfig: siteConfigStack
+        nuxtSiteConfig: stack
       }
     };
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config",
   "type": "module",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Shared site configuration for Nuxt 3 modules.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -30,8 +30,8 @@
     "@nuxt/schema": "^3.7.4",
     "pathe": "^1.1.1",
     "ufo": "^1.3.1",
-    "nuxt-site-config-kit": "1.5.0",
-    "site-config-stack": "1.5.0"
+    "nuxt-site-config-kit": "1.5.2",
+    "site-config-stack": "1.5.2"
   },
   "build": {
     "externals": [
@@ -39,7 +39,7 @@
     ]
   },
   "scripts": {
-    "build": "nuxt-module-build --stub && nuxt-module-build prepare && nuxt-module-build",
+    "build": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxt-module-build build",
     "dev:build": "nuxi build playground",
     "dev:prepare": "nuxt-module-build --stub && nuxi prepare playground",
     "release": "bumpp package.json --commit --push --tag",