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/tasks/deploy-with-composer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ async function getProjectDetails(options: {
const result = await runPrismaJsonCommand<ProjectShowResult>({
packageManager: options.packageManager,
projectDir: options.projectDir,
args: ["project", "show", "--project", options.appName],
args: ["project", "show", options.appName],
});
if (!result.project) return;
return {
Expand Down Expand Up @@ -388,7 +388,7 @@ export async function deployWithComposer(options: {
await runPrismaJsonCommand<ComposerDeployCommandResult>({
packageManager: options.packageManager,
projectDir: options.projectDir,
args: ["composer", "deploy", "module.ts"],
args: ["deploy", "module.ts"],
forwardStderr: options.verbose,
}),
);
Expand Down
7 changes: 2 additions & 5 deletions src/tasks/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function getPrismaScriptMap(packageManager: PackageManager): Record<string, stri
"db:update": prismaCommand("db", "update"),
"db:verify": prismaCommand("db", "verify"),
"migration:plan": prismaCommand("migration", "plan"),
migrate: prismaCommand("migrate"),
migrate: prismaCommand("db", "migrate"),
"migration:status": prismaCommand("migration", "status"),
"migration:show": prismaCommand("migration", "show"),
};
Expand All @@ -58,19 +58,16 @@ export function getComposerScriptMap(packageManager: PackageManager): Record<str
return {};
}

const composerCommand = (subcommand: string, extraArgs: string[] = []) =>
const composerCommand = (subcommand: "dev" | "deploy") =>
getPackageExecutionCommand(packageManager, [
PRISMA_PLATFORM_CLI_PACKAGE,
"composer",
subcommand,
"module.ts",
...extraArgs,
]);

return {
"composer:dev": composerCommand("dev"),
"composer:deploy": composerCommand("deploy"),
"composer:destroy": composerCommand("destroy", ["--production"]),
deploy: `${getRunScriptCommand(packageManager, "build")} && ${getRunScriptCommand(
packageManager,
"composer:deploy",
Expand Down
13 changes: 9 additions & 4 deletions tests/install.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ describe("writePrismaDependencies", () => {
});
expect(packageJson.scripts).toMatchObject({
"contract:emit": `pnpm dlx ${PRISMA_PLATFORM_CLI_PACKAGE} contract emit`,
migrate: `pnpm dlx ${PRISMA_PLATFORM_CLI_PACKAGE} db migrate`,
});
expect(packageJson.scripts?.["db:seed"]).toBeUndefined();
});
Expand Down Expand Up @@ -104,17 +105,21 @@ describe("writePrismaDependencies", () => {
describe("Composer package-manager commands", () => {
test("uses each selected package manager for Prisma CLI execution", () => {
expect(getComposerScriptMap("npm")["composer:deploy"]).toBe(
`npx --yes ${PRISMA_PLATFORM_CLI_PACKAGE} composer deploy module.ts`,
`npx --yes ${PRISMA_PLATFORM_CLI_PACKAGE} deploy module.ts`,
);
expect(getComposerScriptMap("pnpm")["composer:deploy"]).toBe(
`pnpm dlx ${PRISMA_PLATFORM_CLI_PACKAGE} composer deploy module.ts`,
`pnpm dlx ${PRISMA_PLATFORM_CLI_PACKAGE} deploy module.ts`,
);
expect(getComposerScriptMap("yarn")["composer:deploy"]).toBe(
`yarn dlx ${PRISMA_PLATFORM_CLI_PACKAGE} composer deploy module.ts`,
`yarn dlx ${PRISMA_PLATFORM_CLI_PACKAGE} deploy module.ts`,
);
expect(getComposerScriptMap("bun")["composer:deploy"]).toBe(
`bunx ${PRISMA_PLATFORM_CLI_PACKAGE} composer deploy module.ts`,
`bunx ${PRISMA_PLATFORM_CLI_PACKAGE} deploy module.ts`,
);
expect(getComposerScriptMap("bun")["composer:dev"]).toBe(
`bunx ${PRISMA_PLATFORM_CLI_PACKAGE} dev module.ts`,
);
expect(getComposerScriptMap("bun")["composer:destroy"]).toBeUndefined();
expect(getComposerScriptMap("deno")).toEqual({});
});

Expand Down
Loading