nuxt-site-config 0.7.5 → 0.8.0

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "site",
-  "version": "0.7.5"
+  "version": "0.8.0"
 }

package/dist/module.mjs

@@ -1,5 +1,5 @@
 import { defineNuxtModule, createResolver, addImports, addComponent, addPlugin, addServerHandler } from '@nuxt/kit';
-import { updateSiteConfig, useSiteConfig, assertSiteConfig } from 'nuxt-site-config-kit';
+import { initSiteConfig, updateSiteConfig, useSiteConfig, assertSiteConfig } from 'nuxt-site-config-kit';
 
 const module = defineNuxtModule({
   meta: {
@@ -19,6 +19,7 @@ const module = defineNuxtModule({
         name: c
       });
     });
+    await initSiteConfig();
     nuxt.hook("modules:done", async () => {
       await updateSiteConfig({
         _context: "nuxt:config:site",
@@ -33,7 +34,7 @@ const module = defineNuxtModule({
         await assertSiteConfig("prerender");
       });
     });
-    const linkComposables = ["createInternalLinkResolver", "resolveAbsoluteInternalLink", "resolveTrailingSlash"];
+    const linkComposables = ["createSitePathResolver", "withSiteTrailingSlash", "withSiteUrl"];
     linkComposables.forEach((c) => {
       addImports({
         from: resolve("./runtime/composables/utils"),

package/dist/runtime/component/SiteLink.vue

@@ -1,33 +1,23 @@
 <script lang="ts" setup>
 // we need to intercept the `to` property and make sure that we have the right trailing slash
-import { computed, createInternalLinkResolver } from '#imports'
+import { createSitePathResolver, toRefs } from '#imports'
 
-const props = defineProps({
-  to: {
-    type: String,
-    required: true,
-  },
-})
+const props = defineProps<{
+  to: string
+  withBase?: boolean
+  absolute?: boolean
+}>()
 
-const linkResolver = createInternalLinkResolver()
+// make props refs
+const propRefs = toRefs(props)
 
-const to = computed(() => {
-  // only for relative links
-  if (props.to !== '/' && props.to.startsWith('/'))
-    return linkResolver(props.to)
-  return props.to
-})
+const linkResolver = createSitePathResolver({ withBase: propRefs.withBase, absolute: propRefs.absolute })
 
-const attrs = computed(() => {
-  return {
-    ...props,
-    to: to.value,
-  }
-})
+const to = linkResolver(propRefs.to)
 </script>
 
 <template>
-  <NuxtLink v-bind="{ ...$attrs, ...attrs }">
+  <NuxtLink :to="to">
     <slot />
   </NuxtLink>
 </template>

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

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

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

@@ -1,5 +1,9 @@
-export declare function resolveTrailingSlash(path: string): any;
-export declare function resolveAbsoluteInternalLink(relativeInternalLink: string): any;
-export declare function createInternalLinkResolver(options?: {
-    absolute?: boolean;
-}): (path: string) => string;
+import type { MaybeRef } from '@vue/reactivity';
+export declare function createSitePathResolver(options?: {
+    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?: {
+    withBase?: boolean;
+}): any;

package/dist/runtime/composables/utils.mjs

@@ -1,30 +1,34 @@
-import { withBase, withTrailingSlash, withoutTrailingSlash } from "ufo";
-import { computed, useSiteConfig } from "#imports";
-function fixSlashes(trailingSlash, path) {
-  return trailingSlash ? withTrailingSlash(path) : withoutTrailingSlash(path);
+import { fixSlashes, resolveSitePath } from "site-config-stack";
+import { computed, unref, useRuntimeConfig, useSiteConfig } from "#imports";
+export function createSitePathResolver(options = {}) {
+  const siteConfig = useSiteConfig();
+  const nuxtBase = useRuntimeConfig().app.baseURL || "/";
+  return (path) => {
+    return computed(() => resolveSitePath(unref(path), {
+      absolute: unref(options.absolute),
+      withBase: unref(options.withBase),
+      siteUrl: siteConfig.url,
+      trailingSlash: siteConfig.trailingSlash,
+      base: nuxtBase
+    }));
+  };
 }
-export function resolveTrailingSlash(path) {
+export function withSiteTrailingSlash(path) {
   const siteConfig = useSiteConfig();
   return computed(() => {
-    if (typeof siteConfig.trailingSlash === "boolean")
-      return fixSlashes(siteConfig.trailingSlash, path);
-    return path;
+    return fixSlashes(siteConfig.trailingSlash, unref(path));
   });
 }
-export function resolveAbsoluteInternalLink(relativeInternalLink) {
+export function withSiteUrl(path, options = {}) {
   const siteConfig = useSiteConfig();
-  const slashes = resolveTrailingSlash(relativeInternalLink);
+  const base = useRuntimeConfig().app.baseURL || "/";
   return computed(() => {
-    return withBase(slashes.value, siteConfig.url || "/");
+    return resolveSitePath(unref(path), {
+      absolute: true,
+      siteUrl: siteConfig.url,
+      trailingSlash: siteConfig.trailingSlash,
+      base,
+      withBase: options.withBase
+    });
   });
 }
-export function createInternalLinkResolver(options = {}) {
-  const siteConfig = useSiteConfig();
-  return (path) => {
-    if (typeof siteConfig.trailingSlash === "boolean")
-      path = fixSlashes(siteConfig.trailingSlash, path);
-    if (!options.absolute)
-      return path;
-    return withBase(path, siteConfig.url || "/");
-  };
-}

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

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

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

@@ -0,0 +1,4 @@
+export declare function withSiteTrailingSlash(path: string): string;
+export declare function withSiteUrl(path: string, options?: {
+    withBase?: boolean;
+}): string;

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

@@ -0,0 +1,17 @@
+import { fixSlashes, resolveSitePath } from "site-config-stack";
+import { useRuntimeConfig, useSiteConfig } from "#imports";
+export function withSiteTrailingSlash(path) {
+  const siteConfig = useSiteConfig();
+  return fixSlashes(siteConfig.trailingSlash, path);
+}
+export function withSiteUrl(path, options = {}) {
+  const siteConfig = useSiteConfig();
+  const base = useRuntimeConfig().app.baseURL || "/";
+  return resolveSitePath(path, {
+    absolute: true,
+    siteUrl: siteConfig.url,
+    trailingSlash: siteConfig.trailingSlash,
+    base,
+    withBase: options.withBase
+  });
+}

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

@@ -1,12 +1,11 @@
-import { joinURL } from "ufo";
 import { eventHandler, updateSiteConfig, useAppConfig, useNitroOrigin, useRuntimeConfig } from "#imports";
 export default eventHandler((e) => {
   if (!e.context.siteConfig) {
     const appConfig = useAppConfig();
-    const { public: publicRuntimeConfig, app } = useRuntimeConfig();
+    const { public: publicRuntimeConfig } = useRuntimeConfig();
     updateSiteConfig(e, {
       _context: "nitro:init",
-      url: joinURL(useNitroOrigin(e), app.baseURL)
+      url: useNitroOrigin(e)
     });
     updateSiteConfig(e, publicRuntimeConfig.site);
     if (appConfig.site) {

package/dist/runtime/plugins/siteConfig.mjs

@@ -15,6 +15,10 @@ export default defineNuxtPlugin({
     if (!siteConfigStack)
       siteConfigStack = createSiteConfigStack();
     if (process.client) {
+      siteConfigStack.push({
+        _context: "window",
+        url: window.location.origin
+      });
       const state = useState("site-config");
       if (state)
         siteConfigStack.push(state.value);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-site-config",
   "type": "module",
-  "version": "0.7.5",
+  "version": "0.8.0",
   "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.7.5",
-    "site-config-stack": "0.7.5"
+    "nuxt-site-config-kit": "0.8.0",
+    "site-config-stack": "0.8.0"
   },
   "scripts": {
     "build": "nuxt-module-build --stub && nuxt-module-build prepare && nuxt-module-build",