From f2e930ed9f9433f58de9272ade82cd6af3cead62 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 31 Aug 2022 00:57:29 +0000 Subject: [PATCH 1/6] fix(deps): update prisma monorepo to v4.3.0 --- packages/core/package.json | 8 +- prisma-utils/package.json | 4 +- yarn.lock | 297 +++++++++++++++++++++++++------------ 3 files changed, 205 insertions(+), 104 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index ee860704d53..296a1fb0362 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -53,9 +53,9 @@ "@keystone-ui/tooltip": "^6.0.1", "@nodelib/fs.walk": "^1.2.8", "@preconstruct/next": "^4.0.0", - "@prisma/client": "4.2.1", - "@prisma/internals": "4.2.1", - "@prisma/migrate": "4.2.1", + "@prisma/client": "4.3.0", + "@prisma/internals": "4.3.0", + "@prisma/migrate": "4.3.0", "@sindresorhus/slugify": "^1.1.2", "@types/apollo-upload-client": "17.0.1", "@types/bcryptjs": "^2.4.2", @@ -109,7 +109,7 @@ "pirates": "4.0.4", "pluralize": "^8.0.0", "prettier": "^2.5.0", - "prisma": "4.2.1", + "prisma": "4.3.0", "prompts": "^2.4.2", "react": "^18.1.0", "react-dom": "^18.1.0", diff --git a/prisma-utils/package.json b/prisma-utils/package.json index 5de084e5a31..bad2bd8a126 100644 --- a/prisma-utils/package.json +++ b/prisma-utils/package.json @@ -4,8 +4,8 @@ "private": true, "main": "dist/keystone-6-prisma-utils.cjs.js", "dependencies": { - "@prisma/generator-helper": "4.2.1", - "@prisma/internals": "4.2.1", + "@prisma/generator-helper": "4.3.0", + "@prisma/internals": "4.3.0", "fs-extra": "^10.0.0", "prettier": "^2.5.0" }, diff --git a/yarn.lock b/yarn.lock index be27bace75d..931e53361bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3320,33 +3320,33 @@ resolved "https://registry.yarnpkg.com/@preconstruct/next/-/next-4.0.0.tgz#4d9c64ed68bb7cdc72d35d79d1dbe26ba2cae61e" integrity sha512-vSrc8wFQgBErU7dKTKSQtr/DLWPHcN9jMoiWOAQodB1+B4Kpqqry6QhGYoRm0DQU5gNL+Rcp+Xb350O1E/gjsg== -"@prisma/client@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.2.1.tgz#b384587f6066070381ea4c90228a14697a0c271b" - integrity sha512-PZBkY60+k5oix+e6IUfl3ub8TbRLNsPLdfWrdy2eh80WcHTaT+/UfvXf/B7gXedH7FRtbPFHZXk1hZenJiJZFQ== +"@prisma/client@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.3.0.tgz#147e7d7d4f390af4810e672c11ea6a7ca72b0696" + integrity sha512-xCjLAOIOqVdjD+UZbUwx5dFocUmdsrMQFe0jXUswTUgc76NOQVh0L7Z+FCkNCVVZ9RSBfEFX22061Sa02OuPAQ== dependencies: - "@prisma/engines-version" "4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826" + "@prisma/engines-version" "4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b" -"@prisma/debug@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-4.2.1.tgz#22f87552325e761b8be794a7595af65314bd57b2" - integrity sha512-Cf7FBwZN5dNHD/iboWYbKQHSykpoVP/AmWVCUm74S3av2XbbHE5Eku5oudhpWD8gE55UrpHvO8hzBmD9m+XTQQ== +"@prisma/debug@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-4.3.0.tgz#5d6e95c1780290cd0c55fd00f5a688dd854f9213" + integrity sha512-9Q7PKvJMAOBC+UQ/hdQwbtqIBg/TLnKYfxB1TmENdkiPFR0SuNPQFzybClCJoc1l6Bal5+ZjQBAVIO8zTVGMNQ== dependencies: "@types/debug" "4.1.7" debug "4.3.4" strip-ansi "6.0.1" -"@prisma/engine-core@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-4.2.1.tgz#9644a4e699a2be13e2767487de316dbf7c0d001d" - integrity sha512-IExgNEv7QFq1hj1IX4xWkXyk79V+lkTfw0bSaJuTyNgUOjs7X3Li+56Cs7Ss6aVujlBHXT/79lSkjo+oZ7v0Iw== +"@prisma/engine-core@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-4.3.0.tgz#cef0e842f60fb1f867784de7a07baac25839322c" + integrity sha512-03bYLEKbdwmk6TBIbznkcEUEPXmhPFjVIDsxscevwWaOZ8VPDUNmTsA1+kcj4S4TeQvkOr5j9MRs48CcUSVtZA== dependencies: "@opentelemetry/api" "^1.1.0" "@opentelemetry/sdk-trace-base" "^1.4.0" - "@prisma/debug" "4.2.1" - "@prisma/engines" "4.2.1" - "@prisma/generator-helper" "4.2.1" - "@prisma/get-platform" "4.2.1" + "@prisma/debug" "4.3.0" + "@prisma/engines" "4.3.0" + "@prisma/generator-helper" "4.3.0" + "@prisma/get-platform" "4.3.0" chalk "4.1.2" execa "5.1.1" get-stream "6.0.1" @@ -3354,25 +3354,25 @@ new-github-issue-url "0.2.1" p-retry "4.6.2" strip-ansi "6.0.1" - undici "5.8.0" + undici "5.10.0" -"@prisma/engines-version@4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826": - version "4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826.tgz#63917e579b9f15460f102eaf08a4411a7e0666e7" - integrity sha512-tktkqdiwqE4QhmE088boPt+FwPj1Jub/zk+5F6sEfcRHzO5yz9jyMD5HFVtiwxZPLx/8Xg9ElnuTi8E5lWVQFQ== +"@prisma/engines-version@4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b": + version "4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b.tgz#a564dd6fb6f25405fe06164989ebd8a1e4bb3508" + integrity sha512-8yWpXkQRmiSfsi2Wb/ZS5D3RFbeu/btL9Pm/gdF4phB0Lo5KGsDFMxFMgaD64mwED2nHc8ZaEJg/+4Jymb9Znw== -"@prisma/engines@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.2.1.tgz#60c7d0acc1c0c5b70ece712e2cbe13f46a345d6e" - integrity sha512-0KqBwREUOjBiHwITsQzw2DWfLHjntvbqzGRawj4sBMnIiL5CXwyDUKeHOwXzKMtNr1rEjxEsypM14g0CzLRK3g== +"@prisma/engines@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.3.0.tgz#097784f5d044d4a364652420d3c4d6d4c0baa909" + integrity sha512-JAyU7+QEpLkVtgVMYBSPQt9sUcgFqA/MdD4mK7yx+ZyDfHQlP+nT1rmqFPZ3MofR0mAha7nr3rx0ZNN46gLp9Q== -"@prisma/fetch-engine@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-4.2.1.tgz#f8d32a855d2c16696201e7776a987d619720919a" - integrity sha512-O72UNvkiZOBx1fo9LF9BbFOINfJtqy72ska6qwRexa46Fxls2wQHmZAJ2sC2tw5wkm4XO8Nb20rw1qSz6EP1oA== +"@prisma/fetch-engine@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-4.3.0.tgz#739f6cbc9fede21845fb780f25176bbc67d4b947" + integrity sha512-fLn1FOnVGl8DcV58WUogHd/pR+YpZCU+gmAt38BB6KpFKS4zgU+DK1G3YjK/Q7kdtq3wky+qrtFppK1WCJ7Jdg== dependencies: - "@prisma/debug" "4.2.1" - "@prisma/get-platform" "4.2.1" + "@prisma/debug" "4.3.0" + "@prisma/get-platform" "4.3.0" chalk "4.1.2" execa "5.1.1" find-cache-dir "3.3.2" @@ -3389,34 +3389,35 @@ temp-dir "2.0.0" tempy "1.0.1" -"@prisma/generator-helper@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-4.2.1.tgz#26cd37b00dc2b30e08f9e04333496721833e3ab5" - integrity sha512-6P3lJMu/he4LcvUBL+1L9IkBGpF2Z8Kgp3Qr9hyjPLbFh4gLRfMC76Wj4vIlWpOyKW/P3tQH7NwU9kH/eq6z1g== +"@prisma/generator-helper@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-4.3.0.tgz#c2f3df01e5564f29e45125f76df1a50c75006c39" + integrity sha512-GeEtQ0WszJpzP03PNpNr+oB4WHYZ4GyHx9wJgJl3cbXfwmOHD0z/H5A8ZidD1Ix3RdnBM1d0R0BjSijHRrr3Nw== dependencies: - "@prisma/debug" "4.2.1" + "@prisma/debug" "4.3.0" "@types/cross-spawn" "6.0.2" chalk "4.1.2" cross-spawn "7.0.3" -"@prisma/get-platform@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-4.2.1.tgz#6f58207554976df11310ec92d15db8bddfaf9f73" - integrity sha512-Ng/a4MWW9OK2WhJYEOXMvESHHUgRgjJuu4j0gCvXd2OgB+F3/1fwUCRDBkgqSPS7VaSaoYVW7kEx0BDXqTfvHA== +"@prisma/get-platform@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-4.3.0.tgz#bb5d976acce1ce8ae2e7ab49c78d31bf794056fd" + integrity sha512-mcicrI1qQcvpSW5XJAOMJxGXzcy8GA+5P5Z7MkuKi/H70kNTS1NVaHQBB3y92TouUh8dSmysT6w24iNtdLs/ig== dependencies: - "@prisma/debug" "4.2.1" + "@prisma/debug" "4.3.0" -"@prisma/internals@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@prisma/internals/-/internals-4.2.1.tgz#f1743b6c8c40becaa72d53ecabe063e7f0b3da80" - integrity sha512-0mioRLtvdVTKnZvIf8N7MKHBJ0FBxKwdLXNdO/KRU7efsBjy5YANGf/lxgL9wROAC79jYgeu2jLM9YO5L0ZT6w== - dependencies: - "@prisma/debug" "4.2.1" - "@prisma/engine-core" "4.2.1" - "@prisma/engines" "4.2.1" - "@prisma/fetch-engine" "4.2.1" - "@prisma/generator-helper" "4.2.1" - "@prisma/get-platform" "4.2.1" +"@prisma/internals@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@prisma/internals/-/internals-4.3.0.tgz#ac22eb132239caa498956e248c918a0aebbf137c" + integrity sha512-kU6AAayAPbwSXHR3dMbKPpEZzdl0vFn4oSnc2FZ7Rc86j1Yl2t3CVx6YwBHRnpO7deBrT6kjSVM3Aw3J958D9w== + dependencies: + "@prisma/debug" "4.3.0" + "@prisma/engine-core" "4.3.0" + "@prisma/engines" "4.3.0" + "@prisma/fetch-engine" "4.3.0" + "@prisma/generator-helper" "4.3.0" + "@prisma/get-platform" "4.3.0" + "@prisma/prisma-fmt-wasm" "4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b" archiver "5.3.1" arg "5.0.2" chalk "4.1.2" @@ -3456,13 +3457,13 @@ tmp "0.2.1" ts-pattern "^4.0.1" -"@prisma/migrate@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@prisma/migrate/-/migrate-4.2.1.tgz#99e68212894dd6c9618514aa53fdcb29aa9d70d7" - integrity sha512-2HO0bh4XpH5mPEqJEWqiY+qjW1a0/43BlbWq7ZDpAxOzRgQfsniK5kFW4JWNczqpjRFjCpWfJndiogSXMVoeng== +"@prisma/migrate@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@prisma/migrate/-/migrate-4.3.0.tgz#13a10b0ae7021618ecefe34349363a81ba7c4387" + integrity sha512-cFwIxRoDVHAQivsy6sAMoO40sPpMC9duOvzh+qHF+pO/DNNWkdbXSWN2lmmk4/+jeqkSH3ar1liM5HHUSjj75A== dependencies: - "@prisma/debug" "4.2.1" - "@prisma/get-platform" "4.2.1" + "@prisma/debug" "4.3.0" + "@prisma/get-platform" "4.3.0" "@sindresorhus/slugify" "1.1.2" chalk "4.1.2" execa "5.1.1" @@ -3471,14 +3472,20 @@ indent-string "4.0.0" log-update "4.0.0" mariadb "3.0.1" - mssql "8.1.2" - pg "8.7.3" + mongoose "^6.5.0" + mssql "9.0.1" + pg "8.8.0" pkg-up "3.1.0" prompts "2.4.2" strip-ansi "6.0.1" strip-indent "3.0.0" ts-pattern "^4.0.1" +"@prisma/prisma-fmt-wasm@4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b": + version "4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b" + resolved "https://registry.yarnpkg.com/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b.tgz#6c1b03a36048f7ba09e9977b7936c7fb25497dd2" + integrity sha512-65su522mHdxErZ7yIF/jd2/1gyj6lONpcpMchDUW+rWMCnqAjMXE3hxdmpdCetIV4Wfupgot1Uqd3GlMLU2y6g== + "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" @@ -3837,10 +3844,10 @@ dependencies: defer-to-connect "^1.0.1" -"@tediousjs/connection-string@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@tediousjs/connection-string/-/connection-string-0.3.0.tgz#23f7af793a365cc3b6a149ec1320f1e28c4242ff" - integrity sha512-d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ== +"@tediousjs/connection-string@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@tediousjs/connection-string/-/connection-string-0.4.1.tgz#6c92dcde392ff2401d9e9de628c1cd8f4b2a735f" + integrity sha512-gr1mFN7KMOn+VviQKcrt+z1/7ttn7s9NSMFFyg5GrJylNH6JGrDDNRm7C5vE4PNwhW6hYT67QRUO44Ns2LQijg== "@testing-library/dom@^8.5.0": version "8.17.1" @@ -4473,6 +4480,19 @@ "@types/unist" "*" "@types/vfile-message" "*" +"@types/webidl-conversions@*": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz#2b8e60e33906459219aa587e9d1a612ae994cfe7" + integrity sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog== + +"@types/whatwg-url@^8.2.1": + version "8.2.2" + resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63" + integrity sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA== + dependencies: + "@types/node" "*" + "@types/webidl-conversions" "*" + "@types/ws@^8.5.3": version "8.5.3" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" @@ -5331,6 +5351,13 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" +bson@^4.6.5: + version "4.7.0" + resolved "https://registry.yarnpkg.com/bson/-/bson-4.7.0.tgz#7874a60091ffc7a45c5dd2973b5cad7cded9718a" + integrity sha512-VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA== + dependencies: + buffer "^5.6.0" + buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -5364,7 +5391,7 @@ buffer@5.6.0: base64-js "^1.0.2" ieee754 "^1.1.4" -buffer@^5.5.0: +buffer@^5.5.0, buffer@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -5806,7 +5833,7 @@ commander@^7.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== -commander@^9.1.0: +commander@^9.4.0: version "9.4.0" resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c" integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw== @@ -6132,7 +6159,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@4.3.4, debug@4.x, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -9254,6 +9281,11 @@ jws@^4.0.0: jwa "^2.0.0" safe-buffer "^5.0.1" +kareem@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.4.1.tgz#7d81ec518204a48c1cb16554af126806c3cd82b0" + integrity sha512-aJ9opVoXroQUPfovYP5kaj2lM7Jn02Gw13bL0lg9v0V7SaUc0qavPs0Eue7d2DcC3NjqI6QAUElXNsuZSeM+EA== + keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -9896,6 +9928,11 @@ memoize-one@^6.0.0: resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045" integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw== +memory-pager@^1.0.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5" + integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg== + meow@^10.1.1: version "10.1.3" resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.3.tgz#21689959a7d00e8901aff30d208acb2122eb8088" @@ -10455,6 +10492,51 @@ moment-timezone@^0.5.34: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== +mongodb-connection-string-url@^2.5.2: + version "2.5.3" + resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.3.tgz#c0c572b71570e58be2bd52b33dffd1330cfb6990" + integrity sha512-f+/WsED+xF4B74l3k9V/XkTVj5/fxFH2o5ToKXd8Iyi5UhM+sO9u0Ape17Mvl/GkZaFtM0HQnzAG5OTmhKw+tQ== + dependencies: + "@types/whatwg-url" "^8.2.1" + whatwg-url "^11.0.0" + +mongodb@4.8.1: + version "4.8.1" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.8.1.tgz#596de88ff4519128266d9254dbe5b781c4005796" + integrity sha512-/NyiM3Ox9AwP5zrfT9TXjRKDJbXlLaUDQ9Rg//2lbg8D2A8GXV0VidYYnA/gfdK6uwbnL4FnAflH7FbGw3TS7w== + dependencies: + bson "^4.6.5" + denque "^2.0.1" + mongodb-connection-string-url "^2.5.2" + socks "^2.6.2" + optionalDependencies: + saslprep "^1.0.3" + +mongoose@^6.5.0: + version "6.5.4" + resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-6.5.4.tgz#05c57c569d919fb55e656df1e49735a931fdc647" + integrity sha512-8hKV+9baDa7fyWRADQcSN/c0/QQbnewA2D0xOqdFb7f1UGYAHk4YSMNu9Hu2bdRUfQbK/daFuqlcmI17j6/8eg== + dependencies: + bson "^4.6.5" + kareem "2.4.1" + mongodb "4.8.1" + mpath "0.9.0" + mquery "4.0.3" + ms "2.1.3" + sift "16.0.0" + +mpath@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.9.0.tgz#0c122fe107846e31fc58c75b09c35514b3871904" + integrity sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew== + +mquery@4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/mquery/-/mquery-4.0.3.tgz#4d15f938e6247d773a942c912d9748bd1965f89d" + integrity sha512-J5heI+P08I6VJ2Ky3+33IpCdAvlYGTSUjwTPxkAr8i8EoduPMBX2OY/wa3IKZIQl7MU4SbFk8ndgSKyB/cl1zA== + dependencies: + debug "4.x" + mri@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" @@ -10475,17 +10557,17 @@ ms@2.1.3, ms@^2.1.1, ms@^2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -mssql@8.1.2: - version "8.1.2" - resolved "https://registry.yarnpkg.com/mssql/-/mssql-8.1.2.tgz#dff6f0cd3fce403bf6d06eaf83578adbe6aab325" - integrity sha512-xkTw3Sp1Jpq2f7CG3rFQn6YK4XZbnL8HfZhaB/KRC/hjDZlJB3pSWYN2Cp/WwxIeA1iUJkdFa6GTfdMY8+DAjg== +mssql@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/mssql/-/mssql-9.0.1.tgz#9a311388229e5d596bfbda616e535b9a63241d69" + integrity sha512-rmBEPeUgZswvcclSc4s21WJCG0xqDYBas1MSnZepzDPvtNRgkx6f/gCm52EEo2djVtIXJgRq22m7gj7floz4Ng== dependencies: - "@tediousjs/connection-string" "^0.3.0" - commander "^9.1.0" + "@tediousjs/connection-string" "^0.4.1" + commander "^9.4.0" debug "^4.3.3" rfdc "^1.3.0" tarn "^3.0.2" - tedious "^14.0.0" + tedious "^15.0.1" multipipe@^1.0.2: version "1.0.2" @@ -11213,10 +11295,10 @@ pg-int8@1.0.1: resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-pool@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz#f499ce76f9bf5097488b3b83b19861f28e4ed905" - integrity sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ== +pg-pool@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.2.tgz#ed1bed1fb8d79f1c6fd5fb1c99e990fbf9ddf178" + integrity sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w== pg-protocol@^1.5.0: version "1.5.0" @@ -11234,15 +11316,15 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@8.7.3: - version "8.7.3" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz#8a5bdd664ca4fda4db7997ec634c6e5455b27c44" - integrity sha512-HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw== +pg@8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.8.0.tgz#a77f41f9d9ede7009abfca54667c775a240da686" + integrity sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" pg-connection-string "^2.5.0" - pg-pool "^3.5.1" + pg-pool "^3.5.2" pg-protocol "^1.5.0" pg-types "^2.1.0" pgpass "1.x" @@ -11416,12 +11498,12 @@ prism-react-renderer@^1.2.1: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.5.tgz#786bb69aa6f73c32ba1ee813fbe17a0115435085" integrity sha512-IJ+MSwBWKG+SM3b2SUfdrhC+gu01QkV2KmRQgREThBfSQRoufqRfxfHUxpG1WcaFjP+kojcFyO9Qqtpgt3qLCg== -prisma@4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.2.1.tgz#3558359f15021aa4767de8c6d0ca1f285cf33d65" - integrity sha512-HuYqnTDgH8atjPGtYmY0Ql9XrrJnfW7daG1PtAJRW0E6gJxc50lY3vrIDn0yjMR3TvRlypjTcspQX8DT+xD4Sg== +prisma@4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.3.0.tgz#2c989be1bc6298f28bb4db40521dabec46e7a388" + integrity sha512-Ii588H5IsbSun5BwpNQwrayrHKecFEZ6wDoJ7nr2IsqlMblmkA1dextGBObsG9tg+aIVhTrNa7OAbhbvEfqhdQ== dependencies: - "@prisma/engines" "4.2.1" + "@prisma/engines" "4.3.0" process-nextick-args@~2.0.0: version "2.0.1" @@ -12232,6 +12314,13 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +saslprep@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226" + integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag== + dependencies: + sparse-bitfield "^3.0.3" + saxes@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" @@ -12388,6 +12477,11 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" +sift@16.0.0: + version "16.0.0" + resolved "https://registry.yarnpkg.com/sift/-/sift-16.0.0.tgz#447991577db61f1a8fab727a8a98a6db57a23eb8" + integrity sha512-ILTjdP2Mv9V1kIxWMXeMTIRbOBrqKc4JAXmFMnFq3fKeyQ2Qwa3Dw1ubcye3vR+Y6ofA0b9gNDr/y2t6eUeIzQ== + signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" @@ -12524,7 +12618,7 @@ socks-proxy-agent@5, socks-proxy-agent@^5.0.0: debug "4" socks "^2.3.3" -socks@^2.3.3: +socks@^2.3.3, socks@^2.6.2: version "2.7.0" resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== @@ -12594,6 +12688,13 @@ space-separated-tokens@^2.0.0: resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b" integrity sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw== +sparse-bitfield@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11" + integrity sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ== + dependencies: + memory-pager "^1.0.2" + spawndamnit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/spawndamnit/-/spawndamnit-2.0.0.tgz#9f762ac5c3476abb994b42ad592b5ad22bb4b0ad" @@ -13046,10 +13147,10 @@ tarn@^3.0.2: resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.2.tgz#73b6140fbb881b71559c4f8bfde3d9a4b3d27693" integrity sha512-51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ== -tedious@^14.0.0: - version "14.7.0" - resolved "https://registry.yarnpkg.com/tedious/-/tedious-14.7.0.tgz#4126eab68aa3f24ef42406f2e74af5aa96b64e50" - integrity sha512-d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w== +tedious@^15.0.1: + version "15.1.0" + resolved "https://registry.yarnpkg.com/tedious/-/tedious-15.1.0.tgz#4f8db104383f50c581f06baeb33ff6966bb27b88" + integrity sha512-D96Z8SL4ALE/rS6rOAfzWd/x+RD9vWbnNT3w5KZ0e0Tdh5FX1bKEODS+1oemSQM2ok5SktLHqSJqYQRx4yu3WA== dependencies: "@azure/identity" "^2.0.4" "@azure/keyvault-keys" "^4.4.0" @@ -13518,10 +13619,10 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -undici@5.8.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.8.0.tgz#dec9a8ccd90e5a1d81d43c0eab6503146d649a4f" - integrity sha512-1F7Vtcez5w/LwH2G2tGnFIihuWUlc58YidwLiCv+jR2Z50x0tNXpRRw7eOIJ+GvqCqIkg9SB7NWAJ/T9TLfv8Q== +undici@5.10.0: + version "5.10.0" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.10.0.tgz#dd9391087a90ccfbd007568db458674232ebf014" + integrity sha512-c8HsD3IbwmjjbLvoZuRI26TZic+TSEe8FPMLLOkN1AfYRhdjnKBU6yL+IwcSCbdZiX4e5t0lfMDLDCqj4Sq70g== unherit@^1.0.4: version "1.1.3" From 96e008a64fe6e5cd605da67a3530e57f95c8228e Mon Sep 17 00:00:00 2001 From: mitchellhamilton Date: Wed, 31 Aug 2022 11:01:31 +1000 Subject: [PATCH 2/6] Update generated prisma schemas --- examples/assets-local/schema.prisma | 2 +- examples/assets-s3/schema.prisma | 2 +- examples/auth/schema.prisma | 2 +- examples/basic/schema.prisma | 2 +- examples/blog/schema.prisma | 2 +- examples/custom-admin-ui-logo/schema.prisma | 2 +- examples/custom-admin-ui-navigation/schema.prisma | 2 +- examples/custom-admin-ui-pages/schema.prisma | 2 +- examples/custom-field-view/schema.prisma | 2 +- examples/custom-field/schema.prisma | 2 +- examples/custom-session-validation/schema.prisma | 2 +- examples/default-values/schema.prisma | 2 +- examples/document-field/schema.prisma | 2 +- examples/ecommerce/schema.prisma | 2 +- examples/embedded-nextjs/schema.prisma | 2 +- examples/extend-graphql-schema-graphql-ts/schema.prisma | 2 +- examples/extend-graphql-schema-nexus/schema.prisma | 2 +- examples/extend-graphql-schema/schema.prisma | 2 +- examples/extend-graphql-subscriptions/schema.prisma | 2 +- examples/graphql-api-endpoint/schema.prisma | 2 +- examples/json/schema.prisma | 2 +- examples/rest-api/schema.prisma | 2 +- examples/roles/schema.prisma | 2 +- examples/task-manager/schema.prisma | 2 +- examples/testing/schema.prisma | 2 +- examples/virtual-field/schema.prisma | 2 +- examples/with-auth/schema.prisma | 2 +- tests/sandbox/schema.prisma | 2 +- tests/test-projects/basic/schema.prisma | 2 +- tests/test-projects/crud-notifications/schema.prisma | 2 +- tests/test-projects/live-reloading/schema.prisma | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/examples/assets-local/schema.prisma b/examples/assets-local/schema.prisma index 1454bd20c59..60b36aecfce 100644 --- a/examples/assets-local/schema.prisma +++ b/examples/assets-local/schema.prisma @@ -36,4 +36,4 @@ model Author { name String @default("") email String @unique @default("") posts Post[] @relation("Post_author") -} \ No newline at end of file +} diff --git a/examples/assets-s3/schema.prisma b/examples/assets-s3/schema.prisma index 1454bd20c59..60b36aecfce 100644 --- a/examples/assets-s3/schema.prisma +++ b/examples/assets-s3/schema.prisma @@ -36,4 +36,4 @@ model Author { name String @default("") email String @unique @default("") posts Post[] @relation("Post_author") -} \ No newline at end of file +} diff --git a/examples/auth/schema.prisma b/examples/auth/schema.prisma index 0eb7f6db98d..888ef2b59d1 100644 --- a/examples/auth/schema.prisma +++ b/examples/auth/schema.prisma @@ -18,4 +18,4 @@ model User { email String @unique @default("") password String? isAdmin Boolean @default(false) -} \ No newline at end of file +} diff --git a/examples/basic/schema.prisma b/examples/basic/schema.prisma index 5f3755d75a1..6e3581d9327 100644 --- a/examples/basic/schema.prisma +++ b/examples/basic/schema.prisma @@ -50,4 +50,4 @@ model Post { authorId String? @map("author") @@index([authorId]) -} \ No newline at end of file +} diff --git a/examples/blog/schema.prisma b/examples/blog/schema.prisma index f2ebd9b77d1..121bcf94b6b 100644 --- a/examples/blog/schema.prisma +++ b/examples/blog/schema.prisma @@ -29,4 +29,4 @@ model Author { name String @default("") email String @unique @default("") posts Post[] @relation("Post_author") -} \ No newline at end of file +} diff --git a/examples/custom-admin-ui-logo/schema.prisma b/examples/custom-admin-ui-logo/schema.prisma index 512ebcda9b8..974677659d4 100644 --- a/examples/custom-admin-ui-logo/schema.prisma +++ b/examples/custom-admin-ui-logo/schema.prisma @@ -28,4 +28,4 @@ model Person { id String @id @default(cuid()) name String @default("") tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/examples/custom-admin-ui-navigation/schema.prisma b/examples/custom-admin-ui-navigation/schema.prisma index 512ebcda9b8..974677659d4 100644 --- a/examples/custom-admin-ui-navigation/schema.prisma +++ b/examples/custom-admin-ui-navigation/schema.prisma @@ -28,4 +28,4 @@ model Person { id String @id @default(cuid()) name String @default("") tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/examples/custom-admin-ui-pages/schema.prisma b/examples/custom-admin-ui-pages/schema.prisma index 512ebcda9b8..974677659d4 100644 --- a/examples/custom-admin-ui-pages/schema.prisma +++ b/examples/custom-admin-ui-pages/schema.prisma @@ -28,4 +28,4 @@ model Person { id String @id @default(cuid()) name String @default("") tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/examples/custom-field-view/schema.prisma b/examples/custom-field-view/schema.prisma index 1e167c23d70..d8ea86d9afa 100644 --- a/examples/custom-field-view/schema.prisma +++ b/examples/custom-field-view/schema.prisma @@ -29,4 +29,4 @@ model Person { id String @id @default(cuid()) name String @default("") tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/examples/custom-field/schema.prisma b/examples/custom-field/schema.prisma index 27c30a7c0c1..106e2d715bd 100644 --- a/examples/custom-field/schema.prisma +++ b/examples/custom-field/schema.prisma @@ -18,4 +18,4 @@ model Post { rating Int? pair_left String? pair_right String? -} \ No newline at end of file +} diff --git a/examples/custom-session-validation/schema.prisma b/examples/custom-session-validation/schema.prisma index b09afe91e34..dd314049f3e 100644 --- a/examples/custom-session-validation/schema.prisma +++ b/examples/custom-session-validation/schema.prisma @@ -31,4 +31,4 @@ model Person { password String passwordChangedAt DateTime? tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/examples/default-values/schema.prisma b/examples/default-values/schema.prisma index 512ebcda9b8..974677659d4 100644 --- a/examples/default-values/schema.prisma +++ b/examples/default-values/schema.prisma @@ -28,4 +28,4 @@ model Person { id String @id @default(cuid()) name String @default("") tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/examples/document-field/schema.prisma b/examples/document-field/schema.prisma index 4f37a7c61a7..40e7facfa70 100644 --- a/examples/document-field/schema.prisma +++ b/examples/document-field/schema.prisma @@ -31,4 +31,4 @@ model Author { email String @unique @default("") posts Post[] @relation("Post_author") bio String @default("[{\"type\":\"paragraph\",\"children\":[{\"text\":\"\"}]}]") -} \ No newline at end of file +} diff --git a/examples/ecommerce/schema.prisma b/examples/ecommerce/schema.prisma index 1e464eccff4..f42af27e741 100644 --- a/examples/ecommerce/schema.prisma +++ b/examples/ecommerce/schema.prisma @@ -100,4 +100,4 @@ model Role { canManageCart Boolean @default(false) canManageOrders Boolean @default(false) assignedTo User[] @relation("User_role") -} \ No newline at end of file +} diff --git a/examples/embedded-nextjs/schema.prisma b/examples/embedded-nextjs/schema.prisma index c233cb7f2c3..ff0eeb11b6c 100644 --- a/examples/embedded-nextjs/schema.prisma +++ b/examples/embedded-nextjs/schema.prisma @@ -17,4 +17,4 @@ model Post { title String @default("") slug String @default("") content String @default("") -} \ No newline at end of file +} diff --git a/examples/extend-graphql-schema-graphql-ts/schema.prisma b/examples/extend-graphql-schema-graphql-ts/schema.prisma index f2ebd9b77d1..121bcf94b6b 100644 --- a/examples/extend-graphql-schema-graphql-ts/schema.prisma +++ b/examples/extend-graphql-schema-graphql-ts/schema.prisma @@ -29,4 +29,4 @@ model Author { name String @default("") email String @unique @default("") posts Post[] @relation("Post_author") -} \ No newline at end of file +} diff --git a/examples/extend-graphql-schema-nexus/schema.prisma b/examples/extend-graphql-schema-nexus/schema.prisma index f2ebd9b77d1..121bcf94b6b 100644 --- a/examples/extend-graphql-schema-nexus/schema.prisma +++ b/examples/extend-graphql-schema-nexus/schema.prisma @@ -29,4 +29,4 @@ model Author { name String @default("") email String @unique @default("") posts Post[] @relation("Post_author") -} \ No newline at end of file +} diff --git a/examples/extend-graphql-schema/schema.prisma b/examples/extend-graphql-schema/schema.prisma index f2ebd9b77d1..121bcf94b6b 100644 --- a/examples/extend-graphql-schema/schema.prisma +++ b/examples/extend-graphql-schema/schema.prisma @@ -29,4 +29,4 @@ model Author { name String @default("") email String @unique @default("") posts Post[] @relation("Post_author") -} \ No newline at end of file +} diff --git a/examples/extend-graphql-subscriptions/schema.prisma b/examples/extend-graphql-subscriptions/schema.prisma index f2ebd9b77d1..121bcf94b6b 100644 --- a/examples/extend-graphql-subscriptions/schema.prisma +++ b/examples/extend-graphql-subscriptions/schema.prisma @@ -29,4 +29,4 @@ model Author { name String @default("") email String @unique @default("") posts Post[] @relation("Post_author") -} \ No newline at end of file +} diff --git a/examples/graphql-api-endpoint/schema.prisma b/examples/graphql-api-endpoint/schema.prisma index 7f8e4243844..611f0e73b83 100644 --- a/examples/graphql-api-endpoint/schema.prisma +++ b/examples/graphql-api-endpoint/schema.prisma @@ -37,4 +37,4 @@ model Tag { id String @id @default(cuid()) name String @default("") posts Post[] @relation("Post_tags") -} \ No newline at end of file +} diff --git a/examples/json/schema.prisma b/examples/json/schema.prisma index 59ec62f05fd..fdb8aca54c2 100644 --- a/examples/json/schema.prisma +++ b/examples/json/schema.prisma @@ -27,4 +27,4 @@ model Person { id String @id @default(cuid()) name String @default("") packages Package[] @relation("Package_ownedBy") -} \ No newline at end of file +} diff --git a/examples/rest-api/schema.prisma b/examples/rest-api/schema.prisma index 2f141fcd0f8..651410f1739 100644 --- a/examples/rest-api/schema.prisma +++ b/examples/rest-api/schema.prisma @@ -28,4 +28,4 @@ model Person { id String @id @default(cuid()) name String @unique @default("") tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/examples/roles/schema.prisma b/examples/roles/schema.prisma index edd39b35291..259291ba887 100644 --- a/examples/roles/schema.prisma +++ b/examples/roles/schema.prisma @@ -45,4 +45,4 @@ model Role { canManagePeople Boolean @default(false) canManageRoles Boolean @default(false) assignedTo Person[] @relation("Person_role") -} \ No newline at end of file +} diff --git a/examples/task-manager/schema.prisma b/examples/task-manager/schema.prisma index 2f141fcd0f8..651410f1739 100644 --- a/examples/task-manager/schema.prisma +++ b/examples/task-manager/schema.prisma @@ -28,4 +28,4 @@ model Person { id String @id @default(cuid()) name String @unique @default("") tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/examples/testing/schema.prisma b/examples/testing/schema.prisma index 39ae0e88cf4..f5e3d501ff1 100644 --- a/examples/testing/schema.prisma +++ b/examples/testing/schema.prisma @@ -30,4 +30,4 @@ model Person { email String @unique @default("") password String tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/examples/virtual-field/schema.prisma b/examples/virtual-field/schema.prisma index f2ebd9b77d1..121bcf94b6b 100644 --- a/examples/virtual-field/schema.prisma +++ b/examples/virtual-field/schema.prisma @@ -29,4 +29,4 @@ model Author { name String @default("") email String @unique @default("") posts Post[] @relation("Post_author") -} \ No newline at end of file +} diff --git a/examples/with-auth/schema.prisma b/examples/with-auth/schema.prisma index 39ae0e88cf4..f5e3d501ff1 100644 --- a/examples/with-auth/schema.prisma +++ b/examples/with-auth/schema.prisma @@ -30,4 +30,4 @@ model Person { email String @unique @default("") password String tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/tests/sandbox/schema.prisma b/tests/sandbox/schema.prisma index 1b830ce22b8..47775542ef7 100644 --- a/tests/sandbox/schema.prisma +++ b/tests/sandbox/schema.prisma @@ -70,4 +70,4 @@ model User { updatedAt DateTime @updatedAt from_Thing_toOneRelationship Thing[] @relation("Thing_toOneRelationship") from_Thing_toOneRelationshipCard Thing[] @relation("Thing_toOneRelationshipCard") -} \ No newline at end of file +} diff --git a/tests/test-projects/basic/schema.prisma b/tests/test-projects/basic/schema.prisma index b35c1ad0821..f76d6d77d7a 100644 --- a/tests/test-projects/basic/schema.prisma +++ b/tests/test-projects/basic/schema.prisma @@ -34,4 +34,4 @@ model SecretPlan { id String @id @default(cuid()) label String @default("") description String @default("") -} \ No newline at end of file +} diff --git a/tests/test-projects/crud-notifications/schema.prisma b/tests/test-projects/crud-notifications/schema.prisma index 512ebcda9b8..974677659d4 100644 --- a/tests/test-projects/crud-notifications/schema.prisma +++ b/tests/test-projects/crud-notifications/schema.prisma @@ -28,4 +28,4 @@ model Person { id String @id @default(cuid()) name String @default("") tasks Task[] @relation("Task_assignedTo") -} \ No newline at end of file +} diff --git a/tests/test-projects/live-reloading/schema.prisma b/tests/test-projects/live-reloading/schema.prisma index d75f0040036..890ee7a9beb 100644 --- a/tests/test-projects/live-reloading/schema.prisma +++ b/tests/test-projects/live-reloading/schema.prisma @@ -15,4 +15,4 @@ generator client { model Something { id String @id @default(cuid()) text String @default("") -} \ No newline at end of file +} From 76efd8ed9626d794bbaacea10ea501fcf951ef76 Mon Sep 17 00:00:00 2001 From: mitchellhamilton Date: Wed, 31 Aug 2022 16:25:12 +1000 Subject: [PATCH 3/6] Fix tests --- tests/api-tests/db-enable-logging.test.ts | 5 +++-- tests/api-tests/db-map.test.ts | 6 ++++-- tests/api-tests/indexes.test.ts | 3 ++- tests/api-tests/relationships/foreign-key.test.ts | 12 ++++++++---- tests/api-tests/relationships/relation-name.test.ts | 9 ++++++--- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/tests/api-tests/db-enable-logging.test.ts b/tests/api-tests/db-enable-logging.test.ts index 81e3db79ad5..4126bcff3a0 100644 --- a/tests/api-tests/db-enable-logging.test.ts +++ b/tests/api-tests/db-enable-logging.test.ts @@ -27,11 +27,12 @@ test( expect(logs).toEqual([ [ 'prisma:query', - dbProvider === 'sqlite' + (dbProvider === 'sqlite' ? 'SELECT `main`.`User`.`id`, `main`.`User`.`name` FROM `main`.`User` WHERE 1=1 LIMIT ? OFFSET ?' : dbProvider === 'mysql' ? 'SELECT `test_db`.`User`.`id`, `test_db`.`User`.`name` FROM `test_db`.`User` WHERE 1=1' - : 'SELECT "public"."User"."id", "public"."User"."name" FROM "public"."User" WHERE 1=1 OFFSET $1', + : 'SELECT "public"."User"."id", "public"."User"."name" FROM "public"."User" WHERE 1=1 OFFSET $1') + + ' /* traceparent=00-00-00-00 */', ], ]); } finally { diff --git a/tests/api-tests/db-map.test.ts b/tests/api-tests/db-map.test.ts index f47c5b9f06a..47399f8e44d 100644 --- a/tests/api-tests/db-map.test.ts +++ b/tests/api-tests/db-map.test.ts @@ -38,7 +38,8 @@ model SomeList { someField String @default("") @@map("some_table_name") -}`); +} +`); }); const testModules = globby.sync(`packages/**/src/**/test-fixtures.{js,ts}`, { @@ -110,5 +111,6 @@ generator client { model SomeList { id String @id @default(cuid()) someField String @default("") @map("db_map_field") -}`); +} +`); }); diff --git a/tests/api-tests/indexes.test.ts b/tests/api-tests/indexes.test.ts index abb8ad91202..498081c5599 100644 --- a/tests/api-tests/indexes.test.ts +++ b/tests/api-tests/indexes.test.ts @@ -40,7 +40,8 @@ model Test { other String @default("") @@index([somethingIndexed]) -}`); +} +`); }); if (dbProvider === 'postgresql') { diff --git a/tests/api-tests/relationships/foreign-key.test.ts b/tests/api-tests/relationships/foreign-key.test.ts index 4d2bfc0922f..367a599f322 100644 --- a/tests/api-tests/relationships/foreign-key.test.ts +++ b/tests/api-tests/relationships/foreign-key.test.ts @@ -43,7 +43,8 @@ model A { model B { id String @id @default(cuid()) a A? @relation("A_b") -}`); +} +`); }); test('when specifying foreignKey: true in a one to one relationship, that side has the foreign key', async () => { @@ -87,7 +88,8 @@ model B { id String @id @default(cuid()) a A? @relation("B_a", fields: [aId], references: [id]) aId String? @unique @map("a") -}`); +} +`); }); test('when specifying foreignKey: { map } in a one to one relationship, that side has the foreign key with the map', async () => { @@ -131,7 +133,8 @@ model B { id String @id @default(cuid()) a A? @relation("B_a", fields: [aId], references: [id]) aId String? @unique @map("blah") -}`); +} +`); }); test('when specifying foreignKey: true on both sides of a one to one relationship, an error is thrown', async () => { @@ -250,5 +253,6 @@ model B { aId String? @map("something") @@index([aId]) -}`); +} +`); }); diff --git a/tests/api-tests/relationships/relation-name.test.ts b/tests/api-tests/relationships/relation-name.test.ts index 8d62ad17b61..5b9beb06c73 100644 --- a/tests/api-tests/relationships/relation-name.test.ts +++ b/tests/api-tests/relationships/relation-name.test.ts @@ -42,7 +42,8 @@ model A { model B { id String @id @default(cuid()) a A[] @relation("A_b") -}`); +} +`); }); test("the ordering of the lists doesn't affect the relation name", async () => { @@ -85,7 +86,8 @@ model A { model B { id String @id @default(cuid()) a A[] @relation("A_b") -}`); +} +`); }); test('when specifying relationName in a many to many relationship, the relation name is set to that', async () => { @@ -128,7 +130,8 @@ model A { model B { id String @id @default(cuid()) a A[] @relation("the_relation_name") -}`); +} +`); }); test('when specifying relationName on both sides of a many to many relationship, an error is thrown', async () => { From 99db55aa6a919c4ec8e67cdfee6434ba6b5c7108 Mon Sep 17 00:00:00 2001 From: mitchellhamilton Date: Wed, 31 Aug 2022 16:35:55 +1000 Subject: [PATCH 4/6] Update other schema.prisma --- .../core/src/scripts/tests/fixtures/basic-project/schema.prisma | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/scripts/tests/fixtures/basic-project/schema.prisma b/packages/core/src/scripts/tests/fixtures/basic-project/schema.prisma index 8d45dd9a44b..98e28ac443b 100644 --- a/packages/core/src/scripts/tests/fixtures/basic-project/schema.prisma +++ b/packages/core/src/scripts/tests/fixtures/basic-project/schema.prisma @@ -15,4 +15,4 @@ generator client { model Todo { id String @id @default(cuid()) title String @default("") -} \ No newline at end of file +} From a705f28c41c63c7d000a4563dd0ee31f8aeac07b Mon Sep 17 00:00:00 2001 From: mitchellhamilton Date: Wed, 31 Aug 2022 16:40:09 +1000 Subject: [PATCH 5/6] Fix another test --- tests/api-tests/indexes.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/api-tests/indexes.test.ts b/tests/api-tests/indexes.test.ts index 498081c5599..cd322a28f09 100644 --- a/tests/api-tests/indexes.test.ts +++ b/tests/api-tests/indexes.test.ts @@ -94,6 +94,7 @@ model Test { enum TestEnumSelectIndexedType { a b -}`); +} +`); }); } From f2abc6bd4aad37ca247684cb93c222f92a424d94 Mon Sep 17 00:00:00 2001 From: mitchellhamilton Date: Thu, 1 Sep 2022 10:32:15 +1000 Subject: [PATCH 6/6] Fix test --- packages/core/src/scripts/tests/prisma.test.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/core/src/scripts/tests/prisma.test.ts b/packages/core/src/scripts/tests/prisma.test.ts index 3124220e3c2..903b920dc55 100644 --- a/packages/core/src/scripts/tests/prisma.test.ts +++ b/packages/core/src/scripts/tests/prisma.test.ts @@ -15,7 +15,6 @@ test('keystone prisma exits with the same code as the prisma child process exits all: true, cwd: tmp, }); - expect(result.exitCode).toBe(1); expect(stripAnsi(result.all!)).toMatchInlineSnapshot(` " ! Unknown command "bad-thing" @@ -60,6 +59,7 @@ test('keystone prisma exits with the same code as the prisma child process exits $ prisma db push " `); + expect(result.exitCode).toBe(1); }); test('keystone prisma uses the db url in the keystone config', async () => { @@ -73,13 +73,10 @@ test('keystone prisma uses the db url in the keystone config', async () => { all: true, cwd: tmp, }); - expect(result.exitCode).toBe(0); expect(stripAnsi(result.all!)).toMatchInlineSnapshot(` "Prisma schema loaded from schema.prisma Datasource "sqlite": SQLite database "app.db" at "file:./app.db" - - Database connection error: - - P1003: Database app.db does not exist at ./app.db" + Error: P1003: Database app.db does not exist at ./app.db" `); + expect(result.exitCode).toBe(1); });