Skip to content

Commit b6d4e12

Browse files
jacek-prismajacek-prisma
authored
fix: update bundle file assertions (#5953)
Updates assertions to allow client files in the bundles Fixes [platforms-serverless (lambda-node-20, library, ubuntu-22.04)](https://github.com/prisma/ecosystem-tests/actions/runs/13991192039/job/39175561736#logs) and a lot of others
1 parent 841c194 commit b6d4e12

File tree

12 files changed

+36
-20
lines changed

12 files changed

+36
-20
lines changed

‎platforms-serverless-vercel/vercel-node-builder/test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ set -eux
44
DEPLOYED_URL=$( tail -n 1 deployment-url.txt )
55

66
if [ "$PRISMA_CLIENT_ENGINE_TYPE" == "binary" ]; then
7-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-rhel-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]'
7+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-rhel-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]'
88
else
9-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
9+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
1010
fi
1111

1212
pnpm ts-node ../../utils/fetch-retry-and-confirm-version.ts --url $DEPLOYED_URL --prisma-version $(sh ../../utils/prisma_version.sh) --binary-string ${files}

‎platforms-serverless-vercel/vercel-with-redwood/index.test.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ test('should test .prisma/client files', async () => {
4747
const files =
4848
process.env.PRISMA_CLIENT_ENGINE_TYPE === 'binary'
4949
? [
50+
'client.d.ts',
51+
'client.js',
5052
'default.d.ts',
5153
'default.js',
5254
'deno',
@@ -62,6 +64,8 @@ test('should test .prisma/client files', async () => {
6264
'wasm.js',
6365
]
6466
: [
67+
'client.d.ts',
68+
'client.js',
6569
'default.d.ts',
6670
'default.js',
6771
'deno',

‎platforms-serverless/azure-functions-linux/test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ app="$(cat func-tmp.txt)"
66
url="https://$app.azurewebsites.net/api/$app"
77
prisma_version="$(cat ../../.github/prisma-version.txt)"
88
if [ "$PRISMA_CLIENT_ENGINE_TYPE" == "binary" ]; then
9-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-debian-openssl-1.1.x","schema.prisma","wasm.d.ts","wasm.js"]'
9+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-debian-openssl-1.1.x","schema.prisma","wasm.d.ts","wasm.js"]'
1010
else
11-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-debian-openssl-1.1.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
11+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-debian-openssl-1.1.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
1212
fi
1313
expected='{"version":"'$prisma_version'","createUser":{"id":"12345","email":"alice@prisma.io","name":"Alice"},"updateUser":{"id":"12345","email":"bob@prisma.io","name":"Bob"},"users":{"id":"12345","email":"bob@prisma.io","name":"Bob"},"deleteManyUsers":{"count":1}'${files}'}'
1414
actual=$(curl "$url")

‎platforms-serverless/firebase-functions/test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ url="https://us-central1-prisma-e2e-tests-265911.cloudfunctions.net/$func"
77
prisma_version="$(cat ../../.github/prisma-version.txt)"
88

99
if [ "$PRISMA_CLIENT_ENGINE_TYPE" == "binary" ]; then
10-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-debian-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]'
10+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-debian-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]'
1111
else
12-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-debian-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
12+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-debian-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
1313
fi
1414

1515
expected='{"version":"'$prisma_version'","createUser":{"id":"12345","email":"alice@prisma.io","name":"Alice"},"updateUser":{"id":"12345","email":"bob@prisma.io","name":"Bob"},"users":{"id":"12345","email":"bob@prisma.io","name":"Bob"},"deleteManyUsers":{"count":1}'${files}'}'

‎platforms-serverless/gcp-functions/test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ url="https://us-central1-prisma-e2e-tests-265911.cloudfunctions.net/$func"
77
prisma_version="$(cat ../../.github/prisma-version.txt)"
88

99
if [ "$PRISMA_CLIENT_ENGINE_TYPE" == "binary" ]; then
10-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-debian-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]'
10+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-debian-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]'
1111
else
12-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-debian-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
12+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-debian-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
1313
fi
1414

1515
expected='{"version":"'$prisma_version'","createUser":{"id":"12345","email":"alice@prisma.io","name":"Alice"},"updateUser":{"id":"12345","email":"bob@prisma.io","name":"Bob"},"users":{"id":"12345","email":"bob@prisma.io","name":"Bob"},"deleteManyUsers":{"count":1}'${files}'}'

‎platforms-serverless/lambda-node-20/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ async function main() {
1919
const actual = JSON.stringify(original)
2020
console.log('actual', actual)
2121
// TODO Update to only expect on engine file after zip script was updated
22-
let files = `,"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-debian-openssl-1.1.x.so.node","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]`
22+
let files = `,"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-debian-openssl-1.1.x.so.node","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]`
2323
if (process.env.PRISMA_CLIENT_ENGINE_TYPE === 'binary') {
24-
files = `,"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-debian-openssl-1.1.x","query-engine-rhel-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]`
24+
files = `,"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-debian-openssl-1.1.x","query-engine-rhel-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]`
2525
}
2626

2727
const expect =

‎platforms-serverless/netlify-cli/test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
set -eux
44

55
if [ "$PRISMA_CLIENT_ENGINE_TYPE" == "binary" ]; then
6-
BINARY_STRING=',"files":["default.d.ts","default.js","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-rhel-openssl-3.0.x","runtime","schema.prisma","wasm.d.ts","wasm.js"]'
6+
BINARY_STRING=',"files":["client.d.ts","client.js","default.d.ts","default.js","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-rhel-openssl-3.0.x","runtime","schema.prisma","wasm.d.ts","wasm.js"]'
77
else
8-
BINARY_STRING=',"files":["default.d.ts","default.js","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","runtime","schema.prisma","wasm.d.ts","wasm.js"]'
8+
BINARY_STRING=',"files":["client.d.ts","client.js","default.d.ts","default.js","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","runtime","schema.prisma","wasm.d.ts","wasm.js"]'
99
fi
1010

1111
# TODO Use individual deployment URL

‎platforms-serverless/netlify-github/test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ set -eux
55
ID=$( tail -n 1 id.txt )
66

77
if [ "$PRISMA_CLIENT_ENGINE_TYPE" == "binary" ]; then
8-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-rhel-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]'
8+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-rhel-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]'
99
else
10-
files=',"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
10+
files=',"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]'
1111
fi
1212

1313
pnpm ts-node ../../utils/fetch-retry-and-confirm-version.ts --url https://$ID--prisma-ecosystem-tests-netlify-github.netlify.app/.netlify/functions/index --prisma-version $(sh ../../utils/prisma_version.sh) --binary-string $files

‎platforms-serverless/serverless-framework-lambda/test.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ async function main() {
1010
console.log({ data: data.$response.data })
1111

1212
const actual = (data.$response.data as any).Payload
13-
const binaryString = process.env.PRISMA_CLIENT_ENGINE_TYPE === 'binary'
14-
? `,"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-rhel-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]`
15-
: `,"files":["default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]`
13+
const binaryString =
14+
process.env.PRISMA_CLIENT_ENGINE_TYPE === 'binary'
15+
? `,"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","package.json","query-engine-rhel-openssl-3.0.x","schema.prisma","wasm.d.ts","wasm.js"]`
16+
: `,"files":["client.d.ts","client.js","default.d.ts","default.js","deno","edge.d.ts","edge.js","index-browser.js","index.d.ts","index.js","libquery_engine-rhel-openssl-3.0.x.so.node","package.json","schema.prisma","wasm.d.ts","wasm.js"]`
1617
const expect = `{"version":"${Prisma.prismaVersion.client}","createUser":{"id":"12345","email":"alice@prisma.io","name":"Alice"},"updateUser":{"id":"12345","email":"bob@prisma.io","name":"Bob"},"users":{"id":"12345","email":"bob@prisma.io","name":"Bob"},"deleteManyUsers":{"count":1}${binaryString}}`
1718

1819
if (actual !== expect) {

‎platforms/aws-graviton/code/index.test.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ describe('Prisma', () => {
2929
if (process.env.PRISMA_CLIENT_ENGINE_TYPE !== 'binary') {
3030
expect(files).toMatchInlineSnapshot(`
3131
[
32+
"client.d.ts",
33+
"client.js",
3234
"default.d.ts",
3335
"default.js",
3436
"deno",
@@ -47,6 +49,8 @@ describe('Prisma', () => {
4749
} else {
4850
expect(files).toMatchInlineSnapshot(`
4951
[
52+
"client.d.ts",
53+
"client.js",
5054
"default.d.ts",
5155
"default.js",
5256
"deno",

0 commit comments

Comments
 (0)