@dtwo/kit 3.1.1 → 3.2.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-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';
@@ -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, ExtendRouteRulesOptions, ExtendWebpackConfigOptions, ExtendWiteConfigOptions, LoadDtwoConfigOptions, LoadDtwoOptions, RequireModuleOptions, ResolveModuleOptions, ResolvePathOptions, Resolver, addComponent, addComponentsDir, addDevServerHandler, addImports, addImportsDir, addImportsSources, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, 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 };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { promises, existsSync, readFileSync } from 'node:fs';
-import defu, { defu as defu$1 } from 'defu';
+import { defu } from 'defu';
 import { applyDefaults } from 'untyped';
 import { dirname, join, normalize, relative, isAbsolute, resolve, basename, parse } from 'pathe';
 import consola from 'consola';
@@ -147,7 +147,7 @@ function defineDtwoModule(definition) {
     if (uniqueKey) {
       dtwo.options._requiredModules = dtwo.options._requiredModules || {};
       if (dtwo.options._requiredModules[uniqueKey]) {
-        return;
+        return false;
       }
       dtwo.options._requiredModules[uniqueKey] = true;
     }
@@ -432,7 +432,10 @@ async function resolveFiles(path, pattern, opts = {}) {
 async function installModule(moduleToInstall, _inlineOptions, _dtwo) {
   const dtwo = useDtwo();
   const { dtwoModule, inlineOptions } = await normalizeModule(moduleToInstall, _inlineOptions);
-  await dtwoModule(inlineOptions, dtwo);
+  const res = await dtwoModule(inlineOptions, dtwo);
+  if (res === false) {
+    return;
+  }
   if (typeof moduleToInstall === "string") {
     dtwo.options.build.transpile.push(moduleToInstall);
   }
@@ -794,9 +797,27 @@ function extendRouteRules(route, rule, options = {}) {
     if (!opts.routeRules) {
       opts.routeRules = {};
     }
-    opts.routeRules[route] = options.override ? defu$1(rule, opts.routeRules[route]) : defu$1(opts.routeRules[route], rule);
+    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") {
@@ -829,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, addLayout, addPlugin, addPluginTemplate, addPrerenderRoutes, addRouteMiddleware, 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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dtwo/kit",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
@@ -10,15 +10,15 @@
     "dist"
   ],
   "dependencies": {
-    "@dtwo/schema": "3.1.1",
+    "@dtwo/schema": "3.2.0",
     "c12": "1.1.0",
     "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.0.1",
+    "jiti": "1.17.0",
+    "kdimport": "2.2.4",
     "knitwork": "1.0.0",
     "lodash.template": "4.5.0",
     "mlly": "1.1.0",