Skip to content

Commit

Permalink
Merge branch 'main' into integration/static-wasm-worker-loader
Browse files Browse the repository at this point in the history
  • Loading branch information
jkomyno committed May 8, 2024
2 parents 7de3100 + 665eae1 commit 52f5105
Show file tree
Hide file tree
Showing 154 changed files with 6,520 additions and 3,536 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ inputs:
runs:
using: composite
steps:
- uses: pnpm/action-setup@v3.0.0
- uses: pnpm/action-setup@v4.0.0
with:
version: ${{ inputs.pnpm-version }}

Expand Down
14 changes: 14 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,20 @@
"matchPackageNames": ["vitess/vttestserver"],
"schedule": ["before 7am on Wednesday"]
},
{
"groupName": "Extension: Accelerate",
"automerge": true,
"matchPackageNames": ["@prisma/extension-accelerate"],
"matchUpdateTypes": ["patch", "minor", "major"],
"schedule": ["at any time"]
},
{
"groupName": "Extension: Read Replicas",
"automerge": true,
"matchPackageNames": ["@prisma/extension-read-replicas"],
"matchUpdateTypes": ["patch", "minor", "major"],
"schedule": ["at any time"]
},
{
"groupName": "Studio",
"automerge": true,
Expand Down
70 changes: 58 additions & 12 deletions .github/workflows/test-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ jobs:
working-directory: packages/client

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down Expand Up @@ -226,6 +227,8 @@ jobs:
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/client/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -291,6 +294,8 @@ jobs:
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/client/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -555,6 +560,8 @@ jobs:
working-directory: packages/client

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/client/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -631,6 +638,8 @@ jobs:
working-directory: packages/integration-tests

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/integration-tests/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -684,6 +693,8 @@ jobs:
working-directory: packages/internals

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/internals/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -737,6 +748,8 @@ jobs:
working-directory: packages/migrate

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/migrate/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -790,6 +803,8 @@ jobs:
working-directory: packages/cli

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/cli/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -831,6 +846,8 @@ jobs:
working-directory: packages/cli

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/cli/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -866,6 +883,8 @@ jobs:
working-directory: packages/debug

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/debug/src/__tests__/coverage/clover.xml
Expand All @@ -877,6 +896,8 @@ jobs:
working-directory: packages/generator-helper

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/generator-helper/src/__tests__/coverage/clover.xml
Expand All @@ -888,6 +909,8 @@ jobs:
working-directory: packages/get-platform

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/get-platform/src/__tests__/coverage/clover.xml
Expand All @@ -899,6 +922,8 @@ jobs:
working-directory: packages/fetch-engine

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/fetch-engine/src/__tests__/coverage/clover.xml
Expand All @@ -910,6 +935,8 @@ jobs:
working-directory: packages/engines

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/engines/src/__tests__/coverage/clover.xml
Expand All @@ -929,6 +956,8 @@ jobs:
working-directory: packages/adapter-pg

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/adapter-planetscale/src/__tests__/coverage/clover.xml
Expand All @@ -940,6 +969,8 @@ jobs:
working-directory: packages/instrumentation

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/instrumentation/src/__tests__/coverage/clover.xml
Expand All @@ -951,6 +982,8 @@ jobs:
working-directory: packages/schema-files-loader

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/schema-files-loader/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -1023,6 +1056,8 @@ jobs:
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true

- uses: codecov/codecov-action@v4
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/client/src/__tests__/coverage/clover.xml
Expand Down Expand Up @@ -1094,7 +1129,8 @@ jobs:
JEST_JUNIT_SUITE_NAME: 'internals'
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
- uses: codecov/codecov-action@v4
if: (contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-internals-')) && github.repository == 'prisma/prisma'
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && (contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-internals-')) && github.repository == 'prisma/prisma'
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/internals/src/__tests__/coverage/clover.xml
Expand All @@ -1113,7 +1149,8 @@ jobs:
JEST_JUNIT_SUITE_NAME: 'client/old'
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
- uses: codecov/codecov-action@v4
if: contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-client-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && (contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-client-'))
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/client/src/__tests__/coverage/clover.xml
Expand All @@ -1128,7 +1165,7 @@ jobs:
JEST_JUNIT_SUITE_NAME: 'migrate'
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
- uses: codecov/codecov-action@v4
if: contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-migrate-')
if: success() && (contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-migrate-'))
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/migrate/src/__tests__/coverage/clover.xml
Expand All @@ -1143,7 +1180,8 @@ jobs:
JEST_JUNIT_SUITE_NAME: 'cli'
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
- uses: codecov/codecov-action@v4
if: contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-cli-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && (contains(inputs.jobsToRun, '-all-') || contains(inputs.jobsToRun, '-cli-'))
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/cli/src/__tests__/coverage/clover.xml
Expand All @@ -1158,7 +1196,8 @@ jobs:
JEST_JUNIT_SUITE_NAME: 'debug'
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
- uses: codecov/codecov-action@v4
if: contains(inputs.jobsToRun, '-all-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && contains(inputs.jobsToRun, '-all-')
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/debug/src/__tests__/coverage/clover.xml
Expand All @@ -1173,37 +1212,42 @@ jobs:
JEST_JUNIT_SUITE_NAME: 'generator-helper'
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
- uses: codecov/codecov-action@v4
if: contains(inputs.jobsToRun, '-all-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && contains(inputs.jobsToRun, '-all-')
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/generator-helper/src/__tests__/coverage/clover.xml
flags: generator-helper,${{ matrix.os }},library,binary
name: generator-helper-${{ matrix.os }}

- name: Test packages/get-platform
if: contains(inputs.jobsToRun, '-all-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && contains(inputs.jobsToRun, '-all-')
run: pnpm run test
working-directory: packages/get-platform
env:
JEST_JUNIT_SUITE_NAME: 'get-platform'
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
- uses: codecov/codecov-action@v4
if: contains(inputs.jobsToRun, '-all-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && contains(inputs.jobsToRun, '-all-')
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/get-platform/src/__tests__/coverage/clover.xml
flags: get-platform,${{ matrix.os }},library,binary
name: get-platform-${{ matrix.os }}

- name: Test packages/fetch-engine
if: contains(inputs.jobsToRun, '-all-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && contains(inputs.jobsToRun, '-all-')
run: pnpm run test
working-directory: packages/fetch-engine
env:
JEST_JUNIT_SUITE_NAME: 'fetch-engine'
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
- uses: codecov/codecov-action@v4
if: contains(inputs.jobsToRun, '-all-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && contains(inputs.jobsToRun, '-all-')
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/fetch-engine/src/__tests__/coverage/clover.xml
Expand All @@ -1218,7 +1262,8 @@ jobs:
JEST_JUNIT_SUITE_NAME: 'engines'
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true
- uses: codecov/codecov-action@v4
if: contains(inputs.jobsToRun, '-all-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && contains(inputs.jobsToRun, '-all-')
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/engines/src/__tests__/coverage/clover.xml
Expand All @@ -1234,7 +1279,8 @@ jobs:
JEST_JUNIT_UNIQUE_OUTPUT_NAME: true

- uses: codecov/codecov-action@v4
if: contains(inputs.jobsToRun, '-all-')
continue-on-error: true # Can fail randomly and we don't want to fail the whole workflow
if: success() && contains(inputs.jobsToRun, '-all-')
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/engines/src/__tests__/coverage/clover.xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-engines-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3.0.0
- uses: pnpm/action-setup@v4.0.0
with:
version: 8.15.5

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-studio-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3.0.0
- uses: pnpm/action-setup@v4.0.0
with:
version: 8.15.5

Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ services:
# Planetscale
# From https://github.com/prisma/prisma-engines/blob/976a00ae3c30ab9507fa742986c9c6f5327ba10f/docker-compose.yml
vitess-8:
image: vitess/vttestserver:mysql80@sha256:46f0ad212919674da36a3691c65af7f06675e6aa87b19bd73312e4b168c40257
image: vitess/vttestserver:mysql80@sha256:ed369e382dbaff4041ee30ae716d157d893cf4c6ccac4da017dff5fb22737212
restart: unless-stopped
ports:
- 33807:33807
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"bundle-size": "pnpm i && pnpm -r dev && pnpm -r --parallel exec pnpm pack && cd packages/bundle-size && pnpm run create-gzip-files"
},
"devDependencies": {
"@microsoft/api-extractor": "7.43.1",
"@microsoft/api-extractor": "7.43.2",
"@prisma/engines": "workspace:*",
"@sindresorhus/slugify": "1.1.2",
"@size-limit/file": "9.0.0",
Expand All @@ -50,14 +50,14 @@
"buffer": "6.0.3",
"chokidar": "3.6.0",
"decimal.js-light": "2.5.1",
"dotenv-cli": "7.4.1",
"esbuild": "0.20.2",
"dotenv-cli": "7.4.2",
"esbuild": "0.21.1",
"esbuild-register": "3.5.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-eslint-comments": "3.2.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jest": "28.2.0",
"eslint-plugin-jest": "28.5.0",
"eslint-plugin-local-rules": "2.0.1",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-simple-import-sort": "12.1.0",
Expand All @@ -80,14 +80,14 @@
"regenerator-runtime": "0.14.1",
"resolve": "1.22.8",
"safe-buffer": "5.2.1",
"semver": "7.6.0",
"semver": "7.6.1",
"size-limit": "9.0.0",
"spdx-exceptions": "2.5.0",
"spdx-license-ids": "3.0.17",
"staged-git-files": "1.3.0",
"ts-node": "10.9.2",
"ts-toolbelt": "9.6.0",
"tsx": "4.7.2",
"tsx": "4.9.3",
"typescript": "5.4.5",
"zx": "7.2.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-d1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"sideEffects": false,
"dependencies": {
"@prisma/driver-adapter-utils": "workspace:*",
"@cloudflare/workers-types": "4.20240423.0"
"@cloudflare/workers-types": "4.20240502.0"
},
"devDependencies": {},
"peerDependencies": {}
Expand Down

0 comments on commit 52f5105

Please sign in to comment.