nuxt-site-config 0.5.2 → 0.5.4

package/dist/build.d.ts

@@ -1,6 +1,4 @@
-import { S as SiteConfig, a as SiteConfigInput } from './type-6889825a.js';
-export { b as MaybeComputedRef, c as MaybeComputedRefEntries, M as MaybeReadonlyRef, d as SiteConfigContainer, e as SiteConfigReactiveContainer } from './type-6889825a.js';
-import 'vue';
+import { S as SiteConfig, a as SiteConfigInput } from './type-3a82b30b.js';
 
 declare function initSiteConfig(): Promise<SiteConfig>;
 declare function updateSiteConfig(siteConfig: SiteConfigInput): Promise<void>;
@@ -16,4 +14,4 @@ declare function assertSiteConfig(mode: AssertionModes, options?: {
     messages: string[];
 }>;
 
-export { SiteConfig, SiteConfigInput, assertSiteConfig, initSiteConfig, requireSiteConfig, updateSiteConfig, useSiteConfig };
+export { assertSiteConfig, initSiteConfig, requireSiteConfig, updateSiteConfig, useSiteConfig };

package/dist/build.mjs

@@ -44,10 +44,10 @@ const envSiteConfig = {
   name: envShim.NUXT_PUBLIC_SITE_NAME,
   description: envShim.NUXT_PUBLIC_SITE_DESCRIPTION,
   logo: envShim.NUXT_PUBLIC_SITE_IMAGE,
-  index: envShim.NUXT_PUBLIC_SITE_INDEX,
+  indexable: envShim.NUXT_PUBLIC_SITE_INDEXABLE || envShim.NUXT_PUBLIC_SITE_INDEX,
   titleSeparator: envShim.NUXT_PUBLIC_SITE_TITLE_SEPARATOR,
   trailingSlash: envShim.NUXT_PUBLIC_SITE_TRAILING_SLASH,
-  language: envShim.NUXT_PUBLIC_SITE_LANGUAGE
+  locale: envShim.NUXT_PUBLIC_SITE_LANGUAGE || envShim.NUXT_PUBLIC_SITE_LOCALE
 };
 
 let siteConfigContainer;

package/dist/module.d.ts

@@ -1,13 +1,28 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { S as SiteConfig, a as SiteConfigInput } from './type-6889825a.js';
-export { b as MaybeComputedRef, c as MaybeComputedRefEntries, M as MaybeReadonlyRef, d as SiteConfigContainer, e as SiteConfigReactiveContainer } from './type-6889825a.js';
-import 'vue';
+import { b as SiteConfigContainer, a as SiteConfigInput, S as SiteConfig } from './type-3a82b30b.js';
 
 interface ModuleOptions extends SiteConfigInput {
 }
 interface ModulePublicRuntimeConfig {
     site: SiteConfigInput;
 }
+declare module 'h3' {
+    interface H3EventContext {
+        siteConfig: SiteConfigContainer;
+    }
+}
+declare module 'nuxt/schema' {
+    interface AppConfigInput {
+        /** Theme configuration */
+        site?: SiteConfigInput;
+    }
+}
+declare module '@nuxt/schema' {
+    interface AppConfigInput {
+        /** Theme configuration */
+        site?: SiteConfigInput;
+    }
+}
 declare module '@nuxt/schema' {
     interface RuntimeNuxtHooks {
         'site-config:resolve': (siteConfig: SiteConfig) => void;
@@ -18,4 +33,4 @@ interface ModuleHooks {
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 
-export { ModuleHooks, ModuleOptions, ModulePublicRuntimeConfig, SiteConfig, SiteConfigInput, _default as default };
+export { ModuleHooks, ModuleOptions, ModulePublicRuntimeConfig, _default as default };

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "site",
-  "version": "0.5.2"
+  "version": "0.5.4"
 }

package/dist/module.mjs

@@ -69,7 +69,7 @@ const module = defineNuxtModule({
       }
     ]);
     addPlugin({
-      src: resolve("./runtime/plugins/siteConfig.ts")
+      src: resolve("./runtime/plugins/siteConfig")
     });
     addServerHandler({
       middleware: true,

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

@@ -1,2 +1,2 @@
-import type { MaybeComputedRefEntries, SiteConfigInput } from '../../type';
-export declare function updateSiteConfig(input?: MaybeComputedRefEntries<SiteConfigInput>): void;
+import type { SiteConfigInput } from '../../type';
+export declare function updateSiteConfig(input?: SiteConfigInput): void;

package/dist/runtime/composables/updateSiteConfig.mjs

@@ -1,15 +1,10 @@
-import { unref, useNuxtApp, useRequestEvent } from "#imports";
+import { useNuxtApp, useRequestEvent } from "#imports";
 export function updateSiteConfig(input = {}) {
-  const unrefdInput = unref(input);
-  for (const k of Object.keys(unrefdInput)) {
-    unrefdInput[k] = unref(unrefdInput[k]);
-  }
-  const resolvedInput = unrefdInput;
   if (process.server) {
     const container2 = useRequestEvent().context.siteConfig;
-    container2.push(resolvedInput);
+    container2.push(input);
     return;
   }
   const container = useNuxtApp().$siteConfig;
-  container.push(resolvedInput);
+  container.push(input);
 }

package/dist/runtime/composables/utils.mjs

@@ -25,6 +25,6 @@ export function createInternalLinkResolver(options = {}) {
       path = fixSlashes(siteConfig.trailingSlash, path);
     if (!options.absolute)
       return path;
-    return withBase(path, siteConfig.value.url || "/");
+    return withBase(path, siteConfig.url || "/");
   };
 }

package/dist/runtime/siteConfig/env.d.ts

@@ -1,2 +1,2 @@
-import type { SiteConfigInput } from '../type';
+import type { SiteConfigInput } from '../../type';
 export declare const envSiteConfig: SiteConfigInput;

package/dist/runtime/siteConfig/env.mjs

@@ -14,8 +14,8 @@ export const envSiteConfig = {
   name: envShim.NUXT_PUBLIC_SITE_NAME,
   description: envShim.NUXT_PUBLIC_SITE_DESCRIPTION,
   logo: envShim.NUXT_PUBLIC_SITE_IMAGE,
-  index: envShim.NUXT_PUBLIC_SITE_INDEX,
+  indexable: envShim.NUXT_PUBLIC_SITE_INDEXABLE || envShim.NUXT_PUBLIC_SITE_INDEX,
   titleSeparator: envShim.NUXT_PUBLIC_SITE_TITLE_SEPARATOR,
   trailingSlash: envShim.NUXT_PUBLIC_SITE_TRAILING_SLASH,
-  language: envShim.NUXT_PUBLIC_SITE_LANGUAGE
+  locale: envShim.NUXT_PUBLIC_SITE_LANGUAGE || envShim.NUXT_PUBLIC_SITE_LOCALE
 };

package/dist/{type-6889825a.d.ts → type-3a82b30b.d.ts}

@@ -1,5 +1,3 @@
-import { ComputedRef, Ref } from 'vue';
-
 interface SiteConfig {
     /**
      * The canonical Site URL.
@@ -56,24 +54,9 @@ interface SiteConfigInput {
     indexable?: boolean | string;
     trailingSlash?: boolean | string;
 }
-declare module 'nuxt/schema' {
-    interface AppConfigInput {
-        /** Theme configuration */
-        site?: SiteConfigInput;
-    }
-}
-type MaybeReadonlyRef<T> = (() => T) | ComputedRef<T>;
-type MaybeComputedRef<T> = T | MaybeReadonlyRef<T> | Ref<T>;
-type MaybeComputedRefEntries<T> = MaybeComputedRef<T> | {
-    [key in keyof T]?: MaybeComputedRef<T[key]>;
-};
 interface SiteConfigContainer {
     push: (config: SiteConfigInput) => void;
     get: () => SiteConfig;
 }
-interface SiteConfigReactiveContainer {
-    push: (config: MaybeComputedRefEntries<SiteConfigInput>) => () => void;
-    get: () => Ref<SiteConfig>;
-}
 
-export { MaybeReadonlyRef as M, SiteConfig as S, SiteConfigInput as a, MaybeComputedRef as b, MaybeComputedRefEntries as c, SiteConfigContainer as d, SiteConfigReactiveContainer as e };
+export { SiteConfig as S, SiteConfigInput as a, SiteConfigContainer as b };

package/dist/types.d.ts

@@ -16,4 +16,4 @@ declare module 'nuxt/schema' {
 }
 
 
-export { MaybeComputedRef, MaybeComputedRefEntries, MaybeReadonlyRef, SiteConfigContainer, SiteConfigReactiveContainer } from './module'
+export { ModuleHooks, ModuleOptions, ModulePublicRuntimeConfig, default } from './module'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config",
   "type": "module",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "packageManager": "pnpm@8.6.3",
   "description": "Shared site configuration for Nuxt 3 modules.",
   "license": "MIT",

package/dist/runtime/siteConfig/reactiveContainer.d.ts

@@ -1,5 +0,0 @@
-import type { SiteConfigReactiveContainer } from '../../type';
-/**
- * @todo support reactivity
- */
-export declare function createReactiveSiteConfigContainer(): SiteConfigReactiveContainer;

package/dist/runtime/siteConfig/reactiveContainer.mjs

@@ -1,41 +0,0 @@
-import { defu } from "defu";
-import { ref, shallowRef, unref, watch, watchEffect } from "vue";
-import { normalizeSiteConfig } from ".//index.mjs";
-export function createReactiveSiteConfigContainer() {
-  let count = 0;
-  const stack = shallowRef([]);
-  function push(input) {
-    const unrefdInput = {};
-    const unrefdOverrides = unref(input);
-    for (const k of Object.keys(unrefdOverrides)) {
-      unrefdInput[k] = unref(unrefdOverrides[k]);
-    }
-    const id = count++;
-    function cleanUp() {
-      stack.value = stack.value.filter((o) => o._id !== id);
-    }
-    stack.value.push({ ...unrefdInput, _id: id });
-    watch(() => unrefdInput, (input2) => {
-      cleanUp();
-      push(input2);
-    }, {
-      deep: true
-    });
-    return cleanUp;
-  }
-  function get() {
-    const siteConfig = ref({});
-    watchEffect(() => {
-      const inputs = stack.value;
-      let mergedStack = {};
-      for (const o of inputs)
-        mergedStack = defu(o, mergedStack);
-      siteConfig.value = normalizeSiteConfig(mergedStack);
-    });
-    return siteConfig;
-  }
-  return {
-    push,
-    get
-  };
-}