neon 4.11.0 → 4.12.0

package/README.md

@@ -675,7 +675,7 @@ neon config plan --project-id polished-snowflake-12345678 --output json
 neon deploy --branch my-feature --update-existing
 ```
 
-Function deploys declared under `preview.functions` are bundled by neon's own esbuild helper and uploaded as part of `apply`, so the policy stays declarative and the packaged CLI never has to embed esbuild's native binary.
+Function deploys declared under `preview.functions` are bundled with esbuild by default. A directory `source` is discovered as `index.ts`, then `index.js`, then `index.mjs`. Set `bundler: "none"` to ship a prebuilt directory as-is. `neon function deploy --no-bundle` is the same switch without a `neon.ts`.
 
 When a package cannot be bundled — a native addon with no esbuild loader, or an optional peer dependency a library references on an untaken code path — list it in that function's `externalPackages` and the bundler leaves the import alone. `neon dev` honours the same list. It does not make the package resolvable in the deployed archive (there is no `node_modules` next to the bundle), so it only unblocks an import that is never evaluated — a dependency the handler actually calls has to be bundled, and a natively-backed one cannot be. See [`@neon/config`](../config/README.md#unbundleable-dependencies-externalpackages).
 

package/dist/commands/config.js

@@ -23,7 +23,7 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import chalk from "chalk";
 import { packagesToStage, resolveConfig } from "@neon/config";
-import { PushConflictError, apply, assertZipWithinLimits, createBranch, describeNativeFinding, enforceLimits, findUndeclaredNativePackages, inspect, isPartialBranchCreateError, loadConfigFromFile as loadConfigFromFile$1, plan, traceNativePackages } from "@neon/config-runtime";
+import { PushConflictError, apply, assertZipWithinLimits, bundleAsIs, createBranch, describeNativeFinding, enforceLimits, findUndeclaredNativePackages, inspect, isPartialBranchCreateError, loadConfigFromFile as loadConfigFromFile$1, plan, resolveEsbuildEntry, traceNativePackages, zipFunctionBundle } from "@neon/config-runtime";
 //#region src/commands/config.ts
 var config_exports = /* @__PURE__ */ __exportAll({
 	applyCmd: () => applyCmd,
@@ -41,27 +41,24 @@ var config_exports = /* @__PURE__ */ __exportAll({
 	planCmd: () => planCmd,
 	status: () => status
 });
-/**
-* Bundle a function with neonctl's OWN bundler (the shared esbuild helper) so the
-* config-runtime never has to import esbuild itself. Injecting this keeps esbuild
-* out of config-runtime's static module graph — and therefore out of the packaged
-* neonctl snapshot, which resolves esbuild dynamically at deploy time.
-*/
 const neonctlBundler = async (fn) => {
+	if (typeof fn.bundler === "function") return zipFunctionBundle(fn.slug, await fn.bundler(fn));
+	if (fn.bundler === "none") return zipFunctionBundle(fn.slug, await bundleAsIs(fn));
+	const entry = await resolveEsbuildEntry(fn.source);
 	const externalPackages = fn.externalPackages ?? [];
-	const { files, metafile, warnings } = await bundleEntry(fn.source, { externalPackages: externalPackages.map((pkg) => pkg.name) });
+	const { files, metafile, warnings } = await bundleEntry(entry, { externalPackages: externalPackages.map((pkg) => pkg.name) });
 	for (const warning of warnings) log.warning(warning);
 	for (const finding of findUndeclaredNativePackages({
 		metafile,
 		declared: externalPackages.map((pkg) => pkg.name),
-		projectDir: dirname(fn.source)
+		projectDir: dirname(entry)
 	})) log.warning(describeNativeFinding(fn.slug, finding));
 	const staged = packagesToStage(externalPackages);
 	if (staged.length === 0) return zipBundle(files);
 	const traced = await traceNativePackages({
 		slug: fn.slug,
 		packages: staged,
-		projectDir: dirname(fn.source)
+		projectDir: dirname(entry)
 	});
 	for (const warning of traced.warnings) log.warning(warning);
 	const entries = {

package/dist/commands/dev.js

@@ -7,12 +7,12 @@ import { bundleEntry } from "../utils/esbuild.js";
 import { i as resolveDevEnv } from "../_chunks/env-NbA61JR3.js";
 import { resolveFunctionsFromConfig } from "../dev/functions.js";
 import { resolveWatchInputs } from "../dev/inputs.js";
-import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { basename, dirname, join, resolve } from "node:path";
+import { existsSync, mkdirSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { basename, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import chalk from "chalk";
 import { spawn, spawnSync } from "node:child_process";
-import { describeNativeFinding, findUndeclaredNativePackages } from "@neon/config-runtime";
+import { bundleAsIs, describeNativeFinding, findUndeclaredNativePackages, resolveEsbuildEntry } from "@neon/config-runtime";
 import { once } from "node:events";
 //#region src/commands/dev.ts
 var dev_exports = /* @__PURE__ */ __exportAll({
@@ -239,11 +239,13 @@ const plannedToUnit = (fn, branchEnv, searchBase) => {
 			fn: Object.keys(fn.env)
 		},
 		...fn.externalPackages ? { externalPackages: fn.externalPackages } : {},
+		...fn.bundler !== void 0 ? { bundler: fn.bundler } : {},
 		configKey: JSON.stringify({
 			source: fn.source,
 			port: fn.port ?? null,
 			env: fn.env,
-			externalPackages: fn.externalPackages ?? null
+			externalPackages: fn.externalPackages ?? null,
+			bundler: typeof fn.bundler === "function" ? "custom" : fn.bundler ?? null
 		})
 	};
 };
@@ -286,7 +288,7 @@ const runSupervisor = async (units, options = {}) => {
 	const bundleAndStart = async (r) => {
 		let bundlePath;
 		try {
-			bundlePath = await writeBundle(r.unit.source, r.unit.bundleDir, r.unit.externalPackages, r.unit.slug ?? void 0);
+			bundlePath = await writeBundle(r.unit.source, r.unit.bundleDir, r.unit.externalPackages, r.unit.slug ?? void 0, r.unit.bundler);
 		} catch (err) {
 			r.status = "error";
 			logUnit(r.unit, chalk.red("bundle failed: ") + (err instanceof Error ? err.message : String(err)));
@@ -329,7 +331,7 @@ const runSupervisor = async (units, options = {}) => {
 		}, 150);
 	};
 	const startUnit = async (r) => {
-		r.watcher = await startWatcher(r.unit.source, () => {
+		r.watcher = await startWatcher(r.unit, () => {
 			restart(r);
 		});
 		await bundleAndStart(r);
@@ -500,22 +502,50 @@ const spawnChild = (unit, runtimePath, bundlePath) => {
 * positive would otherwise repeat the whole block for its lifetime.
 */
 const reportedFindings = /* @__PURE__ */ new Map();
-const writeBundle = async (source, bundleDir, externalPackages, label) => {
-	const { files, metafile, warnings } = await bundleEntry(source, { ...externalPackages ? { externalPackages } : {} });
+const writeBundle = async (source, bundleDir, externalPackages, label, bundler) => {
+	if (bundler !== void 0 && bundler !== "esbuild") {
+		const files = await bundleForDev(source, label, bundler);
+		return writeBundleFiles(bundleDir, files);
+	}
+	const entry = await resolveEsbuildEntry(source);
+	const { files, metafile, warnings } = await bundleEntry(entry, { ...externalPackages ? { externalPackages } : {} });
 	for (const warning of warnings) log.warning(warning);
 	const findings = findUndeclaredNativePackages({
 		metafile,
 		declared: externalPackages ?? [],
-		projectDir: dirname(source)
+		projectDir: dirname(entry)
 	});
 	const signature = findings.map((f) => f.name).join(",");
 	if (reportedFindings.get(source) !== signature) {
 		reportedFindings.set(source, signature);
 		for (const finding of findings) log.warning(describeNativeFinding(label ?? basename(source), finding));
 	}
+	return writeBundleFiles(bundleDir, files);
+};
+const bundleForDev = async (source, label, bundler) => {
+	const fn = {
+		slug: label ?? basename(source),
+		name: label ?? basename(source),
+		source,
+		env: {},
+		runtime: "nodejs24",
+		bundler
+	};
+	return bundler === "none" ? bundleAsIs(fn) : bundler(fn);
+};
+const writeBundleFiles = (bundleDir, files) => {
+	rmSync(bundleDir, {
+		recursive: true,
+		force: true
+	});
 	mkdirSync(bundleDir, { recursive: true });
-	for (const [name, contents] of Object.entries(files)) writeFileSync(join(bundleDir, name), contents);
-	return join(bundleDir, "index.mjs");
+	for (const [name, contents] of Object.entries(files)) {
+		const dest = join(bundleDir, name);
+		mkdirSync(dirname(dest), { recursive: true });
+		writeFileSync(dest, contents);
+	}
+	const entry = ["index.mjs", "index.js"].find((name) => name in files);
+	return join(bundleDir, entry ?? "index.mjs");
 };
 const urlFor = (port) => port === null ? chalk.red("not running") : `http://localhost:${port}`;
 const waitForReady = (child) => new Promise((resolveReady) => {
@@ -594,11 +624,19 @@ const logUnit = (unit, message) => {
 	const prefix = unit.label ? chalk.dim(`[${unit.label}] `) : "";
 	log.info(`${prefix}${message}`);
 };
-const startWatcher = async (source, restart) => {
+const startWatcher = async (unit, restart) => {
 	const { default: chokidar } = await import("chokidar");
-	const initialInputs = await resolveWatchInputs(source);
-	if (initialInputs === null) return startDirectoryWatcher(chokidar, source, restart);
-	return startInputWatcher(chokidar, source, initialInputs, restart);
+	if (unit.bundler !== void 0 && unit.bundler !== "esbuild") {
+		const dir = statSync(unit.source, { throwIfNoEntry: false })?.isDirectory() === true ? unit.source : dirname(unit.source);
+		return startDirectoryWatcher(chokidar, dir, restart, { ignoreDist: false });
+	}
+	let entry = unit.source;
+	try {
+		entry = await resolveEsbuildEntry(unit.source);
+	} catch {}
+	const initialInputs = await resolveWatchInputs(entry);
+	if (initialInputs === null) return startDirectoryWatcher(chokidar, entry, restart, { ignoreDist: true });
+	return startInputWatcher(chokidar, entry, initialInputs, restart);
 };
 /**
 * Watch the neon.ts file itself for changes, firing `onChange` on every save. Used by the
@@ -645,11 +683,15 @@ const startInputWatcher = async (chokidar, source, initialInputs, restart) => {
 		close: () => watcher.close()
 	};
 };
-const startDirectoryWatcher = async (chokidar, source, restart) => {
-	const watchedDir = dirname(source);
+const startDirectoryWatcher = async (chokidar, source, restart, options) => {
+	const watchedDir = statSync(source, { throwIfNoEntry: false })?.isDirectory() ? source : dirname(source);
 	const isIgnored = (p) => {
-		const segments = p.split(/[/\\]/);
-		return segments.includes("node_modules") || segments.includes(".git") || segments.includes("dist");
+		const rel = relative(watchedDir, p);
+		if (rel === "" || rel === ".") return false;
+		if (rel.startsWith("..")) return false;
+		const segments = rel.split(/[/\\]/);
+		if (segments.includes("node_modules") || segments.includes(".git")) return true;
+		return options.ignoreDist && segments.includes("dist");
 	};
 	const watcher = chokidar.watch(watchedDir, {
 		ignoreInitial: true,

package/dist/commands/functions.js

@@ -7,9 +7,10 @@ import { writer } from "../writer.js";
 import { branchIdFromProps, fillSingleProject } from "../utils/enrichers.js";
 import { bundleEntry } from "../utils/esbuild.js";
 import { zipBundle } from "../utils/zip.js";
-import { existsSync, statSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { describeNativeFinding, findUndeclaredNativePackages } from "@neon/config-runtime";
+import { statSync } from "node:fs";
+import { dirname } from "node:path";
+import { FUNCTION_SOURCE_ENTRIES } from "@neon/config";
+import { bundleAsIs, describeNativeFinding, findUndeclaredNativePackages, resolveEsbuildEntry, zipFunctionBundle } from "@neon/config-runtime";
 //#region src/commands/functions.ts
 var functions_exports = /* @__PURE__ */ __exportAll({
 	aliases: () => aliases,
@@ -55,11 +56,6 @@ const writeDeploymentErrorSection = (out, dep) => {
 };
 const SLUG_PATTERN = /^[a-z0-9]{1,20}$/;
 const SLUG_HELP = "Use 1-20 lowercase letters and digits (no hyphens or other characters).";
-const ENTRY_CANDIDATES = [
-	"index.ts",
-	"index.mjs",
-	"index.js"
-];
 const POLL_INTERVAL_MS = Number(process.env.NEON_FUNCTIONS_POLL_INTERVAL_MS) || 2e3;
 const POLL_TIMEOUT_MS = Number(process.env.NEON_FUNCTIONS_POLL_TIMEOUT_MS) || 6e5;
 const command = "functions";
@@ -80,7 +76,7 @@ const builder = (argv) => argv.usage("$0 function <sub-command> [options]").opti
 	demandOption: true
 }).options({
 	src: {
-		describe: "Function source: a directory containing index.ts, index.mjs, or index.js, or a path to the entry file",
+		describe: "Function source: a directory containing index.ts, index.js, or index.mjs (first file match is the entry), or a path to the entry file",
 		type: "string"
 	},
 	path: {
@@ -105,6 +101,11 @@ const builder = (argv) => argv.usage("$0 function <sub-command> [options]").opti
 		describe: "Wait for the deployment to finish building",
 		type: "boolean",
 		default: true
+	},
+	bundle: {
+		describe: "Bundle --src with esbuild. Use --no-bundle to zip a prebuilt directory (root must contain index.mjs or index.js) or a file of that name.",
+		type: "boolean",
+		default: true
 	}
 }), (args) => deploy(args)).command("list", "List functions on the branch", (yargs) => yargs, (args) => list(args)).command("get <slug>", "Show a function's details", (yargs) => yargs.positional("slug", {
 	describe: "Function slug",
@@ -144,24 +145,33 @@ const emitDeployResult = (props, deployment, fn) => {
 };
 const isTransient = (err) => isNeonApiError(err) && (err.status === void 0 || err.status === 404 || err.status >= 500);
 const deploy = async (props) => {
-	if (props.path !== void 0 || props.entry !== void 0) throw new Error("--path and --entry were removed. Use --src <dir>; the entry point is discovered as index.ts, index.mjs, or index.js in that directory.");
-	if (!(props.src !== void 0 || props.env !== void 0 || props.runtime !== void 0)) throw new Error(`Provide at least one option to deploy, e.g. --src or --env. See: ${getCliName()} function deploy --help.`);
+	if (props.path !== void 0 || props.entry !== void 0) throw new Error(`--path and --entry were removed. Use --src <dir>; the entry point is discovered as ${FUNCTION_SOURCE_ENTRIES.join(", ")} in that directory.`);
+	if (!(props.src !== void 0 || props.env !== void 0 || props.runtime !== void 0 || props.bundle === false)) throw new Error(`Provide at least one option to deploy, e.g. --src, --env, or --no-bundle. See: ${getCliName()} function deploy --help.`);
 	if (!SLUG_PATTERN.test(props.slug)) throw new Error(`Invalid function slug "${props.slug}". ${SLUG_HELP}`);
 	const src = props.src ?? ".";
 	const runtime = props.runtime ?? "nodejs24";
 	const environment = parseEnv(props.env);
-	const srcStat = statSync(src, { throwIfNoEntry: false });
-	if (srcStat === void 0) throw new Error(`--src path not found: ${src}.`);
-	const source = srcStat.isFile() ? src : ENTRY_CANDIDATES.map((name) => join(src, name)).find((p) => existsSync(p));
-	if (source === void 0) throw new Error(`No entry file found in ${src}. Expected one of: ${ENTRY_CANDIDATES.join(", ")}.`);
-	const bundled = await bundleEntry(source);
-	for (const warning of bundled.warnings) log.warning(warning);
-	for (const finding of findUndeclaredNativePackages({
-		metafile: bundled.metafile,
-		declared: [],
-		projectDir: dirname(source)
-	})) log.warning(describeNativeFinding(props.slug, finding));
-	const zip = zipBundle(bundled.files);
+	if (statSync(src, { throwIfNoEntry: false }) === void 0) throw new Error(`--src path not found: ${src}.`);
+	let zip;
+	if (!props.bundle) zip = await zipFunctionBundle(props.slug, await bundleAsIs({
+		slug: props.slug,
+		name: props.slug,
+		source: src,
+		env: {},
+		runtime: "nodejs24",
+		bundler: "none"
+	}, { via: "no-bundle" }));
+	else {
+		const source = await resolveEsbuildEntry(src);
+		const bundled = await bundleEntry(source);
+		for (const warning of bundled.warnings) log.warning(warning);
+		for (const finding of findUndeclaredNativePackages({
+			metafile: bundled.metafile,
+			declared: [],
+			projectDir: dirname(source)
+		})) log.warning(describeNativeFinding(props.slug, finding));
+		zip = zipBundle(bundled.files);
+	}
 	const branchId = await branchIdFromProps(props);
 	let before;
 	try {

package/dist/commands/plugins.js

@@ -13,6 +13,7 @@ import { resolvePluginsPlan } from "../plugins/plan.js";
 import { confirmPluginsInstall } from "../plugins/wizard.js";
 //#region src/commands/plugins.ts
 var plugins_exports = /* @__PURE__ */ __exportAll({
+	aliases: () => aliases,
 	builder: () => builder,
 	command: () => command,
 	describe: () => describe,
@@ -29,6 +30,7 @@ const coerceAgents = (value) => {
 };
 const scopeLabel = (scope) => scope === "project" ? "project" : "user";
 const command = "plugins";
+const aliases = ["plugin"];
 const describe = "Install the Neon plugin into coding agents";
 const pluginProjectAgents = pluginsInstallableAgents("project");
 const pluginGlobalOnlyAgents = pluginsInstallableAgents("global").filter((id) => !pluginProjectAgents.includes(id));
@@ -137,4 +139,4 @@ const handler = async (props) => {
 	throw new Error(`Failed to install the Neon plugin for: ${failed.flatMap((row) => row.agents).join(", ")}.\n${detail}\nRetry with: ${retry}`);
 };
 //#endregion
-export { builder, command, describe, handler, plugins_exports as t };
+export { aliases, builder, command, describe, handler, plugins_exports as t };

package/dist/commands/skills.js

@@ -13,6 +13,7 @@ import { assertSkillsCanRun, resolveSkillsPlan } from "../skills/plan.js";
 import { assertSkillsNode, neonSkillsRetryCommand, neonSkillsUpdateRetryCommand, runSkillsCli, skillsAddArgs, skillsMetadata, skillsUpdateArgs, skillsUpdateDetail, skillsUpdateHadNothing } from "../skills/run.js";
 //#region src/commands/skills.ts
 var skills_exports = /* @__PURE__ */ __exportAll({
+	aliases: () => aliases,
 	builder: () => builder,
 	command: () => command,
 	describe: () => describe,
@@ -38,6 +39,7 @@ const coerceSkills = (value) => {
 	});
 };
 const command = "skills";
+const aliases = ["skill"];
 const describe = "Install Neon agent skills into coding agents";
 const builder = (argv) => argv.usage("$0 skills [command] [options]").command("update", "Update installed skills to the latest versions", (yargs) => yargs.usage("$0 skills update [options]").options({
 	yes: { describe: "Skip the confirm prompt" },
@@ -225,4 +227,4 @@ const updateHandler = async (props) => {
 	if (failure !== void 0) throw new Error(failure.includes("needs npx (Node.js)") || failure.includes("needs Node.js") ? failure : `${failure}\nRetry with: ${neonSkillsUpdateRetryCommand(scope === "global")}`);
 };
 //#endregion
-export { builder, command, describe, handler, skills_exports as t };
+export { aliases, builder, command, describe, handler, skills_exports as t };

package/dist/context.js

@@ -52,8 +52,8 @@ const isClaimCommand = (args) => args._[0] === "claim" || args._[0] === "claimab
 */
 const isApiKeysCommand = (args) => args._[0] === "api-keys" || args._[0] === "api-key";
 const isMcpCommand = (args) => args._[0] === "mcp";
-const isSkillsCommand = (args) => args._[0] === "skills";
-const isPluginsCommand = (args) => args._[0] === "plugins";
+const isSkillsCommand = (args) => args._[0] === "skills" || args._[0] === "skill";
+const isPluginsCommand = (args) => args._[0] === "plugins" || args._[0] === "plugin";
 /** Raw argv is required because auth middleware runs before MCP flags are parsed. */
 const isMcpOauth = (args) => isMcpCommand(args) && argvEnablesMcpOauth(process.argv);
 const OAUTH_FALSE = /* @__PURE__ */ new Set([

package/dist/dev/functions.js

@@ -29,7 +29,8 @@ const resolveFunctionsFromConfig = async (cwd, branchName) => {
 				source,
 				...devPort(fn.dev) !== void 0 ? { port: devPort(fn.dev) } : {},
 				env: { ...fn.env },
-				...fn.externalPackages ? { externalPackages: fn.externalPackages.map((pkg) => pkg.name) } : {}
+				...fn.externalPackages ? { externalPackages: fn.externalPackages.map((pkg) => pkg.name) } : {},
+				...fn.bundler !== "esbuild" ? { bundler: fn.bundler } : {}
 			};
 		})
 	};

package/dist/index.js

@@ -32,7 +32,9 @@ const NO_SUBCOMMANDS_VERBS = [
 	"init",
 	"mcp",
 	"plugins",
+	"plugin",
 	"skills",
+	"skill",
 	"dev",
 	"deploy",
 	"diff",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "4.11.0",
+  "version": "4.12.0",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -63,9 +63,9 @@
     "yaml": "^2.9.0",
     "yargs": "17.7.2",
     "yoctocolors": "^2.1.2",
-    "@neon/config-runtime": "1.0.5",
+    "@neon/config": "1.1.0",
     "@neon/sdk": "3.0.0",
-    "@neon/config": "1.0.5"
+    "@neon/config-runtime": "1.1.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0",
@@ -97,7 +97,7 @@
     "typescript": "^5.9.0",
     "vitest": "^3.0.9",
     "@neon-internals/cli-core": "0.0.0",
-    "@neon-internals/env-core": "0.0.5",
+    "@neon-internals/env-core": "0.0.6",
     "@neon/e2e-harness": "0.0.0"
   },
   "publishConfig": {