refactor: cleanup core and rollup structure (#3209)

Author: pi0

build.config.ts

@@ -6,16 +6,14 @@ import { defineBuildConfig } from "unbuild";
 
 const srcDir = fileURLToPath(new URL("src", import.meta.url));
 
-export const subpaths = ["config", "presets", "runtime", "meta", "types"];
+export const subpaths = ["config", "presets", "runtime", "types"];
 
 export default defineBuildConfig({
   declaration: true,
   name: "nitro",
   entries: [
     { input: "src/cli/index.ts" },
-    { input: "src/config/index.ts" },
-    { input: "src/core/index.ts" },
-    { input: "src/meta/index.ts" },
+    { input: "src/index.ts" },
     { input: "src/types/index.ts" },
     { input: "src/runtime/", outDir: "dist/runtime", format: "esm" },
     { input: "src/presets/", outDir: "dist/presets", format: "esm" },
@@ -37,6 +35,7 @@ export default defineBuildConfig({
   externals: [
     "nitro",
     "nitro/runtime/meta",
+    "nitro/config",
     ...subpaths.map((subpath) => `nitro/${subpath}`),
     "firebase-functions",
     "@scalar/api-reference",
@@ -45,7 +44,6 @@ export default defineBuildConfig({
     jiti: {
       alias: {
         nitro: "nitro",
-        "nitro/meta": resolve(srcDir, "../meta.ts"),
         "nitro/runtime/meta": resolve(srcDir, "../lib/runtime-meta.mjs"),
         ...Object.fromEntries(
           subpaths.map((subpath) => [

lib/config.d.mts

@@ -0,0 +1,7 @@
+import { NitroConfig } from "nitro/types";
+
+export { NitroConfig } from "nitro/types";
+
+declare function defineNitroConfig(config: NitroConfig): NitroConfig;
+
+export { defineNitroConfig };

lib/config.mjs

@@ -0,0 +1,5 @@
+function defineNitroConfig(config) {
+  return config;
+}
+
+export { defineNitroConfig };

lib/meta.d.mts

@@ -0,0 +1 @@
+export const version: string;

lib/meta.mjs

@@ -0,0 +1 @@
+export { version } from "../package.json" with { type: "json" };

package.json

@@ -7,10 +7,10 @@
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
-    ".": "./dist/core/index.mjs",
-    "./config": "./dist/config/index.mjs",
+    ".": "./dist/index.mjs",
+    "./config": "./lib/config.mjs",
     "./types": "./dist/types/index.d.mts",
-    "./meta": "./dist/meta/index.mjs",
+    "./meta": "./lib/meta.mjs",
     "./presets": "./dist/presets/index.mjs",
     "./runtime": "./dist/runtime/index.mjs",
     "./runtime/internal": "./dist/runtime/internal/index.mjs",

scripts/gen-presets.ts

@@ -24,7 +24,7 @@ const presetDirs: string[] = readdirSync(presetsDir, { withFileTypes: true })
 // --- Load presets ---
 const jiti = createJiti(presetsDir, {
   alias: {
-    nitropack: fileURLToPath(new URL("../src/core/index.ts", import.meta.url)),
+    nitropack: fileURLToPath(new URL("../src/index.ts", import.meta.url)),
     ...Object.fromEntries(
       subpaths.map((pkg) => [
         `nitro/${pkg}`,

src/core/build/assets.ts src/build/assets.ts

@@ -1,4 +1,4 @@
-import { getRollupConfig } from "../../rollup";
+import { getRollupConfig } from "./rollup/config";
 import type { Nitro } from "nitro/types";
 import { watchDev } from "./dev";
 import { buildProduction } from "./prod";

src/core/build/build.ts src/build/build.ts

@@ -5,7 +5,7 @@ import { version as nitroVersion } from "nitro/meta";
 import type { Nitro, NitroBuildInfo, RollupConfig } from "nitro/types";
 import { dirname, join, relative, resolve } from "pathe";
 import * as rollup from "rollup";
-import { presetsWithConfig } from "../../presets/_types.gen";
+import { presetsWithConfig } from "../presets/_types.gen";
 import { scanHandlers } from "../scan";
 import { generateFSTree } from "../utils/fs-tree";
 import { nitroServerName } from "../utils/nitro";