@prisma/cli 3.0.0-dev.131.1 → 3.0.0-dev.133.1

package/dist/commands/app/index.js

@@ -333,12 +333,13 @@ function createRollbackCommand(runtime) {
 }
 function createRemoveCommand(runtime) {
 	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("remove"), runtime), "app.remove");
-	command.argument("[app]", "App target from prisma.compute.ts when the config defines multiple apps").addOption(new Option("--app <name>", "App name")).addOption(new Option("--project <id-or-name>", "Project id or name"));
+	command.argument("[app]", "App target from prisma.compute.ts when the config defines multiple apps").addOption(new Option("--app <name>", "App name")).addOption(new Option("--project <id-or-name>", "Project id or name")).addOption(new Option("--branch <name>", "Branch name"));
 	addGlobalFlags(command);
 	command.action(async (configTarget, options) => {
 		const appName = options.app;
 		const projectRef = options.project;
-		await runCommand(runtime, "app.remove", options, (context) => runAppRemove(context, appName, projectRef, configTarget), {
+		const branchName = options.branch;
+		await runCommand(runtime, "app.remove", options, (context) => runAppRemove(context, appName, projectRef, configTarget, branchName), {
 			renderHuman: (context, descriptor, result) => renderAppRemove(context, descriptor, result),
 			renderJson: (result) => serializeAppRemove(result)
 		});

package/dist/controllers/app.js

@@ -967,11 +967,19 @@ async function runAppRollback(context, appName, deploymentId, projectRef, config
 		nextSteps: ["prisma-cli app list-deploys", `prisma-cli app show-deploy ${targetDeployment.id}`]
 	};
 }
-async function runAppRemove(context, appName, projectRef, configTarget) {
+/**
+* Removes an app and every deployment it owns in the resolved branch.
+*
+* @param branchName Scopes the removal to this branch. When omitted the branch
+* is inferred from the local Git branch, falling back to the production branch.
+*/
+async function runAppRemove(context, appName, projectRef, configTarget, branchName) {
 	ensurePreviewAppMode(context);
 	const compute = await resolveComputeManagementContext(context, configTarget, "remove");
 	appName = appName ?? compute.configAppName;
+	if (branchName !== void 0 && branchName.trim() === "") throw usageError("The --branch value cannot be empty", "app remove scopes the removal to the given branch; an empty --branch would silently fall back to the inferred (possibly production) branch.", "Pass a non-empty branch name, e.g. --branch <branch>, or omit --branch to use the inferred branch.", ["prisma-cli app remove --app <name> --branch <branch>"], "app");
 	const { provider, target, projectId } = await requireProviderAndProjectContext(context, projectRef, {
+		branch: branchName !== void 0 ? await resolveDeployBranch(context, branchName) : void 0,
 		commandName: "app remove",
 		projectDir: compute.projectDir
 	});
@@ -1502,13 +1510,21 @@ function requireDeploymentForApp(deployments, deploymentId, appName) {
 		nextSteps: ["prisma-cli app list-deploys"]
 	});
 }
+/**
+* Resolves the app's live deployment from the app pointer, the provider's live
+* flag, then locally cached state.
+*
+* @returns the live deployment id, or null when no authoritative signal exists.
+* Callers must treat null as "not known to be live" rather than assuming the
+* newest deployment is live.
+*/
 async function resolveCurrentLiveDeploymentId(context, projectId, app, deployments) {
 	if (app.liveDeploymentId && deployments.some((deployment) => deployment.id === app.liveDeploymentId)) return app.liveDeploymentId;
 	const providerLiveDeployment = deployments.find((deployment) => deployment.live === true);
 	if (providerLiveDeployment) return providerLiveDeployment.id;
 	const knownLiveDeploymentId = await context.stateStore.readKnownLiveDeployment(projectId, app.id);
 	if (knownLiveDeploymentId && deployments.some((deployment) => deployment.id === knownLiveDeploymentId)) return knownLiveDeploymentId;
-	return deployments[0]?.id ?? null;
+	return null;
 }
 function buildAppShowNextSteps(liveUrl, liveDeployment, deployments) {
 	const nextSteps = [];

package/dist/shell/command-meta.js

@@ -798,8 +798,12 @@ const DESCRIPTORS = [
 			"app",
 			"remove"
 		],
-		description: "Remove the app from the current branch",
-		examples: ["prisma-cli app remove --app hello-world", "prisma-cli app remove --app hello-world --yes"]
+		description: "Remove the app from the resolved branch",
+		examples: [
+			"prisma-cli app remove --app hello-world",
+			"prisma-cli app remove --app hello-world --yes",
+			"prisma-cli app remove --app hello-world --branch feature/foo --yes"
+		]
 	},
 	{
 		id: "project.env",

package/package.json

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