refactor!: remove /kit subpath (#3199)

Author: pi0

build.config.ts

@@ -6,14 +6,7 @@ import { defineBuildConfig } from "unbuild";
 
 const srcDir = fileURLToPath(new URL("src", import.meta.url));
 
-export const subpaths = [
-  "config",
-  "kit",
-  "presets",
-  "runtime",
-  "meta",
-  "types",
-];
+export const subpaths = ["config", "presets", "runtime", "meta", "types"];
 
 export default defineBuildConfig({
   declaration: true,
@@ -22,7 +15,6 @@ export default defineBuildConfig({
     { input: "src/cli/index.ts" },
     { input: "src/config/index.ts" },
     { input: "src/core/index.ts" },
-    { input: "src/kit/index.ts" },
     { input: "src/meta/index.ts" },
     { input: "src/types/index.ts" },
     { input: "src/runtime/", outDir: "dist/runtime", format: "esm" },

package.json

@@ -10,7 +10,6 @@
     ".": "./dist/core/index.mjs",
     "./config": "./dist/config/index.mjs",
     "./types": "./dist/types/index.d.mts",
-    "./kit": "./dist/kit/index.mjs",
     "./meta": "./dist/meta/index.mjs",
     "./presets": "./dist/presets/index.mjs",
     "./runtime": "./dist/runtime/index.mjs",

scripts/gen-presets.ts

@@ -15,6 +15,7 @@ const presetsDir = fileURLToPath(new URL("../src/presets", import.meta.url));
 const presetDirs: string[] = readdirSync(presetsDir, { withFileTypes: true })
   .filter(
     (dir) =>
+      dir.name !== "_utils" &&
       dir.isDirectory() &&
       existsSync(resolve(presetsDir, dir.name, "preset.ts"))
   )
@@ -38,6 +39,9 @@ for (const preset of presetDirs) {
   const _presets = await jiti
     .import(presetPath)
     .then((mod) => (mod as any).default || mod);
+  if (!Array.isArray(_presets)) {
+    throw new TypeError(`Preset ${preset} does not export an array`);
+  }
   allPresets.push(..._presets);
 }
 

src/core/build/assets.ts

@@ -1,6 +1,6 @@
 import { existsSync, promises as fsp } from "node:fs";
 import { globby } from "globby";
-import { isDirectory, prettyPath } from "nitro/kit";
+import { isDirectory, prettyPath } from "../utils/fs";
 import type { Nitro } from "nitro/types";
 import { join, relative, resolve } from "pathe";
 import { compressPublicAssets } from "../utils/compress";

src/core/build/prod.ts

@@ -1,6 +1,6 @@
 import { promises as fsp } from "node:fs";
 import { formatCompatibilityDate } from "compatx";
-import { writeFile } from "nitro/kit";
+import { writeFile } from "../utils/fs";
 import { version as nitroVersion } from "nitro/meta";
 import type { Nitro, NitroBuildInfo, RollupConfig } from "nitro/types";
 import { dirname, join, relative, resolve } from "pathe";

src/core/build/types.ts

@@ -3,7 +3,7 @@ import { defu } from "defu";
 import { genTypeImport } from "knitwork";
 import { lookupNodeModuleSubpath, parseNodeModulePath } from "mlly";
 import { resolveModulePath } from "exsolve";
-import { isDirectory, resolveNitroPath, writeFile } from "nitro/kit";
+import { isDirectory, resolveNitroPath, writeFile } from "../utils/fs";
 import { runtimeDir } from "nitro/runtime/meta";
 import type { Nitro, NitroTypes } from "nitro/types";
 import { dirname, isAbsolute, join, resolve } from "pathe";

src/core/config/resolvers/paths.ts

@@ -1,5 +1,5 @@
 import { existsSync } from "node:fs";
-import { resolveNitroPath } from "nitro/kit";
+import { resolveNitroPath } from "../../utils/fs";
 import { pkgDir } from "nitro/runtime/meta";
 import type { NitroOptions } from "nitro/types";
 import { join, resolve } from "pathe";

src/core/prerender/prerender.ts

@@ -2,7 +2,7 @@ import { pathToFileURL } from "node:url";
 import { colors } from "consola/utils";
 import { defu } from "defu";
 import mime from "mime";
-import { writeFile } from "nitro/kit";
+import { writeFile } from "../utils/fs";
 import type {
   Nitro,
   NitroRouteRules,

src/kit/path.ts src/core/utils/fs.ts

@@ -1,7 +1,9 @@
+import type { Nitro } from "nitro/types";
+import { stat, mkdir, writeFile as fspWriteFile } from "node:fs/promises";
+import { dirname } from "pathe";
 import consola from "consola";
 import { colors } from "consola/utils";
 import { getProperty } from "dot-prop";
-import type { Nitro } from "nitro/types";
 import { relative, resolve } from "pathe";
 
 export function prettyPath(p: string, highlight = true) {
@@ -41,3 +43,27 @@ function _compilePathTemplate(contents: string) {
       return val || `${match}`;
     });
 }
+
+export async function writeFile(
+  file: string,
+  contents: Buffer | string,
+  log = false
+) {
+  await mkdir(dirname(file), { recursive: true });
+  await fspWriteFile(
+    file,
+    contents,
+    typeof contents === "string" ? "utf8" : undefined
+  );
+  if (log) {
+    consola.info("Generated", prettyPath(file));
+  }
+}
+
+export async function isDirectory(path: string) {
+  try {
+    return (await stat(path)).isDirectory();
+  } catch {
+    return false;
+  }
+}

src/kit/index.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const baseWorker = defineNitroPreset(
   {

src/kit/module.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const nitroDev = defineNitroPreset(
   {

src/presets/_nitro/base-worker.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const nitroPrerender = defineNitroPreset(
   {

src/presets/_nitro/nitro-dev.ts

@@ -1,5 +1,5 @@
 import { existsSync, promises as fsp } from "node:fs";
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 import type { Nitro } from "nitro/types";
 import { resolve } from "pathe";
 import { joinURL } from "ufo";

src/presets/_nitro/nitro-prerender.ts

@@ -1,5 +1,5 @@
 import fsp from "node:fs/promises";
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 import { join } from "pathe";
 
 const _static = defineNitroPreset(

src/presets/_nitro/service-worker.ts

@@ -1,7 +1,12 @@
 import fsp from "node:fs/promises";
-import { consola } from "consola";
-import { dirname } from "pathe";
-import { prettyPath } from "./path";
+import { relative, dirname } from "pathe";
+import consola from "consola";
+import { colors } from "consola/utils";
+
+export function prettyPath(p: string, highlight = true) {
+  p = relative(process.cwd(), p);
+  return highlight ? colors.cyan(p) : p;
+}
 
 export async function writeFile(
   file: string,

src/presets/_static/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const alwaysdata = defineNitroPreset(
   {

src/kit/fs.ts src/presets/_utils/fs.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 import { writeAmplifyFiles } from "./utils";
 
 export type { AWSAmplifyOptions as PresetOptions } from "./types";

src/kit/preset.ts src/presets/_utils/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 export type { AwsLambdaOptions as PresetOptions } from "./types";
 
 const awsLambda = defineNitroPreset(

src/presets/alwaysdata/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 import type { Nitro } from "nitro/types";
 import { writeFunctionsRoutes, writeSWARoutes } from "./utils";
 

src/presets/aws-amplify/preset.ts

@@ -1,7 +1,7 @@
 import { createWriteStream } from "node:fs";
 import fsp from "node:fs/promises";
 import archiver from "archiver";
-import { writeFile } from "nitro/kit";
+import { writeFile } from "../_utils/fs";
 import type { Nitro } from "nitro/types";
 import { join, resolve } from "pathe";
 

src/presets/aws-lambda/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const bun = defineNitroPreset(
   {

src/presets/azure/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const cleavr = defineNitroPreset(
   {

src/presets/azure/utils.ts

@@ -1,5 +1,5 @@
-import { defineNitroPreset } from "nitro/kit";
-import { writeFile } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
+import { writeFile } from "../_utils/fs";
 import type { Nitro } from "nitro/types";
 import { resolve } from "pathe";
 

src/presets/bun/preset.ts

@@ -1,5 +1,5 @@
-import { defineNitroPreset } from "nitro/kit";
-import { writeFile } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
+import { writeFile } from "../_utils/fs";
 import type { Nitro } from "nitro/types";
 import { resolve } from "pathe";
 import { unenvCfExternals } from "../_unenv/preset-workerd";

src/presets/cleavr/preset.ts

@@ -4,7 +4,7 @@ import type { WranglerConfig, CloudflarePagesRoutes } from "./types";
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { relative, dirname, extname } from "node:path";
-import { writeFile } from "nitro/kit";
+import { writeFile } from "../_utils/fs";
 import { parseTOML, parseJSONC } from "confbox";
 import { readGitConfig, readPackageJSON, findNearestFile } from "pkg-types";
 import { defu } from "defu";

src/presets/cloudflare/preset-legacy.ts

@@ -1,8 +1,8 @@
 import { builtinModules } from "node:module";
 import MagicString from "magic-string";
 import { findStaticImports } from "mlly";
-import { defineNitroPreset } from "nitro/kit";
-import { writeFile } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
+import { writeFile } from "../_utils/fs";
 import { isAbsolute, resolve } from "pathe";
 
 // nitro/src/rollup/plugin/import-meta.ts

src/presets/cloudflare/preset.ts

@@ -1,5 +1,5 @@
-import { defineNitroPreset } from "nitro/kit";
-import { writeFile } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
+import { writeFile } from "../_utils/fs";
 import { resolve } from "pathe";
 import { unenvDenoPreset } from "../_unenv/preset-deno";
 

src/presets/cloudflare/utils.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const digitalOcean = defineNitroPreset(
   {

src/presets/deno/preset-legacy.ts

@@ -1,5 +1,5 @@
 import { promises as fsp } from "node:fs";
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 import { dirname, resolve } from "pathe";
 import type { PackageJson } from "pkg-types";
 

src/presets/deno/preset.ts

@@ -1,4 +1,5 @@
-import { defineNitroPreset, writeFile } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
+import { writeFile } from "../_utils/fs";
 import { version as nitroVersion } from "nitro/meta";
 import { basename, join, relative } from "pathe";
 import type { Plugin } from "rollup";

src/presets/digitalocean/preset.ts

@@ -1,5 +1,5 @@
 import { existsSync } from "node:fs";
-import { writeFile } from "nitro/kit";
+import { writeFile } from "../_utils/fs";
 import type { Nitro } from "nitro/types";
 import { join, relative } from "pathe";
 import { readPackageJSON, writePackageJSON } from "pkg-types";

src/presets/edgio/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const flightControl = defineNitroPreset(
   {

src/presets/firebase/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const genezio = defineNitroPreset(
   {

src/presets/firebase/utils.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const heroku = defineNitroPreset(
   {

src/presets/flightcontrol/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 import type { Nitro } from "nitro/types";
 import { writeIISFiles, writeIISNodeFiles } from "./utils";
 

src/presets/genezio/preset.ts

@@ -1,7 +1,7 @@
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { defu } from "defu";
-import { writeFile } from "nitro/kit";
+import { writeFile } from "../_utils/fs";
 import type { Nitro } from "nitro/types";
 import { resolve } from "pathe";
 

src/presets/heroku/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const koyeb = defineNitroPreset(
   {

src/presets/iis/preset.ts

@@ -1,5 +1,5 @@
 import { promises as fsp } from "node:fs";
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../../_utils/preset";
 import type { Nitro } from "nitro/types";
 import { dirname, join } from "pathe";
 import { deprecateSWR, writeHeaders, writeRedirects } from "./utils";

src/presets/iis/utils.ts

@@ -1,5 +1,5 @@
 import { promises as fsp } from "node:fs";
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 import type { Nitro } from "nitro/types";
 import { dirname, join } from "pathe";
 import { unenvDenoPreset } from "../_unenv/preset-deno";

src/presets/koyeb/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 import { normalize } from "pathe";
 import { resolveModulePath } from "exsolve";
 

src/presets/netlify/legacy/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const platformSh = defineNitroPreset(
   {

src/presets/netlify/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const renderCom = defineNitroPreset(
   {

src/presets/node/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 
 const stormkit = defineNitroPreset(
   {

src/presets/platform.sh/preset.ts

@@ -1,4 +1,4 @@
-import { defineNitroPreset } from "nitro/kit";
+import { defineNitroPreset } from "../_utils/preset";
 import type { Nitro } from "nitro/types";
 import {
   deprecateSWR,