dtwo 3.1.0-0 → 3.1.1

package/LICENSE

@@ -1,4 +1,4 @@
-MIT License
+The MIT License (MIT)
 
 Copyright (c) 2022 - Dtwo Team
 

package/dist/app/types/augments.d.ts

@@ -17,7 +17,7 @@ declare global {
   }
 }
 
-declare module '@kdujs/runtime-core' {
+declare module 'kdu' {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   interface App<HostElement> {
     $dtwo: DtwoApp

package/dist/index.mjs

@@ -708,7 +708,7 @@ const componentsTypeTemplate = {
       `typeof ${genDynamicImport(isAbsolute(c.filePath) ? relative(buildDir, c.filePath).replace(/(?<=\w)\.(?!kdu)\w+$/g, "") : c.filePath.replace(/(?<=\w)\.(?!kdu)\w+$/g, ""), { wrapper: false })}['${c.export}']`
     ]);
     return `// Generated by components discovery
-declare module '@kdujs/runtime-core' {
+declare module 'kdu' {
   export interface GlobalComponents {
 ${componentTypes.map(([pascalName, type]) => `    '${pascalName}': ${type}`).join("\n")}
 ${componentTypes.map(([pascalName, type]) => `    'Lazy${pascalName}': ${type}`).join("\n")}
@@ -890,10 +890,11 @@ function findComponent(components, name, mode) {
   if (component) {
     return component;
   }
-  if (mode === "server" && !component) {
+  const otherModeComponent = components.find((component2) => id === component2.pascalName);
+  if (mode === "server" && otherModeComponent) {
     return components.find((c) => c.pascalName === "ServerPlaceholder");
   }
-  return components.find((component2) => id === component2.pascalName);
+  return otherModeComponent;
 }
 
 const PLACEHOLDER_RE = /^(k-slot|#)(fallback|placeholder)/;
@@ -1426,7 +1427,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "3.1.0-0";
+const version = "3.1.1";
 
 const _require = createRequire(import.meta.url);
 const kduAppPatterns = (dtwo) => [
@@ -1477,6 +1478,7 @@ const ImportProtectionPlugin = createUnplugin(function(options) {
   };
 });
 
+const TRANSFORM_MARKER = "/* _processed_dtwo_unctx_transform */\n";
 const UnctxTransformPlugin = (dtwo) => {
   const transformer = createTransformer({
     asyncFunctions: ["defineDtwoPlugin", "defineDtwoRouteMiddleware"]
@@ -1489,14 +1491,20 @@ const UnctxTransformPlugin = (dtwo) => {
     name: "unctx:transform",
     enforce: "post",
     transformInclude(id) {
+      if (id.includes("macro=true")) {
+        return true;
+      }
       id = normalize(id).replace(/\?.*$/, "");
       return app?.plugins.some((i) => i.src === id) || app?.middleware.some((m) => m.path === id);
     },
     transform(code, id) {
+      if (code.startsWith(TRANSFORM_MARKER)) {
+        return;
+      }
       const result = transformer.transform(code);
       if (result) {
         return {
-          code: result.code,
+          code: TRANSFORM_MARKER + result.code,
           map: options.sourcemap ? result.magicString.generateMap({ source: id, includeContent: true }) : void 0
         };
       }
@@ -1947,8 +1955,10 @@ async function initDtwo(dtwo) {
   };
   addWitePlugin(ImportProtectionPlugin.wite(config));
   addWebpackPlugin(ImportProtectionPlugin.webpack(config));
-  addWitePlugin(UnctxTransformPlugin(dtwo).wite({ sourcemap: dtwo.options.sourcemap.server || dtwo.options.sourcemap.client }));
-  addWebpackPlugin(UnctxTransformPlugin(dtwo).webpack({ sourcemap: dtwo.options.sourcemap.server || dtwo.options.sourcemap.client }));
+  dtwo.hook("modules:done", () => {
+    addWitePlugin(UnctxTransformPlugin(dtwo).wite({ sourcemap: dtwo.options.sourcemap.server || dtwo.options.sourcemap.client }));
+    addWebpackPlugin(UnctxTransformPlugin(dtwo).webpack({ sourcemap: dtwo.options.sourcemap.server || dtwo.options.sourcemap.client }));
+  });
   if (!dtwo.options.dev) {
     const removeFromServer = ["onBeforeMount", "onMounted", "onBeforeUpdate", "onRenderTracked", "onRenderTriggered", "onActivated", "onDeactivated", "onBeforeUnmount"];
     const removeFromClient = ["onServerPrefetch", "onRenderTracked", "onRenderTriggered"];
@@ -2073,7 +2083,7 @@ const kduShim = {
   filename: "types/kdu-shim.d.ts",
   getContents: () => [
     "declare module '*.kdu' {",
-    "  import { DefineComponent } from '@kdujs/runtime-core'",
+    "  import { DefineComponent } from 'kdu'",
     "  const component: DefineComponent<{}, {}, any>",
     "  export default component",
     "}"
@@ -2150,7 +2160,7 @@ declare module '#app' {
   interface DtwoApp extends DtwoAppInjections { }
 }
 
-declare module '@kdujs/runtime-core' {
+declare module 'kdu' {
   interface ComponentCustomProperties extends DtwoAppInjections { }
 }
 

package/dist/pages/runtime/page.d.ts

@@ -1,19 +1,48 @@
-import type { DefineComponent, KeepAliveProps, TransitionProps } from 'kdu';
-declare const _default: DefineComponent<{
+import type { KNode, KeepAliveProps, TransitionProps } from 'kdu';
+import type { RouteLocationNormalizedLoaded } from 'kdu-router';
+declare const _default: import("kdu").DefineComponent<{
+    name: {
+        type: StringConstructor;
+    };
+    transition: {
+        type: () => boolean | TransitionProps;
+        default: undefined;
+    };
+    keepalive: {
+        type: () => boolean | KeepAliveProps;
+        default: undefined;
+    };
+    route: {
+        type: () => RouteLocationNormalized;
+    };
+    pageKey: {
+        type: () => string | ((route: RouteLocationNormalizedLoaded) => string);
+        default: null;
+    };
+}, () => KNode<import("kdu").RendererNode, import("kdu").RendererElement, {
     [key: string]: any;
-    name?: string | undefined;
-    transition?: boolean | TransitionProps | undefined;
-    keepalive?: boolean | KeepAliveProps | undefined;
-    route?: any;
-    pageKey?: string | ((route: RouteLocationNormalizedLoaded) => string) | undefined;
-}, {}, {}, import("kdu").ComputedOptions, import("kdu").MethodOptions, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
-    [key: string]: any;
-    name?: string | undefined;
-    transition?: boolean | TransitionProps | undefined;
-    keepalive?: boolean | KeepAliveProps | undefined;
-    route?: any;
-    pageKey?: string | ((route: RouteLocationNormalizedLoaded) => string) | undefined;
+}>, unknown, {}, {}, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
+    name: {
+        type: StringConstructor;
+    };
+    transition: {
+        type: () => boolean | TransitionProps;
+        default: undefined;
+    };
+    keepalive: {
+        type: () => boolean | KeepAliveProps;
+        default: undefined;
+    };
+    route: {
+        type: () => RouteLocationNormalized;
+    };
+    pageKey: {
+        type: () => string | ((route: RouteLocationNormalizedLoaded) => string);
+        default: null;
+    };
 }>>, {
-    [x: string]: any;
+    keepalive: boolean | KeepAliveProps;
+    transition: boolean | TransitionProps;
+    pageKey: string | ((route: RouteLocationNormalizedLoaded) => string);
 }>;
 export default _default;

package/dist/pages/runtime/plugins/router.d.ts

@@ -1,8 +1,2 @@
-import type DtwoPage from '../page';
-declare module '@kdujs/runtime-core' {
-    interface GlobalComponents {
-        DtwoPage: typeof DtwoPage;
-    }
-}
 declare const _default: any;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtwo",
-  "version": "3.1.0-0",
+  "version": "3.1.1",
   "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
@@ -34,21 +34,21 @@
   ],
   "dependencies": {
     "@d2js/devalue": "2.0.2",
-    "@dtwo/kit": "3.1.0-0",
-    "@dtwo/schema": "3.1.0-0",
+    "@dtwo/kit": "3.1.1",
+    "@dtwo/schema": "3.1.1",
     "@dtwo/telemetry": "2.1.8",
     "@dtwo/ui-templates": "1.1.0",
     "@dtwo/unplugin": "1.0.0",
-    "@dtwo/wite-builder": "3.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",
     "chokidar": "3.5.3",
     "cookie-es": "0.5.0",
-    "defu": "6.1.1",
+    "defu": "6.1.2",
     "destr": "1.2.2",
-    "dtwc": "3.1.0-0",
+    "dtwc": "3.1.1",
     "escape-string-regexp": "5.0.0",
     "estree-walker": "3.0.3",
     "fs-extra": "11.1.0",
@@ -69,7 +69,7 @@
     "mlly": "1.1.0",
     "ofetch": "1.0.0",
     "ohash": "1.0.0",
-    "pathe": "1.0.0",
+    "pathe": "1.1.0",
     "perfect-debounce": "0.1.3",
     "scule": "1.0.0",
     "strip-literal": "1.0.0",

package/types.d.ts

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