dtwo 3.1.1 → 3.1.2

package/dist/app/compat/idle-callback.mjs

@@ -1,4 +1,5 @@
-export const requestIdleCallback = process.server ? void 0 : globalThis.requestIdleCallback || ((cb) => {
+export const requestIdleCallback = process.server ? () => {
+} : globalThis.requestIdleCallback || ((cb) => {
   const start = Date.now();
   const idleDeadline = {
     didTimeout: false,
@@ -8,6 +9,7 @@ export const requestIdleCallback = process.server ? void 0 : globalThis.requestI
     cb(idleDeadline);
   }, 1);
 });
-export const cancelIdleCallback = process.server ? null : globalThis.cancelIdleCallback || ((id) => {
+export const cancelIdleCallback = process.server ? () => {
+} : globalThis.cancelIdleCallback || ((id) => {
   clearTimeout(id);
 });

package/dist/app/composables/ready.mjs

@@ -1,6 +1,9 @@
 import { useDtwoApp } from "../dtwo.mjs";
 import { requestIdleCallback } from "../compat/idle-callback.mjs";
 export const onDtwoReady = (callback) => {
+  if (process.server) {
+    return;
+  }
   const dtwoApp = useDtwoApp();
   if (dtwoApp.isHydrating) {
     dtwoApp.hooks.hookOnce("app:suspense:resolve", () => {

package/dist/core/runtime/hole/renderer.mjs

@@ -13,7 +13,7 @@ globalThis.__publicAssetsURL = publicAssetsURL;
 const getClientManifest = () => import("#build/dist/server/client.manifest.mjs").then((r) => r.default || r).then((r) => typeof r === "function" ? r() : r);
 const getStaticRenderedHead = () => import("#head-static").then((r) => r.default || r);
 const getServerEntry = () => import("#build/dist/server/server.mjs").then((r) => r.default || r);
-const getSSRStyles = () => import("#build/dist/server/styles.mjs").then((r) => r.default || r);
+const getSSRStyles = lazyCachedFunction(() => import("#build/dist/server/styles.mjs").then((r) => r.default || r));
 const getSSRRenderer = lazyCachedFunction(async () => {
   const manifest = await getClientManifest();
   if (!manifest) {

package/dist/head/runtime/components.d.ts

@@ -48,7 +48,7 @@ export declare const NoScript: import("kdu").DefineComponent<{
     translate: StringConstructor;
 }, () => import("kdu").KNode<import("kdu").RendererNode, import("kdu").RendererElement, {
     [key: string]: any;
-}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, import("kdu").EmitsOptions, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
+}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
     title: StringConstructor;
     body: BooleanConstructor;
     renderPriority: (StringConstructor | NumberConstructor)[];
@@ -172,7 +172,7 @@ export declare const Link: import("kdu").DefineComponent<{
     translate: StringConstructor;
 }, () => import("kdu").KNode<import("kdu").RendererNode, import("kdu").RendererElement, {
     [key: string]: any;
-}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, import("kdu").EmitsOptions, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
+}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
     as: StringConstructor;
     crossorigin: PropType<CrossOrigin>;
     disabled: BooleanConstructor;
@@ -298,7 +298,7 @@ export declare const Base: import("kdu").DefineComponent<{
     translate: StringConstructor;
 }, () => import("kdu").KNode<import("kdu").RendererNode, import("kdu").RendererElement, {
     [key: string]: any;
-}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, import("kdu").EmitsOptions, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
+}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
     href: StringConstructor;
     target: PropType<Target>;
     accesskey: StringConstructor;
@@ -355,7 +355,7 @@ export declare const Title: import("kdu").DefineComponent<{
     [x: string]: any;
 }, () => import("kdu").KNode<import("kdu").RendererNode, import("kdu").RendererElement, {
     [key: string]: any;
-}>[] | null | undefined, {}, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, import("kdu").EmitsOptions, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
+}>[] | null | undefined, {}, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
     [x: string]: any;
 }>>, {
     [x: string]: any;
@@ -412,7 +412,7 @@ export declare const Meta: import("kdu").DefineComponent<{
     translate: StringConstructor;
 }, () => import("kdu").KNode<import("kdu").RendererNode, import("kdu").RendererElement, {
     [key: string]: any;
-}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, import("kdu").EmitsOptions, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
+}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
     charset: StringConstructor;
     content: StringConstructor;
     httpEquiv: PropType<HTTPEquiv>;
@@ -525,7 +525,7 @@ export declare const Style: import("kdu").DefineComponent<{
     translate: StringConstructor;
 }, () => import("kdu").KNode<import("kdu").RendererNode, import("kdu").RendererElement, {
     [key: string]: any;
-}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, import("kdu").EmitsOptions, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
+}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
     type: StringConstructor;
     media: StringConstructor;
     nonce: StringConstructor;
@@ -640,7 +640,7 @@ export declare const Html: import("kdu").DefineComponent<{
     translate: StringConstructor;
 }, () => import("kdu").KNode<import("kdu").RendererNode, import("kdu").RendererElement, {
     [key: string]: any;
-}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, import("kdu").EmitsOptions, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
+}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
     manifest: StringConstructor;
     version: StringConstructor;
     xmlns: StringConstructor;
@@ -742,7 +742,7 @@ export declare const Body: import("kdu").DefineComponent<{
     translate: StringConstructor;
 }, () => import("kdu").KNode<import("kdu").RendererNode, import("kdu").RendererElement, {
     [key: string]: any;
-}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, import("kdu").EmitsOptions, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
+}>[] | null | undefined, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
     renderPriority: (StringConstructor | NumberConstructor)[];
     accesskey: StringConstructor;
     autocapitalize: StringConstructor;

package/dist/index.mjs

@@ -7,6 +7,8 @@ import { encodePath, parseURL, stringifyQuery, parseQuery, joinURL, withTrailing
 import { existsSync, readdirSync, statSync, promises } from 'node:fs';
 import { genArrayFromRaw, genSafeVariableName, genImport, genDynamicImport, genObjectFromRawEntries, genString, genExport } from 'knitwork';
 import { fileURLToPath, pathToFileURL } from 'node:url';
+import { filename } from 'pathe/utils';
+import { hash } from 'ohash';
 import { kebabCase, splitByCase, pascalCase, camelCase } from 'scule';
 import { createUnplugin } from '@dtwo/unplugin';
 import { findStaticImports, findExports, parseStaticImport, resolvePath as resolvePath$1 } from 'mlly';
@@ -20,7 +22,7 @@ import { createRequire } from 'node:module';
 import { createTransformer } from 'unctx/transform';
 import { stripLiteral } from 'strip-literal';
 import { createHole, scanHandlers, writeTypes, build as build$1, prepare, copyPublicAssets, prerender, createDevServer } from 'holepack';
-import defu, { defu as defu$1 } from 'defu';
+import { defu } from 'defu';
 import { dynamicEventHandler } from 'h3';
 import { createHeadCore } from 'kdhead';
 import { renderSSRHead } from '@kdhead/ssr';
@@ -30,7 +32,6 @@ import { debounce } from 'perfect-debounce';
 import { resolveSchema, generateMarkdown, generateTypes } from 'untyped';
 import untypedPlugin from 'untyped/babel-plugin';
 import jiti from 'jiti';
-import { hash } from 'ohash';
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (_distDir.match(/(chunks|shared)$/)) {
@@ -195,12 +196,11 @@ function prepareRoutes(routes, parent) {
   return routes;
 }
 function normalizeRoutes(routes, metaImports = /* @__PURE__ */ new Set()) {
-  const dtwo = useDtwo();
   return {
     imports: metaImports,
     routes: genArrayFromRaw(routes.map((page) => {
       const file = normalize(page.file);
-      const metaImportName = genSafeVariableName(relative(dtwo.options.rootDir, file)) + "Meta";
+      const metaImportName = genSafeVariableName(filename(file) + hash(file)) + "Meta";
       metaImports.add(genImport(`${file}?macro=true`, [{ name: "default", as: metaImportName }]));
       let aliasCode = `${metaImportName}?.alias || []`;
       if (Array.isArray(page.alias) && page.alias.length) {
@@ -538,6 +538,9 @@ const pagesModule = defineDtwoModule({
     dtwo.options.wite.optimizeDeps = dtwo.options.wite.optimizeDeps || {};
     dtwo.options.wite.optimizeDeps.include = dtwo.options.wite.optimizeDeps.include || [];
     dtwo.options.wite.optimizeDeps.include.push("kdu-router");
+    dtwo.options.wite.resolve = dtwo.options.wite.resolve || {};
+    dtwo.options.wite.resolve.dedupe = dtwo.options.wite.resolve.dedupe || [];
+    dtwo.options.wite.resolve.dedupe.push("kdu-router");
     addTemplate({
       filename: "router.options.mjs",
       getContents: async () => {
@@ -1427,7 +1430,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "3.1.1";
+const version = "3.1.2";
 
 const _require = createRequire(import.meta.url);
 const kduAppPatterns = (dtwo) => [
@@ -1867,7 +1870,7 @@ const schemaModule = defineDtwoModule({
       const schemas = await Promise.all(
         schemaDefs.map((schemaDef) => resolveSchema(schemaDef))
       );
-      const schema2 = defu$1(...schemas);
+      const schema2 = defu(...schemas);
       await dtwo.hooks.callHook("schema:resolved", schema2);
       return schema2;
     }
@@ -2113,7 +2116,7 @@ const clientPluginTemplate = {
     const imports = [];
     for (const plugin of clientPlugins) {
       const path = relative(ctx.dtwo.options.rootDir, plugin.src);
-      const variable = genSafeVariableName(path).replace(/_(45|46|47)/g, "_") + "_" + hash(path);
+      const variable = genSafeVariableName(filename(plugin.src)).replace(/_(45|46|47)/g, "_") + "_" + hash(path);
       exports.push(variable);
       imports.push(genImport(plugin.src, variable));
     }
@@ -2131,7 +2134,7 @@ const serverPluginTemplate = {
     const imports = [];
     for (const plugin of serverPlugins) {
       const path = relative(ctx.dtwo.options.rootDir, plugin.src);
-      const variable = genSafeVariableName(path).replace(/_(45|46|47)/g, "_") + "_" + hash(path);
+      const variable = genSafeVariableName(filename(path)).replace(/_(45|46|47)/g, "_") + "_" + hash(path);
       exports.push(variable);
       imports.push(genImport(plugin.src, variable));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtwo",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
@@ -34,33 +34,33 @@
   ],
   "dependencies": {
     "@d2js/devalue": "2.0.2",
-    "@dtwo/kit": "3.1.1",
-    "@dtwo/schema": "3.1.1",
+    "@dtwo/kit": "3.1.2",
+    "@dtwo/schema": "3.1.2",
     "@dtwo/telemetry": "2.1.8",
-    "@dtwo/ui-templates": "1.1.0",
+    "@dtwo/ui-templates": "1.1.1",
     "@dtwo/unplugin": "1.0.0",
-    "@dtwo/wite-builder": "3.1.1",
-    "@kdhead/ssr": "1.0.19",
-    "@kdujs/reactivity": "3.2.45",
-    "@kdujs/shared": "3.2.45",
-    "@kduse/head": "1.0.15",
+    "@dtwo/wite-builder": "3.1.2",
+    "@kdhead/ssr": "1.0.20",
+    "@kdujs/reactivity": "3.2.48",
+    "@kdujs/shared": "3.2.48",
+    "@kduse/head": "1.0.24",
     "chokidar": "3.5.3",
     "cookie-es": "0.5.0",
     "defu": "6.1.2",
     "destr": "1.2.2",
-    "dtwc": "3.1.1",
+    "dtwc": "3.1.2",
     "escape-string-regexp": "5.0.0",
     "estree-walker": "3.0.3",
     "fs-extra": "11.1.0",
     "globby": "13.1.3",
-    "h3": "1.0.2",
+    "h3": "1.1.0",
     "hash-sum": "2.0.0",
-    "holepack": "2.0.0",
+    "holepack": "2.1.1",
     "hookable": "5.4.2",
     "jiti": "1.16.2",
-    "kdhead": "1.0.19",
-    "kdimport": "2.0.1",
-    "kdu": "3.2.45",
+    "kdhead": "1.0.20",
+    "kdimport": "2.1.0",
+    "kdu": "3.2.48",
     "kdu-bundle-renderer": "1.0.0",
     "kdu-devtools-stub": "0.1.0",
     "kdu-router": "4.1.6",
@@ -76,7 +76,7 @@
     "ufo": "1.0.1",
     "ultrahtml": "1.2.0",
     "unctx": "2.1.1",
-    "unenv": "1.0.1",
+    "unenv": "1.0.3",
     "untyped": "1.2.2"
   },
   "devDependencies": {