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 packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"dependencies": {
"@manypkg/tools": "^2.1.2",
"@prisma/cli-engine": "workspace:0.6.1",
"@prisma/composer-cli": "0.21.0",
"@prisma/composer-cli": "0.22.0",
"@prisma/compute-sdk": "0.42.0",
"@prisma/management-api-sdk": "1.69.0",
"@prisma/orm-toolchain": "8.0.0-rc.11",
Expand All @@ -62,7 +62,7 @@
"open": "^11.0.0"
},
"devDependencies": {
"@prisma/composer": "0.21.0",
"@prisma/composer": "0.22.0",
"@prisma/credentials-store": "^7.8.0",
"@repo/cli-conformance": "workspace:8.0.0-rc.16",
"@repo/cli-telemetry": "workspace:8.0.0-rc.16",
Expand Down
12 changes: 7 additions & 5 deletions packages/cli/tests/bin.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { tmpdir } from "node:os";
import { dirname, join, resolve } from "node:path";
import { dirname, join } from "node:path";
import { fileURLToPath } from "node:url";
import type { Runtime, StreamEvent } from "@prisma/cli-engine";
import type { Diagnostic } from "@prisma/cli-engine/protocol";
Expand Down Expand Up @@ -544,11 +544,13 @@ describe("buildCli", () => {

expect(exitCode).toBe(2);
expect(error.code).toBe("CONFIG.FILE_MISSING");
// resolve, not join: composer resolves the section's relative
// path against this cwd, and on Windows that puts a drive on it —
// written to stay right for the day this runs there again.
// Composer resolves the section's relative path against the
// prisma.config.ts that declared it, not against the cwd.
expect(error.where?.path).toBe(
join(resolve("/tmp/bin-test-cwd"), "named-by-the-section.config.ts"),
join(
dirname(COMPOSER_SECTION_CONFIG_PATH),
"named-by-the-section.config.ts",
),
);
expect(error.why).toContain("there is no walk to fall back on");
},
Expand Down
2 changes: 1 addition & 1 deletion packages/prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"dependencies": {
"@manypkg/tools": "^2.1.2",
"@prisma/cli-engine": "workspace:0.6.1",
"@prisma/composer-cli": "0.21.0",
"@prisma/composer-cli": "0.22.0",
"@prisma/compute-sdk": "0.42.0",
"@prisma/management-api-sdk": "1.69.0",
"@prisma/orm-toolchain": "8.0.0-rc.11",
Expand Down
Loading
Loading