diff --git a/package.json b/package.json index 0aed636f2d7c..05ed9b8fea15 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,12 @@ "bench": "ts-node scripts/bench.ts | tee output.txt", "prepare": "is-ci || husky install" }, + "pnpm": { + "overrides": { + "@prisma/sdk": "2.30.2", + "@prisma/client": "2.30.2" + } + }, "devDependencies": { "@sindresorhus/slugify": "1.1.2", "@slack/webhook": "6.0.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index f1573e41e304..b64910798448 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -68,7 +68,7 @@ "@prisma/get-platform": "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20", "@prisma/migrate": "workspace:*", "@prisma/sdk": "workspace:*", - "@prisma/studio-server": "0.422.0", + "@prisma/studio-server": "0.423.0", "@timsuchanek/copy": "1.4.5", "@types/jest": "27.0.1", "@types/rimraf": "3.0.1", @@ -132,4 +132,4 @@ "prettier --write" ] } -} +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 46f24654a54b..7f732e34d996 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: 5.3 +overrides: + '@prisma/sdk': 2.30.2 + '@prisma/client': 2.30.2 + importers: .: @@ -80,15 +84,15 @@ importers: packages/cli: specifiers: - '@prisma/client': workspace:* + '@prisma/client': 2.30.2 '@prisma/debug': workspace:* '@prisma/engines': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/fetch-engine': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/generator-helper': workspace:* '@prisma/get-platform': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/migrate': workspace:* - '@prisma/sdk': workspace:* - '@prisma/studio-server': 0.422.0 + '@prisma/sdk': 2.30.2 + '@prisma/studio-server': 0.423.0 '@timsuchanek/copy': 1.4.5 '@types/jest': 27.0.1 '@types/rimraf': 3.0.1 @@ -132,14 +136,14 @@ importers: dependencies: '@prisma/engines': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 devDependencies: - '@prisma/client': link:../client + '@prisma/client': 2.30.2 '@prisma/debug': link:../debug '@prisma/fetch-engine': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/generator-helper': link:../generator-helper '@prisma/get-platform': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/migrate': link:../migrate - '@prisma/sdk': link:../sdk - '@prisma/studio-server': 0.422.0 + '@prisma/sdk': 2.30.2 + '@prisma/studio-server': 0.423.0_@prisma+client@2.30.2 '@timsuchanek/copy': 1.4.5 '@types/jest': 27.0.1 '@types/rimraf': 3.0.1 @@ -191,7 +195,7 @@ importers: '@prisma/generator-helper': workspace:* '@prisma/get-platform': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/migrate': workspace:* - '@prisma/sdk': workspace:* + '@prisma/sdk': 2.30.2 '@timsuchanek/copy': 1.4.5 '@types/debug': 4.1.7 '@types/jest': 27.0.1 @@ -253,7 +257,7 @@ importers: '@prisma/generator-helper': link:../generator-helper '@prisma/get-platform': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/migrate': link:../migrate - '@prisma/sdk': link:../sdk + '@prisma/sdk': 2.30.2 '@timsuchanek/copy': 1.4.5 '@types/debug': 4.1.7 '@types/jest': 27.0.1 @@ -465,10 +469,10 @@ importers: packages/integration-tests: specifiers: - '@prisma/client': workspace:* + '@prisma/client': 2.30.2 '@prisma/get-platform': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/migrate': workspace:* - '@prisma/sdk': workspace:* + '@prisma/sdk': 2.30.2 '@sindresorhus/slugify': 1.1.2 '@types/jest': 27.0.1 '@types/mssql': 6.0.8 @@ -506,10 +510,10 @@ importers: typescript: 4.3.5 verror: 1.10.0 devDependencies: - '@prisma/client': link:../client + '@prisma/client': 2.30.2 '@prisma/get-platform': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/migrate': link:../migrate - '@prisma/sdk': link:../sdk + '@prisma/sdk': 2.30.2 '@sindresorhus/slugify': 1.1.2 '@types/jest': 27.0.1 '@types/mssql': 6.0.8 @@ -553,7 +557,7 @@ importers: '@prisma/engines-version': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/generator-helper': workspace:* '@prisma/get-platform': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 - '@prisma/sdk': workspace:* + '@prisma/sdk': 2.30.2 '@sindresorhus/slugify': 1.1.2 '@types/jest': 27.0.1 '@types/node': 12.20.19 @@ -615,7 +619,7 @@ importers: devDependencies: '@prisma/engines-version': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@prisma/generator-helper': link:../generator-helper - '@prisma/sdk': link:../sdk + '@prisma/sdk': 2.30.2 '@types/jest': 27.0.1 '@types/node': 12.20.19 '@types/pg': 8.6.1 @@ -648,7 +652,7 @@ importers: packages/react-prisma: specifiers: - '@prisma/client': workspace:* + '@prisma/client': 2.30.2 '@types/jest': 27.0.1 '@types/node': 14.17.9 '@typescript-eslint/eslint-plugin': 4.29.2 @@ -668,7 +672,7 @@ importers: ts-jest: 27.0.5 typescript: 4.3.5 devDependencies: - '@prisma/client': link:../client + '@prisma/client': 2.30.2 '@types/jest': 27.0.1 '@types/node': 14.17.9 '@typescript-eslint/eslint-plugin': 4.29.2_b01b7137116ac50f0745961d9cf72d34 @@ -1639,6 +1643,19 @@ packages: engines: {node: '>=8.0.0'} dev: true + /@prisma/client/2.30.2: + resolution: {integrity: sha512-cfS/1UWBRE4sq0z7spGLYqOE0oN2YJJvKtm+63o7h/BI6ji10VWla79aXBTXj3AImtfykNtC6OHtFVawEl/49w==} + engines: {node: '>=12.2'} + requiresBuild: true + peerDependencies: + prisma: '*' + peerDependenciesMeta: + prisma: + optional: true + dependencies: + '@prisma/engines-version': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 + dev: true + /@prisma/debug/2.30.0: resolution: {integrity: sha512-PCEBFJxOmtLhPcl7VdLeVabSHJnlqWMCR4J1y6H+WvqtCt8oMwhgWu4z2Wgh2baphHC3T87+iQVU5BtZX+b5mA==} dependencies: @@ -1648,8 +1665,8 @@ packages: transitivePeerDependencies: - supports-color - /@prisma/debug/2.31.0-dev.19: - resolution: {integrity: sha512-95EpzGqyEhD9Hpmp+bg3Fv7MBG3K6iUAv2nuJvBDOIKgI6H816u9S1qv+DZxz6noXrHXhBMMH/UkbqY6JPxUkQ==} + /@prisma/debug/2.30.2: + resolution: {integrity: sha512-QFUTRPfFhZ6oryH5KsEaBeBMpFsx16zBWwlBBPkGhfiLRL8eo9vxm4+EVKzKob5PAmrfJCJ7DQvb/k6rdSXdxg==} dependencies: '@types/debug': 4.1.7 debug: 4.3.2 @@ -1658,13 +1675,13 @@ packages: - supports-color dev: true - /@prisma/engine-core/2.31.0-dev.19: - resolution: {integrity: sha512-YZGEj1RnlxeLmLvLvSEcZu1kUwc4kzdwjDk7ujAP4vBNeTBIzyEmvHpsbKu66gR1vT2nO/pR8U9T5fpyX1FE9Q==} + /@prisma/engine-core/2.30.2: + resolution: {integrity: sha512-oDMVIvv5hz/kepNypr6X8yIcOxK0XgJhA8X7grO5hSznPZA+yj64xuYnIPLD0xN9+6u777k8tv4/fMCBSjsjag==} dependencies: - '@prisma/debug': 2.31.0-dev.19 - '@prisma/engines': 2.31.0-11.c6aa2685dff09984e6656f5d99a90b9e90eabbce - '@prisma/generator-helper': 2.31.0-dev.19 - '@prisma/get-platform': 2.31.0-11.c6aa2685dff09984e6656f5d99a90b9e90eabbce + '@prisma/debug': 2.30.2 + '@prisma/engines': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 + '@prisma/generator-helper': 2.30.2 + '@prisma/get-platform': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 chalk: 4.1.2 execa: 5.1.1 get-stream: 6.0.1 @@ -1684,11 +1701,6 @@ packages: resolution: {integrity: sha512-WPnA/IUrxDihrRhdP6+8KAVSwsc0zsh8ioPYsLJjOhzVhwpRbuFH2tJDRIAbc+qFh+BbTIZbeyBYt8fpNXaYQQ==} requiresBuild: true - /@prisma/engines/2.31.0-11.c6aa2685dff09984e6656f5d99a90b9e90eabbce: - resolution: {integrity: sha512-zQXMLIJEApmbHZNhx+lwpfyadHJDO4tOEomprSaW2ORpV4yQTev62mvoygJIMEY4WhhxTzVvuS+OWBDl72hl5Q==} - requiresBuild: true - dev: true - /@prisma/fetch-engine/2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20: resolution: {integrity: sha512-kGbNAtmke1DP9Lj9kFFJp39t7IaQu7mKCGdjQT3+DzgXRLtHmv92zNguGuSVj+E+GBfBvzLOs4yBtUIU8KIgQw==} dependencies: @@ -1712,34 +1724,10 @@ packages: transitivePeerDependencies: - supports-color - /@prisma/fetch-engine/2.31.0-11.c6aa2685dff09984e6656f5d99a90b9e90eabbce: - resolution: {integrity: sha512-yJfmcc7uRgkaxmCoVn5rcluMgmTIzUCNK32VLY971TGGVyxuLKAg3+9lYOWbf2j1EJXVFm57LDhiMob5jyCeaQ==} + /@prisma/generator-helper/2.30.2: + resolution: {integrity: sha512-9iCBIlG+XwagakXV9MU+TTbTB+72iCFcoQwqx4kuhvnZnrPiFppuM6XXDW2EteBIY2G4oCkasMFOC68NQPbfbg==} dependencies: - '@prisma/debug': 2.30.0 - '@prisma/get-platform': 2.31.0-11.c6aa2685dff09984e6656f5d99a90b9e90eabbce - chalk: 4.1.2 - execa: 5.1.1 - find-cache-dir: 3.3.1 - hasha: 5.2.2 - http-proxy-agent: 4.0.1 - https-proxy-agent: 5.0.0 - make-dir: 3.1.0 - node-fetch: 2.6.1 - p-filter: 2.1.0 - p-map: 4.0.0 - p-retry: 4.6.1 - progress: 2.0.3 - rimraf: 3.0.2 - temp-dir: 2.0.0 - tempy: 1.0.1 - transitivePeerDependencies: - - supports-color - dev: true - - /@prisma/generator-helper/2.31.0-dev.19: - resolution: {integrity: sha512-Lf31D3VUH1laJcJ2z4eDDUZWy/A3BhUiIpY0kWbdBBgf8KeSIMJw9toY1+RjEDKD1kVBdq8L4pb4X/wYUM8Lyw==} - dependencies: - '@prisma/debug': 2.31.0-dev.19 + '@prisma/debug': 2.30.2 '@types/cross-spawn': 6.0.2 chalk: 4.1.2 cross-spawn: 7.0.3 @@ -1754,23 +1742,15 @@ packages: transitivePeerDependencies: - supports-color - /@prisma/get-platform/2.31.0-11.c6aa2685dff09984e6656f5d99a90b9e90eabbce: - resolution: {integrity: sha512-d626h9aamBMp7kCd8zRLu1OhjHZ6lQQy6cdVxNPoxsiqY7o96nye3NHgNv4U64ISXtNez6V0QLec7ponm1Sb/g==} + /@prisma/sdk/2.30.2: + resolution: {integrity: sha512-FVVAh5bYCyRK9CLpGQ6XOY3wGp0wgjtNj6zaQ96En9kIrSW9CLMW/nQTG7f4OnXAwX1z7fE7LlvLsipnJKssXA==} dependencies: - '@prisma/debug': 2.30.0 - transitivePeerDependencies: - - supports-color - dev: true - - /@prisma/sdk/2.31.0-dev.19: - resolution: {integrity: sha512-6K3qiasHnTgoeHfPt8oP7k0u8FbEa9PNyl4L8usXJBHOU5fIz0eTiv/TWXpXrBxDuONMXvNx4djPq9QDPXW25w==} - dependencies: - '@prisma/debug': 2.31.0-dev.19 - '@prisma/engine-core': 2.31.0-dev.19 - '@prisma/engines': 2.31.0-11.c6aa2685dff09984e6656f5d99a90b9e90eabbce - '@prisma/fetch-engine': 2.31.0-11.c6aa2685dff09984e6656f5d99a90b9e90eabbce - '@prisma/generator-helper': 2.31.0-dev.19 - '@prisma/get-platform': 2.31.0-11.c6aa2685dff09984e6656f5d99a90b9e90eabbce + '@prisma/debug': 2.30.2 + '@prisma/engine-core': 2.30.2 + '@prisma/engines': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 + '@prisma/fetch-engine': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 + '@prisma/generator-helper': 2.30.2 + '@prisma/get-platform': 2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20 '@timsuchanek/copy': 1.4.5 archiver: 4.0.2 arg: 5.0.1 @@ -1794,7 +1774,7 @@ packages: string-width: 4.2.2 strip-ansi: 6.0.0 strip-indent: 3.0.0 - tar: 6.1.10 + tar: 6.1.8 temp-dir: 2.0.0 temp-write: 4.0.0 tempy: 1.0.1 @@ -1804,25 +1784,26 @@ packages: - supports-color dev: true - /@prisma/studio-pcw/0.422.0_@prisma+sdk@2.31.0-dev.19: - resolution: {integrity: sha512-82VESX2oeh6DwggY6B9Cblaz2xeaJfj0a+LRvUJve8NDShkarhLHMFh9auO8AWa3cCN1gWxEF/DUfnLNL35BrA==} + /@prisma/studio-pcw/0.423.0_e71e9f4190c270e7c2163e3230782422: + resolution: {integrity: sha512-emrBVhCNsfPqI4gkQqKgfvXEyGGTYBUhZiEAM6UXfwLsWxUryKfXVvW2BDTI+wMQvw7/z2o8ZF4ZtEHp1AUr/w==} peerDependencies: '@prisma/client': '*' '@prisma/sdk': '*' dependencies: - '@prisma/sdk': 2.31.0-dev.19 + '@prisma/client': 2.30.2 + '@prisma/sdk': 2.30.2 debug: 4.3.1 lodash: 4.17.21 transitivePeerDependencies: - supports-color dev: true - /@prisma/studio-server/0.422.0: - resolution: {integrity: sha512-VLDIsIDzklsFJB4AUyluZq9QiKQkz/nI9Hrj7Pp7Mb1rm3S0x8fsf4W3jYqibqqqz8rgg+5ztc4EjkCgpCa4sA==} + /@prisma/studio-server/0.423.0_@prisma+client@2.30.2: + resolution: {integrity: sha512-xDoteg7q+dA18r2GTcZicqc8gtS2jzTL3ljDwUGHXq39sMw4Ma+W42yR4B3RVMzkoeuS6GLuqegCTTgjjeMMZg==} dependencies: - '@prisma/sdk': 2.31.0-dev.19 - '@prisma/studio-pcw': 0.422.0_@prisma+sdk@2.31.0-dev.19 - '@prisma/studio-transports': 0.422.0 + '@prisma/sdk': 2.30.2 + '@prisma/studio-pcw': 0.423.0_e71e9f4190c270e7c2163e3230782422 + '@prisma/studio-transports': 0.423.0 '@sentry/node': 6.2.5 checkpoint-client: 1.1.20 cors: 2.8.5 @@ -1830,11 +1811,12 @@ packages: express: 4.17.1 untildify: 4.0.0 transitivePeerDependencies: + - '@prisma/client' - supports-color dev: true - /@prisma/studio-transports/0.422.0: - resolution: {integrity: sha512-w+I/iobFxjVoxy2dcb0/SPslgU/leyKyFWSR2oB+SYduYOC14GEsic2+SpfnJUWIpRTFtqDMyio5ExYpc/Q2DQ==} + /@prisma/studio-transports/0.423.0: + resolution: {integrity: sha512-uEJm9Zjar/ykfC8JMXpEdwsZ5yFi+okEqpkUpJcXGr9Tv/nj/3KgM+tg7ZY2ARCDu0R6hrhz/3SxcMafpHswdQ==} dev: true /@sentry/core/6.2.5: @@ -6978,18 +6960,6 @@ packages: yallist: 3.1.1 dev: true - /tar/6.1.10: - resolution: {integrity: sha512-kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA==} - engines: {node: '>= 10'} - dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 - minipass: 3.1.3 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 - dev: true - /tar/6.1.8: resolution: {integrity: sha512-sb9b0cp855NbkMJcskdSYA7b11Q8JsX4qe4pyUAfHp+Y6jBjJeek2ZVlwEfWayshEIwlIzXx0Fain3QG9JPm2A==} engines: {node: '>= 10'} @@ -7000,7 +6970,6 @@ packages: minizlib: 2.1.2 mkdirp: 1.0.4 yallist: 4.0.0 - dev: false /tarn/3.0.1: resolution: {integrity: sha512-6usSlV9KyHsspvwu2duKH+FMUhqJnAh6J5J/4MITl8s94iSUQTLkJggdiewKv4RyARQccnigV48Z+khiuVZDJw==}