dtwo 3.1.2 → 3.2.1

package/dist/pages/runtime/app.kdu

@@ -1,5 +1,5 @@
-<template>
-  <DtwoLayout>
-    <DtwoPage />
-  </DtwoLayout>
-</template>
+<template>
+  <DtwoLayout>
+    <DtwoPage />
+  </DtwoLayout>
+</template>

package/dist/pages/runtime/page.mjs

@@ -2,7 +2,7 @@ import { computed, defineComponent, h, provide, reactive, onMounted, nextTick, S
 import { RouterView } from "kdu-router";
 import { defu } from "defu";
 import { generateRouteKey, wrapInKeepAlive } from "./utils.mjs";
-import { useDtwoApp } from "#app";
+import { useDtwoApp } from "#app/dtwo";
 import { _wrapIf } from "#app/components/utils";
 import { appPageTransition as defaultPageTransition, appKeepalive as defaultKeepaliveConfig } from "#build/dtwo.config.mjs";
 export default defineComponent({

package/dist/pages/runtime/plugins/prefetch.client.mjs

@@ -1,5 +1,6 @@
 import { hasProtocol } from "ufo";
-import { defineDtwoPlugin, useDtwoApp, useRouter } from "#app";
+import { defineDtwoPlugin, useDtwoApp } from "#app/dtwo";
+import { useRouter } from "#app/composables/router";
 import layouts from "#build/layouts";
 import { namedMiddleware } from "#build/middleware";
 export default defineDtwoPlugin(() => {

package/dist/pages/runtime/plugins/router.mjs

@@ -7,7 +7,11 @@ import {
 } from "kdu-router";
 import { createError } from "h3";
 import { withoutBase, isEqual } from "ufo";
-import { callWithDtwo, defineDtwoPlugin, useRuntimeConfig, showError, clearError, navigateTo, useError, useState, useRequestEvent } from "#app";
+import { callWithDtwo, defineDtwoPlugin, useRuntimeConfig } from "#app/dtwo";
+import { showError, clearError, useError } from "#app/composables/error";
+import { useRequestEvent } from "#app/composables/ssr";
+import { useState } from "#app/composables/state";
+import { navigateTo } from "#app/composables/router";
 import _routes from "#build/routes";
 import routerOptions from "#build/router.options";
 import { globalMiddleware, namedMiddleware } from "#build/middleware";
@@ -132,7 +136,7 @@ export default defineDtwoPlugin(async (dtwoApp) => {
       })]);
     } else if (process.server) {
       const currentURL = to.fullPath || "/";
-      if (!isEqual(currentURL, initialURL)) {
+      if (!isEqual(currentURL, initialURL, { trailingSlash: true })) {
         const event = await callWithDtwo(dtwoApp, useRequestEvent);
         const options = { redirectCode: event.node.res.statusCode !== 200 ? event.node.res.statusCode || 302 : 302 };
         await callWithDtwo(dtwoApp, navigateTo, [currentURL, options]);

package/dist/pages/runtime/router.options.mjs

@@ -1,5 +1,5 @@
 import { nextTick } from "kdu";
-import { useDtwoApp } from "#app";
+import { useDtwoApp } from "#app/dtwo";
 import { appPageTransition as defaultPageTransition } from "#build/dtwo.config.mjs";
 export default {
   scrollBehavior(to, from, savedPosition) {

package/dist/pages/runtime/validate.mjs

@@ -1,11 +1,32 @@
-import { defineDtwoRouteMiddleware } from "#app";
+import { createError, showError } from "#app/composables/error";
+import { callWithDtwo, useDtwoApp } from "#app/dtwo";
+import { defineDtwoRouteMiddleware, useRouter } from "#app/composables/router";
 export default defineDtwoRouteMiddleware(async (to) => {
   if (!to.meta?.validate) {
     return;
   }
+  const dtwoApp = useDtwoApp();
+  const router = useRouter();
   const result = await Promise.resolve(to.meta.validate(to));
   if (result === true) {
     return;
   }
-  return result;
+  if (process.server) {
+    return result;
+  }
+  const error = createError({
+    statusCode: 404,
+    statusMessage: `Page Not Found: ${to.fullPath}`
+  });
+  const unsub = router.beforeResolve((final) => {
+    unsub();
+    if (final === to) {
+      const unsub2 = router.afterEach(async () => {
+        unsub2();
+        await callWithDtwo(dtwoApp, showError, [error]);
+        window.history.pushState({}, "", to.fullPath);
+      });
+      return false;
+    }
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtwo",
-  "version": "3.1.2",
+  "version": "3.2.1",
   "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
@@ -13,9 +13,13 @@
   "exports": {
     ".": "./dist/index.mjs",
     "./config": {
+      "types": "./config.d.ts",
       "import": "./config.mjs",
-      "require": "./config.cjs",
-      "types": "./config.d.ts"
+      "require": "./config.cjs"
+    },
+    "./schema": {
+      "types": "./schema.d.ts",
+      "import": "./schema.mjs"
     },
     "./app": "./dist/app/index.mjs",
     "./package.json": "./package.json"
@@ -30,53 +34,53 @@
     "bin",
     "types.d.ts",
     "dist",
-    "config.*"
+    "config.*",
+    "schema.*"
   ],
   "dependencies": {
     "@d2js/devalue": "2.0.2",
-    "@dtwo/kit": "3.1.2",
-    "@dtwo/schema": "3.1.2",
-    "@dtwo/telemetry": "2.1.8",
+    "@dtwo/kit": "3.2.1",
+    "@dtwo/schema": "3.2.1",
+    "@dtwo/telemetry": "2.1.10",
     "@dtwo/ui-templates": "1.1.1",
-    "@dtwo/unplugin": "1.0.0",
-    "@dtwo/wite-builder": "3.1.2",
-    "@kdhead/ssr": "1.0.20",
+    "@dtwo/unplugin": "1.4.0",
+    "@dtwo/lahm-builder": "3.2.1",
+    "@kdhead/ssr": "1.8.10",
     "@kdujs/reactivity": "3.2.48",
     "@kdujs/shared": "3.2.48",
-    "@kduse/head": "1.0.24",
+    "@kduse/head": "1.3.1-1",
     "chokidar": "3.5.3",
     "cookie-es": "0.5.0",
     "defu": "6.1.2",
     "destr": "1.2.2",
-    "dtwc": "3.1.2",
+    "dtwc": "3.2.1",
     "escape-string-regexp": "5.0.0",
     "estree-walker": "3.0.3",
     "fs-extra": "11.1.0",
     "globby": "13.1.3",
-    "h3": "1.1.0",
+    "h3": "1.5.0",
     "hash-sum": "2.0.0",
-    "holepack": "2.1.1",
+    "holepack": "2.2.2",
     "hookable": "5.4.2",
-    "jiti": "1.16.2",
-    "kdhead": "1.0.20",
-    "kdimport": "2.1.0",
+    "jiti": "1.17.1",
+    "kdhead": "1.8.10",
+    "kdimport": "2.2.4",
     "kdu": "3.2.48",
-    "kdu-bundle-renderer": "1.0.0",
+    "kdu-bundle-renderer": "1.0.2-1",
     "kdu-devtools-stub": "0.1.0",
     "kdu-router": "4.1.6",
     "knitwork": "1.0.0",
-    "magic-string": "0.27.0",
-    "mlly": "1.1.0",
-    "ofetch": "1.0.0",
+    "magic-string": "0.29.0",
+    "mlly": "1.1.1",
+    "ofetch": "1.0.1",
     "ohash": "1.0.0",
     "pathe": "1.1.0",
     "perfect-debounce": "0.1.3",
     "scule": "1.0.0",
-    "strip-literal": "1.0.0",
-    "ufo": "1.0.1",
-    "ultrahtml": "1.2.0",
-    "unctx": "2.1.1",
-    "unenv": "1.0.3",
+    "strip-literal": "1.0.1",
+    "ufo": "1.1.0",
+    "unctx": "2.1.2",
+    "unenv": "1.2.0",
     "untyped": "1.2.2"
   },
   "devDependencies": {
@@ -85,7 +89,7 @@
     "unbuild": "1.1.1"
   },
   "engines": {
-    "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
   },
   "scripts": {}
 }

package/schema.d.ts

@@ -0,0 +1 @@
+export * from '@dtwo/schema'

package/schema.mjs

@@ -0,0 +1 @@
+export * from '@dtwo/schema'

package/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="holepack" />
 export * from './dist/index'
 
-import type { SchemaDefinition } from '@dtwo/schema'
+import type { SchemaDefinition } from 'dtwo/schema'
 
 declare global {
   const defineDtwoConfig: typeof import('dtwo/config')['defineDtwoConfig']

package/README.md

@@ -1,7 +0,0 @@
-# Dtwo
-
-Dtwo 3: **The Intuitive Web Framework** ✨
-
-## License
-
-[MIT](./LICENSE)