diff --git a/.changeset/twelve-squids-peel.md b/.changeset/twelve-squids-peel.md new file mode 100644 index 00000000000..a005a3d24fc --- /dev/null +++ b/.changeset/twelve-squids-peel.md @@ -0,0 +1,6 @@ +--- +"@keystone-next/keystone": patch +"@keystone-next/api-tests-legacy": patch +--- + +Updated Prisma dependencies to `2.27.0`. diff --git a/packages/keystone/package.json b/packages/keystone/package.json index b3df47dae4e..bbf205c7929 100644 --- a/packages/keystone/package.json +++ b/packages/keystone/package.json @@ -47,9 +47,9 @@ "@keystone-ui/toast": "^4.0.1", "@keystone-ui/tooltip": "^4.0.0", "@preconstruct/next": "^3.0.0", - "@prisma/client": "2.26.0", - "@prisma/migrate": "2.26.0", - "@prisma/sdk": "2.26.0", + "@prisma/client": "2.27.0", + "@prisma/migrate": "2.27.0", + "@prisma/sdk": "2.27.0", "@sindresorhus/slugify": "^1.1.2", "@types/apollo-upload-client": "14.1.0", "@types/babel__core": "^7.1.15", @@ -95,7 +95,7 @@ "pirates": "^4.0.1", "pluralize": "^8.0.0", "prettier": "^2.3.2", - "prisma": "2.26.0", + "prisma": "2.27.0", "prompts": "^2.4.1", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/packages/keystone/src/scripts/tests/migrations.test.ts b/packages/keystone/src/scripts/tests/migrations.test.ts index ac30a1d4aa7..e78e19a5ae8 100644 --- a/packages/keystone/src/scripts/tests/migrations.test.ts +++ b/packages/keystone/src/scripts/tests/migrations.test.ts @@ -497,6 +497,10 @@ describe('useMigrations: true', () => { ✨ Generating GraphQL and Prisma schemas - Drift detected: Your database schema is not in sync with your migration history. + The following is a summary of the differences between the expected database schema given your migrations files, and the actual schema of the database. + + It should be understood as the set of changes to get from the expected schema to the actual schema. + [+] Added tables - Todo @@ -543,6 +547,10 @@ describe('useMigrations: true', () => { ✨ Generating GraphQL and Prisma schemas - Drift detected: Your database schema is not in sync with your migration history. + The following is a summary of the differences between the expected database schema given your migrations files, and the actual schema of the database. + + It should be understood as the set of changes to get from the expected schema to the actual schema. + [+] Added tables - Todo diff --git a/tests/api-tests/fields/unique.test.ts b/tests/api-tests/fields/unique.test.ts index f0f404bac95..823e6ff36be 100644 --- a/tests/api-tests/fields/unique.test.ts +++ b/tests/api-tests/fields/unique.test.ts @@ -73,7 +73,9 @@ testModules expectInternalServerError(body.errors, [ { path: ['createTest'], - message: `\nInvalid \`prisma.test.create()\` invocation:\n\n\n Unique constraint failed on the fields: (\`testField\`)`, + message: expect.stringMatching( + /\nInvalid `list\.listKey\).create\(\)` invocation in\n(.*\n)\n(.*\n){4} Unique constraint failed on the fields: \(`testField`\)/ + ), }, ]); }) @@ -100,7 +102,9 @@ testModules expectInternalServerError(body.errors, [ { path: ['bar'], - message: `\nInvalid \`prisma.test.create()\` invocation:\n\n\n Unique constraint failed on the fields: (\`testField\`)`, + message: expect.stringMatching( + /\nInvalid `list\.listKey\).create\(\)` invocation in\n(.*\n)\n(.*\n){4} Unique constraint failed on the fields: \(`testField`\)/ + ), }, ]); }) diff --git a/yarn.lock b/yarn.lock index dc1fe05af17..1d83094dcdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2069,12 +2069,12 @@ resolved "https://registry.yarnpkg.com/@preconstruct/next/-/next-3.0.0.tgz#71781cbaecd011f43e456a149817094a43e4755f" integrity sha512-G90cyJX9w4Zr3Bt/j2fURgDhsJb5+agqf4YUgrvDe3Dyvbbssy9a6d0tzLH0ehfa2Osxw/EEhQb+W4X+v/x06A== -"@prisma/client@2.26.0": - version "2.26.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.26.0.tgz#a23a83bc5c931243ee20b78d9ded423e158aa4c1" - integrity sha512-iwhjdUV/MEQZ7RzTEcZ/D+ewxx/pGExWJ2LypfHioJIvEMyK0saPiR0tjMvMT2I2SVzrIM5dXGhBHWi2JksWrQ== +"@prisma/client@2.27.0": + version "2.27.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.27.0.tgz#17d98e64deea29063bee1778d85b5f7edeb14a26" + integrity sha512-Sh2b1M8MGbOHbwG1FEqdWTUCrEX3p7gt2e7gpaBWou8yTIJvP1UZ4YlHgpuUcR1q4pEIR/JTZJeQk2l4iDyRBQ== dependencies: - "@prisma/engines-version" "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" + "@prisma/engines-version" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" "@prisma/debug@2.26.0": version "2.26.0" @@ -2084,15 +2084,23 @@ debug "4.3.2" ms "^2.1.3" -"@prisma/engine-core@2.26.0": - version "2.26.0" - resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.26.0.tgz#53b1707b4ff753e5dd3686d4eb80b38b5e9bc699" - integrity sha512-YDW0UTFSznK8LaVXbUY40uIOAaGVGvRvE1eTLZVWJ1Ap5kLyQlBZVRaZ2m+fYy0DP1CobOg2s80PUJIbUj+kdg== +"@prisma/debug@2.27.0": + version "2.27.0" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.27.0.tgz#ae4c565813011c6e6d29fbe948672f39bc4899d3" + integrity sha512-Et01S4RoLnQP9u547dCp74aSnLWTu0akfBCzF4zQZsbEdw7wXLttrcvbcYKr+KhpfF5Xu291UP/Kaxg0aj8o4w== dependencies: - "@prisma/debug" "2.26.0" - "@prisma/engines" "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" - "@prisma/generator-helper" "2.26.0" - "@prisma/get-platform" "2.26.0" + debug "4.3.2" + ms "^2.1.3" + +"@prisma/engine-core@2.27.0": + version "2.27.0" + resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.27.0.tgz#3bc0bbca4324f973340f869f8594caa2a3c3b6b3" + integrity sha512-Sx1bqYoalJcBGIKLR9w2wo9IThftsenlYkgM1iEZ4jSdQoue0U8JbToeFcpF+zn+FEvidtH2pC9GG397XT18yA== + dependencies: + "@prisma/debug" "2.27.0" + "@prisma/engines" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" + "@prisma/generator-helper" "2.27.0" + "@prisma/get-platform" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" chalk "^4.0.0" execa "^5.0.0" get-stream "^6.0.0" @@ -2102,23 +2110,23 @@ terminal-link "^2.1.1" undici "3.3.6" -"@prisma/engines-version@2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d": - version "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d.tgz#aa707f4496ab92ef1eaf17758274f63b86d2ff9f" - integrity sha512-8tygPkPxag3myF5fgNQ60zwnNSZzFf4J+DXGKykXaBLLt9W2FLkaE5sVL8/OqAGhLAnVsKj83CqPms35bKrTKw== +"@prisma/engines-version@2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb": + version "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb.tgz#60a34634fe26be9caca42556605a132e70810e3c" + integrity sha512-pwOsYdzw8+cwKlUrCzasiRh96RhNuJ/QcKr0HwjxxlUWTmbEayDKjqRRz5fsUYIpSv5fW1B3SsbzHOqVtFZ6XQ== -"@prisma/engines@2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d": - version "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d.tgz#cfdacfad3acc0f3bf1d7710aa8f3852fd85ac6d9" - integrity sha512-a0jIhLvw9rFh6nZTr5Y3uzP28I2xNDu3pqxANvwMNnmIoYr1wYEcO1pMXn/36BGXldDdAWMmAbhfloHA3IB8DA== +"@prisma/engines@2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb": + version "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb.tgz#22084a81e90b66665aa3aacde79ef5b1bc3587fe" + integrity sha512-AIbIhAxmd2CHZO5XzQTPrfk+Tp/5eoNoSledOG3yc6Dk97siLvnBuSEv7prggUbedCufDwZLAvwxV4PEw3zOlQ== -"@prisma/fetch-engine@2.26.0": - version "2.26.0" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.26.0.tgz#45b253b63260850aa5eddb24c57f9f2922c01b6e" - integrity sha512-bKEfPCbeW1ldDwZFbf03txLcdTwcB7LUb0s0iqin+V4uPzuWdrEYAVHgzWBd6NaxndKp3IT9BBU+UKxsYvwZmw== +"@prisma/fetch-engine@2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb": + version "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb.tgz#a9b2b9813852a2d8b7a86b25cb4e2edad0f5a8ab" + integrity sha512-KdZZ5hUnMrCuImhvoHNnhnTlDY76mnKdEnM4QtaTF9HptwbPWaX/NZ5hwGC6WZf3PjWYr4BiQoC0v8Q7RF88Kg== dependencies: "@prisma/debug" "2.26.0" - "@prisma/get-platform" "2.26.0" + "@prisma/get-platform" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" chalk "^4.0.0" execa "^5.0.0" find-cache-dir "^3.3.1" @@ -2135,30 +2143,30 @@ temp-dir "^2.0.0" tempy "^1.0.0" -"@prisma/generator-helper@2.26.0": - version "2.26.0" - resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.26.0.tgz#c7ef7be8d560ceffa2acded2ca599d930ac3baac" - integrity sha512-w8OwQntKje/mvK/yQV4mo/Ce65/xFcEPN8wybOu/2U/kfN9Hmpm2yVjMP+tqPwngwWCG0yxxsyNTfAOS6zoYMw== +"@prisma/generator-helper@2.27.0": + version "2.27.0" + resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.27.0.tgz#405ace2f7371ef309e1699786941e89b66ea4b94" + integrity sha512-ol5AkNxd4MNOl8Cqb81/uJ7ASOVLgMilzU0qz6q7M2k5ModW5rT1ZU6RWAh8qzt/Ba+N9suGHkw8GoRWFiRDiw== dependencies: - "@prisma/debug" "2.26.0" + "@prisma/debug" "2.27.0" "@types/cross-spawn" "^6.0.1" chalk "^4.0.0" cross-spawn "^7.0.2" -"@prisma/get-platform@2.26.0": - version "2.26.0" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.26.0.tgz#7d292f6e99a019d11220deae4332be50ca2dde48" - integrity sha512-TeJ2lMyZqT+6JvsFQUL91W7f7eBQUsJjSqne7svYxRyc4r8sBpmmXRYb9pGjWe8FhZQsTc56r3Hd/HqnImGRsg== +"@prisma/get-platform@2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb": + version "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb.tgz#1247d6758ddfd7703872c02048ce776495629105" + integrity sha512-N+akWuGHmgCaTfnD4YUum57wd4+GfOvKiTYYIMY2CIEJbxvFw/GF9v8rozl3WRZPgL+Hx3D0ZPB8E4NgvaLy0g== dependencies: "@prisma/debug" "2.26.0" -"@prisma/migrate@2.26.0": - version "2.26.0" - resolved "https://registry.yarnpkg.com/@prisma/migrate/-/migrate-2.26.0.tgz#f0e6b93b8255c0b2397e8246b205395beaa9fee8" - integrity sha512-dxa5572MnfPE5hhyvRmjj0hgtdQQXUcv4w6aLULNQK1/im585BWUDiB1warDTXpQekqwNTispaW0mse9g/DIhQ== +"@prisma/migrate@2.27.0": + version "2.27.0" + resolved "https://registry.yarnpkg.com/@prisma/migrate/-/migrate-2.27.0.tgz#4de26dc74918b2c3607cbab8a5aa6672452cc321" + integrity sha512-c9mdCKSkPFPPKn4+aA5hvHARD6D5klSmft+S489o8dT6qKfglCUQZQU+eD/Jh8uj8cHEhjZqL4VrsClJG/xe3A== dependencies: - "@prisma/debug" "2.26.0" - "@prisma/get-platform" "2.26.0" + "@prisma/debug" "2.27.0" + "@prisma/get-platform" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" "@sindresorhus/slugify" "^1.1.0" execa "^5.0.0" global-dirs "^3.0.0" @@ -2173,17 +2181,17 @@ strip-ansi "^6.0.0" strip-indent "^3.0.0" -"@prisma/sdk@2.26.0": - version "2.26.0" - resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.26.0.tgz#cac48c3555d778d9ff70e284a73541852b561773" - integrity sha512-D4XmyIxwlnNGR0+okNozj1/CYfQ4iDPat8/h+jK1SHW6oItRVVXm+yzN84ZlLxXFn+UMxQP9QnCo7iIn80u5jw== - dependencies: - "@prisma/debug" "2.26.0" - "@prisma/engine-core" "2.26.0" - "@prisma/engines" "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" - "@prisma/fetch-engine" "2.26.0" - "@prisma/generator-helper" "2.26.0" - "@prisma/get-platform" "2.26.0" +"@prisma/sdk@2.27.0": + version "2.27.0" + resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.27.0.tgz#dc42fdd7a236725a9f3e00f6aae6191f026d5e08" + integrity sha512-CywUaCIfCkE5bDPxJkiE7gBoSS4VsqX2QIswjXhDIDrdZ7W4T6dFQd7Ozin9aA6yvKCY6weh0E1Ck7H8MDA3/w== + dependencies: + "@prisma/debug" "2.27.0" + "@prisma/engine-core" "2.27.0" + "@prisma/engines" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" + "@prisma/fetch-engine" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" + "@prisma/generator-helper" "2.27.0" + "@prisma/get-platform" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" "@timsuchanek/copy" "^1.4.5" archiver "^4.0.0" arg "^5.0.0" @@ -2201,7 +2209,7 @@ node-fetch "2.6.1" p-map "^4.0.0" read-pkg-up "^7.0.1" - resolve-pkg "^2.0.0" + resolve "^1.2.0" rimraf "^3.0.2" shell-quote "^1.7.2" string-width "^4.2.0" @@ -10805,12 +10813,12 @@ prism-react-renderer@^1.2.1: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.2.1.tgz#392460acf63540960e5e3caa699d851264e99b89" integrity sha512-w23ch4f75V1Tnz8DajsYKvY5lF7H1+WvzvLUcF0paFxkTHSp42RS0H5CttdN2Q8RR3DRGZ9v5xD/h3n8C8kGmg== -prisma@2.26.0: - version "2.26.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-2.26.0.tgz#48f7b8fa166900ae20f2383da711ac8712a56b86" - integrity sha512-MXTQlF8X9mabkdTRb9x5nF6jvo1kT85d9hqIpYjLLZy+5tlvEaCaLBj+ok8GINdfYBS7gwQERZ9MHx0tb5dCdg== +prisma@2.27.0: + version "2.27.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-2.27.0.tgz#45fdecb9c2470c7ad602e804ffed70dfa7c46ad1" + integrity sha512-/3H9C+IPlJmY5KArhfKHMpxKXqcZIBZ+LjM1b5FxvLCGQkq/mRC96SpHcKcLtiYgftNAX13nvlxg+cBw9Dbe8Q== dependencies: - "@prisma/engines" "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" + "@prisma/engines" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" process-nextick-args@~2.0.0: version "2.0.1" @@ -11624,7 +11632,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.2.0, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==