From cff9d600abde1335a4708387827bf4fc030590b9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 16:03:00 +0000 Subject: [PATCH 1/2] fix(deps): update prisma monorepo to v5.14.0 --- packages/core/package.json | 8 +-- pnpm-lock.yaml | 135 ++++++++++++++++++++++++++++++++++--- 2 files changed, 128 insertions(+), 15 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index e252431bac8..eef3030e6be 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -204,9 +204,9 @@ "@keystone-ui/toast": "workspace:^", "@keystone-ui/tooltip": "workspace:^", "@nodelib/fs.walk": "^2.0.0", - "@prisma/client": "5.13.0", - "@prisma/internals": "5.13.0", - "@prisma/migrate": "5.13.0", + "@prisma/client": "5.14.0", + "@prisma/internals": "5.14.0", + "@prisma/migrate": "5.14.0", "@sindresorhus/slugify": "^1.1.2", "apollo-upload-client": "^17.0.0", "bcryptjs": "^2.4.3", @@ -235,7 +235,7 @@ "meow": "^9.0.0", "next": "^13.3.0", "pluralize": "^8.0.0", - "prisma": "5.13.0", + "prisma": "5.14.0", "prompts": "^2.4.2", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8b7f1cefb7c..0c0e88a787a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1971,14 +1971,14 @@ importers: specifier: ^2.0.0 version: 2.0.0 '@prisma/client': - specifier: 5.13.0 - version: 5.13.0(prisma@5.13.0) + specifier: 5.14.0 + version: 5.14.0(prisma@5.14.0) '@prisma/internals': - specifier: 5.13.0 - version: 5.13.0 + specifier: 5.14.0 + version: 5.14.0 '@prisma/migrate': - specifier: 5.13.0 - version: 5.13.0(@prisma/generator-helper@5.13.0)(@prisma/internals@5.13.0) + specifier: 5.14.0 + version: 5.14.0(@prisma/generator-helper@5.14.0)(@prisma/internals@5.14.0) '@sindresorhus/slugify': specifier: ^1.1.2 version: 1.1.2 @@ -2064,8 +2064,8 @@ importers: specifier: ^8.0.0 version: 8.0.0 prisma: - specifier: 5.13.0 - version: 5.13.0 + specifier: 5.14.0 + version: 5.14.0 prompts: specifier: ^2.4.2 version: 2.4.2 @@ -2433,7 +2433,7 @@ importers: version: 5.13.0 '@prisma/migrate': specifier: ^5.0.0 - version: 5.13.0(@prisma/generator-helper@5.13.0)(@prisma/internals@5.13.0) + version: 5.13.0(@prisma/generator-helper@5.14.0)(@prisma/internals@5.13.0) chalk: specifier: ^4.1.2 version: 4.1.2 @@ -4915,39 +4915,84 @@ packages: prisma: optional: true + '@prisma/client@5.14.0': + resolution: {integrity: sha512-akMSuyvLKeoU4LeyBAUdThP/uhVP3GuLygFE3MlYzaCb3/J8SfsYBE5PkaFuLuVpLyA6sFoW+16z/aPhNAESqg==} + engines: {node: '>=16.13'} + peerDependencies: + prisma: '*' + peerDependenciesMeta: + prisma: + optional: true + '@prisma/debug@5.13.0': resolution: {integrity: sha512-699iqlEvzyCj9ETrXhs8o8wQc/eVW+FigSsHpiskSFydhjVuwTJEfj/nIYqTaWFYuxiWQRfm3r01meuW97SZaQ==} + '@prisma/debug@5.14.0': + resolution: {integrity: sha512-iq56qBZuFfX3fCxoxT8gBX33lQzomBU0qIUaEj1RebsKVz1ob/BVH1XSBwwwvRVtZEV1b7Fxx2eVu34Ge/mg3w==} + '@prisma/engines-version@5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b': resolution: {integrity: sha512-AyUuhahTINGn8auyqYdmxsN+qn0mw3eg+uhkp8zwknXYIqoT3bChG4RqNY/nfDkPvzWAPBa9mrDyBeOnWSgO6A==} + '@prisma/engines-version@5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48': + resolution: {integrity: sha512-ip6pNkRo1UxWv+6toxNcYvItNYaqQjXdFNGJ+Nuk2eYtRoEdoF13wxo7/jsClJFFenMPVNVqXQDV0oveXnR1cA==} + '@prisma/engines@5.13.0': resolution: {integrity: sha512-hIFLm4H1boj6CBZx55P4xKby9jgDTeDG0Jj3iXtwaaHmlD5JmiDkZhh8+DYWkTGchu+rRF36AVROLnk0oaqhHw==} + '@prisma/engines@5.14.0': + resolution: {integrity: sha512-lgxkKZ6IEygVcw6IZZUlPIfLQ9hjSYAtHjZ5r64sCLDgVzsPFCi2XBBJgzPMkOQ5RHzUD4E/dVdpn9+ez8tk1A==} + '@prisma/fetch-engine@5.13.0': resolution: {integrity: sha512-Yh4W+t6YKyqgcSEB3odBXt7QyVSm0OQlBSldQF2SNXtmOgMX8D7PF/fvH6E6qBCpjB/yeJLy/FfwfFijoHI6sA==} + '@prisma/fetch-engine@5.14.0': + resolution: {integrity: sha512-VrheA9y9DMURK5vu8OJoOgQpxOhas3qF0IBHJ8G/0X44k82kc8E0w98HCn2nhnbOOMwbWsJWXfLC2/F8n5u0gQ==} + '@prisma/generator-helper@5.13.0': resolution: {integrity: sha512-i+53beJ0dxkDrkHdsXxmeMf+eVhyhOIpL0SdBga8vwe0qHPrAIJ/lpuT/Hj0y5awTmq40qiUEmhXwCEuM/Z17w==} + '@prisma/generator-helper@5.14.0': + resolution: {integrity: sha512-xVc71cmTnPZ0lnSs4FAY6Ta72vFJ3webrQwKMQ2ujr6hDG1VPIEf820T1TOS3ZZQd/OKigNKXnq3co8biz9/qw==} + '@prisma/get-platform@5.13.0': resolution: {integrity: sha512-B/WrQwYTzwr7qCLifQzYOmQhZcFmIFhR81xC45gweInSUn2hTEbfKUPd2keAog+y5WI5xLAFNJ3wkXplvSVkSw==} + '@prisma/get-platform@5.14.0': + resolution: {integrity: sha512-/yAyBvcEjRv41ynZrhdrPtHgk47xLRRq/o5eWGcUpBJ1YrUZTYB8EoPiopnP7iQrMATK8stXQdPOoVlrzuTQZw==} + '@prisma/internals@5.13.0': resolution: {integrity: sha512-OPMzS+IBPzCLT4s+IfGUbOhGFY51CFbokIFMZuoSeLKWE8UvDlitiXZ3OlVqDPUc0AlH++ysQHzDISHbZD+ZUg==} + '@prisma/internals@5.14.0': + resolution: {integrity: sha512-s0JRNDmR2bvcyy0toz89jy7SbbjANAs4e9KCReNvSm5czctIaZzDf68tcOXdtH0G7m9mKhVhNPdS9lMky0DhWA==} + '@prisma/migrate@5.13.0': resolution: {integrity: sha512-cFIYfX92yVyOGp/tYGGMShXVptlER23Yg05HoGdzjPBzy6jDQEBBs9VhlRA9I39I8zGFxNFOql+5pIGxktkGyw==} peerDependencies: '@prisma/generator-helper': '*' '@prisma/internals': '*' + '@prisma/migrate@5.14.0': + resolution: {integrity: sha512-/1sZWxtQojUS1UoyuElaKviqwkUAMjzQ2IKoXP1RHFhxb7bzq+WKcqj9c98ACq/aRST9YJi/j3YQjwLa5ciAiQ==} + peerDependencies: + '@prisma/generator-helper': '*' + '@prisma/internals': '*' + '@prisma/prisma-schema-wasm@5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b': resolution: {integrity: sha512-+IhHvuE1wKlyOpJgwAhGop1oqEt+1eixrCeikBIshRhdX6LwjmtRxVxVMlP5nS1yyughmpfkysIW4jZTa+Zjuw==} + '@prisma/prisma-schema-wasm@5.14.0-17.56ca112d5a19c9925b53af75c3c6b7ada97f9f85': + resolution: {integrity: sha512-SX9vE9dGYBap6xsfJuDE5b2eoA6w1vKsx8QpLUHZR+kIV6GQVUYUboEfkvYYoBVen3s9LqxJ1+LjHL/1MqBZag==} + + '@prisma/prisma-schema-wasm@5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48': + resolution: {integrity: sha512-WeTmJ0mK8ALoKJUQFO+465k9lm1JWS4ODUg7akJq1wjgyDU1RTAzDFli8ESmNJlMVgJgoAd6jXmzcnoA0HT9Lg==} + '@prisma/schema-files-loader@5.13.0': resolution: {integrity: sha512-6sVMoqobkWKsmzb98LfLiIt/aFRucWfkzSUBsqk7sc+h99xjynJt6aKtM2SSkyndFdWpRU0OiCHfQ9UlYUEJIw==} + '@prisma/schema-files-loader@5.14.0': + resolution: {integrity: sha512-n1QHR2C63dARKPZe0WPn7biybcBHzXe+BEmiHC5Drq9KPWnpmQtIfGpqm1ZKdvCZfcA5FF3wgpSMPK4LnB0obQ==} + '@protobufjs/aspromise@1.1.2': resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} @@ -9968,6 +10013,11 @@ packages: engines: {node: '>=16.13'} hasBin: true + prisma@5.14.0: + resolution: {integrity: sha512-gCNZco7y5XtjrnQYeDJTiVZmT/ncqCr5RY1/Cf8X2wgLRmyh9ayPAGBNziI4qEE4S6SxCH5omQLVo9lmURaJ/Q==} + engines: {node: '>=16.13'} + hasBin: true + prismjs@1.29.0: resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==} engines: {node: '>=6'} @@ -14828,10 +14878,18 @@ snapshots: optionalDependencies: prisma: 5.13.0 + '@prisma/client@5.14.0(prisma@5.14.0)': + optionalDependencies: + prisma: 5.14.0 + '@prisma/debug@5.13.0': {} + '@prisma/debug@5.14.0': {} + '@prisma/engines-version@5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b': {} + '@prisma/engines-version@5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48': {} + '@prisma/engines@5.13.0': dependencies: '@prisma/debug': 5.13.0 @@ -14839,20 +14897,41 @@ snapshots: '@prisma/fetch-engine': 5.13.0 '@prisma/get-platform': 5.13.0 + '@prisma/engines@5.14.0': + dependencies: + '@prisma/debug': 5.14.0 + '@prisma/engines-version': 5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48 + '@prisma/fetch-engine': 5.14.0 + '@prisma/get-platform': 5.14.0 + '@prisma/fetch-engine@5.13.0': dependencies: '@prisma/debug': 5.13.0 '@prisma/engines-version': 5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b '@prisma/get-platform': 5.13.0 + '@prisma/fetch-engine@5.14.0': + dependencies: + '@prisma/debug': 5.14.0 + '@prisma/engines-version': 5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48 + '@prisma/get-platform': 5.14.0 + '@prisma/generator-helper@5.13.0': dependencies: '@prisma/debug': 5.13.0 + '@prisma/generator-helper@5.14.0': + dependencies: + '@prisma/debug': 5.14.0 + '@prisma/get-platform@5.13.0': dependencies: '@prisma/debug': 5.13.0 + '@prisma/get-platform@5.14.0': + dependencies: + '@prisma/debug': 5.14.0 + '@prisma/internals@5.13.0': dependencies: '@prisma/debug': 5.13.0 @@ -14865,21 +14944,51 @@ snapshots: arg: 5.0.2 prompts: 2.4.2 - '@prisma/migrate@5.13.0(@prisma/generator-helper@5.13.0)(@prisma/internals@5.13.0)': + '@prisma/internals@5.14.0': + dependencies: + '@prisma/debug': 5.14.0 + '@prisma/engines': 5.14.0 + '@prisma/fetch-engine': 5.14.0 + '@prisma/generator-helper': 5.14.0 + '@prisma/get-platform': 5.14.0 + '@prisma/prisma-schema-wasm': 5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48 + '@prisma/schema-files-loader': 5.14.0 + arg: 5.0.2 + prompts: 2.4.2 + + '@prisma/migrate@5.13.0(@prisma/generator-helper@5.14.0)(@prisma/internals@5.13.0)': dependencies: '@prisma/debug': 5.13.0 '@prisma/engines-version': 5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b - '@prisma/generator-helper': 5.13.0 + '@prisma/generator-helper': 5.14.0 '@prisma/get-platform': 5.13.0 '@prisma/internals': 5.13.0 prompts: 2.4.2 + '@prisma/migrate@5.14.0(@prisma/generator-helper@5.14.0)(@prisma/internals@5.14.0)': + dependencies: + '@prisma/debug': 5.14.0 + '@prisma/engines-version': 5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48 + '@prisma/generator-helper': 5.14.0 + '@prisma/get-platform': 5.14.0 + '@prisma/internals': 5.14.0 + prompts: 2.4.2 + '@prisma/prisma-schema-wasm@5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b': {} + '@prisma/prisma-schema-wasm@5.14.0-17.56ca112d5a19c9925b53af75c3c6b7ada97f9f85': {} + + '@prisma/prisma-schema-wasm@5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48': {} + '@prisma/schema-files-loader@5.13.0': dependencies: fs-extra: 11.1.1 + '@prisma/schema-files-loader@5.14.0': + dependencies: + '@prisma/prisma-schema-wasm': 5.14.0-17.56ca112d5a19c9925b53af75c3c6b7ada97f9f85 + fs-extra: 11.1.1 + '@protobufjs/aspromise@1.1.2': {} '@protobufjs/base64@1.1.2': {} @@ -21369,6 +21478,10 @@ snapshots: dependencies: '@prisma/engines': 5.13.0 + prisma@5.14.0: + dependencies: + '@prisma/engines': 5.14.0 + prismjs@1.29.0: {} private@0.1.8: {} From 653b1756c2ac515f3deb731d0e76c1d7f0761469 Mon Sep 17 00:00:00 2001 From: Josh Calder <8251494+borisno2@users.noreply.github.com> Date: Wed, 15 May 2024 17:39:52 +1000 Subject: [PATCH 2/2] update `getCommittedArtifacts` to support multiple schemas --- packages/core/src/artifacts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/artifacts.ts b/packages/core/src/artifacts.ts index 313d6c6eff6..d9cad476d18 100644 --- a/packages/core/src/artifacts.ts +++ b/packages/core/src/artifacts.ts @@ -72,7 +72,7 @@ async function getCommittedArtifacts (config: __ResolvedKeystoneConfig, graphQLS const prismaSchema = printPrismaSchema(config, lists) return { graphql: getFormattedGraphQLSchema(printSchema(graphQLSchema)), - prisma: await formatSchema({ schema: prismaSchema }), + prisma: (await formatSchema({ schemas: [[config.db.prismaSchemaPath, prismaSchema]] }))[0][1], } }