nuxt-site-config 1.2.3 → 1.4.0

package/dist/module.d.mts

@@ -9,7 +9,7 @@ interface ModuleOptions extends SiteConfigInput {
      */
     debug: boolean;
 }
-interface ModulePublicRuntimeConfig {
+interface ModuleRuntimeConfig {
     site: SiteConfigInput;
 }
 interface ModuleHooks {
@@ -17,4 +17,4 @@ interface ModuleHooks {
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 
-export { type ModuleHooks, type ModuleOptions, type ModulePublicRuntimeConfig, _default as default };
+export { type ModuleHooks, type ModuleOptions, type ModuleRuntimeConfig, _default as default };

package/dist/module.d.ts

@@ -9,7 +9,7 @@ interface ModuleOptions extends SiteConfigInput {
      */
     debug: boolean;
 }
-interface ModulePublicRuntimeConfig {
+interface ModuleRuntimeConfig {
     site: SiteConfigInput;
 }
 interface ModuleHooks {
@@ -17,4 +17,4 @@ interface ModuleHooks {
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 
-export { type ModuleHooks, type ModuleOptions, type ModulePublicRuntimeConfig, _default as default };
+export { type ModuleHooks, type ModuleOptions, type ModuleRuntimeConfig, _default as default };

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "site",
-  "version": "1.2.3"
+  "version": "1.4.0"
 }

package/dist/module.mjs

@@ -1,8 +1,8 @@
 import { useNuxt, createResolver, addTemplate, defineNuxtModule, useLogger, addImports, addComponent, addPlugin, hasNuxtModule, addServerHandler, addPrerenderRoutes } from '@nuxt/kit';
-import { initSiteConfig, updateSiteConfig, useSiteConfig } from 'nuxt-site-config-kit';
+import { initSiteConfig, updateSiteConfig, getSiteConfigStack } from 'nuxt-site-config-kit';
 import { relative } from 'pathe';
 
-const version = "1.2.3";
+const version = "1.4.0";
 
 function extendTypes(module, template) {
   const nuxt = useNuxt();
@@ -42,18 +42,20 @@ const module = defineNuxtModule({
     logger.level = config.debug ? 4 : 3;
     const { resolve } = createResolver(import.meta.url);
     await initSiteConfig();
+    const siteConfigInput = { ...config };
+    delete siteConfigInput.debug;
     await updateSiteConfig({
       // we should allow environment variables to override the site config
       _priority: -3,
       _context: "nuxt-site-config:config",
-      ...config
+      ...siteConfigInput
     });
     nuxt.hook("modules:done", async () => {
       await nuxt.callHook("site-config:resolve");
-      nuxt.options.runtimeConfig.public["nuxt-site-config"] = {
-        // @ts-expect-error untyped
-        siteConfig: useSiteConfig(),
-        version
+      nuxt.options.runtimeConfig["nuxt-site-config"] = {
+        stack: getSiteConfigStack().stack,
+        version,
+        debug: config.debug
       };
     });
     extendTypes("nuxt-site-config", async ({ typesPath }) => {
@@ -159,6 +161,13 @@ declare module '@nuxt/schema' {
       addPlugin({
         src: resolve("./runtime/plugins/i18n")
       });
+      updateSiteConfig({
+        _context: "@nuxtjs/i18n",
+        // @ts-expect-error untyped
+        url: nuxt.options.i18n?.baseUrl,
+        // @ts-expect-error untyped
+        defaultLocale: nuxt.options.i18n?.defaultLocale
+      });
     }
     addServerHandler({
       middleware: true,

package/dist/runtime/composables/updateSiteConfig.mjs

@@ -5,6 +5,6 @@ export function updateSiteConfig(input = {}) {
     stack2.push(input);
     return;
   }
-  const stack = useNuxtApp().$siteConfig;
+  const stack = useNuxtApp().$nuxtSiteConfig;
   stack.push(input);
 }

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

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

package/dist/runtime/composables/useSiteConfig.mjs

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

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

@@ -1,26 +1,35 @@
-import { defineEventHandler, updateSiteConfig, useAppConfig, useNitroOrigin, useRuntimeConfig } from "#imports";
+import { createSiteConfigStack } from "site-config-stack";
+import { defineEventHandler, useAppConfig, useNitroOrigin, useRuntimeConfig } from "#imports";
 export default defineEventHandler((e) => {
-  if (!e.context.siteConfig) {
+  const config = useRuntimeConfig()["nuxt-site-config"];
+  const siteConfig = e.context.siteConfig || createSiteConfigStack({
+    // @ts-expect-error untyped
+    debug: config.debug
+  });
+  if (siteConfig) {
     const appConfig = useAppConfig();
     const nitroOrigin = useNitroOrigin(e);
     e.context.siteConfigNitroOrigin = nitroOrigin;
-    const { public: publicRuntimeConfig } = useRuntimeConfig();
-    updateSiteConfig(e, {
+    siteConfig.push({
       _context: "nitro:init",
+      _priority: -4,
       url: nitroOrigin
     });
-    updateSiteConfig(e, publicRuntimeConfig["nuxt-site-config"]?.siteConfig);
+    const buildStack = config.stack || [];
+    buildStack.forEach((c) => siteConfig.push(c));
     if (appConfig.site) {
-      updateSiteConfig(e, {
+      siteConfig.push({
+        _priority: -2,
         _context: "app:config",
         ...appConfig.site
       });
     }
     if (e.context._nitro.routeRules.site) {
-      updateSiteConfig(e, {
+      siteConfig.push({
         _context: "route-rules",
         ...e.context._nitro.routeRules.site
       });
     }
   }
+  e.context.siteConfig = siteConfig;
 });

package/dist/runtime/nitro/routes/debug.mjs

@@ -4,9 +4,11 @@ export default defineEventHandler(async (e) => {
   const siteConfig = useSiteConfig(e);
   const nitroOrigin = useNitroOrigin(e);
   const { public: publicRuntimeConfig } = useRuntimeConfig();
+  const stack = e.context.siteConfig.stack;
   setHeader(e, "Content-Type", "application/json");
   return {
-    ...siteConfig,
+    config: siteConfig,
+    stack,
     nitroOrigin,
     version: publicRuntimeConfig["nuxt-site-config"]?.version
   };

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

@@ -1,9 +1,10 @@
 import { createSiteConfigStack } from "site-config-stack";
-import { defineNuxtPlugin, useRequestEvent, useState } from "#imports";
+import { defineNuxtPlugin, 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;
     if (process.server) {
       siteConfigStack = useRequestEvent().context.siteConfig;
@@ -11,8 +12,11 @@ export default defineNuxtPlugin({
         useState("site-config", () => useRequestEvent().context.siteConfig.get());
       });
     }
-    if (!siteConfigStack)
-      siteConfigStack = createSiteConfigStack();
+    if (!siteConfigStack) {
+      siteConfigStack = createSiteConfigStack({
+        debug: config.debug
+      });
+    }
     if (process.client) {
       siteConfigStack.push({
         _context: "window",
@@ -24,7 +28,7 @@ export default defineNuxtPlugin({
     }
     return {
       provide: {
-        siteConfig: siteConfigStack
+        nuxtSiteConfig: siteConfigStack
       }
     };
   }

package/dist/runtime/plugins/i18n.mjs

@@ -1,14 +1,19 @@
-import { defineNuxtPlugin, ref, updateSiteConfig, useSiteConfig } from "#imports";
+import { computed, defineNuxtPlugin, updateSiteConfig } from "#imports";
 export default defineNuxtPlugin({
   name: "nuxt-site-config:i18n",
   // @ts-expect-error todo fix upstream
   enforce: 1,
   // needs to come after i18n
   setup(nuxtApp) {
-    const i18n = nuxtApp.$i18n || { locale: ref(useSiteConfig().defaultLocale) };
+    const i18n = nuxtApp.$i18n;
+    if (!i18n)
+      return;
     updateSiteConfig({
       _context: "@nuxtjs/i18n",
-      currentLocale: i18n.locale
+      url: i18n.baseUrl.value,
+      currentLocale: i18n.locale,
+      description: computed(() => i18n.t("nuxtSiteConfig.description")),
+      name: computed(() => i18n.t("nuxtSiteConfig.name"))
     });
   }
 });

package/dist/types.d.mts

@@ -1,19 +1,19 @@
 
-import { ModuleOptions, ModuleHooks, ModulePublicRuntimeConfig } from './module'
+import { ModuleOptions, ModuleHooks, ModuleRuntimeConfig } from './module'
 
 declare module '@nuxt/schema' {
   interface NuxtConfig { ['site']?: Partial<ModuleOptions> }
   interface NuxtOptions { ['site']?: ModuleOptions }
   interface NuxtHooks extends ModuleHooks {}
-  interface PublicRuntimeConfig extends ModulePublicRuntimeConfig {}
+  interface RuntimeConfig extends ModuleRuntimeConfig {}
 }
 
 declare module 'nuxt/schema' {
   interface NuxtConfig { ['site']?: Partial<ModuleOptions> }
   interface NuxtOptions { ['site']?: ModuleOptions }
   interface NuxtHooks extends ModuleHooks {}
-  interface PublicRuntimeConfig extends ModulePublicRuntimeConfig {}
+  interface RuntimeConfig extends ModuleRuntimeConfig {}
 }
 
 
-export { ModuleHooks, ModuleOptions, ModulePublicRuntimeConfig, default } from './module'
+export { ModuleHooks, ModuleOptions, ModuleRuntimeConfig, default } from './module'

package/dist/types.d.ts

@@ -1,19 +1,19 @@
 
-import { ModuleOptions, ModuleHooks, ModulePublicRuntimeConfig } from './module'
+import { ModuleOptions, ModuleHooks, ModuleRuntimeConfig } from './module'
 
 declare module '@nuxt/schema' {
   interface NuxtConfig { ['site']?: Partial<ModuleOptions> }
   interface NuxtOptions { ['site']?: ModuleOptions }
   interface NuxtHooks extends ModuleHooks {}
-  interface PublicRuntimeConfig extends ModulePublicRuntimeConfig {}
+  interface RuntimeConfig extends ModuleRuntimeConfig {}
 }
 
 declare module 'nuxt/schema' {
   interface NuxtConfig { ['site']?: Partial<ModuleOptions> }
   interface NuxtOptions { ['site']?: ModuleOptions }
   interface NuxtHooks extends ModuleHooks {}
-  interface PublicRuntimeConfig extends ModulePublicRuntimeConfig {}
+  interface RuntimeConfig extends ModuleRuntimeConfig {}
 }
 
 
-export { ModuleHooks, ModuleOptions, ModulePublicRuntimeConfig, default } from './module'
+export { ModuleHooks, ModuleOptions, ModuleRuntimeConfig, default } from './module'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config",
   "type": "module",
-  "version": "1.2.3",
+  "version": "1.4.0",
   "description": "Shared site configuration for Nuxt 3 modules.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -26,12 +26,12 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "^3.7.3",
-    "@nuxt/schema": "^3.7.3",
+    "@nuxt/kit": "^3.7.4",
+    "@nuxt/schema": "^3.7.4",
     "pathe": "^1.1.1",
-    "ufo": "^1.3.0",
-    "nuxt-site-config-kit": "1.2.3",
-    "site-config-stack": "1.2.3"
+    "ufo": "^1.3.1",
+    "nuxt-site-config-kit": "1.4.0",
+    "site-config-stack": "1.4.0"
   },
   "build": {
     "externals": [