nuxt-site-config 0.8.17 → 1.0.2

package/dist/module.d.ts

@@ -1,40 +1,16 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { SiteConfigStack, SiteConfigInput, AssertionModes, ModuleAssertion, SiteConfig } from 'nuxt-site-config-kit';
+import { SiteConfigInput, SiteConfig } from 'nuxt-site-config-kit';
 
+declare const processShim: NodeJS.Process;
+declare const envShim: NodeJS.ProcessEnv;
 interface ModuleOptions extends SiteConfigInput {
 }
 interface ModulePublicRuntimeConfig {
     site: SiteConfigInput;
 }
-declare module 'h3' {
-    interface H3EventContext {
-        siteConfig: SiteConfigStack;
-    }
-}
-declare module 'nuxt/schema' {
-    interface AppConfigInput {
-        /** Theme configuration */
-        site?: SiteConfigInput;
-    }
-}
-declare module '@nuxt/schema' {
-    interface AppConfigInput {
-        /** Theme configuration */
-        site?: SiteConfigInput;
-    }
-    interface Nuxt {
-        _siteConfig?: SiteConfigStack;
-        _siteConfigAsserts?: Partial<Record<Partial<AssertionModes>, ModuleAssertion[]>>;
-    }
-}
-declare module '@nuxt/schema' {
-    interface RuntimeNuxtHooks {
-        'site-config:resolve': (siteConfig: SiteConfig) => void;
-    }
-}
 interface ModuleHooks {
     'site-config:resolve': (siteConfig: SiteConfig) => void;
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 
-export { ModuleHooks, ModuleOptions, ModulePublicRuntimeConfig, _default as default };
+export { ModuleHooks, ModuleOptions, ModulePublicRuntimeConfig, _default as default, envShim, processShim };

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "site",
-  "version": "0.8.17"
+  "version": "1.0.2"
 }

package/dist/module.mjs

@@ -1,6 +1,26 @@
-import { defineNuxtModule, createResolver, addImports, addComponent, addPlugin, addServerHandler } from '@nuxt/kit';
-import { initSiteConfig, updateSiteConfig, useSiteConfig, assertSiteConfig } from 'nuxt-site-config-kit';
+import { useNuxt, addTemplate, defineNuxtModule, createResolver, addImports, addComponent, addPlugin, addServerHandler } from '@nuxt/kit';
+import { initSiteConfig, updateSiteConfig, useSiteConfig } from 'nuxt-site-config-kit';
+import { resolve } from 'pathe';
 
+function extendTypes(module, template) {
+  const nuxt = useNuxt();
+  addTemplate({
+    filename: `module/${module}.d.ts`,
+    getContents: async () => {
+      const s = await template();
+      return `// Generated by ${module}
+${s}
+export {}
+`;
+    }
+  });
+  nuxt.hooks.hook("prepare:types", ({ references }) => {
+    references.push({ path: resolve(nuxt.options.buildDir, `module/${module}.d.ts`) });
+  });
+}
+
+const processShim = typeof process !== "undefined" ? process : {};
+const envShim = processShim.env || {};
 const module = defineNuxtModule({
   meta: {
     name: "nuxt-site-config",
@@ -18,10 +38,75 @@ const module = defineNuxtModule({
         _context: "nuxt:config:site",
         ...config
       });
-      const siteConfig = await useSiteConfig();
-      await nuxt.callHook("site-config:resolve", siteConfig);
+      const runtimeConfig = nuxt.options.runtimeConfig;
+      function getRuntimeConfig(config2) {
+        const env = config2.toUpperCase();
+        if (envShim[`NUXT_SITE_${env}}`])
+          return envShim[`NUXT_SITE_${env}}`];
+        if (envShim[`NUXT_PUBLIC_SITE_${env}}`])
+          return envShim[`NUXT_PUBLIC_SITE_${env}}`];
+        return runtimeConfig[`site${config2}`] || runtimeConfig.public?.[`site${config2}`];
+      }
+      updateSiteConfig({
+        _context: "fallbackRuntimeConfigAndEnv",
+        url: getRuntimeConfig("Url"),
+        name: getRuntimeConfig("Name"),
+        description: getRuntimeConfig("Description"),
+        logo: getRuntimeConfig("Image"),
+        defaultLocale: getRuntimeConfig("Language"),
+        indexable: getRuntimeConfig("Indexable")
+      });
+      updateSiteConfig({
+        _context: "runtimeConfig",
+        ...nuxt?.options.runtimeConfig.public.site || {}
+      });
+      const siteConfig = useSiteConfig();
+      await nuxt.callHook("`site-config:resolve`", siteConfig);
       nuxt.options.runtimeConfig.public.site = siteConfig;
     });
+    extendTypes("nuxt-site-config", async () => {
+      return `
+import type { SiteConfig, SiteConfigInput, SiteConfigStack } from '${resolve("./runtime/types")}'
+
+declare module 'nitropack' {
+  interface NitroRouteRules {
+    site: SiteConfigInput
+  }
+  interface NitroRouteConfig {
+    site: SiteConfig
+  }
+}
+
+declare module 'h3' {
+  interface H3EventContext {
+    siteConfig: SiteConfigStack
+  }
+}
+
+declare module 'nuxt/schema' {
+  interface AppConfigInput {
+    /** Theme configuration */
+    site?: SiteConfigInput
+  }
+}
+
+declare module '@nuxt/schema' {
+  interface AppConfigInput {
+    /** Theme configuration */
+    site?: SiteConfigInput
+  }
+  interface Nuxt {
+    _siteConfig?: SiteConfigStack
+  }
+}
+
+declare module '@nuxt/schema' {
+  export interface RuntimeNuxtHooks {
+    'site-config:resolve': (siteConfig: SiteConfig) => void
+  }
+}
+`;
+    });
     const composables = ["useSiteConfig", "updateSiteConfig", "useNitroOrigin"];
     composables.forEach((c) => {
       addImports({
@@ -36,15 +121,12 @@ const module = defineNuxtModule({
         name: c
       });
     });
-    nuxt.hooks.hook("nitro:init", async (nitro) => {
-      nitro.hooks.hookOnce("prerender:generate", async () => {
-        await assertSiteConfig("prerender");
-      });
-    });
     await addComponent({
       filePath: resolve("./runtime/component/SiteLink.vue"),
       name: "SiteLink"
     });
+    if (process.env.playground)
+      nuxt.options.alias["site-config-stack"] = resolve("../../site-config/src/index");
     nuxt.options.nitro.imports = nuxt.options.nitro.imports || {};
     nuxt.options.nitro.imports.imports = nuxt.options.nitro.imports.imports || [];
     nuxt.options.nitro.imports.imports.push(...[
@@ -90,4 +172,4 @@ const module = defineNuxtModule({
   }
 });
 
-export { module as default };
+export { module as default, envShim, processShim };

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

@@ -1,2 +1,2 @@
-import type { NuxtSiteConfig } from '../../types';
+import type { NuxtSiteConfig } from '../types';
 export declare function useSiteConfig(): NuxtSiteConfig;

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

@@ -1,3 +1,3 @@
 import type { H3Event } from 'h3';
-import type { NuxtSiteConfig } from '../../../types';
+import type { NuxtSiteConfig } from '../../types';
 export declare function useSiteConfig(e: H3Event): NuxtSiteConfig;

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

@@ -1,5 +1,5 @@
-import { eventHandler, updateSiteConfig, useAppConfig, useNitroOrigin, useRuntimeConfig } from "#imports";
-export default eventHandler((e) => {
+import { defineEventHandler, updateSiteConfig, useAppConfig, useNitroOrigin, useRuntimeConfig } from "#imports";
+export default defineEventHandler((e) => {
   if (!e.context.siteConfig) {
     const appConfig = useAppConfig();
     const nitroOrigin = useNitroOrigin(e);

package/dist/runtime/types.d.ts

@@ -0,0 +1,3 @@
+import type { SiteConfig, SiteConfigInput, SiteConfigStack } from 'site-config-stack';
+export type NuxtSiteConfig = Omit<SiteConfig, 'url'> & Required<Pick<SiteConfig, 'url'>>;
+export { SiteConfig, SiteConfigStack, SiteConfigInput };

package/dist/runtime/types.mjs

@@ -0,0 +1 @@
+export {};

package/dist/types.d.ts

@@ -16,4 +16,4 @@ declare module 'nuxt/schema' {
 }
 
 
-export { ModuleHooks, ModuleOptions, ModulePublicRuntimeConfig, default } from './module'
+export { ModuleHooks, ModuleOptions, ModulePublicRuntimeConfig, default, envShim, processShim } from './module'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config",
   "type": "module",
-  "version": "0.8.17",
+  "version": "1.0.2",
   "packageManager": "pnpm@8.6.6",
   "description": "Shared site configuration for Nuxt 3 modules.",
   "license": "MIT",
@@ -29,9 +29,10 @@
   "dependencies": {
     "@nuxt/kit": "^3.6.2",
     "@nuxt/schema": "^3.6.2",
+    "pathe": "^1.1.1",
     "ufo": "^1.1.2",
-    "nuxt-site-config-kit": "0.8.17",
-    "site-config-stack": "0.8.17"
+    "nuxt-site-config-kit": "1.0.2",
+    "site-config-stack": "1.0.2"
   },
   "build": {
     "externals": [