@dtwo/schema 3.1.2 → 3.2.1

package/dist/index.mjs

@@ -262,7 +262,7 @@ const build = defineUntypedSchema({
   /**
    * The builder to use for bundling the Kdu part of your application.
    *
-   * @type {'wite' | 'webpack' | { bundle: (dtwo: typeof import('../src/types/dtwo').Dtwo) => Promise<void> }}
+   * @type {'lahm' | 'webpack' | { bundle: (dtwo: typeof import('../src/types/dtwo').Dtwo) => Promise<void> }}
    */
   builder: {
     $resolve: async (val, get) => {
@@ -270,10 +270,10 @@ const build = defineUntypedSchema({
         return val;
       }
       const map = {
-        wite: "@dtwo/wite-builder",
+        lahm: "@dtwo/lahm-builder",
         webpack: "@dtwo/webpack-builder"
       };
-      return map[val] || val || (await get("wite") === false ? map.webpack : map.wite);
+      return map[val] || val || (await get("lahm") === false ? map.webpack : map.lahm);
     }
   },
   /**
@@ -336,7 +336,7 @@ const build = defineUntypedSchema({
     /**
     * Dtwo uses `webpack-bundle-analyzer` to visualize your bundles and how to optimize them.
     *
-    * Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for wite](https://github.com/btd/rollup-plugin-visualizer#options).
+    * Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for lahm](https://github.com/btd/rollup-plugin-visualizer#options).
     *
     * @example
     * ```js
@@ -511,8 +511,7 @@ const common = defineUntypedSchema({
   },
   /**
    * Whether to enable rendering of HTML - either dynamically (in server mode) or at generate time.
-   * If set to `false` and combined with `static` target, generated pages will simply display
-   * a loading screen with no content.
+   * If set to `false` generated pages will have no content.
    */
   ssr: {
     $resolve: (val) => val ?? true
@@ -816,9 +815,12 @@ const dev = defineUntypedSchema({
     /** Dev server listening port */
     port: process.env.DTWO_PORT || process.env.HOLE_PORT || process.env.PORT || 3e3,
     /** Dev server listening host */
-    host: process.env.DTWO_HOST || process.env.HOLE_HOST || process.env.HOST || "localhost",
+    host: process.env.DTWO_HOST || process.env.HOLE_HOST || process.env.HOST || "",
     /**
-     * Listening dev server url
+     * Listening dev server URL.
+     *
+     * This should not be set directly as it will always be overridden by the
+     * dev server with the full URL (for module and internal use).
      */
     url: "http://localhost:3000"
   }
@@ -846,17 +848,27 @@ const experimental = defineUntypedSchema({
      */
     treeshakeClientOnly: true,
     /**
-     * Use wite-node for on-demand server chunk loading
+     * Emit `app:chunkError` hook when there is an error loading lahm/webpack
+     * chunks.
+     *
+     * You can set this to `reload` to perform a hard reload of the new route
+     * when a chunk fails to load when navigating to a new route.
+     *
+     * @type {boolean | 'reload'}
+     */
+    emitRouteChunkError: false,
+    /**
+     * Use lahm-node for on-demand server chunk loading
      *
-     * @deprecated use `wite.devBundler: 'wite-node'`
+     * @deprecated use `lahm.devBundler: 'lahm-node'`
      */
-    witeNode: {
+    lahmNode: {
       $resolve: (val) => {
-        val = process.env.EXPERIMENTAL_WITE_NODE ? true : val;
+        val = process.env.EXPERIMENTAL_LAHM_NODE ? true : val;
         if (val === true) {
-          console.warn("`wite-node` is now enabled by default. You can safely remove `experimental.witeNode` from your config.");
+          console.warn("`lahm-node` is now enabled by default. You can safely remove `experimental.lahmNode` from your config.");
         } else if (val === false) {
-          console.warn("`wite-node` is now enabled by default. To disable it, set `wite.devBundler` to `legacy` instead.");
+          console.warn("`lahm-node` is now enabled by default. To disable it, set `lahm.devBundler` to `legacy` instead.");
         }
         return val ?? true;
       }
@@ -864,9 +876,9 @@ const experimental = defineUntypedSchema({
     /**
      * Split server bundle into multiple chunks and dynamically import them.
      */
-    witeServerDynamicImports: true,
+    lahmServerDynamicImports: true,
     /**
-     * Inline styles when rendering HTML (currently wite only).
+     * Inline styles when rendering HTML (currently lahm only).
      *
      * You can also pass a function that receives the path of a Kdu component
      * and returns a boolean indicating whether to inline the styles for that component.
@@ -1131,16 +1143,16 @@ const typescript = defineUntypedSchema({
   }
 });
 
-const wite = defineUntypedSchema({
+const lahm = defineUntypedSchema({
   /**
-   * Configuration that will be passed directly to Wite.
+   * Configuration that will be passed directly to Lahm.
    *
-   * See https://witejs.web.app/config for more information.
-   * Please note that not all wite options are supported in Dtwo.
+   * See https://lahmjs.web.app/config for more information.
+   * Please note that not all lahm options are supported in Dtwo.
    *
-   * @type {typeof import('../src/types/config').WiteConfig}
+   * @type {typeof import('../src/types/config').LahmConfig}
    */
-  wite: {
+  lahm: {
     root: {
       $resolve: async (val, get) => val ?? await get("srcDir")
     },
@@ -1172,6 +1184,14 @@ const wite = defineUntypedSchema({
         }
       }
     },
+    kduJsx: {
+      $resolve: async (val, get) => {
+        return {
+          isCustomElement: (await get("kdu")).compilerOptions?.isCustomElement,
+          ...val || {}
+        };
+      }
+    },
     optimizeDeps: {
       exclude: {
         $resolve: async (val, get) => [
@@ -1215,7 +1235,7 @@ const webpack = defineUntypedSchema({
     /**
      * Dtwo uses `webpack-bundle-analyzer` to visualize your bundles and how to optimize them.
      *
-     * Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for wite](https://github.com/btd/rollup-plugin-visualizer#options).
+     * Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for lahm](https://github.com/btd/rollup-plugin-visualizer#options).
      *
      * @example
      * ```js
@@ -1512,7 +1532,7 @@ const index = {
   ...postcss,
   ...router,
   ...typescript,
-  ...wite,
+  ...lahm,
   ...webpack
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dtwo/schema",
-  "version": "3.1.2",
+  "version": "3.2.1",
   "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
@@ -13,30 +13,31 @@
   "devDependencies": {
     "@types/lodash.template": "4.5.1",
     "@types/semver": "7.3.13",
-    "@kdhead/schema": "1.0.20",
-    "@witejs/plugin-kdu": "4.0.0",
-    "holepack": "2.1.1",
+    "@kdhead/schema": "1.8.10",
+    "@lahmjs/plugin-kdu": "4.2.3",
+    "@lahmjs/plugin-kdu-jsx": "3.0.1",
+    "holepack": "2.2.2",
     "kdu-router": "4.1.6",
     "unbuild": "1.1.1",
-    "wite": "4.2.0"
+    "lahm": "4.5.14"
   },
   "dependencies": {
-    "c12": "1.1.0",
+    "c12": "1.1.2",
     "create-require": "1.1.1",
     "defu": "6.1.2",
     "hookable": "5.4.2",
-    "jiti": "1.16.2",
-    "kdimport": "2.1.0",
+    "jiti": "1.17.1",
+    "kdimport": "2.2.4",
     "pathe": "1.1.0",
-    "pkg-types": "1.0.1",
+    "pkg-types": "1.0.2",
     "postcss-import-resolver": "2.0.0",
     "scule": "1.0.0",
     "std-env": "3.3.2",
-    "ufo": "1.0.1",
+    "ufo": "1.1.0",
     "untyped": "1.2.2"
   },
   "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/config.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentsOptions } from '../src/types/components'
 import type { ImportsOptions } from '../src/types/imports'
 import type { CompilerOptions } from '@kdujs/compiler-core'
-import type { DtwoAppConfig, RuntimeConfig, AppConfig, WiteConfig } from '../src/types/config'
+import type { DtwoAppConfig, RuntimeConfig, AppConfig, LahmConfig } from '../src/types/config'
 import type { DtwoPlugin, Dtwo } from '../src/types/dtwo'
 import type { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
 import type { PluginVisualizerOptions } from 'rollup-plugin-visualizer'
@@ -234,9 +234,9 @@ export interface ConfigSchema {
  /**
   * The builder to use for bundling the Kdu part of your application.
   * 
-  * @default "@dtwo/wite-builder"
+  * @default "@dtwo/lahm-builder"
  */
- builder: 'wite' | 'webpack' | { bundle: (dtwo: Dtwo) => Promise<void> },
+ builder: 'lahm' | 'webpack' | { bundle: (dtwo: Dtwo) => Promise<void> },
 
  /**
   * Whether to generate sourcemaps.
@@ -287,7 +287,7 @@ export interface ConfigSchema {
   /**
    * Dtwo uses `webpack-bundle-analyzer` to visualize your bundles and how to optimize them.
    * 
-   * Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for wite](https://github.com/btd/rollup-plugin-visualizer#options).
+   * Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for lahm](https://github.com/btd/rollup-plugin-visualizer#options).
    * 
    * @default false
    * 
@@ -441,7 +441,7 @@ export interface ConfigSchema {
  debug: boolean,
 
  /**
-  * Whether to enable rendering of HTML - either dynamically (in server mode) or at generate time. If set to `false` and combined with `static` target, generated pages will simply display a loading screen with no content.
+  * Whether to enable rendering of HTML - either dynamically (in server mode) or at generate time. If set to `false` generated pages will have no content.
   * 
   * @default true
  */
@@ -733,12 +733,14 @@ export interface ConfigSchema {
   /**
    * Dev server listening host
    * 
-   * @default "localhost"
+   * @default ""
   */
   host: string,
 
   /**
-   * Listening dev server url
+   * Listening dev server URL.
+   * 
+   * This should not be set directly as it will always be overridden by the dev server with the full URL (for module and internal use).
    * 
    * @default "http://localhost:3000"
   */
@@ -777,23 +779,32 @@ export interface ConfigSchema {
   treeshakeClientOnly: boolean,
 
   /**
-   * Use wite-node for on-demand server chunk loading
+   * Emit `app:chunkError` hook when there is an error loading lahm/webpack chunks.
+   * 
+   * You can set this to `reload` to perform a hard reload of the new route when a chunk fails to load when navigating to a new route.
+   * 
+   * @default false
+  */
+  emitRouteChunkError: boolean | 'reload',
+
+  /**
+   * Use lahm-node for on-demand server chunk loading
    * 
    * @default true
    * 
-   * @deprecated use `wite.devBundler: 'wite-node'`
+   * @deprecated use `lahm.devBundler: 'lahm-node'`
   */
-  witeNode: boolean,
+  lahmNode: boolean,
 
   /**
    * Split server bundle into multiple chunks and dynamically import them.
    * 
    * @default true
   */
-  witeServerDynamicImports: boolean,
+  lahmServerDynamicImports: boolean,
 
   /**
-   * Inline styles when rendering HTML (currently wite only).
+   * Inline styles when rendering HTML (currently lahm only).
    * 
    * You can also pass a function that receives the path of a Kdu component and returns a boolean indicating whether to inline the styles for that component.
    * 
@@ -1069,18 +1080,18 @@ export interface ConfigSchema {
  },
 
  /**
-  * Configuration that will be passed directly to Wite.
+  * Configuration that will be passed directly to Lahm.
   * 
-  * See https://witejs.web.app/config for more information. Please note that not all wite options are supported in Dtwo.
+  * See https://lahmjs.web.app/config for more information. Please note that not all lahm options are supported in Dtwo.
   * 
  */
- wite: WiteConfig,
+ lahm: LahmConfig,
 
  webpack: {
   /**
    * Dtwo uses `webpack-bundle-analyzer` to visualize your bundles and how to optimize them.
    * 
-   * Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for wite](https://github.com/btd/rollup-plugin-visualizer#options).
+   * Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for lahm](https://github.com/btd/rollup-plugin-visualizer#options).
    * 
    * @default false
    * 

package/schema/config.defaults.json

@@ -1,6 +1,6 @@
 {
   "rootDir": "/<rootDir>",
-  "wite": {
+  "lahm": {
     "base": "/",
     "root": "/<rootDir>",
     "mode": "production",
@@ -26,6 +26,7 @@
         "compilerOptions": {}
       }
     },
+    "kduJsx": {},
     "optimizeDeps": {
       "exclude": [
         "kdu-demi"
@@ -119,7 +120,7 @@
     "/<rootDir>/node_modules",
     "D:/Workspace/ORGs/d2js/dtwo/packages/schema/node_modules"
   ],
-  "builder": "@dtwo/wite-builder",
+  "builder": "@dtwo/lahm-builder",
   "sourcemap": {
     "server": true,
     "client": false
@@ -178,7 +179,7 @@
   "devServer": {
     "https": false,
     "port": 3000,
-    "host": "localhost",
+    "host": "",
     "url": "http://localhost:3000"
   },
   "experimental": {
@@ -186,8 +187,9 @@
     "reactivityTransform": false,
     "externalKdu": true,
     "treeshakeClientOnly": true,
-    "witeNode": true,
-    "witeServerDynamicImports": true,
+    "emitRouteChunkError": false,
+    "lahmNode": true,
+    "lahmServerDynamicImports": true,
     "inlineSSRStyles": true,
     "noScripts": false,
     "payloadExtraction": false,

package/schema/config.md

@@ -136,8 +136,8 @@ Dtwo will automatically guess the file type by its extension and use the appropr
 
 
 # `builder`
-- **Type**: `'wite' | 'webpack' | { bundle: (dtwo: SrcTypesDtwoDtwo) => Promise<void> }`
-- **Default**: `"@dtwo/wite-builder"`
+- **Type**: `'lahm' | 'webpack' | { bundle: (dtwo: SrcTypesDtwoDtwo) => Promise<void> }`
+- **Default**: `"@dtwo/lahm-builder"`
 
 > The builder to use for bundling the Kdu part of your application.
 
@@ -173,7 +173,7 @@ Templates are rendered using [`lodash.template`](https://lodash.com/docs/4.17.15
 > Dtwo uses `webpack-bundle-analyzer` to visualize your bundles and how to optimize them.
 
 
-Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for wite](https://github.com/btd/rollup-plugin-visualizer#options).
+Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for lahm](https://github.com/btd/rollup-plugin-visualizer#options).
 
 
 # `extends`
@@ -292,7 +292,7 @@ At the moment, it prints out hook names and timings on the server, and logs hook
 - **Type**: `boolean`
 - **Default**: `true`
 
-> Whether to enable rendering of HTML - either dynamically (in server mode) or at generate time. If set to `false` and combined with `static` target, generated pages will simply display a loading screen with no content.
+> Whether to enable rendering of HTML - either dynamically (in server mode) or at generate time. If set to `false` generated pages will have no content.
 
 
 # `modules`
@@ -449,7 +449,7 @@ For programmatic usage and type support, you can directly provide app config wit
 
 ## `host`
 - **Type**: `string`
-- **Default**: `"localhost"`
+- **Default**: `""`
 
 > Dev server listening host
 
@@ -458,7 +458,10 @@ For programmatic usage and type support, you can directly provide app config wit
 - **Type**: `string`
 - **Default**: `"http://localhost:3000"`
 
-> Listening dev server url
+> Listening dev server URL.
+
+
+This should not be set directly as it will always be overridden by the dev server with the full URL (for module and internal use).
 
 
 # `experimental`
@@ -491,14 +494,24 @@ For programmatic usage and type support, you can directly provide app config wit
 > Tree shakes contents of client-only components from server bundle.
 
 
-## `witeNode`
+## `emitRouteChunkError`
+- **Type**: `boolean | 'reload'`
+- **Default**: `false`
+
+> Emit `app:chunkError` hook when there is an error loading lahm/webpack chunks.
+
+
+You can set this to `reload` to perform a hard reload of the new route when a chunk fails to load when navigating to a new route.
+
+
+## `lahmNode`
 - **Type**: `boolean`
 - **Default**: `true`
 
-> Use wite-node for on-demand server chunk loading
+> Use lahm-node for on-demand server chunk loading
 
 
-## `witeServerDynamicImports`
+## `lahmServerDynamicImports`
 - **Type**: `boolean`
 - **Default**: `true`
 
@@ -509,7 +522,7 @@ For programmatic usage and type support, you can directly provide app config wit
 - **Type**: `boolean | ((id?: string) => boolean)`
 - **Default**: `true`
 
-> Inline styles when rendering HTML (currently wite only).
+> Inline styles when rendering HTML (currently lahm only).
 
 
 You can also pass a function that receives the path of a Kdu component and returns a boolean indicating whether to inline the styles for that component.
@@ -751,7 +764,7 @@ If set to true, this will type check in development. You can restrict this to bu
 We recommend instead either enabling [**Take Over Mode**](https://kdu-js.web.app/guide/typescript/overview.html#kocan-takeover-mode) or adding TypeScript Kdu Plugin (Kocan)** 👉 [[Download](https://marketplace.visualstudio.com/items?itemName=Kdu-Code.vscode-typescript-kdu-plugin)].
 
 
-# `wite`
+# `lahm`
 
 ## `root`
 - **Type**: `string`
@@ -793,6 +806,8 @@ We recommend instead either enabling [**Take Over Mode**](https://kdu-js.web.app
 
 #### `compilerOptions`
 
+## `kduJsx`
+
 ## `optimizeDeps`
 
 ### `exclude`
@@ -852,7 +867,7 @@ We recommend instead either enabling [**Take Over Mode**](https://kdu-js.web.app
 > Dtwo uses `webpack-bundle-analyzer` to visualize your bundles and how to optimize them.
 
 
-Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for wite](https://github.com/btd/rollup-plugin-visualizer#options).
+Set to `true` to enable bundle analysis, or pass an object with options: [for webpack](https://github.com/webpack-contrib/webpack-bundle-analyzer#options-for-plugin) or [for lahm](https://github.com/btd/rollup-plugin-visualizer#options).
 
 
 ## `profile`