nitro 3.0.1-alpha.2 → 3.0.260311-beta

package/dist/_build/rolldown.mjs

@@ -1,14 +1,11 @@
-import "../_common.mjs";
-import { _ as writeTypes, at as join, d as libChunkName, f as baseBuildConfig, h as writeBuildInfo, l as NODE_MODULES_RE, n as baseBuildPlugins, st as relative, u as getChunkName } from "./common.mjs";
-import { i as debounce } from "../_libs/rc9+c12+dotenv.mjs";
+import { _ as writeTypes, ct as join, d as libChunkName, f as baseBuildConfig, h as writeBuildInfo, it as basename, l as NODE_MODULES_RE, n as baseBuildPlugins, u as getChunkName, ut as relative } from "./common.mjs";
 import { t as formatCompatibilityDate } from "../_libs/compatx.mjs";
 import { n as scanHandlers } from "../_chunks/nitro2.mjs";
-import { n as watch$1 } from "../_libs/readdirp+chokidar.mjs";
-import { t as generateFSTree } from "../_chunks/utils.mjs";
+import { n as watch } from "../_libs/readdirp+chokidar.mjs";
+import { t as debounce } from "../_libs/perfect-debounce.mjs";
+import { n as generateFSTree } from "../_chunks/utils.mjs";
 import { builtinModules } from "node:module";
-import { watch } from "node:fs";
 import { defu } from "defu";
-
 //#region src/build/rolldown/config.ts
 const getRolldownConfig = async (nitro) => {
 	const base = baseBuildConfig(nitro);
@@ -67,10 +64,12 @@ const getRolldownConfig = async (nitro) => {
 	};
 	config = defu(nitro.options.rolldownConfig, nitro.options.rollupConfig, config);
 	const outputConfig = config.output;
-	if (outputConfig.inlineDynamicImports || outputConfig.format === "iife") delete outputConfig.codeSplitting;
+	if (outputConfig.inlineDynamicImports || outputConfig.format === "iife") {
+		delete outputConfig.inlineDynamicImports;
+		outputConfig.codeSplitting = false;
+	}
 	return config;
 };
-
 //#endregion
 //#region src/build/rolldown/dev.ts
 async function watchDev(nitro, config) {
@@ -97,11 +96,15 @@ async function watchDev(nitro, config) {
 		"unlink",
 		"unlinkDir"
 	]);
-	const scanDirsWatcher = watch$1(scanDirs, { ignoreInitial: true }).on("all", (event) => {
+	const scanDirsWatcher = watch(scanDirs, { ignoreInitial: true }).on("all", (event) => {
 		if (watchReloadEvents.has(event)) reload();
 	});
-	const rootDirWatcher = watch(nitro.options.rootDir, { persistent: false }, (_event, filename) => {
-		if (filename && /^server\.[mc]?[jt]sx?$/.test(filename)) reload();
+	const serverEntryRe = /^server\.[mc]?[jt]sx?$/;
+	const rootDirWatcher = watch(nitro.options.rootDir, {
+		ignoreInitial: true,
+		depth: 0
+	}).on("all", (event, path) => {
+		if (watchReloadEvents.has(event) && serverEntryRe.test(basename(path))) reload();
 	});
 	nitro.hooks.hook("close", () => {
 		watcher.close();
@@ -109,31 +112,30 @@ async function watchDev(nitro, config) {
 		rootDirWatcher.close();
 	});
 	nitro.hooks.hook("rollup:reload", () => reload());
+	nitro.logger.info(`Starting dev watcher (builder: \`rolldown\`, preset: \`${nitro.options.preset}\`, compatibility date: \`${formatCompatibilityDate(nitro.options.compatibilityDate)}\`)`);
 	await load();
-	function startWatcher(nitro$1, config$1) {
-		const watcher$1 = rolldown.watch(config$1);
+	function startWatcher(nitro, config) {
+		const watcher = rolldown.watch(config);
 		let start;
-		watcher$1.on("event", (event) => {
+		watcher.on("event", (event) => {
 			switch (event.code) {
 				case "START":
 					start = Date.now();
-					nitro$1.logger.info(`Starting dev watcher (builder: \`rolldown\`, preset: \`${nitro$1.options.preset}\`, compatibility date: \`${formatCompatibilityDate(nitro$1.options.compatibilityDate)}\`)`);
-					nitro$1.hooks.callHook("dev:start");
+					nitro.hooks.callHook("dev:start");
 					break;
 				case "BUNDLE_END":
-					nitro$1.hooks.callHook("compiled", nitro$1);
-					if (nitro$1.options.logging.buildSuccess) nitro$1.logger.success(`Server built`, start ? `in ${Date.now() - start}ms` : "");
-					nitro$1.hooks.callHook("dev:reload");
+					nitro.hooks.callHook("compiled", nitro);
+					if (nitro.options.logging.buildSuccess) nitro.logger.success(`Server built`, start ? `in ${Date.now() - start}ms` : "");
+					nitro.hooks.callHook("dev:reload");
 					break;
 				case "ERROR":
-					nitro$1.logger.error(event.error);
-					nitro$1.hooks.callHook("dev:error", event.error);
+					nitro.logger.error(event.error);
+					nitro.hooks.callHook("dev:error", event.error);
 			}
 		});
-		return watcher$1;
+		return watcher;
 	}
 }
-
 //#endregion
 //#region src/build/rolldown/prod.ts
 async function buildProduction(nitro, config) {
@@ -141,11 +143,12 @@ async function buildProduction(nitro, config) {
 	const buildStartTime = Date.now();
 	await scanHandlers(nitro);
 	await writeTypes(nitro);
+	let output;
 	if (!nitro.options.static) {
 		nitro.logger.info(`Building server (builder: \`rolldown\`, preset: \`${nitro.options.preset}\`, compatibility date: \`${formatCompatibilityDate(nitro.options.compatibilityDate)}\`)`);
-		await (await rolldown.rolldown(config)).write(config.output);
+		output = await (await rolldown.rolldown(config)).write(config.output);
 	}
-	const buildInfo = await writeBuildInfo(nitro);
+	const buildInfo = await writeBuildInfo(nitro, output);
 	if (!nitro.options.static) {
 		if (nitro.options.logging.buildSuccess) nitro.logger.success(`Server built in ${Date.now() - buildStartTime}ms`);
 		if (nitro.options.logLevel > 1) process.stdout.write(await generateFSTree(nitro.options.output.serverDir, { compressedSizes: nitro.options.logging.compressedSizes }) || "");
@@ -155,10 +158,9 @@ async function buildProduction(nitro, config) {
 	const rewriteRelativePaths = (input) => {
 		return input.replace(/([\s:])\.\/(\S*)/g, `$1${rOutput}/$2`);
 	};
-	if (buildInfo.commands.preview) nitro.logger.success(`You can preview this build using \`${rewriteRelativePaths(buildInfo.commands.preview)}\``);
-	if (buildInfo.commands.deploy) nitro.logger.success(`You can deploy this build using \`${rewriteRelativePaths(buildInfo.commands.deploy)}\``);
+	nitro.logger.success("You can preview this build using `npx nitro preview`");
+	if (buildInfo.commands.deploy) nitro.logger.success(rewriteRelativePaths("You can deploy this build using `npx nitro deploy --prebuilt`"));
 }
-
 //#endregion
 //#region src/build/rolldown/build.ts
 async function rolldownBuild(nitro) {
@@ -167,6 +169,5 @@ async function rolldownBuild(nitro) {
 	await nitro.hooks.callHook("rollup:before", nitro, config);
 	return nitro.options.dev ? watchDev(nitro, config) : buildProduction(nitro, config);
 }
-
 //#endregion
-export { rolldownBuild };
+export { rolldownBuild };

package/dist/_build/rollup.mjs

@@ -1,18 +1,15 @@
-import "../_common.mjs";
-import { _ as writeTypes, at as join, d as libChunkName, f as baseBuildConfig, h as writeBuildInfo, it as isAbsolute, l as NODE_MODULES_RE, n as baseBuildPlugins, st as relative, t as oxc, u as getChunkName } from "./common.mjs";
-import { i as debounce } from "../_libs/rc9+c12+dotenv.mjs";
+import { _ as writeTypes, ct as join, d as libChunkName, f as baseBuildConfig, h as writeBuildInfo, it as basename, l as NODE_MODULES_RE, n as baseBuildPlugins, st as isAbsolute, t as oxc, u as getChunkName, ut as relative } from "./common.mjs";
 import { t as formatCompatibilityDate } from "../_libs/compatx.mjs";
 import { n as scanHandlers } from "../_chunks/nitro2.mjs";
-import { n as watch$1 } from "../_libs/readdirp+chokidar.mjs";
+import { n as watch } from "../_libs/readdirp+chokidar.mjs";
+import { t as debounce } from "../_libs/perfect-debounce.mjs";
 import { t as alias } from "../_libs/plugin-alias.mjs";
-import { n as inject } from "../_libs/plugin-inject.mjs";
-import { t as generateFSTree } from "../_chunks/utils.mjs";
+import { t as inject } from "../_libs/plugin-inject.mjs";
+import { n as generateFSTree } from "../_chunks/utils.mjs";
 import { t as commonjs } from "../_libs/commondir+is-reference.mjs";
 import { t as json } from "../_libs/plugin-json.mjs";
 import { t as nodeResolve } from "../_libs/hasown+resolve+deepmerge.mjs";
-import { watch } from "node:fs";
 import { defu } from "defu";
-
 //#region src/build/rollup/config.ts
 const getRollupConfig = async (nitro) => {
 	const base = baseBuildConfig(nitro);
@@ -22,7 +19,7 @@ const getRollupConfig = async (nitro) => {
 		external: [...base.env.external],
 		plugins: [
 			...await baseBuildPlugins(nitro, base),
-			oxc({
+			await oxc({
 				sourcemap: !!nitro.options.sourcemap,
 				minify: nitro.options.minify ? { ...nitro.options.oxc?.minify } : false,
 				transform: {
@@ -76,7 +73,6 @@ const getRollupConfig = async (nitro) => {
 	if (outputConfig.inlineDynamicImports || outputConfig.format === "iife") delete outputConfig.manualChunks;
 	return config;
 };
-
 //#endregion
 //#region src/build/rollup/error.ts
 function formatRollupError(_error) {
@@ -96,7 +92,6 @@ function formatRollupError(_error) {
 		return _error?.toString();
 	}
 }
-
 //#endregion
 //#region src/build/rollup/dev.ts
 async function watchDev(nitro, rollupConfig) {
@@ -123,11 +118,15 @@ async function watchDev(nitro, rollupConfig) {
 		"unlink",
 		"unlinkDir"
 	]);
-	const scanDirsWatcher = watch$1(scanDirs, { ignoreInitial: true }).on("all", (event, path, stat$1) => {
+	const scanDirsWatcher = watch(scanDirs, { ignoreInitial: true }).on("all", (event, path, stat) => {
 		if (watchReloadEvents.has(event)) reload();
 	});
-	const rootDirWatcher = watch(nitro.options.rootDir, { persistent: false }, (_event, filename) => {
-		if (filename && /^server\.[mc]?[jt]sx?$/.test(filename)) reload();
+	const serverEntryRe = /^server\.[mc]?[jt]sx?$/;
+	const rootDirWatcher = watch(nitro.options.rootDir, {
+		ignoreInitial: true,
+		depth: 0
+	}).on("all", (event, path) => {
+		if (watchReloadEvents.has(event) && serverEntryRe.test(basename(path))) reload();
 	});
 	nitro.hooks.hook("close", () => {
 		rollupWatcher.close();
@@ -135,31 +134,30 @@ async function watchDev(nitro, rollupConfig) {
 		rootDirWatcher.close();
 	});
 	nitro.hooks.hook("rollup:reload", () => reload());
+	nitro.logger.info(`Starting dev watcher (builder: \`rollup\`, preset: \`${nitro.options.preset}\`, compatibility date: \`${formatCompatibilityDate(nitro.options.compatibilityDate)}\`)`);
 	await load();
-	function startRollupWatcher(nitro$1, rollupConfig$1) {
-		const watcher = rollup.watch(defu(rollupConfig$1, { watch: { chokidar: nitro$1.options.watchOptions } }));
+	function startRollupWatcher(nitro, rollupConfig) {
+		const watcher = rollup.watch(defu(rollupConfig, { watch: { chokidar: nitro.options.watchOptions } }));
 		let start;
 		watcher.on("event", (event) => {
 			switch (event.code) {
 				case "START":
 					start = Date.now();
-					nitro$1.logger.info(`Starting dev watcher (builder: \`rollup\`, preset: \`${nitro$1.options.preset}\`, compatibility date: \`${formatCompatibilityDate(nitro$1.options.compatibilityDate)}\`)`);
-					nitro$1.hooks.callHook("dev:start");
+					nitro.hooks.callHook("dev:start");
 					break;
 				case "BUNDLE_END":
-					nitro$1.hooks.callHook("compiled", nitro$1);
-					if (nitro$1.options.logging.buildSuccess) nitro$1.logger.success(`Server built`, start ? `in ${Date.now() - start}ms` : "");
-					nitro$1.hooks.callHook("dev:reload");
+					nitro.hooks.callHook("compiled", nitro);
+					if (nitro.options.logging.buildSuccess) nitro.logger.success(`Server built`, start ? `in ${Date.now() - start}ms` : "");
+					nitro.hooks.callHook("dev:reload");
 					break;
 				case "ERROR":
-					nitro$1.logger.error(formatRollupError(event.error));
-					nitro$1.hooks.callHook("dev:error", event.error);
+					nitro.logger.error(formatRollupError(event.error));
+					nitro.hooks.callHook("dev:error", event.error);
 			}
 		});
 		return watcher;
 	}
 }
-
 //#endregion
 //#region src/build/rollup/prod.ts
 async function buildProduction(nitro, rollupConfig) {
@@ -167,27 +165,23 @@ async function buildProduction(nitro, rollupConfig) {
 	const buildStartTime = Date.now();
 	await scanHandlers(nitro);
 	await writeTypes(nitro);
+	let output;
 	if (!nitro.options.static) {
 		nitro.logger.info(`Building server (builder: \`rollup\`, preset: \`${nitro.options.preset}\`, compatibility date: \`${formatCompatibilityDate(nitro.options.compatibilityDate)}\`)`);
-		await (await rollup.rollup(rollupConfig).catch((error) => {
+		output = await (await rollup.rollup(rollupConfig).catch((error) => {
 			nitro.logger.error(formatRollupError(error));
 			throw error;
 		})).write(rollupConfig.output);
 	}
-	const buildInfo = await writeBuildInfo(nitro);
+	const buildInfo = await writeBuildInfo(nitro, output);
 	if (!nitro.options.static) {
 		if (nitro.options.logging.buildSuccess) nitro.logger.success(`Server built in ${Date.now() - buildStartTime}ms`);
 		if (nitro.options.logLevel > 1) process.stdout.write(await generateFSTree(nitro.options.output.serverDir, { compressedSizes: nitro.options.logging.compressedSizes }) || "");
 	}
 	await nitro.hooks.callHook("compiled", nitro);
-	const rOutput = relative(process.cwd(), nitro.options.output.dir);
-	const rewriteRelativePaths = (input) => {
-		return input.replace(/([\s:])\.\/(\S*)/g, `$1${rOutput}/$2`);
-	};
-	if (buildInfo.commands.preview) nitro.logger.success(`You can preview this build using \`${rewriteRelativePaths(buildInfo.commands.preview)}\``);
-	if (buildInfo.commands.deploy) nitro.logger.success(`You can deploy this build using \`${rewriteRelativePaths(buildInfo.commands.deploy)}\``);
+	nitro.logger.success("You can preview this build using `npx nitro preview`");
+	if (buildInfo.commands.deploy) nitro.logger.success("You can deploy this build using `npx nitro deploy --prebuilt`");
 }
-
 //#endregion
 //#region src/build/rollup/build.ts
 async function rollupBuild(nitro) {
@@ -196,6 +190,5 @@ async function rollupBuild(nitro) {
 	await nitro.hooks.callHook("rollup:before", nitro, config);
 	return nitro.options.dev ? watchDev(nitro, config) : buildProduction(nitro, config);
 }
-
 //#endregion
-export { rollupBuild };
+export { rollupBuild };

package/dist/_build/vite.build.mjs

@@ -1,16 +1,18 @@
-import { V as a } from "./common.mjs";
+import { H as v } from "./common.mjs";
 import { nitro } from "nitro/vite";
-
 //#region src/build/vite/build.ts
 async function viteBuild(nitro$1) {
 	if (nitro$1.options.dev) throw new Error("Nitro dev CLI does not supports vite. Please use `vite dev` instead.");
 	const { createBuilder } = await import(nitro$1.options.__vitePkg__ || "vite");
-	await (await createBuilder({
+	const pluginInstance = nitro({ _nitro: nitro$1 });
+	globalThis.__nitro_build__ = true;
+	const builder = await createBuilder({
 		base: nitro$1.options.rootDir,
-		plugins: [await nitro({ _nitro: nitro$1 })],
-		logLevel: a ? "warn" : void 0
-	})).buildApp();
+		plugins: [pluginInstance],
+		logLevel: v ? "warn" : void 0
+	});
+	delete globalThis.__nitro_build__;
+	await builder.buildApp();
 }
-
 //#endregion
-export { viteBuild };
+export { viteBuild };