dtwo 3.1.2 → 3.2.1

package/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2022 - Dtwo Team
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2022 - Dtwo Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/app.d.ts

@@ -1 +1 @@
-export * from './dist/app'
+export * from './dist/app'

package/bin/dtwo.mjs

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
-import 'dtwc/cli'
+#!/usr/bin/env node
+import 'dtwc/cli'

package/config.cjs

@@ -1,7 +1,7 @@
-function defineDtwoConfig (config) {
-  return config
-}
-
-module.exports = {
-  defineDtwoConfig
-}
+function defineDtwoConfig (config) {
+  return config
+}
+
+module.exports = {
+  defineDtwoConfig
+}

package/config.d.ts

@@ -1,4 +1,4 @@
-import type { DtwoConfig } from '@dtwo/schema'
-export { DtwoConfig } from '@dtwo/schema'
+import type { DtwoConfig } from 'dtwo/schema'
+export { DtwoConfig } from 'dtwo/schema'
 
 export declare function defineDtwoConfig(config: DtwoConfig): DtwoConfig

package/config.mjs

@@ -1,5 +1,5 @@
-function defineDtwoConfig (config) {
-  return config
-}
-
-export { defineDtwoConfig }
+function defineDtwoConfig (config) {
+  return config
+}
+
+export { defineDtwoConfig }

package/dist/app/components/client-only.mjs

@@ -1,75 +1,75 @@
-import { ref, onMounted, defineComponent, createElementBlock, h, createElementKNode } from 'kdu'
-
-export default defineComponent({
-  name: 'ClientOnly',
-  inheritAttrs: false,
-  // eslint-disable-next-line kdu/require-prop-types
-  props: ['fallback', 'placeholder', 'placeholderTag', 'fallbackTag'],
-  setup (_, { slots, attrs }) {
-    const mounted = ref(false)
-    onMounted(() => { mounted.value = true })
-    return (props) => {
-      if (mounted.value) { return slots.default?.() }
-      const slot = slots.fallback || slots.placeholder
-      if (slot) { return slot() }
-      const fallbackStr = props.fallback || props.placeholder || ''
-      const fallbackTag = props.fallbackTag || props.placeholderTag || 'span'
-      return createElementBlock(fallbackTag, attrs, fallbackStr)
-    }
-  }
-})
-
-const cache = new WeakMap()
-
-export function createClientOnly (component) {
-  if (cache.has(component)) {
-    return cache.get(component)
-  }
-
-  const clone = { ...component }
-
-  if (clone.render) {
-    // override the component render (non script setup component)
-    clone.render = (ctx, ...args) => {
-      if (ctx.mounted$) {
-        const res = component.render(ctx, ...args)
-        return (res.children === null || typeof res.children === 'string')
-          ? createElementKNode(res.type, res.props, res.children, res.patchFlag, res.dynamicProps, res.shapeFlag)
-          : h(res)
-      } else {
-        return h('div', ctx.$attrs ?? ctx._.attrs)
-      }
-    }
-  } else if (clone.template) {
-    // handle runtime-compiler template
-    clone.template = `
-      <template k-if="mounted$">${component.template}</template>
-      <template k-else><div></div></template>
-    `
-  }
-
-  clone.setup = (props, ctx) => {
-    const mounted$ = ref(false)
-    onMounted(() => { mounted$.value = true })
-
-    return Promise.resolve(component.setup?.(props, ctx) || {})
-      .then((setupState) => {
-        return typeof setupState !== 'function'
-          ? { ...setupState, mounted$ }
-          : (...args) => {
-              if (mounted$.value) {
-                const res = setupState(...args)
-                return (res.children === null || typeof res.children === 'string')
-                  ? createElementKNode(res.type, res.props, res.children, res.patchFlag, res.dynamicProps, res.shapeFlag)
-                  : h(res)
-              } else {
-                return h('div', ctx.attrs)
-              }
-            }
-      })
-  }
-
-  cache.set(component, clone)
-
-  return clone
-}
+import { ref, onMounted, defineComponent, createElementBlock, h, createElementKNode } from 'kdu'
+
+export default defineComponent({
+  name: 'ClientOnly',
+  inheritAttrs: false,
+  // eslint-disable-next-line kdu/require-prop-types
+  props: ['fallback', 'placeholder', 'placeholderTag', 'fallbackTag'],
+  setup (_, { slots, attrs }) {
+    const mounted = ref(false)
+    onMounted(() => { mounted.value = true })
+    return (props) => {
+      if (mounted.value) { return slots.default?.() }
+      const slot = slots.fallback || slots.placeholder
+      if (slot) { return slot() }
+      const fallbackStr = props.fallback || props.placeholder || ''
+      const fallbackTag = props.fallbackTag || props.placeholderTag || 'span'
+      return createElementBlock(fallbackTag, attrs, fallbackStr)
+    }
+  }
+})
+
+const cache = new WeakMap()
+
+export function createClientOnly (component) {
+  if (cache.has(component)) {
+    return cache.get(component)
+  }
+
+  const clone = { ...component }
+
+  if (clone.render) {
+    // override the component render (non script setup component)
+    clone.render = (ctx, ...args) => {
+      if (ctx.mounted$) {
+        const res = component.render(ctx, ...args)
+        return (res.children === null || typeof res.children === 'string')
+          ? createElementKNode(res.type, res.props, res.children, res.patchFlag, res.dynamicProps, res.shapeFlag)
+          : h(res)
+      } else {
+        return h('div', ctx.$attrs ?? ctx._.attrs)
+      }
+    }
+  } else if (clone.template) {
+    // handle runtime-compiler template
+    clone.template = `
+      <template k-if="mounted$">${component.template}</template>
+      <template k-else><div></div></template>
+    `
+  }
+
+  clone.setup = (props, ctx) => {
+    const mounted$ = ref(false)
+    onMounted(() => { mounted$.value = true })
+
+    return Promise.resolve(component.setup?.(props, ctx) || {})
+      .then((setupState) => {
+        return typeof setupState !== 'function'
+          ? { ...setupState, mounted$ }
+          : (...args) => {
+              if (mounted$.value) {
+                const res = setupState(...args)
+                return (res.children === null || typeof res.children === 'string')
+                  ? createElementKNode(res.type, res.props, res.children, res.patchFlag, res.dynamicProps, res.shapeFlag)
+                  : h(res)
+              } else {
+                return h('div', ctx.attrs)
+              }
+            }
+      })
+  }
+
+  cache.set(component, clone)
+
+  return clone
+}

package/dist/app/components/dev-only.mjs

@@ -1,11 +1,11 @@
-import { defineComponent } from 'kdu'
-
-export default defineComponent({
-  name: 'DevOnly',
-  setup (_, props) {
-    if (process.dev) {
-      return () => props.slots.default?.()
-    }
-    return () => null
-  }
-})
+import { defineComponent } from 'kdu'
+
+export default defineComponent({
+  name: 'DevOnly',
+  setup (_, props) {
+    if (process.dev) {
+      return () => props.slots.default?.()
+    }
+    return () => null
+  }
+})

package/dist/app/components/dtwo-error-boundary.mjs

@@ -1,5 +1,5 @@
 import { defineComponent, ref, onErrorCaptured } from "kdu";
-import { useDtwoApp } from "#app";
+import { useDtwoApp } from "#app/dtwo";
 export default defineComponent({
   emits: {
     error(_error) {

package/dist/app/components/dtwo-error-page.kdu

@@ -1,46 +1,46 @@
-<template>
-  <ErrorTemplate k-bind="{ statusCode, statusMessage, description, stack }" />
-</template>
-
-<script setup>
-import { defineAsyncComponent } from 'kdu'
-
-// Deliberately prevent reactive update when error is cleared
-// eslint-disable-next-line kdu/no-setup-props-destructure
-const { error } = defineProps({
-  error: Object
-})
-
-// TODO: extract to a separate utility
-const stacktrace = (error.stack || '')
-  .split('\n')
-  .splice(1)
-  .map((line) => {
-    const text = line
-      .replace('webpack:/', '')
-      .replace('.kdu', '.js') // TODO: Support sourcemap
-      .trim()
-    return {
-      text,
-      internal: (line.includes('node_modules') && !line.includes('.cache')) ||
-        line.includes('internal') ||
-        line.includes('new Promise')
-    }
-  }).map(i => `<span class="stack${i.internal ? ' internal' : ''}">${i.text}</span>`).join('\n')
-
-// Error page props
-const statusCode = Number(error.statusCode || 500)
-const is404 = statusCode === 404
-
-const statusMessage = error.statusMessage ?? (is404 ? 'Page Not Found' : 'Internal Server Error')
-const description = error.message || error.toString()
-const stack = process.dev && !is404 ? error.description || `<pre>${stacktrace}</pre>` : undefined
-
-// TODO: Investigate side-effect issue with imports
-const _Error404 = defineAsyncComponent(() => import('@dtwo/ui-templates/templates/error-404.kdu').then(r => r.default || r))
-const _Error = process.dev
-  ? defineAsyncComponent(() => import('@dtwo/ui-templates/templates/error-dev.kdu').then(r => r.default || r))
-  : defineAsyncComponent(() => import('@dtwo/ui-templates/templates/error-500.kdu').then(r => r.default || r))
-
-const ErrorTemplate = is404 ? _Error404 : _Error
-</script>
+<template>
+  <ErrorTemplate k-bind="{ statusCode, statusMessage, description, stack }" />
+</template>
+
+<script setup>
+import { defineAsyncComponent } from 'kdu'
+
+// Deliberately prevent reactive update when error is cleared
+// eslint-disable-next-line kdu/no-setup-props-destructure
+const { error } = defineProps({
+  error: Object
+})
+
+// TODO: extract to a separate utility
+const stacktrace = (error.stack || '')
+  .split('\n')
+  .splice(1)
+  .map((line) => {
+    const text = line
+      .replace('webpack:/', '')
+      .replace('.kdu', '.js') // TODO: Support sourcemap
+      .trim()
+    return {
+      text,
+      internal: (line.includes('node_modules') && !line.includes('.cache')) ||
+        line.includes('internal') ||
+        line.includes('new Promise')
+    }
+  }).map(i => `<span class="stack${i.internal ? ' internal' : ''}">${i.text}</span>`).join('\n')
+
+// Error page props
+const statusCode = Number(error.statusCode || 500)
+const is404 = statusCode === 404
+
+const statusMessage = error.statusMessage ?? (is404 ? 'Page Not Found' : 'Internal Server Error')
+const description = error.message || error.toString()
+const stack = process.dev && !is404 ? error.description || `<pre>${stacktrace}</pre>` : undefined
+
+// TODO: Investigate side-effect issue with imports
+const _Error404 = defineAsyncComponent(() => import('@dtwo/ui-templates/templates/error-404.kdu').then(r => r.default || r))
+const _Error = process.dev
+  ? defineAsyncComponent(() => import('@dtwo/ui-templates/templates/error-dev.kdu').then(r => r.default || r))
+  : defineAsyncComponent(() => import('@dtwo/ui-templates/templates/error-500.kdu').then(r => r.default || r))
+
+const ErrorTemplate = is404 ? _Error404 : _Error
+</script>

package/dist/app/components/dtwo-island.mjs

@@ -2,7 +2,9 @@ import { defineComponent, createStaticKNode, computed, ref, watch } from "kdu";
 import { debounce } from "perfect-debounce";
 import { hash } from "ohash";
 import { appendHeader } from "h3";
-import { useHead, useDtwoApp, useRequestEvent } from "#app";
+import { useDtwoApp } from "#app/dtwo";
+import { useRequestEvent } from "#app/composables/ssr";
+import { useHead } from "#app/composables/head";
 const pKey = "_islandPromises";
 export default defineComponent({
   name: "DtwoIsland",

package/dist/app/components/dtwo-loading-indicator.mjs

@@ -1,5 +1,5 @@
 import { computed, defineComponent, h, onBeforeUnmount, ref } from "kdu";
-import { useDtwoApp } from "#app";
+import { useDtwoApp } from "#app/dtwo";
 export default defineComponent({
   name: "DtwoLoadingIndicator",
   props: {
@@ -37,12 +37,14 @@ export default defineComponent({
         right: 0,
         left: 0,
         pointerEvents: "none",
-        width: `${indicator.progress.value}%`,
+        width: "auto",
         height: `${props.height}px`,
         opacity: indicator.isLoading.value ? 1 : 0,
         background: props.color || void 0,
         backgroundSize: `${100 / indicator.progress.value * 100}% auto`,
-        transition: "width 0.1s, height 0.4s, opacity 0.4s",
+        transform: `scaleX(${indicator.progress.value}%)`,
+        transformOrigin: "left",
+        transition: "transform 0.1s, height 0.4s, opacity 0.4s",
         zIndex: 999999
       }
     }, slots);

package/dist/app/components/dtwo-root.kdu

@@ -1,18 +1,20 @@
 <template>
   <Suspense @resolve="onResolve">
     <ErrorComponent k-if="error" :error="error" />
-    <IslandRendererer k-else-if="islandContext" :context="islandContext" />
+    <IslandRenderer k-else-if="islandContext" :context="islandContext" />
     <AppComponent k-else />
   </Suspense>
 </template>
 
 <script setup>
 import { defineAsyncComponent, onErrorCaptured, onServerPrefetch, provide } from 'kdu'
-import { callWithDtwo, isDtwoError, showError, useError, useRoute, useDtwoApp } from '#app'
+import { callWithDtwo, useDtwoApp } from '#app/dtwo'
+import { isDtwoError, showError, useError } from '#app/composables/error'
+import { useRoute } from '#app/composables/router'
 import AppComponent from '#build/app-component.mjs'
 
 const ErrorComponent = defineAsyncComponent(() => import('#build/error-component.mjs').then(r => r.default || r))
-const IslandRendererer = process.server
+const IslandRenderer = process.server
   ? defineAsyncComponent(() => import('./island-renderer').then(r => r.default || r))
   : () => null
 

package/dist/app/components/island-renderer.mjs

@@ -1,6 +1,6 @@
 import { createBlock, defineComponent, h, Teleport } from "kdu";
 import * as islandComponents from "#build/components.islands.mjs";
-import { createError } from "#app";
+import { createError } from "#app/composables/error";
 export default defineComponent({
   props: {
     context: {

package/dist/app/components/layout.mjs

@@ -1,6 +1,6 @@
 import { computed, defineComponent, h, inject, nextTick, onMounted, Transition, unref } from "kdu";
 import { _wrapIf } from "./utils.mjs";
-import { useRoute } from "#app";
+import { useRoute } from "#app/composables/router";
 import { useRoute as useKduRouterRoute } from "#build/pages";
 import layouts from "#build/layouts";
 import { appLayoutTransition as defaultLayoutTransition } from "#build/dtwo.config.mjs";

package/dist/app/composables/component.mjs

@@ -2,7 +2,7 @@ import { getCurrentInstance, reactive, toRefs } from "kdu";
 import { useDtwoApp } from "../dtwo.mjs";
 import { useAsyncData } from "./asyncData.mjs";
 import { useRoute } from "./router.mjs";
-import { useHead } from "#head";
+import { useHead } from "./head.mjs";
 export const DtwoComponentIndicator = "__dtwo_component";
 async function runLegacyAsyncData(res, fn) {
   const dtwo = useDtwoApp();

package/dist/app/composables/error.d.ts

@@ -1,7 +1,7 @@
 import type { H3Error } from 'h3';
 export declare const useError: () => import("kdu").Ref<Error | {
     url: string;
-    statusCode: string;
+    statusCode: number;
     statusMessage: string;
     message: string;
     description: string;

package/dist/app/composables/fetch.d.ts

@@ -1,15 +1,16 @@
 import type { FetchError } from 'ofetch';
-import type { TypedInternalResponse, HoleFetchOptions, HoleFetchRequest } from 'holepack';
+import type { TypedInternalResponse, HoleFetchOptions, HoleFetchRequest, AvailableRouterMethod } from 'holepack';
 import type { Ref } from 'kdu';
 import type { AsyncDataOptions, _Transform, KeyOfRes, AsyncData, PickFrom } from './asyncData';
-export type FetchResult<ReqT extends HoleFetchRequest> = TypedInternalResponse<ReqT, unknown>;
+export type FetchResult<ReqT extends HoleFetchRequest, M extends AvailableRouterMethod<ReqT>> = TypedInternalResponse<ReqT, unknown, M>;
 type ComputedOptions<T extends Record<string, any>> = {
     [K in keyof T]: T[K] extends Function ? T[K] : T[K] extends Record<string, any> ? ComputedOptions<T[K]> | Ref<T[K]> | T[K] : Ref<T[K]> | T[K];
 };
-type ComputedFetchOptions<R extends HoleFetchRequest> = ComputedOptions<HoleFetchOptions<R>>;
-export interface UseFetchOptions<DataT, Transform extends _Transform<DataT, any> = _Transform<DataT, DataT>, PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>, R extends HoleFetchRequest = string & {}> extends AsyncDataOptions<DataT, Transform, PickKeys>, ComputedFetchOptions<R> {
+type ComputedFetchOptions<R extends HoleFetchRequest, M extends AvailableRouterMethod<R>> = ComputedOptions<HoleFetchOptions<R, M>>;
+export interface UseFetchOptions<DataT, Transform extends _Transform<DataT, any> = _Transform<DataT, DataT>, PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>, R extends HoleFetchRequest = string & {}, M extends AvailableRouterMethod<R> = AvailableRouterMethod<R>> extends AsyncDataOptions<DataT, Transform, PickKeys>, ComputedFetchOptions<R, M> {
     key?: string;
+    $fetch?: typeof globalThis.$fetch;
 }
-export declare function useFetch<ResT = void, ErrorT = FetchError, ReqT extends HoleFetchRequest = HoleFetchRequest, _ResT = ResT extends void ? FetchResult<ReqT> : ResT, Transform extends (res: _ResT) => any = (res: _ResT) => _ResT, PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>>(request: Ref<ReqT> | ReqT | (() => ReqT), opts?: UseFetchOptions<_ResT, Transform, PickKeys, ReqT>): AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, ErrorT | null>;
-export declare function useLazyFetch<ResT = void, ErrorT = FetchError, ReqT extends HoleFetchRequest = HoleFetchRequest, _ResT = ResT extends void ? FetchResult<ReqT> : ResT, Transform extends (res: _ResT) => any = (res: _ResT) => _ResT, PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>>(request: Ref<ReqT> | ReqT | (() => ReqT), opts?: Omit<UseFetchOptions<_ResT, Transform, PickKeys>, 'lazy'>): AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, ErrorT | null>;
+export declare function useFetch<ResT = void, ErrorT = FetchError, ReqT extends HoleFetchRequest = HoleFetchRequest, Method extends AvailableRouterMethod<ReqT> = 'get' extends AvailableRouterMethod<ReqT> ? 'get' : AvailableRouterMethod<ReqT>, _ResT = ResT extends void ? FetchResult<ReqT, Method> : ResT, Transform extends (res: _ResT) => any = (res: _ResT) => _ResT, PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>>(request: Ref<ReqT> | ReqT | (() => ReqT), opts?: UseFetchOptions<_ResT, Transform, PickKeys, ReqT, Method>): AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, ErrorT | null>;
+export declare function useLazyFetch<ResT = void, ErrorT = FetchError, ReqT extends HoleFetchRequest = HoleFetchRequest, Method extends AvailableRouterMethod<ReqT> = 'get' extends AvailableRouterMethod<ReqT> ? 'get' : AvailableRouterMethod<ReqT>, _ResT = ResT extends void ? FetchResult<ReqT, Method> : ResT, Transform extends (res: _ResT) => any = (res: _ResT) => _ResT, PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>>(request: Ref<ReqT> | ReqT | (() => ReqT), opts?: Omit<UseFetchOptions<_ResT, Transform, PickKeys, Method>, 'lazy'>): AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, ErrorT | null>;
 export {};

package/dist/app/composables/fetch.mjs

@@ -1,5 +1,6 @@
 import { computed, unref, reactive } from "kdu";
 import { hash } from "ohash";
+import { useRequestFetch } from "./ssr.mjs";
 import { useAsyncData } from "./asyncData.mjs";
 export function useFetch(request, arg1, arg2) {
   const [opts = {}, autoKey] = typeof arg1 === "string" ? [{}, arg1] : [arg1, arg2];
@@ -49,7 +50,12 @@ export function useFetch(request, arg1, arg2) {
   const asyncData = useAsyncData(key, () => {
     controller?.abort?.();
     controller = typeof AbortController !== "undefined" ? new AbortController() : {};
-    return $fetch(_request.value, { signal: controller.signal, ..._fetchOptions });
+    const isLocalFetch = typeof _request.value === "string" && _request.value.startsWith("/");
+    let _$fetch = opts.$fetch || globalThis.$fetch;
+    if (process.server && !opts.$fetch && isLocalFetch) {
+      _$fetch = useRequestFetch();
+    }
+    return _$fetch(_request.value, { signal: controller.signal, ..._fetchOptions });
   }, _asyncDataOptions);
   return asyncData;
 }

package/dist/app/composables/head.d.ts

@@ -0,0 +1,2 @@
+export type { MetaObject } from '#head';
+export { useHead, useSeoMeta, useServerSeoMeta } from '#head';

package/dist/app/composables/head.mjs

@@ -0,0 +1 @@
+export { useHead, useSeoMeta, useServerSeoMeta } from "#head";

package/dist/app/composables/index.d.ts

@@ -9,9 +9,11 @@ export { useFetch, useLazyFetch } from './fetch';
 export type { FetchResult, UseFetchOptions } from './fetch';
 export { useCookie } from './cookie';
 export type { CookieOptions, CookieRef } from './cookie';
-export { useRequestHeaders, useRequestEvent, setResponseStatus } from './ssr';
+export { useRequestHeaders, useRequestEvent, useRequestFetch, setResponseStatus } from './ssr';
 export { onDtwoReady } from './ready';
 export { abortNavigation, addRouteMiddleware, defineDtwoRouteMiddleware, onBeforeRouteLeave, onBeforeRouteUpdate, setPageLayout, navigateTo, useRoute, useRouter } from './router';
 export type { AddRouteMiddlewareOptions, RouteMiddleware } from './router';
 export { preloadComponents, prefetchComponents, preloadRouteComponents } from './preload';
 export { isPrerendered, loadPayload, preloadPayload } from './payload';
+export type { MetaObject } from './head';
+export { useHead, useSeoMeta, useServerSeoMeta } from './head';

package/dist/app/composables/index.mjs

@@ -5,8 +5,9 @@ export { useState } from "./state.mjs";
 export { clearError, createError, isDtwoError, showError, useError } from "./error.mjs";
 export { useFetch, useLazyFetch } from "./fetch.mjs";
 export { useCookie } from "./cookie.mjs";
-export { useRequestHeaders, useRequestEvent, setResponseStatus } from "./ssr.mjs";
+export { useRequestHeaders, useRequestEvent, useRequestFetch, setResponseStatus } from "./ssr.mjs";
 export { onDtwoReady } from "./ready.mjs";
 export { abortNavigation, addRouteMiddleware, defineDtwoRouteMiddleware, onBeforeRouteLeave, onBeforeRouteUpdate, setPageLayout, navigateTo, useRoute, useRouter } from "./router.mjs";
 export { preloadComponents, prefetchComponents, preloadRouteComponents } from "./preload.mjs";
 export { isPrerendered, loadPayload, preloadPayload } from "./payload.mjs";
+export { useHead, useSeoMeta, useServerSeoMeta } from "./head.mjs";

package/dist/app/composables/payload.mjs

@@ -1,6 +1,6 @@
-import { joinURL } from "ufo";
-import { useDtwoApp } from "../dtwo.mjs";
-import { useHead, useRuntimeConfig } from "../index.mjs";
+import { joinURL, hasProtocol } from "ufo";
+import { useDtwoApp, useRuntimeConfig } from "../dtwo.mjs";
+import { useHead } from "./head.mjs";
 export function loadPayload(url, opts = {}) {
   if (process.server) {
     return null;
@@ -33,8 +33,8 @@ function _getPayloadURL(url, opts = {}) {
   if (u.search) {
     throw new Error("Payload URL cannot contain search params: " + url);
   }
-  if (u.host !== "localhost") {
-    throw new Error("Payload URL cannot contain host: " + url);
+  if (u.host !== "localhost" || hasProtocol(u.pathname, true)) {
+    throw new Error("Payload URL must not include hostname: " + url);
   }
   const hash = opts.hash || (opts.fresh ? Date.now() : "");
   return joinURL(useRuntimeConfig().app.baseURL, u.pathname, hash ? `_payload.${hash}.js` : "_payload.js");
@@ -45,7 +45,7 @@ async function _importPayload(payloadURL) {
   }
   const res = await import(
     /* webpackIgnore: true */
-    /* @wite-ignore */
+    /* @lahm-ignore */
     payloadURL
   ).catch((err) => {
     console.warn("[dtwo] Cannot load payload ", payloadURL, err);

package/dist/app/composables/preload.mjs

@@ -26,11 +26,11 @@ export async function preloadRouteComponents(to, router = useRouter()) {
   if (router._routePreloaded.has(to)) {
     return;
   }
-  router._routePreloaded.add(to);
   const promises = router._preloadPromises = router._preloadPromises || [];
   if (promises.length > 4) {
     return Promise.all(promises).then(() => preloadRouteComponents(to, router));
   }
+  router._routePreloaded.add(to);
   const components = router.resolve(to).matched.map((component) => component.components?.default).filter((component) => typeof component === "function");
   for (const component of components) {
     const promise = Promise.resolve(component()).catch(() => {

package/dist/app/composables/router.mjs

@@ -53,7 +53,7 @@ export const navigateTo = (to, options) => {
   const toPath = typeof to === "string" ? to : to.path || "/";
   const isExternal = hasProtocol(toPath, true);
   if (isExternal && !options?.external) {
-    throw new Error("Navigating to external URL is not allowed by default. Use `nagivateTo (url, { external: true })`.");
+    throw new Error("Navigating to external URL is not allowed by default. Use `navigateTo (url, { external: true })`.");
   }
   if (isExternal && parseURL(toPath).protocol === "script:") {
     throw new Error("Cannot navigate to an URL with script protocol.");

package/dist/app/composables/ssr.d.ts

@@ -3,4 +3,5 @@ import type { DtwoApp } from '../dtwo';
 export declare function useRequestHeaders<K extends string = string>(include: K[]): Record<Lowercase<K>, string | undefined>;
 export declare function useRequestHeaders(): Readonly<Record<string, string | undefined>>;
 export declare function useRequestEvent(dtwoApp?: DtwoApp): H3Event;
+export declare function useRequestFetch(): typeof global.$fetch;
 export declare function setResponseStatus(code: number, message?: string): void;

package/dist/app/composables/ssr.mjs

@@ -12,6 +12,13 @@ export function useRequestHeaders(include) {
 export function useRequestEvent(dtwoApp = useDtwoApp()) {
   return dtwoApp.ssrContext?.event;
 }
+export function useRequestFetch() {
+  if (process.client) {
+    return globalThis.$fetch;
+  }
+  const event = useDtwoApp().ssrContext?.event;
+  return event?.$fetch || globalThis.$fetch;
+}
 export function setResponseStatus(code, message) {
   const event = process.server && useRequestEvent();
   if (event) {

package/dist/app/config.d.ts

@@ -1,4 +1,4 @@
-import type { AppConfig } from '@dtwo/schema';
+import type { AppConfig } from 'dtwo/schema';
 type DeepPartial<T> = T extends Function ? T : T extends Record<string, any> ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;