create-prisma 0.4.2-pr.34.112.1 → 0.4.2-pr.34.114.1

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import "./create-D7XYRH3T.mjs";
+import "./create-CzguBCmV.mjs";
 import { createCreatePrismaCli } from "./index.mjs";
 
 //#region src/cli.ts

package/dist/{create-D7XYRH3T.mjs → create-CzguBCmV.mjs}

@@ -1707,8 +1707,6 @@ async function executeCreateAddonSetupContext(params) {
 //#endregion
 //#region src/tasks/deploy-to-compute.ts
 const PRISMA_CLI_PACKAGE = "@prisma/cli@latest";
-const COMPUTE_DEPLOY_BRANCH = "main";
-const COMPUTE_ENV_ROLE = "production";
 const DEPLOY_OPTIONS_BY_TEMPLATE = {
 	hono: {
 		framework: "hono",
@@ -1724,6 +1722,26 @@ const DEPLOY_OPTIONS_BY_TEMPLATE = {
 function getPrismaCliCommand(packageManager) {
 	return getPackageExecutionCommand(getPrismaCliExecutionPackageManager(packageManager), [PRISMA_CLI_PACKAGE]);
 }
+function getPrismaCliAppDeployCommand(packageManager) {
+	return getPackageExecutionCommand(getPrismaCliExecutionPackageManager(packageManager), [
+		PRISMA_CLI_PACKAGE,
+		"app",
+		"deploy"
+	]);
+}
+function getComputeDeployScriptMap(context) {
+	const deployArgs = [
+		"--prod",
+		"--framework",
+		context.framework,
+		...context.httpPort ? ["--http-port", String(context.httpPort)] : []
+	];
+	const deployCommand = [getPrismaCliAppDeployCommand(context.packageManager), ...deployArgs].join(" ");
+	return {
+		"compute:deploy": deployCommand,
+		"compute:deploy:ci": `${deployCommand} --yes`
+	};
+}
 function runPrismaCli(packageManager, args, options = {}) {
 	const execution = getPackageExecutionArgs(getPrismaCliExecutionPackageManager(packageManager), [PRISMA_CLI_PACKAGE, ...args]);
 	return execa(execution.command, execution.args, options);
@@ -1806,15 +1824,6 @@ function redactSecrets(message) {
 	return message.replace(/(['"])([A-Z0-9_]*(?:DATABASE_URL|DIRECT_URL|TOKEN|SECRET|PASSWORD|API_KEY|PRIVATE_KEY|ACCESS_KEY)[A-Z0-9_]*=)(.*?)\1/g, "$1$2<redacted>$1").replace(/\b([A-Z0-9_]*(?:DATABASE_URL|DIRECT_URL|TOKEN|SECRET|PASSWORD|API_KEY|PRIVATE_KEY|ACCESS_KEY)[A-Z0-9_]*=)[^\s]+/g, "$1<redacted>");
 }
 function parseDeployJson(stdout) {
-	return parsePrismaCliJson(stdout);
-}
-function parseProjectCreateJson(stdout) {
-	return parsePrismaCliJson(stdout);
-}
-function parseProjectEnvJson(stdout) {
-	return parsePrismaCliJson(stdout);
-}
-function parsePrismaCliJson(stdout) {
 	if (typeof stdout !== "string" || stdout.trim().length === 0) return null;
 	try {
 		return JSON.parse(stdout);
@@ -1846,70 +1855,9 @@ function toComputeDeployResult(data) {
 		branchName: data.result.branch.name
 	};
 }
-async function createComputeProjectForDeploy(params) {
-	const { stdout, exitCode } = await runPrismaCli(params.context.packageManager, [
-		"project",
-		"create",
-		params.context.createProjectName,
-		"--json",
-		"--yes"
-	], {
-		cwd: params.projectDir,
-		reject: false,
-		stdio: [
-			"ignore",
-			"pipe",
-			"pipe"
-		]
-	});
-	const parsed = parseProjectCreateJson(stdout);
-	if (!parsed) throw new Error("Could not parse prisma project create output.");
-	if (exitCode !== 0 || !parsed.ok) throw createDeployError(parsed.ok ? "Prisma project create failed." : getJsonErrorMessage(parsed.error, "Prisma project create failed."));
-	return parsed.result.project.id;
-}
-async function writeComputeEnvironmentVariables(params) {
-	for (const [key, value] of Object.entries(params.envVars ?? {})) {
-		const commonArgs = [
-			`${key}=${value}`,
-			"--project",
-			params.projectRef,
-			"--role",
-			COMPUTE_ENV_ROLE,
-			"--json",
-			"--yes"
-		];
-		if ((await runProjectEnvCommand(params.context, params.projectDir, ["add", ...commonArgs])).ok) continue;
-		const updateResult = await runProjectEnvCommand(params.context, params.projectDir, ["update", ...commonArgs]);
-		if (!updateResult.ok) throw createDeployError(getJsonErrorMessage(updateResult.error, `Failed to configure ${key} for Prisma Compute.`));
-	}
-}
-async function runProjectEnvCommand(context, projectDir, args) {
-	const { stdout, exitCode } = await runPrismaCli(context.packageManager, [
-		"project",
-		"env",
-		...args
-	], {
-		cwd: projectDir,
-		reject: false,
-		stdio: [
-			"ignore",
-			"pipe",
-			"pipe"
-		]
-	});
-	const parsed = parseProjectEnvJson(stdout);
-	if (!parsed) throw new Error("Could not parse prisma project env output.");
-	if (exitCode !== 0 && parsed.ok) return {
-		ok: false,
-		error: { message: "Prisma project env command failed." }
-	};
-	return parsed;
-}
 async function executeComputeDeployContext(params) {
 	const deploySpinner = spinner();
 	deploySpinner.start("Deploying to Prisma Compute...");
-	const envVars = params.envVars ?? {};
-	const shouldPreconfigureEnvVars = Object.keys(envVars).length > 0;
 	const args = [
 		"app",
 		"deploy",
@@ -1917,23 +1865,11 @@ async function executeComputeDeployContext(params) {
 		"--yes",
 		"--framework",
 		params.context.framework,
-		"--branch",
-		COMPUTE_DEPLOY_BRANCH
+		"--create-project",
+		params.context.createProjectName
 	];
 	try {
-		if (shouldPreconfigureEnvVars) {
-			const projectRef = await createComputeProjectForDeploy({
-				context: params.context,
-				projectDir: params.projectDir
-			});
-			await writeComputeEnvironmentVariables({
-				context: params.context,
-				projectDir: params.projectDir,
-				projectRef,
-				envVars
-			});
-			args.push("--project", projectRef);
-		} else args.push("--create-project", params.context.createProjectName);
+		for (const [key, value] of Object.entries(params.envVars ?? {})) args.push("--env", `${key}=${value}`);
 		if (params.context.httpPort) args.push("--http-port", String(params.context.httpPort));
 		const { stdout, exitCode } = await runPrismaCli(params.context.packageManager, args, {
 			cwd: params.projectDir,
@@ -2024,7 +1960,7 @@ async function getAnonymousId() {
 }
 function getCommonProperties() {
 	return {
-		"cli-version": "0.4.2-pr.34.112.1",
+		"cli-version": "0.4.2-pr.34.114.1",
 		"node-version": process.version,
 		platform: process.platform,
 		arch: process.arch
@@ -2358,6 +2294,11 @@ async function executeCreateContext(context) {
 			packageManager: context.prismaSetupContext.packageManager,
 			projectDir: context.targetDirectory
 		});
+		if (context.computeDeployContext) await addPackageDependency({
+			scripts: getComputeDeployScriptMap(context.computeDeployContext),
+			scriptMode: "if-missing",
+			projectDir: context.targetDirectory
+		});
 	} catch (error) {
 		return {
 			ok: false,
@@ -2411,7 +2352,10 @@ async function executeCreateContext(context) {
 			stage: "compute_deploy",
 			error: result.error
 		};
-		if (result.ok) deployResult = result.result;
+		if (result.ok) {
+			deployResult = result.result;
+			prismaResult.nextSteps.push(`- ${getRunScriptCommand(context.prismaSetupContext.packageManager, "compute:deploy")}`);
+		}
 	} catch (error) {
 		return {
 			ok: false,

package/dist/index.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { a as DatabaseUrlSchema, i as DatabaseProviderSchema, n as CreateCommandInputSchema, o as PackageManagerSchema, r as CreateTemplateSchema, s as SchemaPresetSchema, t as runCreateCommand } from "./create-D7XYRH3T.mjs";
+import { a as DatabaseUrlSchema, i as DatabaseProviderSchema, n as CreateCommandInputSchema, o as PackageManagerSchema, r as CreateTemplateSchema, s as SchemaPresetSchema, t as runCreateCommand } from "./create-CzguBCmV.mjs";
 import { os } from "@orpc/server";
 import { createCli } from "trpc-cli";
 
 //#region src/index.ts
-const CLI_VERSION = "0.4.2-pr.34.112.1";
+const CLI_VERSION = "0.4.2-pr.34.114.1";
 const router = os.router({ create: os.meta({
 	description: "Create a new project with Prisma setup",
 	default: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma",
-  "version": "0.4.2-pr.34.112.1",
+  "version": "0.4.2-pr.34.114.1",
   "private": false,
   "description": "Create Prisma 7 projects with first-party templates and great DX.",
   "homepage": "https://github.com/prisma/create-prisma",