nitro 3.0.260415-beta → 3.0.260429-beta

package/dist/_libs/nypm+tinyexec.mjs

@@ -1,4 +1,5 @@
-import { ct as join$1, dt as resolve$1, lt as normalize$1 } from "../_build/common.mjs";
+import { n as __exportAll } from "../_common.mjs";
+import { ft as resolve$1, lt as join$1, ut as normalize$1 } from "../_build/common.mjs";
 import { createRequire } from "node:module";
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
@@ -6,67 +7,66 @@ import { delimiter, dirname, join, normalize, resolve } from "node:path";
 import { cwd } from "node:process";
 import { PassThrough } from "node:stream";
 import { spawn } from "node:child_process";
-import c from "node:readline";
-var l = (e, t) => () => (t || e((t = { exports: {} }).exports, t), t.exports);
-var u = /* @__PURE__ */ createRequire(import.meta.url);
-const d = /^path$/i;
-const f = {
+import { pipeline } from "node:stream/promises";
+import u from "node:readline";
+var d = (e, t) => () => (t || e((t = { exports: {} }).exports, t), t.exports);
+var f = /* @__PURE__ */ createRequire(import.meta.url);
+const p = /^path$/i;
+const m = {
 	key: "PATH",
 	value: ""
 };
-function p(e) {
+function h(e) {
 	for (const t in e) {
-		if (!Object.prototype.hasOwnProperty.call(e, t) || !d.test(t)) continue;
+		if (!Object.prototype.hasOwnProperty.call(e, t) || !p.test(t)) continue;
 		const n = e[t];
-		if (!n) return f;
+		if (!n) return m;
 		return {
 			key: t,
 			value: n
 		};
 	}
-	return f;
+	return m;
 }
-function m(e, t) {
-	const i = t.value.split(delimiter);
-	const o = [];
+function g(e, t) {
+	const n = t.value.split(delimiter);
+	const a = [];
 	let s = e;
 	let c;
 	do {
-		o.push(resolve(s, "node_modules", ".bin"));
+		a.push(resolve(s, "node_modules", ".bin"));
 		c = s;
 		s = dirname(s);
 	} while (s !== c);
-	const l = o.concat(i).join(delimiter);
+	a.push(dirname(process.execPath));
+	const l = a.concat(n).join(delimiter);
 	return {
 		key: t.key,
 		value: l
 	};
 }
-function h(e, t) {
+function _(e, t) {
 	const n = {
 		...process.env,
 		...t
 	};
-	const r = m(e, p(n));
+	const r = g(e, h(n));
 	n[r.key] = r.value;
 	return n;
 }
-const g = (e) => {
+const v = (e) => {
 	let t = e.length;
 	const n = new PassThrough();
 	const r = () => {
-		if (--t === 0) n.emit("end");
+		if (--t === 0) n.end();
 	};
-	for (const t of e) {
-		t.pipe(n, { end: false });
-		t.on("end", r);
-	}
+	for (const t of e) pipeline(t, n, { end: false }).then(r).catch(r);
 	return n;
 };
-var _ = /* @__PURE__ */ l(((e, t) => {
+var y = /* @__PURE__ */ d(((e, t) => {
 	t.exports = a;
 	a.sync = o;
-	var n = u("fs");
+	var n = f("fs");
 	function r(e, t) {
 		var n = t.pathExt !== void 0 ? t.pathExt : process.env.PATHEXT;
 		if (!n) return true;
@@ -91,10 +91,10 @@ var _ = /* @__PURE__ */ l(((e, t) => {
 		return i(n.statSync(e), e, t);
 	}
 }));
-var v = /* @__PURE__ */ l(((e, t) => {
+var b = /* @__PURE__ */ d(((e, t) => {
 	t.exports = r;
 	r.sync = i;
-	var n = u("fs");
+	var n = f("fs");
 	function r(e, t, r) {
 		n.stat(e, function(e, n) {
 			r(e, e ? false : a(n, t));
@@ -119,11 +119,11 @@ var v = /* @__PURE__ */ l(((e, t) => {
 		return n & l || n & c && i === o || n & s && r === a || n & u && a === 0;
 	}
 }));
-var y = /* @__PURE__ */ l(((e, t) => {
-	u("fs");
+var x = /* @__PURE__ */ d(((e, t) => {
+	f("fs");
 	var n;
-	if (process.platform === "win32" || global.TESTING_WINDOWS) n = _();
-	else n = v();
+	if (process.platform === "win32" || global.TESTING_WINDOWS) n = y();
+	else n = b();
 	t.exports = r;
 	r.sync = i;
 	function r(e, t, i) {
@@ -159,11 +159,11 @@ var y = /* @__PURE__ */ l(((e, t) => {
 		}
 	}
 }));
-var b = /* @__PURE__ */ l(((e, t) => {
+var S = /* @__PURE__ */ d(((e, t) => {
 	const n = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-	const r = u("path");
+	const r = f("path");
 	const i = n ? ";" : ":";
-	const a = y();
+	const a = x();
 	const o = (e) => Object.assign(/* @__PURE__ */ new Error(`not found: ${e}`), { code: "ENOENT" });
 	const s = (e, t) => {
 		const r = t.colon || i;
@@ -229,7 +229,7 @@ var b = /* @__PURE__ */ l(((e, t) => {
 	t.exports = c;
 	c.sync = l;
 }));
-var x = /* @__PURE__ */ l(((e, t) => {
+var C = /* @__PURE__ */ d(((e, t) => {
 	const n = (e = {}) => {
 		const t = e.env || process.env;
 		if ((e.platform || process.platform) !== "win32") return "PATH";
@@ -238,10 +238,10 @@ var x = /* @__PURE__ */ l(((e, t) => {
 	t.exports = n;
 	t.exports.default = n;
 }));
-var S = /* @__PURE__ */ l(((e, t) => {
-	const n = u("path");
-	const r = b();
-	const i = x();
+var w = /* @__PURE__ */ d(((e, t) => {
+	const n = f("path");
+	const r = S();
+	const i = C();
 	function a(e, t) {
 		const a = e.options.env || process.env;
 		const o = process.cwd();
@@ -267,7 +267,7 @@ var S = /* @__PURE__ */ l(((e, t) => {
 	}
 	t.exports = o;
 }));
-var C = /* @__PURE__ */ l(((e, t) => {
+var T = /* @__PURE__ */ d(((e, t) => {
 	const n = /([()\][%!^"`<>&|;, *?])/g;
 	function r(e) {
 		e = e.replace(n, "^$1");
@@ -285,11 +285,11 @@ var C = /* @__PURE__ */ l(((e, t) => {
 	t.exports.command = r;
 	t.exports.argument = i;
 }));
-var w = /* @__PURE__ */ l(((e, t) => {
+var E = /* @__PURE__ */ d(((e, t) => {
 	t.exports = /^#!(.*)/;
 }));
-var T = /* @__PURE__ */ l(((e, t) => {
-	const n = w();
+var D = /* @__PURE__ */ d(((e, t) => {
+	const n = E();
 	t.exports = (e = "") => {
 		const t = e.match(n);
 		if (!t) return null;
@@ -299,9 +299,9 @@ var T = /* @__PURE__ */ l(((e, t) => {
 		return i ? `${a} ${i}` : a;
 	};
 }));
-var E = /* @__PURE__ */ l(((e, t) => {
-	const n = u("fs");
-	const r = T();
+var O = /* @__PURE__ */ d(((e, t) => {
+	const n = f("fs");
+	const r = D();
 	function i(e) {
 		const t = 150;
 		const i = Buffer.alloc(t);
@@ -315,11 +315,11 @@ var E = /* @__PURE__ */ l(((e, t) => {
 	}
 	t.exports = i;
 }));
-var D = /* @__PURE__ */ l(((e, t) => {
-	const n = u("path");
-	const r = S();
-	const i = C();
-	const a = E();
+var k = /* @__PURE__ */ d(((e, t) => {
+	const n = f("path");
+	const r = w();
+	const i = T();
+	const a = O();
 	const o = process.platform === "win32";
 	const s = /\.(?:com|exe)$/i;
 	const c = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
@@ -333,7 +333,7 @@ var D = /* @__PURE__ */ l(((e, t) => {
 		}
 		return e.file;
 	}
-	function d(e) {
+	function u(e) {
 		if (!o) return e;
 		const t = l(e);
 		const r = !s.test(t);
@@ -353,7 +353,7 @@ var D = /* @__PURE__ */ l(((e, t) => {
 		}
 		return e;
 	}
-	function f(e, t, n) {
+	function d(e, t, n) {
 		if (t && !Array.isArray(t)) {
 			n = t;
 			t = null;
@@ -370,11 +370,11 @@ var D = /* @__PURE__ */ l(((e, t) => {
 				args: t
 			}
 		};
-		return n.shell ? r : d(r);
+		return n.shell ? r : u(r);
 	}
-	t.exports = f;
+	t.exports = d;
 }));
-var O = /* @__PURE__ */ l(((e, t) => {
+var A = /* @__PURE__ */ d(((e, t) => {
 	const n = process.platform === "win32";
 	function r(e, t) {
 		return Object.assign(/* @__PURE__ */ new Error(`${t} ${e.command} ENOENT`), {
@@ -411,10 +411,10 @@ var O = /* @__PURE__ */ l(((e, t) => {
 		notFoundError: r
 	};
 }));
-var A = (/* @__PURE__ */ l(((e, t) => {
-	const n = u("child_process");
-	const r = D();
-	const i = O();
+var M = (/* @__PURE__ */ d(((e, t) => {
+	const n = f("child_process");
+	const r = k();
+	const i = A();
 	function a(e, t, a) {
 		const o = r(e, t, a);
 		const s = n.spawn(o.command, o.args, o.options);
@@ -433,9 +433,7 @@ var A = (/* @__PURE__ */ l(((e, t) => {
 	t.exports._parse = r;
 	t.exports._enoent = i;
 })))();
-var j = class extends Error {
-	result;
-	output;
+var N = class extends Error {
 	get exitCode() {
 		if (this.result.exitCode !== null) return this.result.exitCode;
 	}
@@ -445,18 +443,18 @@ var j = class extends Error {
 		this.output = t;
 	}
 };
-const M = {
+const F = {
 	timeout: void 0,
 	persist: false
 };
-const N = { windowsHide: true };
-function P(e, t) {
+const L = { windowsHide: true };
+function R(e, t) {
 	return {
 		command: normalize(e),
 		args: t ?? []
 	};
 }
-function F(e) {
+function z(e) {
 	const t = new AbortController();
 	for (const n of e) {
 		if (n.aborted) {
@@ -470,12 +468,14 @@ function F(e) {
 	}
 	return t.signal;
 }
-async function I(e) {
+async function B(e) {
 	let t = "";
-	for await (const n of e) t += n.toString();
+	try {
+		for await (const n of e) t += n.toString();
+	} catch {}
 	return t;
 }
-var L = class {
+var V = class {
 	_process;
 	_aborted = false;
 	_options;
@@ -495,7 +495,7 @@ var L = class {
 	}
 	constructor(e, t, n) {
 		this._options = {
-			...M,
+			...F,
 			...n
 		};
 		this._command = e;
@@ -514,7 +514,7 @@ var L = class {
 		return this._process?.killed === true;
 	}
 	pipe(e, t, n) {
-		return z(e, t, {
+		return W(e, t, {
 			...n,
 			stdin: this
 		});
@@ -525,29 +525,30 @@ var L = class {
 		const t = [];
 		if (this._streamErr) t.push(this._streamErr);
 		if (this._streamOut) t.push(this._streamOut);
-		const n = g(t);
-		const r = c.createInterface({ input: n });
+		const n = v(t);
+		const r = u.createInterface({ input: n });
 		for await (const e of r) yield e.toString();
 		await this._processClosed;
 		e.removeAllListeners();
 		if (this._thrownError) throw this._thrownError;
-		if (this._options?.throwOnError && this.exitCode !== 0 && this.exitCode !== void 0) throw new j(this);
+		if (this._options?.throwOnError && this.exitCode !== 0 && this.exitCode !== void 0) throw new N(this);
 	}
 	async _waitForOutput() {
 		const e = this._process;
 		if (!e) throw new Error("No process was started");
-		const [t, n] = await Promise.all([this._streamOut ? I(this._streamOut) : "", this._streamErr ? I(this._streamErr) : ""]);
+		const [t, n] = await Promise.all([this._streamOut ? B(this._streamOut) : "", this._streamErr ? B(this._streamErr) : ""]);
 		await this._processClosed;
-		if (this._options?.stdin) await this._options.stdin;
+		const { stdin: r } = this._options;
+		if (r && typeof r !== "string") await r;
 		e.removeAllListeners();
 		if (this._thrownError) throw this._thrownError;
-		const r = {
+		const i = {
 			stderr: n,
 			stdout: t,
 			exitCode: this.exitCode
 		};
-		if (this._options.throwOnError && this.exitCode !== 0 && this.exitCode !== void 0) throw new j(this, r);
-		return r;
+		if (this._options.throwOnError && this.exitCode !== 0 && this.exitCode !== void 0) throw new N(this, i);
+		return i;
 	}
 	then(e, t) {
 		return this._waitForOutput().then(e, t);
@@ -558,7 +559,7 @@ var L = class {
 		const e = cwd();
 		const n = this._options;
 		const r = {
-			...N,
+			...L,
 			...n.nodeOptions
 		};
 		const i = [];
@@ -566,19 +567,20 @@ var L = class {
 		if (n.timeout !== void 0) i.push(AbortSignal.timeout(n.timeout));
 		if (n.signal !== void 0) i.push(n.signal);
 		if (n.persist === true) r.detached = true;
-		if (i.length > 0) r.signal = F(i);
-		r.env = h(e, r.env);
-		const { command: a, args: s } = P(this._command, this._args);
-		const c = (0, A._parse)(a, s, r);
+		if (i.length > 0) r.signal = z(i);
+		r.env = _(e, r.env);
+		const { command: a, args: o } = R(this._command, this._args);
+		const c = (0, M._parse)(a, o, r);
 		const l = spawn(c.command, c.args, c.options);
 		if (l.stderr) this._streamErr = l.stderr;
 		if (l.stdout) this._streamOut = l.stdout;
 		this._process = l;
 		l.once("error", this._onError);
 		l.once("close", this._onClose);
-		if (n.stdin !== void 0 && l.stdin && n.stdin.process) {
-			const { stdout: e } = n.stdin.process;
-			if (e) e.pipe(l.stdin);
+		if (l.stdin) {
+			const { stdin: e } = n;
+			if (typeof e === "string") l.stdin.end(e);
+			else e?.process?.stdout?.pipe(l.stdin);
 		}
 	}
 	_resetState() {
@@ -599,12 +601,18 @@ var L = class {
 		if (this._resolveClose) this._resolveClose();
 	};
 };
-const R = (e, t, n) => {
-	const r = new L(e, t, n);
+const U = (e, t, n) => {
+	const r = new V(e, t, n);
 	r.spawn();
 	return r;
 };
-const z = R;
+const W = U;
+var dist_exports = /* @__PURE__ */ __exportAll({
+	addDependency: () => addDependency,
+	addDevDependency: () => addDevDependency,
+	detectPackageManager: () => detectPackageManager,
+	packageManagers: () => packageManagers
+});
 async function findup(cwd, match, options = {}) {
 	const segments = normalize$1(cwd).split("/");
 	while (segments.length > 0) {
@@ -613,11 +621,32 @@ async function findup(cwd, match, options = {}) {
 		segments.pop();
 	}
 }
-async function readPackageJSON(cwd) {
+async function readPackageJSON(cwd, options = {}) {
 	return findup(cwd, (p) => {
 		const pkgPath = join(p, "package.json");
 		if (existsSync(pkgPath)) return readFile(pkgPath, "utf8").then((data) => JSON.parse(data));
-	});
+	}, options);
+}
+async function readInstalledPackageJSON(pkgName, cwd) {
+	const pkgJSONPath = await findup(cwd, (p) => {
+		const candidate = join(p, "node_modules", pkgName, "package.json");
+		if (existsSync(candidate)) return candidate;
+	}, { includeParentDirs: true });
+	if (!pkgJSONPath) return null;
+	try {
+		return JSON.parse(await readFile(pkgJSONPath, "utf8"));
+	} catch {
+		return null;
+	}
+}
+async function readPackageJSONFromResolver(requireFn, pkgName) {
+	let resolved;
+	try {
+		resolved = requireFn.resolve(pkgName);
+	} catch {
+		return null;
+	}
+	return readPackageJSON(resolved, { includeParentDirs: true });
 }
 function cached(fn) {
 	let v;
@@ -632,7 +661,7 @@ function cached(fn) {
 const hasCorepack = cached(async () => {
 	if (globalThis.process?.versions?.webcontainer) return false;
 	try {
-		const { exitCode } = await R("corepack", ["--version"]);
+		const { exitCode } = await U("corepack", ["--version"]);
 		return exitCode === 0;
 	} catch {
 		return false;
@@ -640,7 +669,7 @@ const hasCorepack = cached(async () => {
 });
 async function executeCommand(command, args, options = {}) {
 	const xArgs = command !== "npm" && command !== "bun" && command !== "deno" && options.corepack !== false && await hasCorepack() ? ["corepack", [command, ...args]] : [command, args];
-	const { exitCode, stdout, stderr } = await R(xArgs[0], xArgs[1], { nodeOptions: {
+	const { exitCode, stdout, stderr } = await U(xArgs[0], xArgs[1], { nodeOptions: {
 		cwd: resolve$1(options.cwd || process.cwd()),
 		env: options.env,
 		stdio: options.silent ? "pipe" : "inherit"
@@ -797,8 +826,10 @@ async function addDependency(name, options = {}) {
 		const _require = createRequire(join(resolvedOptions.cwd, "/_.js"));
 		for (const _name of names) {
 			const pkgName = _name.match(/^(.[^@]+)/)?.[0];
-			const pkg = await readPackageJSON(_require.resolve(pkgName));
-			if (!pkg?.peerDependencies || pkg?.name !== pkgName) continue;
+			if (!pkgName) continue;
+			let pkg = await readPackageJSONFromResolver(_require, pkgName);
+			if (pkg?.name !== pkgName) pkg = await readInstalledPackageJSON(pkgName, resolvedOptions.cwd);
+			if (!pkg?.peerDependencies) continue;
 			for (const [peerDependency, version] of Object.entries(pkg.peerDependencies)) {
 				if (pkg.peerDependenciesMeta?.[peerDependency]?.optional) continue;
 				if (existingPkg?.dependencies?.[peerDependency] || existingPkg?.devDependencies?.[peerDependency]) continue;
@@ -819,4 +850,4 @@ async function addDevDependency(name, options = {}) {
 		dev: true
 	});
 }
-export { packageManagers as i, addDevDependency as n, detectPackageManager as r, addDependency as t };
+export { dist_exports as t };

package/dist/_libs/pkg-types.d.mts

@@ -1,17 +1,20 @@
-import { CompilerOptions, TypeAcquisition } from "typescript";
+import * as ts from "typescript";
+//#endregion
+//#region src/tsconfig/types.d.ts
 type StripEnums<T extends Record<string, any>> = { [K in keyof T]: T[K] extends boolean ? T[K] : T[K] extends string ? T[K] : T[K] extends object ? T[K] : T[K] extends Array<any> ? T[K] : T[K] extends undefined ? undefined : any };
 interface TSConfig {
-  compilerOptions?: StripEnums<CompilerOptions>;
+  compilerOptions?: StripEnums<ts.CompilerOptions>;
   exclude?: string[];
   compileOnSave?: boolean;
   extends?: string | string[];
   files?: string[];
   include?: string[];
-  typeAcquisition?: TypeAcquisition;
+  typeAcquisition?: ts.TypeAcquisition;
   references?: {
     path: string;
   }[];
-}
+} //#endregion
+//#region src/tsconfig/utils.d.ts
 /**
  * Defines a TSConfig structure.
  * @param tsconfig - The contents of `tsconfig.json` as an object. See {@link TSConfig}.

package/dist/_libs/plugin-inject.mjs

@@ -1,5 +1,7 @@
+import { n as __exportAll } from "../_common.mjs";
 import { S as MagicString, c as walk, i as createFilter, r as attachScopes, s as makeLegalIdentifier } from "../_build/common.mjs";
 import { sep } from "path";
+var es_exports = /* @__PURE__ */ __exportAll({ default: () => inject });
 var escape = function(str) {
 	return str.replace(/[-[\]/{}()*+?.\\^$|]/g, "\\$&");
 };
@@ -126,4 +128,4 @@ function inject(options) {
 		}
 	};
 }
-export { inject as t };
+export { inject as n, es_exports as t };

package/dist/_libs/pluginutils.mjs

@@ -1,3 +1,4 @@
+import { n as __exportAll } from "../_common.mjs";
 import { S as MagicString, x as stripLiteral } from "../_build/common.mjs";
 import fs from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -272,7 +273,7 @@ function assetsPlugin(pluginOpts) {
 			load: {
 				filter: { id: /^\0virtual:fullstack\// },
 				async handler(id) {
-					if (id === "\0virtual:fullstack/runtime") return `export const mergeAssets = ${(await import("./_2.mjs")).mergeAssets.toString()};`;
+					if (id === "\0virtual:fullstack/runtime") return `export const mergeAssets = ${(await Promise.resolve().then(() => runtime_exports)).mergeAssets.toString()};`;
 					const parsed = parseAssetsVirtual(id);
 					if (!parsed) return;
 					assert$1.notEqual(this.environment.name, "client");
@@ -595,6 +596,7 @@ function assetsURL(url, config) {
 function assetsURLDev(url, config) {
 	return config.base + url;
 }
+var runtime_exports = /* @__PURE__ */ __exportAll({ mergeAssets: () => mergeAssets });
 function mergeAssets(...args) {
 	const js = uniqBy(args.flatMap((h) => h.js), (a) => a.href);
 	const css = uniqBy(args.flatMap((h) => h.css), (a) => a.href);
@@ -617,4 +619,4 @@ function mergeAssets(...args) {
 		});
 	}
 }
-export { assetsPlugin as n, mergeAssets as t };
+export { assetsPlugin as n, runtime_exports as t };

package/dist/_libs/readdirp+chokidar.mjs

@@ -1338,7 +1338,8 @@ var FSWatcher = class extends EventEmitter {
 		if (!this._userIgnored) {
 			const { cwd } = this.options;
 			const ignored = (this.options.ignored || []).map(normalizeIgnored(cwd));
-			this._userIgnored = anymatch([...[...this._ignoredPaths].map(normalizeIgnored(cwd)), ...ignored], void 0);
+			const list = [...[...this._ignoredPaths].map(normalizeIgnored(cwd)), ...ignored];
+			this._userIgnored = anymatch(list, void 0);
 		}
 		return this._userIgnored(path, stats);
 	}