@dtwo/kit 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/dist/index.d.ts

@@ -1,8 +1,8 @@
-import { ModuleOptions, ModuleDefinition, DtwoModule, Dtwo, DtwoConfig, DtwoOptions, SchemaDefinition, ImportPresetWithDeprecation, DtwoCompatibility, DtwoCompatibilityIssues, ComponentsDir, Component, DtwoTemplate, DtwoHooks, DtwoPlugin, DtwoPluginTemplate, ResolvedDtwoTemplate } from '@dtwo/schema';
+import { ModuleOptions, ModuleDefinition, DtwoModule, Dtwo, DtwoConfig, DtwoOptions, SchemaDefinition, ImportPresetWithDeprecation, DtwoCompatibility, DtwoCompatibilityIssues, ComponentsDir, Component, DtwoTemplate, DtwoHooks, DtwoMiddleware, DtwoPlugin, DtwoPluginTemplate, ResolvedDtwoTemplate } from '@dtwo/schema';
 import { LoadConfigOptions } from 'c12';
 import { Import } from 'kdimport';
 import { Configuration, WebpackPluginInstance } from 'webpack';
-import { UserConfig, Plugin } from 'wite';
+import { UserConfig, Plugin } from 'lahm';
 import * as unctx_index from 'unctx/index';
 import { HoleEventHandler, HoleDevEventHandler, Hole, HoleRouteConfig } from 'holepack';
 import * as consola from 'consola';
@@ -68,7 +68,7 @@ interface ExtendConfigOptions {
 }
 interface ExtendWebpackConfigOptions extends ExtendConfigOptions {
 }
-interface ExtendWiteConfigOptions extends ExtendConfigOptions {
+interface ExtendLahmConfigOptions extends ExtendConfigOptions {
 }
 /**
  * Extend webpack config
@@ -78,17 +78,17 @@ interface ExtendWiteConfigOptions extends ExtendConfigOptions {
  */
 declare function extendWebpackConfig(fn: ((config: Configuration) => void), options?: ExtendWebpackConfigOptions): void;
 /**
- * Extend Wite config
+ * Extend Lahm config
  */
-declare function extendWiteConfig(fn: ((config: UserConfig) => void), options?: ExtendWiteConfigOptions): (() => void) | undefined;
+declare function extendLahmConfig(fn: ((config: UserConfig) => void), options?: ExtendLahmConfigOptions): (() => void) | undefined;
 /**
  * Append webpack plugin to the config.
  */
 declare function addWebpackPlugin(plugin: WebpackPluginInstance | WebpackPluginInstance[], options?: ExtendWebpackConfigOptions): void;
 /**
- * Append Wite plugin to the config.
+ * Append Lahm plugin to the config.
  */
-declare function addWitePlugin(plugin: Plugin | Plugin[], options?: ExtendWiteConfigOptions): void;
+declare function addLahmPlugin(plugin: Plugin | Plugin[], options?: ExtendLahmConfigOptions): void;
 
 /**
  * Check version constraints and return incompatibility issues as an array
@@ -211,7 +211,16 @@ interface ExtendRouteRulesOptions {
      */
     override?: boolean;
 }
-declare function extendRouteRules(route: string, rule: HoleRouteConfig, options?: ExtendRouteRulesOptions): void;
+declare function extendRouteRules(route: string, rule: HoleRouteConfig, options?: ExtendRouteRulesOptions): void;
+interface AddRouteMiddlewareOptions {
+    /**
+     * Override existing middleware with the same name, if it exists
+     *
+     * @default false
+     */
+    override?: boolean;
+}
+declare function addRouteMiddleware(input: DtwoMiddleware | DtwoMiddleware[], options?: AddRouteMiddlewareOptions): void;
 
 /**
  * Normalize a dtwo plugin object
@@ -341,4 +350,4 @@ declare const templateUtils: {
     }) => string;
 };
 
-export { AddComponentOptions, AddPluginOptions, ExtendConfigOptions, ExtendRouteRulesOptions, ExtendWebpackConfigOptions, ExtendWiteConfigOptions, LoadDtwoConfigOptions, LoadDtwoOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addServerHandler, addServerPlugin, addTemplate, addWebpackPlugin, addWitePlugin, assertDtwoCompatibility, buildDtwo, checkDtwoCompatibility, clearRequireCache, compileTemplate, createResolver, defineDtwoModule, dtwoCtx, extendDtwoSchema, extendPages, extendRouteRules, extendWebpackConfig, extendWiteConfig, findPath, getDtwoVersion, getRequireCacheItem, hasDtwoCompatibility, importModule, installModule, isDtwo2, isDtwo3, isIgnored, isNodeModules, loadDtwo, loadDtwoConfig, logger, normalizePlugin, normalizeTemplate, requireModule, requireModulePkg, resolveAlias, resolveFiles, resolveModule, resolvePath, scanRequireTree, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseDtwo, updateTemplates, useDtwo, useHole, useLogger };
+export { AddComponentOptions, AddPluginOptions, AddRouteMiddlewareOptions, ExtendConfigOptions, ExtendLahmConfigOptions, ExtendRouteRulesOptions, ExtendWebpackConfigOptions, LoadDtwoConfigOptions, LoadDtwoOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLahmPlugin, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerPlugin, addTemplate, addWebpackPlugin, assertDtwoCompatibility, buildDtwo, checkDtwoCompatibility, clearRequireCache, compileTemplate, createResolver, defineDtwoModule, dtwoCtx, extendDtwoSchema, extendLahmConfig, extendPages, extendRouteRules, extendWebpackConfig, findPath, getDtwoVersion, getRequireCacheItem, hasDtwoCompatibility, importModule, installModule, isDtwo2, isDtwo3, isIgnored, isNodeModules, loadDtwo, loadDtwoConfig, logger, normalizePlugin, normalizeTemplate, requireModule, requireModulePkg, resolveAlias, resolveFiles, resolveModule, resolvePath, scanRequireTree, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseDtwo, updateTemplates, useDtwo, useHole, useLogger };

package/dist/index.mjs

@@ -522,7 +522,7 @@ async function loadDtwo(opts) {
     configOverrides: opts.overrides,
     ready: opts.ready,
     envConfig: opts.dotenv
-    // TODO: Backward format convertion
+    // TODO: Backward format conversion
   });
   return dtwo;
 }
@@ -589,7 +589,7 @@ function extendWebpackConfig(fn, options = {}) {
     }
   });
 }
-function extendWiteConfig(fn, options = {}) {
+function extendLahmConfig(fn, options = {}) {
   const dtwo = useDtwo();
   if (options.dev === false && dtwo.options.dev) {
     return;
@@ -598,9 +598,9 @@ function extendWiteConfig(fn, options = {}) {
     return;
   }
   if (options.server !== false && options.client !== false) {
-    return dtwo.hook("wite:extend", ({ config }) => fn(config));
+    return dtwo.hook("lahm:extend", ({ config }) => fn(config));
   }
-  dtwo.hook("wite:extendConfig", (config, { isClient, isServer }) => {
+  dtwo.hook("lahm:extendConfig", (config, { isClient, isServer }) => {
     if (options.server !== false && isServer) {
       return fn(config);
     }
@@ -619,8 +619,8 @@ function addWebpackPlugin(plugin, options) {
     }
   }, options);
 }
-function addWitePlugin(plugin, options) {
-  extendWiteConfig((config) => {
+function addLahmPlugin(plugin, options) {
+  extendLahmConfig((config) => {
     config.plugins = config.plugins || [];
     if (Array.isArray(plugin)) {
       config.plugins.push(...plugin);
@@ -800,6 +800,24 @@ function extendRouteRules(route, rule, options = {}) {
     opts.routeRules[route] = options.override ? defu(rule, opts.routeRules[route]) : defu(opts.routeRules[route], rule);
   }
 }
+function addRouteMiddleware(input, options = {}) {
+  const dtwo = useDtwo();
+  const middlewares = Array.isArray(input) ? input : [input];
+  dtwo.hook("app:resolve", (app) => {
+    for (const middleware of middlewares) {
+      const find = app.middleware.findIndex((item) => item.name === middleware.name);
+      if (find >= 0) {
+        if (options.override === true) {
+          app.middleware[find] = middleware;
+        } else {
+          console.warn(`'${middleware.name}' middleware already exists at '${app.middleware[find].path}'. You can set \`override: true\` to replace it.`);
+        }
+      } else {
+        app.middleware.push(middleware);
+      }
+    }
+  });
+}
 
 function normalizePlugin(plugin) {
   if (typeof plugin === "string") {
@@ -832,4 +850,4 @@ function addPluginTemplate(plugin, opts = {}) {
   return addPlugin(normalizedPlugin, opts);
 }
 
-export { addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addServerHandler, addServerPlugin, addTemplate, addWebpackPlugin, addWitePlugin, assertDtwoCompatibility, buildDtwo, checkDtwoCompatibility, clearRequireCache, compileTemplate, createResolver, defineDtwoModule, dtwoCtx, extendDtwoSchema, extendPages, extendRouteRules, extendWebpackConfig, extendWiteConfig, findPath, getDtwoVersion, getRequireCacheItem, hasDtwoCompatibility, importModule, installModule, isDtwo2, isDtwo3, isIgnored, isNodeModules, loadDtwo, loadDtwoConfig, logger, normalizePlugin, normalizeTemplate, requireModule, requireModulePkg, resolveAlias, resolveFiles, resolveModule, resolvePath, scanRequireTree, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseDtwo, updateTemplates, useDtwo, useHole, useLogger };
+export { addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLahmPlugin, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, addServerHandler, addServerPlugin, addTemplate, addWebpackPlugin, assertDtwoCompatibility, buildDtwo, checkDtwoCompatibility, clearRequireCache, compileTemplate, createResolver, defineDtwoModule, dtwoCtx, extendDtwoSchema, extendLahmConfig, extendPages, extendRouteRules, extendWebpackConfig, findPath, getDtwoVersion, getRequireCacheItem, hasDtwoCompatibility, importModule, installModule, isDtwo2, isDtwo3, isIgnored, isNodeModules, loadDtwo, loadDtwoConfig, logger, normalizePlugin, normalizeTemplate, requireModule, requireModulePkg, resolveAlias, resolveFiles, resolveModule, resolvePath, scanRequireTree, templateUtils, tryImportModule, tryRequireModule, tryResolveModule, tryUseDtwo, updateTemplates, useDtwo, useHole, useLogger };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dtwo/kit",
-  "version": "3.1.2",
+  "version": "3.2.1",
   "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
@@ -10,23 +10,23 @@
     "dist"
   ],
   "dependencies": {
-    "@dtwo/schema": "3.1.2",
-    "c12": "1.1.0",
+    "@dtwo/schema": "3.2.1",
+    "c12": "1.1.2",
     "consola": "2.15.3",
     "defu": "6.1.2",
     "globby": "13.1.3",
     "hash-sum": "2.0.0",
     "ignore": "5.2.4",
-    "jiti": "1.16.2",
-    "kdimport": "2.1.0",
+    "jiti": "1.17.1",
+    "kdimport": "2.2.4",
     "knitwork": "1.0.0",
     "lodash.template": "4.5.0",
-    "mlly": "1.1.0",
+    "mlly": "1.1.1",
     "pathe": "1.1.0",
-    "pkg-types": "1.0.1",
+    "pkg-types": "1.0.2",
     "scule": "1.0.0",
     "semver": "7.3.8",
-    "unctx": "2.1.1",
+    "unctx": "2.1.2",
     "untyped": "1.2.2"
   },
   "devDependencies": {
@@ -35,7 +35,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/README.md

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