diff --git a/.changeset/few-walls-ring.md b/.changeset/few-walls-ring.md new file mode 100644 index 00000000000..d91a9a2f2db --- /dev/null +++ b/.changeset/few-walls-ring.md @@ -0,0 +1,5 @@ +--- +'@keystone-next/keystone': major +--- + +Upgraded Primsa dependency to `2.22.0`. diff --git a/packages-next/keystone/package.json b/packages-next/keystone/package.json index 80b88aa9405..d78c68f4a6f 100644 --- a/packages-next/keystone/package.json +++ b/packages-next/keystone/package.json @@ -34,9 +34,9 @@ "@keystone-next/types": "^17.0.1", "@keystone-next/utils-legacy": "^10.0.0", "@preconstruct/next": "^3.0.0", - "@prisma/client": "2.21.2", - "@prisma/migrate": "2.21.2", - "@prisma/sdk": "2.21.2", + "@prisma/client": "2.22.0", + "@prisma/migrate": "2.22.0", + "@prisma/sdk": "2.22.0", "@sindresorhus/slugify": "^1.1.2", "@types/babel__core": "^7.1.14", "@types/cookie": "^0.4.0", @@ -73,7 +73,7 @@ "pirates": "^4.0.1", "pluralize": "^8.0.0", "prettier": "^2.2.1", - "prisma": "2.21.2", + "prisma": "2.22.0", "prompts": "^2.4.1", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/packages-next/keystone/src/lib/migrations.ts b/packages-next/keystone/src/lib/migrations.ts index 070253631dc..9942081a37a 100644 --- a/packages-next/keystone/src/lib/migrations.ts +++ b/packages-next/keystone/src/lib/migrations.ts @@ -287,8 +287,8 @@ function printMigrationId(migrationId: string): string { async function ensureDatabaseExists(dbUrl: string, schemaDir: string) { // createDatabase will return false when the database already exists - const result = await createDatabase(dbUrl, schemaDir); - if (result && result.exitCode === 0) { + const created = await createDatabase(dbUrl, schemaDir); + if (created) { const credentials = uriToCredentials(dbUrl); console.log( `✨ ${credentials.type} database "${credentials.database}" created at ${getDbLocation( diff --git a/packages-next/keystone/src/scripts/tests/prisma.test.ts b/packages-next/keystone/src/scripts/tests/prisma.test.ts index 7539644ec4f..4fae93dd5a1 100644 --- a/packages-next/keystone/src/scripts/tests/prisma.test.ts +++ b/packages-next/keystone/src/scripts/tests/prisma.test.ts @@ -57,7 +57,7 @@ test('keystone-next prisma exits with the same code as the prisma child process $ prisma db pull Push the Prisma schema state to the database - $ prisma db push --preview-feature + $ prisma db push " `); }); diff --git a/yarn.lock b/yarn.lock index 880440e2624..f01b8877092 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1998,30 +1998,30 @@ resolved "https://registry.yarnpkg.com/@primer/octicons-react/-/octicons-react-13.0.0.tgz#a7f2288fd9cf9cabc1e75553a0dd9f00d74b68c1" integrity sha512-j5XppNRCvgaMZLPsVvvmp6GSh7P5pq6PUbsfLNBWi2Kz3KYDeoGDWbPr5MjoxFOGUn6Hjnt6qjHPRxahd11vLQ== -"@prisma/client@2.21.2": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.21.2.tgz#ca8489832da1d61add429390210be4d7896e5e29" - integrity sha512-UjkOXYpxLuHyoMDsP2m0LTcxhrjQa1dEOLFe3aDrO/BLrs/2yUxyPdtwSKxizRXFzuXSGkKIK225vcjZRuMpAg== +"@prisma/client@2.22.0": + version "2.22.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.22.0.tgz#ca028025b648fdca0dda415809ea309cc7c3bcc7" + integrity sha512-0KL433vaxlQWyxJEwwvLr277Z0KdGehwon3SrdmeTKrJV1sYI6ogrCFxPXAb30JWFVwwAIS+QhkdklBpwQMLGQ== dependencies: - "@prisma/engines-version" "2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d" + "@prisma/engines-version" "2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c" -"@prisma/debug@2.21.2": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.21.2.tgz#10ab3e5dd26217920c0a1d1c5c752a1df08ac988" - integrity sha512-oB5JmzR9/I0hYU7GOuzSBF2F0QCDHp1UUi1acIGb5Vu6EQtP6VOwBmgCOyNW6VrwxvnjcEsNtLXnRQ1rl4DKqw== +"@prisma/debug@2.22.0": + version "2.22.0" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.22.0.tgz#262e6ccce1085458adfa2656adc80d5132edc9f9" + integrity sha512-Dq9oCUiS8pwCnt3ZyryWysZNLVKN0zzO9dBfy3TOypN0KQvouh/r780vtqVJDQ7OBJLOVtxpF2IhAdsgpFOzPw== dependencies: debug "4.3.2" ms "^2.1.3" -"@prisma/engine-core@2.21.2": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.21.2.tgz#cf40d7647e5ff945454fbb04655f41657be17ddf" - integrity sha512-t+XYncNZrVzl1HaKF6zYT1pEzBxgcJM7tHbtTuhHG6aGPVObb7oJqAmrOWI98Ac38YuKrenKJa0Ce24Qf00XWQ== +"@prisma/engine-core@2.22.0": + version "2.22.0" + resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.22.0.tgz#c6d038232b8824e88c229d15de13c463fc8a79ef" + integrity sha512-s6cNwPWf3vDqoL8iwSaubKVDWxThzH3K1Li30a5SoYZ6vgXoREzmw6GlfE8/ZtZ8H4HBZGAWVu3fFHlKsL+CIw== dependencies: - "@prisma/debug" "2.21.2" - "@prisma/engines" "2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d" - "@prisma/generator-helper" "2.21.2" - "@prisma/get-platform" "2.21.2" + "@prisma/debug" "2.22.0" + "@prisma/engines" "2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c" + "@prisma/generator-helper" "2.22.0" + "@prisma/get-platform" "2.22.0" chalk "^4.0.0" execa "^5.0.0" get-stream "^6.0.0" @@ -2029,25 +2029,25 @@ new-github-issue-url "^0.2.1" p-retry "^4.2.0" terminal-link "^2.1.1" - undici "3.3.4" + undici "3.3.6" -"@prisma/engines-version@2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d": - version "2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d.tgz#b749bae4173eb766dafc298aaa7d883c2dbe555b" - integrity sha512-9/fE1gdPWmjbMjXUJjrTMt848TsgEnSjZCcJ1wu9OAcRlAKKJBLehftqC3gSEShDijvMYgeTdGU5snMpwmv4vg== +"@prisma/engines-version@2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c": + version "2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c.tgz#e98ee17217a0ebb54f2f9314fbbfd610b05e6e31" + integrity sha512-OkkVwk6iTzTbwwl8JIKAENyxmh4TFORal55QMKQzrHEY8UzbD0M90mQnmziz3PAopQUZgTFFMlaPAq1WNrLMtA== -"@prisma/engines@2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d": - version "2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d.tgz#aafed60c9506bc766e49ea60b9f8ce7da2385bc6" - integrity sha512-L57tvSoom2GDWDqik4wrAUBvLTAv5MTm2OOzNMBKsv0w5cX7ONoZ8KnGQN+csmdJpQVBs93dIvIBm72OO+l/9Q== +"@prisma/engines@2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c": + version "2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c.tgz#4ccd255e0823605db3d8387a5195b6fdabe3b0c0" + integrity sha512-KmWdogrsfsSLYvfqY3cS3QcDGzaEFklE+T6dNJf+k/KPQum4A29IwDalafMwh5cMN8ivZobUbowNSwWJrMT08Q== -"@prisma/fetch-engine@2.21.2": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.21.2.tgz#1dc232872e31b7479ab3e42cfba19ac27bd4d1b0" - integrity sha512-SKg75GdyVfmlAM8ydH/vTnxU29FpwVhvKdOP5fjJvhqv1/YGCStsiYR36x7GggBlNuh7KKtI7KtRpjc0jE+SbQ== +"@prisma/fetch-engine@2.22.0": + version "2.22.0" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.22.0.tgz#720350c9265d3a0e59c32a80044d3871c124f99e" + integrity sha512-V9qHBZZxHXiCI9eZQ/8OwoEu/nMqkY4QGAiDLuPngd6DRxQ6bBOMN19Xe4D078TSgarkboN13D9EgWRS8efH+w== dependencies: - "@prisma/debug" "2.21.2" - "@prisma/get-platform" "2.21.2" + "@prisma/debug" "2.22.0" + "@prisma/get-platform" "2.22.0" chalk "^4.0.0" execa "^5.0.0" find-cache-dir "^3.3.1" @@ -2064,30 +2064,30 @@ temp-dir "^2.0.0" tempy "^1.0.0" -"@prisma/generator-helper@2.21.2": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.21.2.tgz#5620e032bd906cc42d65c15a7de8876d239aa170" - integrity sha512-zo3rqKTWo3GExb2rLgwo0EMHfpeJyj6Lo8b5g1CFWCmtpe3O4gic7mqiTWRz2jk5r6FiSIyOl4+iVRBjDmHFhg== +"@prisma/generator-helper@2.22.0": + version "2.22.0" + resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.22.0.tgz#aa2a7647deaa979f151c7e47c2bd40e84eb1771b" + integrity sha512-lAhzFIPnbDgr9WiKDaXIkusMrctu+ZP8m7KzeXwn83S/HzXscD7TrCSeCXPcTAeXdpbourhwZQJFWsMUqr8Ihg== dependencies: - "@prisma/debug" "2.21.2" + "@prisma/debug" "2.22.0" "@types/cross-spawn" "^6.0.1" chalk "^4.0.0" cross-spawn "^7.0.2" -"@prisma/get-platform@2.21.2": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.21.2.tgz#e480d9676989495b28d734f01a64caa00ea2fa15" - integrity sha512-z9Nme7AaD4f34S1oRPjXaJJPlF4WTEx/yPxBAxvNb4QR6w84zU4zahu5n6Vkc6ErRPihlSiRG2ptDdQie/Cdww== +"@prisma/get-platform@2.22.0": + version "2.22.0" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.22.0.tgz#ce8fdbd5f4bb0fdca77f91cdb3ac7dc5381a3979" + integrity sha512-b59XqH3l5xCQTbTiYJYVFMJvWRUZNyybA5OM/EMAFYJNxj991GRynjZll6uB5sUO+W/tWyxuAq/o/Y/F1Piq1g== dependencies: - "@prisma/debug" "2.21.2" + "@prisma/debug" "2.22.0" -"@prisma/migrate@2.21.2": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@prisma/migrate/-/migrate-2.21.2.tgz#eb57d5c7e3901917b3b608a040a50a653806d9ec" - integrity sha512-UpLYel5lM+ddYtRcZFrLLu0GPolf1fs5jeZ8ilxSmLsn8siXiuBh8P8yzWUBKGCtYsS2EaPMS3igwd+TL+O09g== +"@prisma/migrate@2.22.0": + version "2.22.0" + resolved "https://registry.yarnpkg.com/@prisma/migrate/-/migrate-2.22.0.tgz#6109794461e7cab8fdd20454990e996d95aa60a7" + integrity sha512-eL/OrMBNxuMo/tsTHpw+0Aeyl6S9LRXTAVZ5bviqOIee2ytU8hTXy3Ewv+WsYxDVkHmcj8FpQAA7PKqv2L2PyA== dependencies: - "@prisma/debug" "2.21.2" - "@prisma/get-platform" "2.21.2" + "@prisma/debug" "2.22.0" + "@prisma/get-platform" "2.22.0" "@sindresorhus/slugify" "^1.1.0" diff "4.0.2" execa "^5.0.0" @@ -2103,21 +2103,21 @@ strip-ansi "^6.0.0" strip-indent "^3.0.0" -"@prisma/sdk@2.21.2": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.21.2.tgz#f983998febc529ba7733ac6760c3f7d89538920d" - integrity sha512-m35JPEGYOnldBrIGpKdwxP/xER0S4vpk7L/qiLZGW6kVMcJRaeUGEONzmgaXtAXn6dP2BopsQ0UheCs3aF8uiQ== - dependencies: - "@prisma/debug" "2.21.2" - "@prisma/engine-core" "2.21.2" - "@prisma/engines" "2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d" - "@prisma/fetch-engine" "2.21.2" - "@prisma/generator-helper" "2.21.2" - "@prisma/get-platform" "2.21.2" +"@prisma/sdk@2.22.0": + version "2.22.0" + resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.22.0.tgz#5b97ec60b4a4203c16fa90d5eabb77020376117a" + integrity sha512-Dd7zezL7dJ5PXadz10GHc8p2l6l4XsP/jHalbq1Tp60mnC2MZvLoqtQC8qMhE1YBDFrUezgm9Uwh49Vj1MQuEg== + dependencies: + "@prisma/debug" "2.22.0" + "@prisma/engine-core" "2.22.0" + "@prisma/engines" "2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c" + "@prisma/fetch-engine" "2.22.0" + "@prisma/generator-helper" "2.22.0" + "@prisma/get-platform" "2.22.0" "@timsuchanek/copy" "^1.4.5" archiver "^4.0.0" arg "^5.0.0" - chalk "4.1.0" + chalk "4.1.1" checkpoint-client "1.1.20" cli-truncate "^2.1.0" dotenv "^8.2.0" @@ -2143,7 +2143,6 @@ tempy "^1.0.0" terminal-link "^2.1.1" tmp "0.2.1" - url-parse "^1.4.7" "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" @@ -4518,10 +4517,10 @@ chalk@4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== +chalk@4.1.1, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -4545,14 +4544,6 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - char-regex@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" @@ -10624,12 +10615,12 @@ prism-react-renderer@^1.2.0: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.2.0.tgz#5ad4f90c3e447069426c8a53a0eafde60909cdf4" integrity sha512-GHqzxLYImx1iKN1jJURcuRoA/0ygCcNhfGw1IT8nPIMzarmKQ3Nc+JcG0gi8JXQzuh0C5ShE4npMIoqNin40hg== -prisma@2.21.2: - version "2.21.2" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-2.21.2.tgz#a73b4cbe92a884aa98b317684d6741871b5e94a5" - integrity sha512-Ux9ovDIUHsMNLGLtuo6BBKCuuBVLpZmhM2LXF+VBUQvsbmsVfp3u5CRyHGEqaZqMibYQJISy7YZYF/RgozHKkQ== +prisma@2.22.0: + version "2.22.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-2.22.0.tgz#69063fa95cdcaaf660b61017d79c6a6dda054517" + integrity sha512-rJgjZCl0mxrdCjR6N5Z5Ivm6fy+iPznOQDA4TSiKvzs7tzo4smsBbFZmliylmEeRkuq2f93+/I/jmw64rrFpHQ== dependencies: - "@prisma/engines" "2.21.0-36.e421996c87d5f3c8f7eeadd502d4ad402c89464d" + "@prisma/engines" "2.22.0-21.60cc71d884972ab4e897f0277c4b84383dddaf6c" process-nextick-args@~2.0.0: version "2.0.1" @@ -10781,11 +10772,6 @@ querystring@^0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -11467,11 +11453,6 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= - resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -13070,10 +13051,10 @@ unbox-primitive@^1.0.0: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" -undici@3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/undici/-/undici-3.3.4.tgz#a52dab910cf4f46ce1a39377dd9049bb08656d2a" - integrity sha512-9BAepS9jBqD9lLKO2UJ8vPZlIHNmVibkMt23c+qBQhpXpG11F6SH12ttYeKGfEiFaHyZ1wZlOIHED7TTZOCTGQ== +undici@3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/undici/-/undici-3.3.6.tgz#06d3b97b7eeff46bce6f8a71079c09f64dd59dc1" + integrity sha512-/j3YTZ5AobMB4ZrTY72mzM54uFUX32v0R/JRW9G2vOyF1uSKYAx+WT8dMsAcRS13TOFISv094TxIyWYk+WEPsA== unherit@^1.0.4: version "1.1.3" @@ -13369,14 +13350,6 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.7: - version "1.5.1" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b" - integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"