Skip to content

Commit 104bfe7

Browse files
authored
refactor: cleanup core and rollup structure (#3209)
1 parent 0ea5807 commit 104bfe7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+606
-620
lines changed

build.config.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ import { defineBuildConfig } from "unbuild";
66

77
const srcDir = fileURLToPath(new URL("src", import.meta.url));
88

9-
export const subpaths = ["config", "presets", "runtime", "meta", "types"];
9+
export const subpaths = ["config", "presets", "runtime", "types"];
1010

1111
export default defineBuildConfig({
1212
declaration: true,
1313
name: "nitro",
1414
entries: [
1515
{ input: "src/cli/index.ts" },
16-
{ input: "src/config/index.ts" },
17-
{ input: "src/core/index.ts" },
18-
{ input: "src/meta/index.ts" },
16+
{ input: "src/index.ts" },
1917
{ input: "src/types/index.ts" },
2018
{ input: "src/runtime/", outDir: "dist/runtime", format: "esm" },
2119
{ input: "src/presets/", outDir: "dist/presets", format: "esm" },
@@ -37,6 +35,7 @@ export default defineBuildConfig({
3735
externals: [
3836
"nitro",
3937
"nitro/runtime/meta",
38+
"nitro/config",
4039
...subpaths.map((subpath) => `nitro/${subpath}`),
4140
"firebase-functions",
4241
"@scalar/api-reference",
@@ -45,7 +44,6 @@ export default defineBuildConfig({
4544
jiti: {
4645
alias: {
4746
nitro: "nitro",
48-
"nitro/meta": resolve(srcDir, "../meta.ts"),
4947
"nitro/runtime/meta": resolve(srcDir, "../lib/runtime-meta.mjs"),
5048
...Object.fromEntries(
5149
subpaths.map((subpath) => [

lib/config.d.mts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { NitroConfig } from "nitro/types";
2+
3+
export { NitroConfig } from "nitro/types";
4+
5+
declare function defineNitroConfig(config: NitroConfig): NitroConfig;
6+
7+
export { defineNitroConfig };

lib/config.mjs

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
function defineNitroConfig(config) {
2+
return config;
3+
}
4+
5+
export { defineNitroConfig };

lib/meta.d.mts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const version: string;

lib/meta.mjs

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

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"type": "module",
88
"exports": {
99
"./package.json": "./package.json",
10-
".": "./dist/core/index.mjs",
11-
"./config": "./dist/config/index.mjs",
10+
".": "./dist/index.mjs",
11+
"./config": "./lib/config.mjs",
1212
"./types": "./dist/types/index.d.mts",
13-
"./meta": "./dist/meta/index.mjs",
13+
"./meta": "./lib/meta.mjs",
1414
"./presets": "./dist/presets/index.mjs",
1515
"./runtime": "./dist/runtime/index.mjs",
1616
"./runtime/internal": "./dist/runtime/internal/index.mjs",

scripts/gen-presets.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const presetDirs: string[] = readdirSync(presetsDir, { withFileTypes: true })
2424
// --- Load presets ---
2525
const jiti = createJiti(presetsDir, {
2626
alias: {
27-
nitropack: fileURLToPath(new URL("../src/core/index.ts", import.meta.url)),
27+
nitropack: fileURLToPath(new URL("../src/index.ts", import.meta.url)),
2828
...Object.fromEntries(
2929
subpaths.map((pkg) => [
3030
`nitro/${pkg}`,
File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getRollupConfig } from "../../rollup";
1+
import { getRollupConfig } from "./rollup/config";
22
import type { Nitro } from "nitro/types";
33
import { watchDev } from "./dev";
44
import { buildProduction } from "./prod";
File renamed without changes.
File renamed without changes.
File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { version as nitroVersion } from "nitro/meta";
55
import type { Nitro, NitroBuildInfo, RollupConfig } from "nitro/types";
66
import { dirname, join, relative, resolve } from "pathe";
77
import * as rollup from "rollup";
8-
import { presetsWithConfig } from "../../presets/_types.gen";
8+
import { presetsWithConfig } from "../presets/_types.gen";
99
import { scanHandlers } from "../scan";
1010
import { generateFSTree } from "../utils/fs-tree";
1111
import { nitroServerName } from "../utils/nitro";

0 commit comments

Comments
 (0)