Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/prisma/prisma into feat/l…
Browse files Browse the repository at this point in the history
…ong-running-transactions
  • Loading branch information
millsp committed Jul 21, 2021
2 parents 28d9cf3 + ed84fc8 commit 1d7d5da
Show file tree
Hide file tree
Showing 18 changed files with 17,838 additions and 542 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/update-engines-version.yml
Expand Up @@ -41,13 +41,13 @@ jobs:
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.BOT_TOKEN }}
commit-message: "fix(deps): update engines to ${{ github.event.inputs.version }}"
commit-message: "chore(deps): update engines to ${{ github.event.inputs.version }}"
committer: "Prismo <prismabots@gmail.com>"
author: "Prismo <prismabots@gmail.com>"
branch: deps/engines-${{ github.event.inputs.version }}
delete-branch: true
labels: automerge
title: "fix(deps): update engines to ${{ github.event.inputs.version }}"
title: "chore(deps): update engines to ${{ github.event.inputs.version }}"
body: |
This automatic PR updates the engines to version `${{ github.event.inputs.version }}`. This will get automatically merged if all the tests pass.
## Packages:
Expand Down
8 changes: 4 additions & 4 deletions package.json
Expand Up @@ -10,9 +10,9 @@
},
"devDependencies": {
"@types/benchmark": "2.1.1",
"@types/node": "14.17.4",
"@typescript-eslint/eslint-plugin": "4.28.2",
"@typescript-eslint/parser": "4.28.2",
"@types/node": "14.17.5",
"@typescript-eslint/eslint-plugin": "4.28.3",
"@typescript-eslint/parser": "4.28.3",
"arg": "5.0.0",
"benchmark": "2.1.4",
"chalk": "4.1.1",
Expand All @@ -28,7 +28,7 @@
"p-map": "4.0.0",
"prettier": "2.3.2",
"staged-git-files": "1.2.0",
"ts-node": "10.0.0",
"ts-node": "10.1.0",
"typescript": "4.3.5"
}
}
92 changes: 46 additions & 46 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/package.json
Expand Up @@ -11,9 +11,9 @@
"@sindresorhus/slugify": "1.1.2",
"@slack/webhook": "6.0.0",
"@types/debug": "4.1.6",
"@types/graphviz": "0.0.32",
"@types/node": "12.20.15",
"@types/redis": "2.8.30",
"@types/graphviz": "0.0.33",
"@types/node": "12.20.16",
"@types/redis": "2.8.31",
"arg": "5.0.0",
"batching-toposort": "1.2.0",
"chalk": "4.1.1",
Expand All @@ -24,11 +24,11 @@
"node-fetch": "2.6.1",
"p-map": "4.0.0",
"p-reduce": "2.1.0",
"p-retry": "4.6.0",
"p-retry": "4.6.1",
"redis": "3.1.2",
"redis-lock": "0.1.4",
"semver": "7.3.5",
"ts-node": "10.0.0",
"ts-node": "10.1.0",
"typescript": "4.3.5"
},
"scripts": {
Expand Down
16 changes: 8 additions & 8 deletions src/packages/cli/package.json
Expand Up @@ -63,17 +63,17 @@
"devDependencies": {
"@prisma/client": "workspace:*",
"@prisma/debug": "workspace:*",
"@prisma/fetch-engine": "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb",
"@prisma/fetch-engine": "2.28.0-8.215319b1f112e9e5b5a1f2d2b0553982d2669776",
"@prisma/generator-helper": "workspace:*",
"@prisma/get-platform": "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb",
"@prisma/get-platform": "2.28.0-8.215319b1f112e9e5b5a1f2d2b0553982d2669776",
"@prisma/migrate": "workspace:*",
"@prisma/sdk": "workspace:*",
"@prisma/studio-server": "0.410.0",
"@prisma/studio-server": "0.416.0",
"@timsuchanek/copy": "1.4.5",
"@types/jest": "26.0.24",
"@types/ws": "7.4.6",
"@typescript-eslint/eslint-plugin": "4.28.2",
"@typescript-eslint/parser": "4.28.2",
"@types/ws": "7.4.7",
"@typescript-eslint/eslint-plugin": "4.28.3",
"@typescript-eslint/parser": "4.28.3",
"chalk": "4.1.1",
"checkpoint-client": "1.1.20",
"dotenv": "10.0.0",
Expand All @@ -93,7 +93,7 @@
"is-installed-globally": "0.4.0",
"jest": "27.0.6",
"line-replace": "2.0.1",
"lint-staged": "11.0.0",
"lint-staged": "11.0.1",
"log-update": "4.0.0",
"make-dir": "3.1.0",
"node-fetch": "2.6.1",
Expand Down Expand Up @@ -125,7 +125,7 @@
"precommit": "lint-staged"
},
"dependencies": {
"@prisma/engines": "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb"
"@prisma/engines": "2.28.0-8.215319b1f112e9e5b5a1f2d2b0553982d2669776"
},
"lint-staged": {
"*.ts": [
Expand Down

0 comments on commit 1d7d5da

Please sign in to comment.