Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/commands/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
import { getCreatePrismaIntro } from "../ui/branding";
import { resolveExecutionSettings } from "../ui/output";
import { getErrorMessage } from "../utils/errors";
import { getUnsupportedNodeMessage, supportsPrismaNext } from "../utils/node-version";
import { getUnsupportedNodeMessage, supportsPrisma } from "../utils/node-version";

const DEFAULT_PROJECT_NAME = "my-app";
const DEFAULT_TEMPLATE: CreateTemplate = "minimal";
Expand Down Expand Up @@ -221,7 +221,7 @@ export async function runCreateCommand(
if (input.json && input.verbose) {
throw new Error("--verbose cannot be used with --json because JSON mode is output-only.");
}
if (!supportsPrismaNext()) {
if (!supportsPrisma()) {
const message = getUnsupportedNodeMessage();
cancel(message, { output });
process.exitCode = 1;
Expand Down
11 changes: 7 additions & 4 deletions src/constants/dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import type { CreateTemplate, PackageManager } from "../types";
export const dependencyVersionMap = {
"@astrojs/node": "^10.0.2",
"@elysiajs/node": "^1.4.5",
"@prisma/composer": "0.15.0",
"@prisma/composer-prisma-cloud": "0.15.0",
"@prisma/composer": "0.16.0",
"@prisma/composer-prisma-cloud": "0.16.0",
"@prisma/orm-mongo": "8.0.0-rc.8",
// Must match @prisma/composer-prisma-cloud's exact peerDependency.
"@prisma/orm-postgres": "8.0.0-rc.8",
Expand All @@ -18,7 +18,10 @@ export const dependencyVersionMap = {
mongodb: "^7.1.0",
"mongodb-memory-server": "^11.1.0",
nitro: "^3.0.260610-beta",
prisma: "8.0.0-rc.11",
prisma: "8.0.0-rc.12",
// The ORM runtime's timestamp columns need a global Temporal, which no
// stable Node or Bun ships yet.
"temporal-polyfill": "^1.0.4",
tsx: "^4.21.0",
typescript: "^5.9.3",
} as const;
Expand All @@ -29,7 +32,7 @@ export const dependencyVersionMap = {
// above: the CLI bundles its own copies of @prisma/composer-cli and
// @prisma/orm-toolchain, and those must match the @prisma/composer* and
// @prisma/orm-* versions this map installs into the project.
export const PRISMA_PLATFORM_CLI_PACKAGE = "prisma@8.0.0-rc.11";
export const PRISMA_PLATFORM_CLI_PACKAGE = "prisma@8.0.0-rc.12";
// Deno runs the same pinned consolidated CLI. The former `prisma-next`
// fallback is dead: under Deno the bare `npm:prisma-next` specifier resolves
// to the highest non-prerelease version (0.12.0, frozen), which cannot emit
Expand Down
1 change: 1 addition & 0 deletions src/tasks/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ export async function writePrismaDependencies(
projectDir = process.cwd(),
): Promise<void> {
const dependencies = [getDbPackages(provider)];
if (provider === "postgres" && packageManager !== "deno") dependencies.push("temporal-polyfill");
if (provider === "mongo") dependencies.push("arktype", "mongodb");
if (packageManager === "deno") dependencies.push("dotenv");

Expand Down
2 changes: 1 addition & 1 deletion src/utils/node-version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function parseVersion(version: string): [number, number, number] {
return [Number(major), Number(minor), Number.parseInt(patch, 10)];
}

export function supportsPrismaNext(nodeVersion = process.versions.node): boolean {
export function supportsPrisma(nodeVersion = process.versions.node): boolean {
const current = parseVersion(nodeVersion);
for (let index = 0; index < MINIMUM_NODE_VERSION.length; index += 1) {
if (current[index]! > MINIMUM_NODE_VERSION[index]!) return true;
Expand Down
4 changes: 2 additions & 2 deletions templates/create/_shared/module.ts.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{#unless (eq packageManager "deno")}}
import { module } from "@prisma/composer";
{{#if (eq provider "postgres")}}
import { pnPostgres } from "@prisma/composer-prisma-cloud/prisma-next";
import { postgres } from "@prisma/composer-prisma-cloud/orm";

import { appContract } from "./src/prisma/composer.ts";
{{else}}
Expand All @@ -12,7 +12,7 @@ import app from "./service.ts";
export default module("{{projectName}}", ({ provision }) => {
{{#if (eq provider "postgres")}}
const database = provision(
pnPostgres({
postgres({
name: "database",
contract: appContract,
config: "./prisma.config.ts",
Expand Down
4 changes: 2 additions & 2 deletions templates/create/_shared/service.ts.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { type } from "arktype";
{{/if}}
import { compute } from "@prisma/composer-prisma-cloud";
{{#if (eq provider "postgres")}}
import { pnPostgres } from "@prisma/composer-prisma-cloud/prisma-next";
import { postgres } from "@prisma/composer-prisma-cloud/orm";

import { appContract } from "./src/prisma/composer.ts";
{{/if}}
Expand All @@ -19,7 +19,7 @@ export default compute({
name: "app",
deps: {
{{#if (eq provider "postgres")}}
database: pnPostgres(appContract),
database: postgres(appContract),
{{/if}}
},
{{#if (eq provider "mongo")}}
Expand Down
4 changes: 2 additions & 2 deletions templates/create/_shared/src/prisma/composer.ts.hbs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{{#unless (eq packageManager "deno")}}
{{#if (eq provider "postgres")}}
import { pnContract } from "@prisma/composer-prisma-cloud/prisma-next";
import { dataContract } from "@prisma/composer-prisma-cloud/orm";

import type { Contract } from "./{{#if (eq authoring "typescript")}}generated/{{/if}}contract.d.ts";
import contractJson from "./{{#if (eq authoring "typescript")}}generated/{{/if}}contract.json" with { type: "json" };

export const appContract = pnContract<Contract>(contractJson);
export const appContract = dataContract<Contract>(contractJson);
{{/if}}
{{/unless}}
2 changes: 2 additions & 0 deletions templates/create/_shared/src/prisma/db.ts.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ if (!databaseUrl) {

export const db = postgres<Contract>({ contractJson, url: databaseUrl });
{{else}}
import "temporal-polyfill/global";

import service from "../../service.ts";
import type { Contract } from "./{{#if (eq authoring "typescript")}}generated/{{/if}}contract.d.ts";
import contractJson from "./{{#if (eq authoring "typescript")}}generated/{{/if}}contract.json" with { type: "json" };
Expand Down
6 changes: 3 additions & 3 deletions tests/dependencies.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ describe("Prisma 8 dependency versions", () => {
test("uses the selected Prisma 8 and Composer releases", () => {
expect(getDependencyVersion("@prisma/orm-postgres")).toBe("8.0.0-rc.8");
expect(getDependencyVersion("@prisma/orm-mongo")).toBe("8.0.0-rc.8");
expect(getDependencyVersion("@prisma/composer")).toBe("0.15.0");
expect(getDependencyVersion("@prisma/composer-prisma-cloud")).toBe("0.15.0");
expect(getDependencyVersion("prisma")).toBe("8.0.0-rc.11");
expect(getDependencyVersion("@prisma/composer")).toBe("0.16.0");
expect(getDependencyVersion("@prisma/composer-prisma-cloud")).toBe("0.16.0");
expect(getDependencyVersion("prisma")).toBe("8.0.0-rc.12");
expect(getDependencyVersion("alchemy")).toBe("2.0.0-beta.74");
expect(getDependencyVersion("effect")).toBe("4.0.0-rc.112");
});
Expand Down
20 changes: 17 additions & 3 deletions tests/e2e/create-prisma.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@ function findAppEndpoint(output: string): string | undefined {
}
}

async function fetchUntilReady(url: string, deadline: number): Promise<Response> {
while (true) {
try {
const response = await fetch(url);
if (response.status === 200 || Date.now() >= deadline) return response;
} catch (error) {
if (Date.now() >= deadline) throw error;
}
await Bun.sleep(1_000);
}
}

async function verifyComposerDev(projectDir: string) {
const process = Bun.spawn({
cmd: ["bun", "run", "dev:composer"],
Expand Down Expand Up @@ -123,7 +135,9 @@ async function verifyComposerDev(projectDir: string) {
const appUrl = findAppEndpoint(output);
if (!appUrl) continue;

const response = await fetch(appUrl);
// The endpoint frame can precede the app process binding its port, so
// retry connection refusals until the deadline.
const response = await fetchUntilReady(appUrl, deadline);
expect(response.status).toBe(200);
const body = (await response.json()) as { users: Array<{ name: string }> };
expect(body.users.map((user) => user.name)).toEqual(["Alice", "Bob", "Carol"]);
Expand Down Expand Up @@ -354,11 +368,11 @@ describe("create-prisma e2e", () => {
expect(
await pathExists(path.join(projectDir, ".claude/skills/prisma-composer/SKILL.md")),
).toBe(true);
expect(packageJson.devDependencies.prisma).toBe("8.0.0-rc.11");
expect(packageJson.devDependencies.prisma).toBe("8.0.0-rc.12");
expect(packageJson.scripts.postinstall).toBe("prisma skills sync || exit 0");
expect(packageJson.scripts.deploy).toContain("bun run composer:deploy");
expect(packageJson.overrides.effect).toBe("4.0.0-rc.112");
expect(moduleSource).toContain("pnPostgres({");
expect(moduleSource).toContain("postgres({");
expect(dbSource).toContain("service.load().database.client");

await runCommand(projectDir, ["bun", "run", "build"]);
Expand Down
4 changes: 2 additions & 2 deletions tests/install.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ describe("generated templates", () => {
);
}
if (provider === "postgres") {
expect(moduleSource).toContain("pnPostgres({");
expect(moduleSource).toContain("postgres({");
expect(moduleSource).toContain('config: "./prisma.config.ts"');
expect(prismaConfig).toContain("connection: process.env.DATABASE_URL!");
expect(seedSource).toContain("conflictOn: { email: user.email }");
Expand All @@ -259,7 +259,7 @@ describe("generated templates", () => {
expect(composerSource).toContain(
'import type { Contract } from "./contract.d.ts";',
);
expect(composerSource).toContain("pnContract<Contract>(contractJson)");
expect(composerSource).toContain("dataContract<Contract>(contractJson)");
}
} else {
expect(moduleSource).toContain('envSecret("MONGODB_URL")');
Expand Down
8 changes: 4 additions & 4 deletions tests/node-version.test.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { describe, expect, test } from "bun:test";

import { getUnsupportedNodeMessage, supportsPrismaNext } from "../src/utils/node-version";
import { getUnsupportedNodeMessage, supportsPrisma } from "../src/utils/node-version";

describe("Prisma 8 Node compatibility", () => {
test("requires Node 22.18 or newer", () => {
expect(supportsPrismaNext("22.17.9")).toBe(false);
expect(supportsPrismaNext("22.18.0")).toBe(true);
expect(supportsPrismaNext("24.0.0")).toBe(true);
expect(supportsPrisma("22.17.9")).toBe(false);
expect(supportsPrisma("22.18.0")).toBe(true);
expect(supportsPrisma("24.0.0")).toBe(true);
});

test("returns an actionable message", () => {
Expand Down
Loading