@prisma/cli 3.0.0-dev.39.1 → 3.0.0-dev.40.1

package/dist/commands/app/index.js

@@ -62,13 +62,13 @@ function createDeployCommand(runtime) {
 	command.addOption(new Option("--app <name>", "App name")).addOption(new Option("--project <id-or-name>", "Project id or name")).addOption(new Option("--create-project <name>", "Create and link a new Project before deploying")).addOption(new Option("--branch <name>", "Branch name")).addOption(new Option("--framework <name>", "Framework to deploy").choices([
 		"nextjs",
 		"hono",
-		"tanstack-start"
-	])).addOption(new Option("--entry <path>", "Entrypoint path for Bun or auto deploys")).addOption(new Option("--build-type <type>", "Legacy deploy build type").choices([...PREVIEW_BUILD_TYPES]).default("auto").hideHelp()).addOption(new Option("--http-port <port>", "HTTP port override for the deployed app")).addOption(new Option("--env <name=value>", "Environment variable").argParser(collectRepeatableValues));
+		"tanstack-start",
+		"bun"
+	])).addOption(new Option("--entry <path>", "Entrypoint path for Bun deploys")).addOption(new Option("--http-port <port>", "HTTP port override for the deployed app")).addOption(new Option("--env <name=value>", "Environment variable").argParser(collectRepeatableValues));
 	addGlobalFlags(command);
 	command.action(async (options) => {
 		const appName = options.app;
 		const entry = options.entry;
-		const buildType = options.buildType;
 		const branchName = options.branch;
 		const framework = options.framework;
 		const httpPort = options.httpPort;
@@ -80,7 +80,6 @@ function createDeployCommand(runtime) {
 			createProjectName,
 			branchName,
 			entrypoint: entry,
-			buildType,
 			framework,
 			httpPort,
 			envAssignments

package/dist/controllers/app.js

@@ -9,7 +9,7 @@ import { requireComputeAuth } from "../lib/auth/guard.js";
 import { readAuthState } from "../lib/auth/auth-ops.js";
 import { parseEnvAssignments } from "../lib/app/env-vars.js";
 import { renderDeployOutputRows } from "../lib/app/deploy-output.js";
-import { readBunPackageJson } from "../lib/app/bun-project.js";
+import { readBunPackageEntrypoint, readBunPackageJson } from "../lib/app/bun-project.js";
 import { DEFAULT_LOCAL_DEV_PORT, resolveLocalBuildType, runLocalApp } from "../lib/app/local-dev.js";
 import { inferTargetName, projectNotFoundError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "../lib/project/local-pin.js";
@@ -29,8 +29,10 @@ import open from "open";
 const DEPLOY_FRAMEWORKS = [
 	"nextjs",
 	"hono",
-	"tanstack-start"
+	"tanstack-start",
+	"bun"
 ];
+const TANSTACK_START_PACKAGES = ["@tanstack/react-start", "@tanstack/solid-start"];
 const FRAMEWORK_DEFAULT_HTTP_PORT = 3e3;
 const PRISMA_PROJECT_ID_ENV_VAR = "PRISMA_PROJECT_ID";
 const PRISMA_APP_ID_ENV_VAR = "PRISMA_APP_ID";
@@ -105,15 +107,12 @@ async function runAppDeploy(context, appName, options) {
 	const skipLocalPin = Boolean(envProjectId || options?.projectRef || options?.createProjectName);
 	const localPin = skipLocalPin ? { kind: "missing" } : await readLocalResolutionPin(context.runtime.cwd);
 	if (!skipLocalPin && localPin.kind === "invalid") throw localResolutionPinStaleError();
-	const explicitBuildType = Boolean(options?.buildType && options.buildType !== "auto");
+	const branch = await resolveDeployBranch(context, options?.branchName);
 	if (options?.httpPort) parseDeployHttpPort(options.httpPort);
 	assertSupportedEntrypointForRequestedDeployShape({
 		requestedFramework: options?.framework,
-		requestedBuildType: options?.buildType,
-		explicitBuildType,
 		entrypoint: options?.entrypoint
 	});
-	const branch = await resolveDeployBranch(context, options?.branchName);
 	const { provider, target, projectId } = await requireProviderAndDeployProjectContext(context, options?.projectRef, {
 		branch,
 		createProjectName: options?.createProjectName,
@@ -128,8 +127,7 @@ async function runAppDeploy(context, appName, options) {
 	}
 	let framework = await resolveDeployFramework(context, {
 		requestedFramework: options?.framework,
-		requestedBuildType: options?.buildType,
-		explicitBuildType
+		entrypoint: options?.entrypoint
 	});
 	let runtime = resolveDeployRuntime(options?.httpPort, framework);
 	assertSupportedEntrypoint(framework.buildType, options?.entrypoint, "deploy");
@@ -151,13 +149,14 @@ async function runAppDeploy(context, appName, options) {
 		runtime,
 		firstDeploy: selectedApp.firstDeploy,
 		explicitFramework: Boolean(options?.framework),
-		explicitBuildType,
+		explicitEntrypoint: Boolean(options?.entrypoint),
 		explicitHttpPort: Boolean(options?.httpPort)
 	});
 	framework = customized.framework;
 	runtime = customized.runtime;
 	const buildType = framework.buildType;
 	assertSupportedEntrypoint(buildType, options?.entrypoint, "deploy");
+	const entrypoint = await resolveDeployEntrypoint(context.runtime.cwd, framework, options?.entrypoint);
 	const portMapping = parseDeployPortMapping(String(runtime.port));
 	const progressState = createPreviewDeployProgressState();
 	const deployStartedAt = Date.now();
@@ -168,7 +167,7 @@ async function runAppDeploy(context, appName, options) {
 		appId: selectedApp.appId,
 		appName: selectedApp.appName,
 		region: selectedApp.region,
-		entrypoint: options?.entrypoint,
+		entrypoint,
 		buildType,
 		portMapping,
 		envVars,
@@ -718,7 +717,7 @@ async function resolveAppDomainTarget(context, options) {
 	});
 	const envProjectId = readDeployEnvOverride(context, PRISMA_PROJECT_ID_ENV_VAR);
 	const envAppId = readDeployEnvOverride(context, PRISMA_APP_ID_ENV_VAR);
-	const skipLocalPin = Boolean(envProjectId);
+	const skipLocalPin = Boolean(envProjectId || options?.projectRef);
 	const localPin = skipLocalPin ? { kind: "missing" } : await readLocalResolutionPin(context.runtime.cwd);
 	if (!skipLocalPin && localPin.kind === "invalid") throw localResolutionPinStaleError();
 	const { provider, target, projectId } = await requireProviderAndDeployProjectContext(context, options?.projectRef, {
@@ -1505,15 +1504,12 @@ async function resolveGitHeadPath(gitPath) {
 }
 async function resolveDeployFramework(context, options) {
 	if (options.requestedFramework) return frameworkFromUserFacingValue(options.requestedFramework, "set by --framework");
-	if (options.explicitBuildType) {
-		const buildType = normalizeBuildType(options.requestedBuildType);
-		if (buildType !== "auto") return {
-			key: buildType,
-			buildType,
-			displayName: formatBuildTypeName(buildType),
-			annotation: "set by --build-type"
-		};
-	}
+	if (options.entrypoint) return {
+		key: "bun",
+		buildType: "bun",
+		displayName: "Bun",
+		annotation: "set by --entry"
+	};
 	const detected = await detectDeployFramework(context.runtime.cwd);
 	if (detected) return detected;
 	throw frameworkNotDetectedError(context.runtime.cwd);
@@ -1529,12 +1525,22 @@ function resolveDeployRuntime(requestedHttpPort, framework) {
 	};
 }
 function assertSupportedEntrypointForRequestedDeployShape(options) {
-	if (options.requestedFramework) {
-		assertSupportedEntrypoint(frameworkFromUserFacingValue(options.requestedFramework, "set by --framework").buildType, options.entrypoint, "deploy");
+	if (!options.requestedFramework) return;
+	assertSupportedEntrypoint(frameworkFromUserFacingValue(options.requestedFramework, "set by --framework").buildType, options.entrypoint, "deploy");
+}
+async function resolveDeployEntrypoint(cwd, framework, explicitEntrypoint) {
+	if (explicitEntrypoint || framework.buildType !== "bun") return explicitEntrypoint;
+	const packageEntrypoint = readBunPackageEntrypoint(await readBunPackageJson(cwd));
+	if (packageEntrypoint) return packageEntrypoint;
+	if (framework.key !== "hono") return;
+	const defaultEntrypoint = "src/index.ts";
+	try {
+		await access(path.join(cwd, defaultEntrypoint));
+		return defaultEntrypoint;
+	} catch (error) {
+		if (error.code !== "ENOENT") throw error;
 		return;
 	}
-	if (!options.explicitBuildType) return;
-	assertSupportedEntrypoint(normalizeBuildType(options.requestedBuildType), options.entrypoint, "deploy");
 }
 async function detectDeployFramework(cwd) {
 	const packageJson = await readBunPackageJson(cwd);
@@ -1551,7 +1557,7 @@ async function detectDeployFramework(cwd) {
 		displayName: "Hono",
 		annotation: "detected from package.json"
 	};
-	if (hasPackageDependency(packageJson, "@tanstack/start")) return {
+	if (hasAnyPackageDependency(packageJson, TANSTACK_START_PACKAGES)) return {
 		key: "tanstack-start",
 		buildType: "tanstack-start",
 		displayName: "TanStack Start",
@@ -1564,7 +1570,8 @@ async function detectNextConfig(cwd) {
 		"next.config.js",
 		"next.config.mjs",
 		"next.config.cjs",
-		"next.config.ts"
+		"next.config.ts",
+		"next.config.mts"
 	]) {
 		const filePath = path.join(cwd, candidate);
 		try {
@@ -1585,6 +1592,9 @@ async function detectNextConfig(cwd) {
 function hasPackageDependency(packageJson, dependencyName) {
 	return hasDependency(packageJson?.dependencies, dependencyName) || hasDependency(packageJson?.devDependencies, dependencyName);
 }
+function hasAnyPackageDependency(packageJson, dependencyNames) {
+	return dependencyNames.some((dependencyName) => hasPackageDependency(packageJson, dependencyName));
+}
 function hasDependency(dependencies, dependencyName) {
 	return Boolean(dependencies && typeof dependencies === "object" && dependencyName in dependencies);
 }
@@ -1604,9 +1614,16 @@ function frameworkFromUserFacingValue(value, annotation) {
 			displayName: "Hono",
 			annotation
 		};
+		case "bun": return {
+			key: "bun",
+			buildType: "bun",
+			displayName: "Bun",
+			annotation
+		};
 		case "tanstack":
 		case "tanstack-start":
-		case "@tanstack/start": return {
+		case "@tanstack/react-start":
+		case "@tanstack/solid-start": return {
 			key: "tanstack-start",
 			buildType: "tanstack-start",
 			displayName: "TanStack Start",
@@ -1616,19 +1633,21 @@ function frameworkFromUserFacingValue(value, annotation) {
 	}
 }
 function frameworkNotDetectedError(cwd, requestedFramework) {
-	const supported = "Next.js, Hono, TanStack Start";
+	const supported = "Next.js, Hono, TanStack Start, Bun";
 	const directory = cwd ? ` in ${formatDeployDirectory(cwd)}` : "";
 	return new CliError({
 		code: "FRAMEWORK_NOT_DETECTED",
 		domain: "app",
 		summary: requestedFramework ? `Unsupported framework "${requestedFramework}"` : `Cannot detect a supported framework${directory}`,
 		why: `Supported Beta frameworks: ${supported}.`,
-		fix: "Add one of these frameworks as a dependency, or pass --framework <nextjs|hono|tanstack-start>.",
+		fix: "Add one of these frameworks as a dependency, pass --framework <nextjs|hono|tanstack-start|bun>, or pass --entry <path> for a Bun app.",
 		exitCode: 2,
 		nextSteps: [
 			"prisma-cli app deploy --framework nextjs",
 			"prisma-cli app deploy --framework hono",
-			"prisma-cli app deploy --framework tanstack-start"
+			"prisma-cli app deploy --framework tanstack-start",
+			"prisma-cli app deploy --framework bun --entry server.ts",
+			"prisma-cli app deploy --entry server.ts"
 		]
 	});
 }
@@ -1643,7 +1662,7 @@ function maybeRenderProjectLinked(context, directory, projectName, localPinPath)
 	context.output.stderr.write(`${context.ui.success("✔")} Linked "${directory}" to Project "${projectName}"\nSaved ${localPinPath}\n\n`);
 }
 async function maybeCustomizeDeploySettings(context, options) {
-	if (!options.firstDeploy || context.flags.yes || options.explicitFramework || options.explicitBuildType || options.explicitHttpPort || !canPrompt(context)) return {
+	if (!options.firstDeploy || context.flags.yes || options.explicitFramework || options.explicitEntrypoint || options.explicitHttpPort || !canPrompt(context)) return {
 		framework: options.framework,
 		runtime: options.runtime
 	};
@@ -1700,6 +1719,7 @@ function frameworkDisplayName(framework) {
 		case "nextjs": return "Next.js";
 		case "hono": return "Hono";
 		case "tanstack-start": return "TanStack Start";
+		case "bun": return "Bun";
 	}
 }
 function validateDeployHttpPortText(value) {
@@ -1734,7 +1754,10 @@ function getBuildTypeExamples(commandName) {
 	});
 }
 function assertSupportedEntrypoint(buildType, entrypoint, commandName) {
-	if (buildType !== "auto" && buildType !== "bun" && entrypoint) throw usageError(`App ${commandName} does not accept --entry with --build-type ${buildType}`, `${formatBuildTypeName(buildType)} apps do not use an entrypoint flag in the current preview.`, `Remove --entry, or rerun prisma-cli app ${commandName} with --build-type bun when you want to target a Bun entrypoint directly.`, [`prisma-cli app ${commandName} --build-type ${buildType}`, `prisma-cli app ${commandName} --build-type bun --entry server.ts`], "app");
+	if (buildType !== "auto" && buildType !== "bun" && entrypoint) {
+		if (commandName === "deploy") throw usageError(`App deploy does not accept --entry with ${formatBuildTypeName(buildType)}`, `${formatBuildTypeName(buildType)} apps derive their runtime entrypoint from build output.`, "Remove --entry, or use --framework bun when you want to target a Bun entrypoint directly.", [`prisma-cli app deploy --framework ${buildType}`, "prisma-cli app deploy --framework bun --entry server.ts"], "app");
+		throw usageError(`App ${commandName} does not accept --entry with --build-type ${buildType}`, `${formatBuildTypeName(buildType)} apps do not use an entrypoint flag in the current preview.`, `Remove --entry, or rerun prisma-cli app ${commandName} with --build-type bun when you want to target a Bun entrypoint directly.`, [`prisma-cli app ${commandName} --build-type ${buildType}`, `prisma-cli app ${commandName} --build-type bun --entry server.ts`], "app");
+	}
 }
 async function requireLocalBuildType(context, buildType, commandName) {
 	const resolvedBuildType = await resolveLocalBuildType(context.runtime.cwd, buildType);

package/dist/shell/command-meta.js

@@ -212,7 +212,8 @@ const DESCRIPTORS = [
 			"prisma-cli app deploy --app my-app --env DATABASE_URL=postgresql://example",
 			"prisma-cli app deploy --app my-app --framework nextjs --http-port 3000",
 			"prisma-cli app deploy --branch feat-login --framework hono",
-			"pnpm dlx skills@latest add prisma/prisma-cli/skills#cli-v<cli-version> --all"
+			"pnpm dlx skills@latest add prisma/prisma-cli/skills#cli-v<cli-version> --all",
+			"prisma-cli app deploy --framework bun --entry src/server.ts"
 		]
 	},
 	{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.39.1",
+  "version": "3.0.0-dev.40.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {