From 04f0705b8f23c3b44f8724a320001ef47c8f067a Mon Sep 17 00:00:00 2001 From: Prismo <52275815+prisma-bot@users.noreply.github.com> Date: Wed, 4 Aug 2021 10:54:40 +0200 Subject: [PATCH] chore(deps): update engines to 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 (#8556) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update engines to 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 * fix: getConfig provider is now a string * update lockfile * test(sdk): update getConfig snapshots * refactor: remove useless resolveDatasources function * test(sdk): update getGenerators snapshots * fix weird type Co-authored-by: Joël --- packages/cli/package.json | 6 +- packages/client/package.json | 8 +- .../src/__tests__/resolveDatasources.test.ts | 62 +----- .../client/src/generation/generateClient.ts | 3 +- .../client/src/utils/resolveDatasources.ts | 12 -- packages/engine-core/package.json | 4 +- packages/integration-tests/package.json | 2 +- packages/migrate/package.json | 4 +- .../migrate/src/utils/ensureDatabaseExists.ts | 4 +- packages/sdk/package.json | 6 +- .../__snapshots__/getConfig.test.ts.snap | 16 +- .../engine-commands/getConfig.test.ts | 7 + .../getGenerators/getGenerators.test.ts | 184 +++++++++--------- packages/sdk/src/cli/types.ts | 2 +- packages/sdk/src/engine-commands/getConfig.ts | 2 +- packages/sdk/src/getGenerators.ts | 4 +- pnpm-lock.yaml | 151 ++++++++------ 17 files changed, 213 insertions(+), 264 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 6ca21922cd18..b4f767fec151 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -63,9 +63,9 @@ "devDependencies": { "@prisma/client": "workspace:*", "@prisma/debug": "workspace:*", - "@prisma/fetch-engine": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/fetch-engine": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@prisma/generator-helper": "workspace:*", - "@prisma/get-platform": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/get-platform": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@prisma/migrate": "workspace:*", "@prisma/sdk": "workspace:*", "@prisma/studio-server": "0.418.0", @@ -127,7 +127,7 @@ "precommit": "lint-staged" }, "dependencies": { - "@prisma/engines": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219" + "@prisma/engines": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4" }, "lint-staged": { "*.ts": [ diff --git a/packages/client/package.json b/packages/client/package.json index af452de55e36..af3f21c3a76a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -61,10 +61,10 @@ "devDependencies": { "@prisma/debug": "workspace:*", "@prisma/engine-core": "workspace:*", - "@prisma/engines": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", - "@prisma/fetch-engine": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/engines": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", + "@prisma/fetch-engine": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@prisma/generator-helper": "workspace:*", - "@prisma/get-platform": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/get-platform": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@prisma/migrate": "workspace:*", "@prisma/sdk": "workspace:*", "@timsuchanek/copy": "1.4.5", @@ -128,7 +128,7 @@ } }, "dependencies": { - "@prisma/engines-version": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219" + "@prisma/engines-version": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4" }, "lint-staged": { "*.ts": [ diff --git a/packages/client/src/__tests__/resolveDatasources.test.ts b/packages/client/src/__tests__/resolveDatasources.test.ts index b33f7197c0b2..a6717a7519c0 100644 --- a/packages/client/src/__tests__/resolveDatasources.test.ts +++ b/packages/client/src/__tests__/resolveDatasources.test.ts @@ -3,10 +3,7 @@ import { datasourceToDatasourceOverwrite, serializeDatasources, } from '../generation/serializeDatasources' -import { - absolutizeRelativePath, - resolveDatasources, -} from '../utils/resolveDatasources' +import { absolutizeRelativePath } from '../utils/resolveDatasources' const cwd = '/Users/tim/project/prisma' const outputDir = '/Users/tim/project/node_modules/@prisma/client/runtime' @@ -89,62 +86,9 @@ const datasources: DataSource[] = [ }, ] -test('resolveDatasources', () => { - expect(resolveDatasources(datasources, cwd, outputDir)) - .toMatchInlineSnapshot(` - Array [ - Object { - activeProvider: sqlite, - config: Object {}, - name: db, - provider: sqlite, - url: Object { - fromEnvVar: null, - value: file:db.db, - }, - }, - Object { - activeProvider: sqlite, - config: Object {}, - name: db2, - provider: sqlite, - url: Object { - fromEnvVar: null, - value: file:./some-dir/db.db, - }, - }, - Object { - activeProvider: mysql, - config: Object {}, - name: db3, - provider: mysql, - url: Object { - fromEnvVar: null, - value: mysql:localhost, - }, - }, - Object { - activeProvider: postgresql, - config: Object {}, - name: db4, - provider: postgresql, - url: Object { - fromEnvVar: null, - value: postgresql://, - }, - }, - ] - `) -}) - test('serializeDatasources', () => { - expect( - serializeDatasources( - resolveDatasources(datasources, cwd, outputDir).map( - datasourceToDatasourceOverwrite, - ), - ), - ).toMatchInlineSnapshot(` + expect(serializeDatasources(datasources.map(datasourceToDatasourceOverwrite))) + .toMatchInlineSnapshot(` [ { "name": "db", diff --git a/packages/client/src/generation/generateClient.ts b/packages/client/src/generation/generateClient.ts index 631ceeaf9d1b..7b4de68feeb1 100644 --- a/packages/client/src/generation/generateClient.ts +++ b/packages/client/src/generation/generateClient.ts @@ -15,7 +15,6 @@ import pkgUp from 'pkg-up' import { promisify } from 'util' import { DMMF as PrismaClientDMMF } from '../runtime/dmmf-types' import { Dictionary } from '../runtime/utils/common' -import { resolveDatasources } from '../utils/resolveDatasources' import { getPrismaClientDMMF } from './getDMMF' import { JS, TS, TSClient } from './TSClient' import { BrowserJS } from './TSClient/Generatable' @@ -83,7 +82,7 @@ export async function buildClient({ document, runtimePath, browser, - datasources: resolveDatasources(datasources, schemaDir, outputDir), + datasources: datasources, generator, platforms: useNodeAPI ? Object.keys(binaryPaths.libqueryEngine!) diff --git a/packages/client/src/utils/resolveDatasources.ts b/packages/client/src/utils/resolveDatasources.ts index 25d8057a55b7..93320745fe70 100644 --- a/packages/client/src/utils/resolveDatasources.ts +++ b/packages/client/src/utils/resolveDatasources.ts @@ -1,17 +1,5 @@ -import { DataSource } from '@prisma/generator-helper' import path from 'path' -export function resolveDatasources( - datasources: DataSource[], - cwd: string, - outputDir: string, - absolutePaths?: boolean, -): DataSource[] { - return datasources.map((datasource) => { - return datasource - }) -} - export function absolutizeRelativePath( url: string, cwd: string, diff --git a/packages/engine-core/package.json b/packages/engine-core/package.json index a48fd458d03f..b234b3781d22 100644 --- a/packages/engine-core/package.json +++ b/packages/engine-core/package.json @@ -45,9 +45,9 @@ }, "dependencies": { "@prisma/debug": "workspace:*", - "@prisma/engines": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/engines": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@prisma/generator-helper": "workspace:*", - "@prisma/get-platform": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/get-platform": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "chalk": "4.1.2", "execa": "5.1.1", "get-stream": "6.0.1", diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 19dea341212a..24fb8d9bcc53 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -9,7 +9,7 @@ "repository": "git@github.com:prisma/prisma.git", "devDependencies": { "@prisma/client": "workspace:*", - "@prisma/get-platform": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/get-platform": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@prisma/migrate": "workspace:*", "@prisma/sdk": "workspace:*", "@sindresorhus/slugify": "1.1.2", diff --git a/packages/migrate/package.json b/packages/migrate/package.json index 7c471a5dcde9..338d0702d201 100644 --- a/packages/migrate/package.json +++ b/packages/migrate/package.json @@ -16,7 +16,7 @@ "version": "latest" }, "devDependencies": { - "@prisma/engines-version": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/engines-version": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@prisma/generator-helper": "workspace:*", "@prisma/sdk": "workspace:*", "@types/jest": "26.0.24", @@ -55,7 +55,7 @@ }, "dependencies": { "@prisma/debug": "workspace:*", - "@prisma/get-platform": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/get-platform": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@sindresorhus/slugify": "1.1.0", "execa": "5.1.1", "global-dirs": "3.0.0", diff --git a/packages/migrate/src/utils/ensureDatabaseExists.ts b/packages/migrate/src/utils/ensureDatabaseExists.ts index e8ed0e1e2bb8..3f2e4d0ef1af 100644 --- a/packages/migrate/src/utils/ensureDatabaseExists.ts +++ b/packages/migrate/src/utils/ensureDatabaseExists.ts @@ -73,7 +73,7 @@ export async function ensureCanConnectToDatabase( throw new Error(`Couldn't find a datasource in the schema.prisma file`) } - if (activeDatasource.provider[0] === 'mongodb') { + if (activeDatasource.provider === 'mongodb') { throw new Error( `"mongodb" provider is not supported with this command. For more info see https://www.prisma.io/docs/concepts/database-connectors/mongodb`, ) @@ -107,7 +107,7 @@ export async function ensureDatabaseExists( throw new Error(`Couldn't find a datasource in the schema.prisma file`) } - if (activeDatasource.provider[0] === 'mongodb') { + if (activeDatasource.provider === 'mongodb') { throw new Error( `"mongodb" provider is not supported with this command. For more info see https://www.prisma.io/docs/concepts/database-connectors/mongodb`, ) diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 90b70fda6800..4ef108abc98d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -53,10 +53,10 @@ "dependencies": { "@prisma/debug": "workspace:*", "@prisma/engine-core": "workspace:*", - "@prisma/engines": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", - "@prisma/fetch-engine": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/engines": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", + "@prisma/fetch-engine": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@prisma/generator-helper": "workspace:*", - "@prisma/get-platform": "2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219", + "@prisma/get-platform": "2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4", "@timsuchanek/copy": "1.4.5", "archiver": "4.0.2", "arg": "5.0.0", diff --git a/packages/sdk/src/__tests__/engine-commands/__snapshots__/getConfig.test.ts.snap b/packages/sdk/src/__tests__/engine-commands/__snapshots__/getConfig.test.ts.snap index d957c8f68686..bb6631bd8d21 100644 --- a/packages/sdk/src/__tests__/engine-commands/__snapshots__/getConfig.test.ts.snap +++ b/packages/sdk/src/__tests__/engine-commands/__snapshots__/getConfig.test.ts.snap @@ -6,9 +6,7 @@ Object { Object { "activeProvider": "postgresql", "name": "db", - "provider": Array [ - "postgresql", - ], + "provider": "postgresql", "url": Object { "fromEnvVar": "SOMETHING-SOMETHING-1234", "value": null, @@ -26,9 +24,7 @@ Object { Object { "activeProvider": "postgresql", "name": "db", - "provider": Array [ - "postgresql", - ], + "provider": "postgresql", "url": Object { "fromEnvVar": "TEST_POSTGRES_URI_FOR_DATASOURCE", "value": "postgres://user:password@something:5432/db", @@ -46,9 +42,7 @@ Object { Object { "activeProvider": "sqlite", "name": "db", - "provider": Array [ - "sqlite", - ], + "provider": "sqlite", "url": Object { "fromEnvVar": null, "value": "file:../hello.db", @@ -66,9 +60,7 @@ Object { Object { "activeProvider": "sqlite", "name": "db", - "provider": Array [ - "sqlite", - ], + "provider": "sqlite", "url": Object { "fromEnvVar": null, "value": "file:dev.db", diff --git a/packages/sdk/src/__tests__/engine-commands/getConfig.test.ts b/packages/sdk/src/__tests__/engine-commands/getConfig.test.ts index daf199e94590..1a0e141e4cf5 100644 --- a/packages/sdk/src/__tests__/engine-commands/getConfig.test.ts +++ b/packages/sdk/src/__tests__/engine-commands/getConfig.test.ts @@ -16,6 +16,10 @@ describe('getConfig', () => { }`, }) + expect(config.datasources).toHaveLength(1) + expect(config.datasources[0].provider).toEqual('sqlite') + expect(config.generators).toHaveLength(0) + expect(config.warnings).toHaveLength(0) expect(config).toMatchSnapshot() }) @@ -66,6 +70,9 @@ describe('getConfig', () => { }`, }) + expect(config.datasources).toHaveLength(1) + expect(config.generators).toHaveLength(1) + expect(config.warnings).toHaveLength(0) expect(config).toMatchSnapshot() }) diff --git a/packages/sdk/src/__tests__/getGenerators/getGenerators.test.ts b/packages/sdk/src/__tests__/getGenerators/getGenerators.test.ts index 84e218903a80..114298156493 100644 --- a/packages/sdk/src/__tests__/getGenerators/getGenerators.test.ts +++ b/packages/sdk/src/__tests__/getGenerators/getGenerators.test.ts @@ -68,9 +68,7 @@ describe('getGenerators', () => { Object { "activeProvider": "sqlite", "name": "db", - "provider": Array [ - "sqlite", - ], + "provider": "sqlite", "url": Object { "fromEnvVar": null, "value": "file:./dev.db", @@ -162,9 +160,7 @@ describe('getGenerators', () => { Object { "activeProvider": "sqlite", "name": "db", - "provider": Array [ - "sqlite", - ], + "provider": "sqlite", "url": Object { "fromEnvVar": null, "value": "file:./dev.db", @@ -258,9 +254,7 @@ describe('getGenerators', () => { Object { "activeProvider": "sqlite", "name": "db", - "provider": Array [ - "sqlite", - ], + "provider": "sqlite", "url": Object { "fromEnvVar": null, "value": "file:./dev.db", @@ -336,38 +330,36 @@ describe('getGenerators', () => { 'otherGenerators', ]), ).toMatchInlineSnapshot(` - Object { - "datamodel": "datasource db { - provider = \\"sqlite\\" - url = \\"file:./dev.db\\" - } + Object { + "datamodel": "datasource db { + provider = \\"sqlite\\" + url = \\"file:./dev.db\\" + } - generator gen_env { - provider = \\"predefined-generator\\" - binaryTargets = env(\\"BINARY_TARGETS_ENV_VAR_TEST\\") - } + generator gen_env { + provider = \\"predefined-generator\\" + binaryTargets = env(\\"BINARY_TARGETS_ENV_VAR_TEST\\") + } - model User { - id Int @id - name String - } - ", - "datasources": Array [ - Object { - "activeProvider": "sqlite", - "name": "db", - "provider": Array [ - "sqlite", - ], - "url": Object { - "fromEnvVar": null, - "value": "file:./dev.db", - }, - }, - ], - "otherGenerators": Array [], - } - `) + model User { + id Int @id + name String + } + ", + "datasources": Array [ + Object { + "activeProvider": "sqlite", + "name": "db", + "provider": "sqlite", + "url": Object { + "fromEnvVar": null, + "value": "file:./dev.db", + }, + }, + ], + "otherGenerators": Array [], + } + `) const generator = omit(generators[0].options!.generator, ['output']) const platform = await getPlatform() @@ -435,38 +427,36 @@ describe('getGenerators', () => { 'otherGenerators', ]), ).toMatchInlineSnapshot(` - Object { - "datamodel": "datasource db { - provider = \\"sqlite\\" - url = \\"file:./dev.db\\" - } + Object { + "datamodel": "datasource db { + provider = \\"sqlite\\" + url = \\"file:./dev.db\\" + } - generator gen_env { - provider = \\"predefined-generator\\" - binaryTargets = env(\\"BINARY_TARGETS_ENV_VAR_TEST\\") - } + generator gen_env { + provider = \\"predefined-generator\\" + binaryTargets = env(\\"BINARY_TARGETS_ENV_VAR_TEST\\") + } - model User { - id Int @id - name String - } - ", - "datasources": Array [ - Object { - "activeProvider": "sqlite", - "name": "db", - "provider": Array [ - "sqlite", - ], - "url": Object { - "fromEnvVar": null, - "value": "file:./dev.db", - }, - }, - ], - "otherGenerators": Array [], - } - `) + model User { + id Int @id + name String + } + ", + "datasources": Array [ + Object { + "activeProvider": "sqlite", + "name": "db", + "provider": "sqlite", + "url": Object { + "fromEnvVar": null, + "value": "file:./dev.db", + }, + }, + ], + "otherGenerators": Array [], + } + `) expect(omit(generators[0].options!.generator, ['output'])) .toMatchInlineSnapshot(` @@ -613,20 +603,20 @@ describe('getGenerators', () => { }) } catch (e) { expect(stripAnsi(e.message)).toMatchInlineSnapshot(` -" -You don't have any models defined in your schema.prisma, so nothing will be generated. -You can define a model like this: - -model User { - id Int @id @default(autoincrement()) - email String @unique - name String? -} - -More information in our documentation: -https://pris.ly/d/prisma-schema -" -`) + " + You don't have any models defined in your schema.prisma, so nothing will be generated. + You can define a model like this: + + model User { + id Int @id @default(autoincrement()) + email String @unique + name String? + } + + More information in our documentation: + https://pris.ly/d/prisma-schema + " + `) } }) @@ -649,20 +639,20 @@ https://pris.ly/d/prisma-schema }) } catch (e) { expect(stripAnsi(e.message)).toMatchInlineSnapshot(` -" -You don't have any models defined in your schema.prisma, so nothing will be generated. -You can define a model like this: - -model User { - id String @id @default(dbgenerated()) @map(\\"_id\\") @db.ObjectId - email String @unique - name String? -} - -More information in our documentation: -https://pris.ly/d/prisma-schema -" -`) + " + You don't have any models defined in your schema.prisma, so nothing will be generated. + You can define a model like this: + + model User { + id String @id @default(dbgenerated()) @map(\\"_id\\") @db.ObjectId + email String @unique + name String? + } + + More information in our documentation: + https://pris.ly/d/prisma-schema + " + `) } }) }) diff --git a/packages/sdk/src/cli/types.ts b/packages/sdk/src/cli/types.ts index c6f06f88c1c7..068c11f7aaeb 100644 --- a/packages/sdk/src/cli/types.ts +++ b/packages/sdk/src/cli/types.ts @@ -28,7 +28,7 @@ export type GeneratorOptions = { otherGenerators: GeneratorConfig[] cwd: string dmmf: any - dataSources: any + datasources: any datamodel: string } diff --git a/packages/sdk/src/engine-commands/getConfig.ts b/packages/sdk/src/engine-commands/getConfig.ts index abf0ccdddd47..965afc600313 100644 --- a/packages/sdk/src/engine-commands/getConfig.ts +++ b/packages/sdk/src/engine-commands/getConfig.ts @@ -53,7 +53,7 @@ export async function getConfig( // TODO This has been outdated for ages and needs to be handled differently and/or removed if ( - data.datasources?.[0]?.provider?.[0] === 'sqlite' && + data.datasources?.[0]?.provider === 'sqlite' && data.generators.some((g) => g.previewFeatures.includes('createMany')) ) { const message = `Database provider "sqlite" and the preview feature "createMany" can't be used at the same time. diff --git a/packages/sdk/src/getGenerators.ts b/packages/sdk/src/getGenerators.ts index 21c0736e7414..16c408a2a562 100644 --- a/packages/sdk/src/getGenerators.ts +++ b/packages/sdk/src/getGenerators.ts @@ -151,7 +151,7 @@ export async function getGenerators({ if (dmmf.datamodel.models.length === 0) { // MongoDB needs extras for @id: @map("_id") @db.ObjectId - if (config.datasources.some((d) => d.provider.includes('mongodb'))) { + if (config.datasources.some((d) => d.provider === 'mongodb')) { throw new Error(missingModelMessageMongoDB) } @@ -159,7 +159,7 @@ export async function getGenerators({ } if ( - config.datasources.some((d) => d.provider.includes('mongodb')) && + config.datasources.some((d) => d.provider === 'mongodb') && !previewFeatures.includes('mongoDb') ) { throw new Error(mongoFeatureFlagMissingMessage) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 741196200a2d..9b0fda82cb0e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -82,10 +82,10 @@ importers: specifiers: '@prisma/client': workspace:* '@prisma/debug': workspace:* - '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 - '@prisma/fetch-engine': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 + '@prisma/fetch-engine': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': workspace:* - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/migrate': workspace:* '@prisma/sdk': workspace:* '@prisma/studio-server': 0.418.0 @@ -130,13 +130,13 @@ importers: ts-jest: 27.0.4 typescript: 4.3.5 dependencies: - '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 devDependencies: '@prisma/client': link:../client '@prisma/debug': link:../debug - '@prisma/fetch-engine': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/fetch-engine': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': link:../generator-helper - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/migrate': link:../migrate '@prisma/sdk': link:../sdk '@prisma/studio-server': 0.418.0 @@ -185,11 +185,11 @@ importers: specifiers: '@prisma/debug': workspace:* '@prisma/engine-core': workspace:* - '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 - '@prisma/engines-version': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 - '@prisma/fetch-engine': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 + '@prisma/engines-version': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 + '@prisma/fetch-engine': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': workspace:* - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/migrate': workspace:* '@prisma/sdk': workspace:* '@timsuchanek/copy': 1.4.5 @@ -244,14 +244,14 @@ importers: tsd: 0.17.0 typescript: 4.3.5 dependencies: - '@prisma/engines-version': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines-version': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 devDependencies: '@prisma/debug': link:../debug '@prisma/engine-core': link:../engine-core - '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 - '@prisma/fetch-engine': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 + '@prisma/fetch-engine': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': link:../generator-helper - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/migrate': link:../migrate '@prisma/sdk': link:../sdk '@timsuchanek/copy': 1.4.5 @@ -356,9 +356,9 @@ importers: packages/engine-core: specifiers: '@prisma/debug': workspace:* - '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': workspace:* - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@types/jest': 26.0.24 '@types/node': 12.20.18 '@typescript-eslint/eslint-plugin': 4.29.0 @@ -386,9 +386,9 @@ importers: undici: 3.3.6 dependencies: '@prisma/debug': link:../debug - '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': link:../generator-helper - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 chalk: 4.1.2 execa: 5.1.1 get-stream: 6.0.1 @@ -466,7 +466,7 @@ importers: packages/integration-tests: specifiers: '@prisma/client': workspace:* - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/migrate': workspace:* '@prisma/sdk': workspace:* '@sindresorhus/slugify': 1.1.2 @@ -507,7 +507,7 @@ importers: verror: 1.10.0 devDependencies: '@prisma/client': link:../client - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/migrate': link:../migrate '@prisma/sdk': link:../sdk '@sindresorhus/slugify': 1.1.2 @@ -550,9 +550,9 @@ importers: packages/migrate: specifiers: '@prisma/debug': workspace:* - '@prisma/engines-version': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines-version': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': workspace:* - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/sdk': workspace:* '@sindresorhus/slugify': 1.1.0 '@types/jest': 26.0.24 @@ -598,7 +598,7 @@ importers: typescript: 4.3.5 dependencies: '@prisma/debug': link:../debug - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@sindresorhus/slugify': 1.1.0 execa: 5.1.1 global-dirs: 3.0.0 @@ -613,7 +613,7 @@ importers: strip-ansi: 6.0.0 strip-indent: 3.0.0 devDependencies: - '@prisma/engines-version': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines-version': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': link:../generator-helper '@prisma/sdk': link:../sdk '@types/jest': 26.0.24 @@ -692,10 +692,10 @@ importers: specifiers: '@prisma/debug': workspace:* '@prisma/engine-core': workspace:* - '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 - '@prisma/fetch-engine': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 + '@prisma/fetch-engine': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': workspace:* - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@timsuchanek/copy': 1.4.5 '@types/jest': 26.0.24 '@types/node': 12.20.18 @@ -748,10 +748,10 @@ importers: dependencies: '@prisma/debug': link:../debug '@prisma/engine-core': link:../engine-core - '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 - '@prisma/fetch-engine': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/engines': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 + '@prisma/fetch-engine': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@prisma/generator-helper': link:../generator-helper - '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 '@timsuchanek/copy': 1.4.5 archiver: 4.0.2 arg: 5.0.0 @@ -1646,8 +1646,8 @@ packages: transitivePeerDependencies: - supports-color - /@prisma/debug/2.29.0-dev.20: - resolution: {integrity: sha512-s6wNppb2WcLji6vCWX54YXe0kOe7q3ERsDCTAHFNNcjsOfr0L807aId5nV8mfICqqK8nFS5HtQdH4oWW6Fvgdg==} + /@prisma/debug/2.29.0-dev.23: + resolution: {integrity: sha512-fLfFUqFQKPpBulF31KrCWJzQ2VTnbgdqPCEnFBhNLz2Ect4tVSb4arn1W3voICy7EaQucIyxkYZ2+XqapdU8rw==} dependencies: debug: 4.3.2 ms: 2.1.3 @@ -1655,12 +1655,12 @@ packages: - supports-color dev: true - /@prisma/engine-core/2.29.0-dev.20: - resolution: {integrity: sha512-Z8Aw1m/eOvZuMSYCSvBc8Mlrr2v9aOqJ5KVOpog7t6bjJJhaKmLNIQWJ4Q+T+W7dFAZfE+Ebg3ruF0vBJd66Lg==} + /@prisma/engine-core/2.29.0-dev.23: + resolution: {integrity: sha512-O4SGgILtPqS0WfgcvZkvsRlAoDMtlajng+ZSQfXOdqy798NaiNfgOe1qbZSpj5ahIha5cOJjmwldWgkU6JjUnw==} dependencies: - '@prisma/debug': 2.29.0-dev.20 + '@prisma/debug': 2.29.0-dev.23 '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 - '@prisma/generator-helper': 2.29.0-dev.20 + '@prisma/generator-helper': 2.29.0-dev.23 '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 chalk: 4.1.2 execa: 5.1.1 @@ -1674,18 +1674,47 @@ packages: - supports-color dev: true - /@prisma/engines-version/2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219: - resolution: {integrity: sha512-ZQ3Z5K2YhtbUVeyZu15hF8fxgBQx8eod/5DWyApdothSPnu2Lz/nOG0WzdrwEIluSQBOXtHpOygiBsSC5b+IpA==} + /@prisma/engines-version/2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4: + resolution: {integrity: sha512-eAhHX7YroUlKIzD3HBiLXcPSNd8NYFguxzKAdP1Hn7XqdrNytQ4KX6TnSDu6tlveg4yE9y3Rr97boPJgZPWpAg==} /@prisma/engines/2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219: resolution: {integrity: sha512-+j+2o1/rdysn8CFSTLIsDYW8aeEmpBJQ0PayBiROFgPJOlUEaqYKFn/q3Iph4VTh7XRZsYITulwUaolH0XRTSg==} requiresBuild: true + dev: true + + /@prisma/engines/2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4: + resolution: {integrity: sha512-CKAb1hnkhIIZ+cP6f57g3BJt5cRg1QCLpaBL2Kp6nkSVz0PKPkckoezNsD6gL1SOVlPQ/Jtwoqhru4fPWmuP3Q==} + requiresBuild: true /@prisma/fetch-engine/2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219: resolution: {integrity: sha512-/vY/N1qZr7np130Mp22gAgh70OCHxBzfhHSXuDno3xfgumGWB51jf87b7z+4m3mWx39/yRlfXhvbyqIMVo6pwg==} dependencies: '@prisma/debug': 2.28.0 '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 + chalk: 4.1.2 + execa: 5.1.1 + find-cache-dir: 3.3.1 + hasha: 5.2.2 + http-proxy-agent: 4.0.1 + https-proxy-agent: 5.0.0 + make-dir: 3.1.0 + node-fetch: 2.6.1 + p-filter: 2.1.0 + p-map: 4.0.0 + p-retry: 4.6.1 + progress: 2.0.3 + rimraf: 3.0.2 + temp-dir: 2.0.0 + tempy: 1.0.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@prisma/fetch-engine/2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4: + resolution: {integrity: sha512-R7rZ/YKaI5CwXPzxs+zagnmLjLDTV3nZMYyq7+05zm8UGlH+wKgJtvLoSSIjDTgZZldYoiQUCiHOOABVYv+/kQ==} + dependencies: + '@prisma/debug': 2.28.0 + '@prisma/get-platform': 2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4 chalk: 4.1.1 execa: 5.1.1 find-cache-dir: 3.3.1 @@ -1704,11 +1733,11 @@ packages: transitivePeerDependencies: - supports-color - /@prisma/generator-helper/2.29.0-dev.20: - resolution: {integrity: sha512-931olfVO3ixYVGrs9ADULn7CcFzPIef0gs5jqfUvyYxcBQaL8ne5oabxeZQaP7cQaGnKnQEX0OB9FnYfu0bMbw==} + /@prisma/generator-helper/2.29.0-dev.23: + resolution: {integrity: sha512-yL71QgaitsMFJEAfY2IgQOf0nudWeU9pwxHTY4kjbXn4PO683IYBuPRdrQ6O+THnxihiqPN449ziedyHq62qcw==} dependencies: - '@prisma/debug': 2.29.0-dev.20 - '@types/cross-spawn': 6.0.1 + '@prisma/debug': 2.29.0-dev.23 + '@types/cross-spawn': 6.0.2 chalk: 4.1.2 cross-spawn: 7.0.3 transitivePeerDependencies: @@ -1721,15 +1750,23 @@ packages: '@prisma/debug': 2.28.0 transitivePeerDependencies: - supports-color + dev: true + + /@prisma/get-platform/2.29.0-14.7a25b4cea9ebc8ffbbe419dbe66a06590f514fe4: + resolution: {integrity: sha512-5eTrJqj7ZINnz5iJLvtX9qZjfEu3xDcUcuex0Nce+ecMt2t5taQDCMaCLp4M5qeVQCIOFJeomk5p17wG/3cPXQ==} + dependencies: + '@prisma/debug': 2.28.0 + transitivePeerDependencies: + - supports-color - /@prisma/sdk/2.29.0-dev.20: - resolution: {integrity: sha512-tGPHjkBWm60TtMIadiudJu4HoGHPh+04Ma9BoaXjhOR9VaijbvxFi1wWkFl7wIwAebn/EwrC3KN/h9PxRqgMcQ==} + /@prisma/sdk/2.29.0-dev.23: + resolution: {integrity: sha512-v9zr2tuHjzhWFiOu0KzGX+FxENTVw3qnTTBT7FwdJpa8NmT/hjgKIoiH9uRVgyLz1DEGWe6bsYBROogFz1H9QQ==} dependencies: - '@prisma/debug': 2.29.0-dev.20 - '@prisma/engine-core': 2.29.0-dev.20 + '@prisma/debug': 2.29.0-dev.23 + '@prisma/engine-core': 2.29.0-dev.23 '@prisma/engines': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 '@prisma/fetch-engine': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 - '@prisma/generator-helper': 2.29.0-dev.20 + '@prisma/generator-helper': 2.29.0-dev.23 '@prisma/get-platform': 2.29.0-13.10a1beca097abd55b7d4a40e6a1035985ba4e219 '@timsuchanek/copy': 1.4.5 archiver: 4.0.2 @@ -1764,13 +1801,13 @@ packages: - supports-color dev: true - /@prisma/studio-pcw/0.418.0_@prisma+sdk@2.29.0-dev.20: + /@prisma/studio-pcw/0.418.0_@prisma+sdk@2.29.0-dev.23: resolution: {integrity: sha512-Ujt54DkAC6f+59LMdorR5e+iRpfCf2CeQ+ooAtPQSd9FZKsR81EqmVufc/PGn9zD/l5dc584mjqP1sjOReHy2Q==} peerDependencies: '@prisma/client': '*' '@prisma/sdk': '*' dependencies: - '@prisma/sdk': 2.29.0-dev.20 + '@prisma/sdk': 2.29.0-dev.23 debug: 4.3.1 lodash: 4.17.21 transitivePeerDependencies: @@ -1780,8 +1817,8 @@ packages: /@prisma/studio-server/0.418.0: resolution: {integrity: sha512-U8aMPLnvRMUuB1hW9+V+0JLF28lQGNiZFFEhwFleI8U6VYjlYBSTWX5d7anwGbTq3Q26K9DgvetjIEKWxaezBQ==} dependencies: - '@prisma/sdk': 2.29.0-dev.20 - '@prisma/studio-pcw': 0.418.0_@prisma+sdk@2.29.0-dev.20 + '@prisma/sdk': 2.29.0-dev.23 + '@prisma/studio-pcw': 0.418.0_@prisma+sdk@2.29.0-dev.23 '@prisma/studio-transports': 0.418.0 '@sentry/node': 6.2.5 checkpoint-client: 1.1.20 @@ -1790,7 +1827,6 @@ packages: express: 4.17.1 untildify: 4.0.0 transitivePeerDependencies: - - '@prisma/client' - supports-color dev: true @@ -1993,17 +2029,10 @@ packages: resolution: {integrity: sha512-XmdNOarpSSxnb3DE2rRFOFsEyoqXLUL+7H8nSGS25vs+JS0018bd+cW5Ma9vdlkPmoTHSQ6e8EUFMFMxeE4l+g==} dev: true - /@types/cross-spawn/6.0.1: - resolution: {integrity: sha512-MtN1pDYdI6D6QFDzy39Q+6c9rl2o/xN7aWGe6oZuzqq5N6+YuwFsWiEAv3dNzvzN9YzU+itpN8lBzFpphQKLAw==} - dependencies: - '@types/node': 14.17.7 - dev: true - /@types/cross-spawn/6.0.2: resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==} dependencies: - '@types/node': 14.17.6 - dev: false + '@types/node': 14.17.7 /@types/debug/4.1.7: resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==} @@ -2112,10 +2141,10 @@ packages: /@types/node/14.17.6: resolution: {integrity: sha512-iBxsxU7eswQDGhlr3AiamBxOssaYxbM+NKXVil8jg9yFXvrfEFbDumLD/2dMTB+zYyg7w+Xjt8yuxfdbUHAtcQ==} + dev: true /@types/node/14.17.7: resolution: {integrity: sha512-SYTdMaW47se8499q8m0fYKZZRlmq0RaRv6oYmlVm6DUm31l0fhOl1D03X8hGxohCKTI2Bg6w7W0TiYB51aJzag==} - dev: true /@types/node/8.10.66: resolution: {integrity: sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==}