From 0020742420a0271e5578dc38c94051bd1facfe4c Mon Sep 17 00:00:00 2001 From: Jason Kuhrt Date: Fri, 10 Sep 2021 10:09:37 -0400 Subject: [PATCH] feat: support prisma up to 3 (#147) --- .github/workflows/pr.yml | 2 +- package.json | 8 +-- yarn.lock | 114 +++++++++++++++++++-------------------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ddaa57ff3..846c8690c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -59,7 +59,7 @@ jobs: matrix: os: ['ubuntu-latest'] node-version: [16.x] - prisma-client-version: ['2.29'] + prisma-client-version: ['2.29', '2.30'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/package.json b/package.json index 144f88f42..f50e64626 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@homer0/prettier-plugin-jsdoc": "^4.0.5", "@prisma-labs/prettier-config": "0.1.0", "@prisma/client": "2.30.0", - "@prisma/sdk": "2.30.0", + "@prisma/sdk": "^3.0.2", "@types/debug": "^4.1.7", "@types/expand-tilde": "^2.0.0", "@types/jest": "26.0.24", @@ -94,7 +94,7 @@ "nexus": "^1.1.0", "nodemon": "^2.0.12", "prettier": "2.3.2", - "prisma": "2.30.0", + "prisma": "3.0.2", "strip-ansi": "^6", "ts-jest": "27.0.4", "ts-node": "^10.1.0", @@ -104,7 +104,7 @@ }, "prettier": "@prisma-labs/prettier-config", "peerDependencies": { - "@prisma/client": "2.29.x || 2.30.x", + "@prisma/client": "2.29.x || 2.30.x || 3.x", "nexus": "^1.0.0", "ts-node": "^10.0.0" }, @@ -117,7 +117,7 @@ "comment-parser": "1.1.5" }, "dependencies": { - "@prisma/generator-helper": "^2.29.x", + "@prisma/generator-helper": "^3.0.2", "debug": "^4.3.2", "decimal.js": "^10.3.1", "dindist": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index 293074101..41252a2ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -795,33 +795,33 @@ dependencies: "@prisma/engines-version" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" -"@prisma/debug@2.29.1": - version "2.29.1" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.29.1.tgz#f5a6b480ea063844c6b1b40974402be8bda05fad" - integrity sha512-8OAh4ozVCvlcZU1HaP7QTWIA6Aqzs98nYgTYrxjDLqXJcytIvpIjHxfgqKhuPQ8MTkUm9cI5TJGswwcjJt0/0g== +"@prisma/debug@2.30.3": + version "2.30.3" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.30.3.tgz#2c10a4aa4c99728d0f13d64036eca9521352b0d4" + integrity sha512-hMsCl6ZA718vgKuTRd1+qeetzGSVkZEIEUTfeT5rPtklgqDytQ01nRNN74gLeoSI64tyGg/pvSX1wgAioMuyiQ== dependencies: "@types/debug" "4.1.7" debug "4.3.2" ms "2.1.3" -"@prisma/debug@2.30.0": - version "2.30.0" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.30.0.tgz#f9e25106a650b7e6c53b26a7f67195c24b2bc82d" - integrity sha512-PCEBFJxOmtLhPcl7VdLeVabSHJnlqWMCR4J1y6H+WvqtCt8oMwhgWu4z2Wgh2baphHC3T87+iQVU5BtZX+b5mA== +"@prisma/debug@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-3.0.2.tgz#a99ae8dfa075f4e58a25666d609deb900820c5be" + integrity sha512-D2/LghEqphW6h9ycT8nfdEw2rzT0LXmikBy2101aYcY28vS01rHTVIUOiz/DDaltlqY1qBat3F5vgM+6GwIqbw== dependencies: "@types/debug" "4.1.7" debug "4.3.2" ms "2.1.3" -"@prisma/engine-core@2.30.0": - version "2.30.0" - resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.30.0.tgz#26264a634ddfd9320dc1a46c0a9accdfe8a3bb76" - integrity sha512-wy9B1dJLGv5u/E6LbjobEjEfhCVf9++2L3OLAAk9hfg4cCqwY4629woJ1m3w5FWLy29HSnZKgpvQ/8lz1dUbMA== +"@prisma/engine-core@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-3.0.2.tgz#f5d574a4b7d359700d0725cb866a5f7be1e12701" + integrity sha512-ThS4ggYJ7J73NcsR3bkrM71vudW1tmcq0o6KLjSFcVirAHB8zEztVzfVgF38GTPOops0lF5XF8fUv4Y+jVvoXg== dependencies: - "@prisma/debug" "2.30.0" - "@prisma/engines" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - "@prisma/generator-helper" "2.30.0" - "@prisma/get-platform" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" + "@prisma/debug" "3.0.2" + "@prisma/engines" "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + "@prisma/generator-helper" "3.0.2" + "@prisma/get-platform" "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" chalk "4.1.2" execa "5.1.1" get-stream "6.0.1" @@ -836,18 +836,18 @@ resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb.tgz#1360113dc19e1d43d4442e3b638ccfa0e1711943" integrity sha512-oThNpx7HtJ0eEmnvrWARYcNCs6dqFdAK3Smt2bJVDD6Go4HLuuhjx028osP+rHaFrGOTx7OslLZYtvvFlAXRDA== -"@prisma/engines@2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb": - version "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb.tgz#b4d91ff876662b1de83e0cc913149a1c088becc7" - integrity sha512-LPKq88lIbYezvX0OOc1PU42hHdTsSMPJWmK8lusaHK7DaLHyXjDp/551LbsVapypbjW6N3Jx/If6GoMDASSMSw== +"@prisma/engines@2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db": + version "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz#b6cf70bc05dd2a62168a16f3ea58a1b011074621" + integrity sha512-Q9CwN6e5E5Abso7J3A1fHbcF4NXGRINyMnf7WQ07fXaebxTTARY5BNUzy2Mo5uH82eRVO5v7ImNuR044KTjLJg== -"@prisma/fetch-engine@2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb": - version "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb.tgz#434c8fb3b7c631bc1f55abb87e16c03c60895ce3" - integrity sha512-62/gM4Gm+e1BQlgj4OFmdQKa22nWg5FZ6hNsoRHopcm45RRhnSHqYiD+9djo/98i1/+MYfwxCwPqhhJm28lJuw== +"@prisma/fetch-engine@2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db": + version "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz#d5f5b18d273cb933eab134c46ca3bd65a006482c" + integrity sha512-MVlloe2gnnG8YpB9utDos0qnnHw05ud24OOu6jtXFcYIBJR4rd+7pmRTY5TgD76RnbWH4rNzD5NL1xAiXMTZKA== dependencies: - "@prisma/debug" "2.29.1" - "@prisma/get-platform" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" + "@prisma/debug" "2.30.3" + "@prisma/get-platform" "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" chalk "^4.0.0" execa "^5.0.0" find-cache-dir "^3.3.1" @@ -864,34 +864,34 @@ temp-dir "^2.0.0" tempy "^1.0.0" -"@prisma/generator-helper@2.30.0", "@prisma/generator-helper@^2.29.x": - version "2.30.0" - resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.30.0.tgz#152f7381d7c4eb6022c7173f905d98a79f830728" - integrity sha512-7XKJM83LLrpDSqiDrINaBqtePUJomgxfiofIx0TM5pBIg2vmWwpe5Q+VDQxr88ypqVW83NW6BfPgTm7Qni4+mQ== +"@prisma/generator-helper@3.0.2", "@prisma/generator-helper@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-3.0.2.tgz#6aa49ec8d7b31491b21ac99d3020308f93346f22" + integrity sha512-ACWo7j2zapEq8bMNNgfS2QRa9Kkl/rSqNX8iiKo01D1/79jy/MjI+k+S8ByOQBzTeIdiRmu3CF7dO6lV0UQ3eg== dependencies: - "@prisma/debug" "2.30.0" + "@prisma/debug" "3.0.2" "@types/cross-spawn" "6.0.2" chalk "4.1.2" cross-spawn "7.0.3" -"@prisma/get-platform@2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb": - version "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb.tgz#6b2aa861c1c6383c39178d0e272d5bc53dc7bc30" - integrity sha512-gqB9defmpCvxvQM9HFNpo1s0G652eE556ckO+k9X1Kfbt1vaX6FuxtQD5IPcu0nDm42u3NTkX9lDR1Y0j5VPng== +"@prisma/get-platform@2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db": + version "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz#5a5e9efbdd5607d2fe31e8e7fdad4803d48f17ba" + integrity sha512-c3RYEv/l+n/i7wU/Ua2P3ZXWiKKKAmoZ832VHDe8eX5I8IlhTG+/8pwnGW/b3O/XDXMcYnSGMZqKszToqSYp5g== dependencies: - "@prisma/debug" "2.29.1" + "@prisma/debug" "2.30.3" -"@prisma/sdk@2.30.0": - version "2.30.0" - resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.30.0.tgz#0c7d5bc4872d87b31831ce8ddd7ac5ab73c80471" - integrity sha512-bIYLphnGnfoguFfKiHon/RZhMTAk8gpElUos1+O7RHzDdzqPEusyl8T9lX123zxhmeVocyV0V2y/AxaD5USaxg== - dependencies: - "@prisma/debug" "2.30.0" - "@prisma/engine-core" "2.30.0" - "@prisma/engines" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - "@prisma/fetch-engine" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - "@prisma/generator-helper" "2.30.0" - "@prisma/get-platform" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" +"@prisma/sdk@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-3.0.2.tgz#55d1958e6c5d045affdcad3da552a77d5de14e73" + integrity sha512-TP/thlJy9lYb9LOUUXevJYk4owtoNjmHkgAhiI6+IEZ+0fQ30/cLUgk8rsHfQumdTH5GnUsNdOuF3P/JyyBHSg== + dependencies: + "@prisma/debug" "3.0.2" + "@prisma/engine-core" "3.0.2" + "@prisma/engines" "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + "@prisma/fetch-engine" "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + "@prisma/generator-helper" "3.0.2" + "@prisma/get-platform" "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" "@timsuchanek/copy" "1.4.5" archiver "4.0.2" arg "5.0.1" @@ -915,7 +915,7 @@ string-width "4.2.2" strip-ansi "6.0.0" strip-indent "3.0.0" - tar "6.1.8" + tar "6.1.11" temp-dir "2.0.0" temp-write "4.0.0" tempy "1.0.1" @@ -4804,12 +4804,12 @@ printj@~1.1.0: resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== -prisma@2.30.0: - version "2.30.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-2.30.0.tgz#5b12091c480d538540b898d364b73651d44b4a01" - integrity sha512-2XYpSibcVpMd1JDxYypGDU/JKq0W2f/HI1itdddr4Pfg+q6qxt/ItWKcftv4/lqN6u/BVlQ2gDzXVEjpHeO5kQ== +prisma@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-3.0.2.tgz#e86cb6abf4a815c7ac97b9d0ed383f01c253ce34" + integrity sha512-TyOCbtWGDVdWvsM1RhUzJXoGClXGalHhyYWIc5eizSF8T1ScGiOa34asBUdTnXOUBFSErbsqMNw40DHAteBm1A== dependencies: - "@prisma/engines" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" + "@prisma/engines" "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" process-nextick-args@~2.0.0: version "2.0.1" @@ -5473,10 +5473,10 @@ tar-stream@^2.1.2: inherits "^2.0.3" readable-stream "^3.1.1" -tar@6.1.8: - version "6.1.8" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.8.tgz#4fc50cfe56511c538ce15b71e05eebe66530cbd4" - integrity sha512-sb9b0cp855NbkMJcskdSYA7b11Q8JsX4qe4pyUAfHp+Y6jBjJeek2ZVlwEfWayshEIwlIzXx0Fain3QG9JPm2A== +tar@6.1.11: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0"