Skip to content

Commit

Permalink
chore(deps): update engines to 4.13.0-15.f8f78f335fd86dea323d7fbc581f…
Browse files Browse the repository at this point in the history
…df500d745e9a (#18637)

* chore(deps): update engines to 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a

* fix: update snapshotscd '/Users/jkomyno/work/prisma/prisma/packages/fetch-engine' after engines change

* fix: update snapshots

* fix: explicitly rename 'schema-engine-cli' into 'migration-engine-cli' when using NODE_API. Updated snapshots

---------

Co-authored-by: jkomyno <skiabo97@gmail.com>
  • Loading branch information
prisma-bot and jkomyno committed Apr 6, 2023
1 parent 906d265 commit 047fda8
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 33 deletions.
Expand Up @@ -11,17 +11,6 @@ Default Engines Hash : ENGINE_VERSION
Studio : STUDIO_VERSION
`;

exports[`version version with custom binaries (Node-API) 1`] = `
prisma : 0.0.0
@prisma/client : Not found
Current platform : TEST_PLATFORM
Query Engine (Node-API) : libquery-engine ENGINE_VERSION (at sanitized_path/libquery_engine-TEST_PLATFORM.LIBRARY_TYPE.node, resolved by PRISMA_QUERY_ENGINE_LIBRARY)
Migration Engine : migration-engine-cli ENGINE_VERSION (at sanitized_path/migration-engine-TEST_PLATFORM, resolved by PRISMA_MIGRATION_ENGINE_BINARY)
Format Wasm : @prisma/prisma-fmt-wasm CLI_VERSION.ENGINE_VERSION
Default Engines Hash : ENGINE_VERSION
Studio : STUDIO_VERSION
`;

exports[`version basic version 1`] = `
prisma : 0.0.0
@prisma/client : Not found
Expand All @@ -33,6 +22,17 @@ Default Engines Hash : ENGINE_VERSION
Studio : STUDIO_VERSION
`;

exports[`version version with custom binaries (Node-API) 1`] = `
prisma : 0.0.0
@prisma/client : Not found
Current platform : TEST_PLATFORM
Query Engine (Node-API) : libquery-engine ENGINE_VERSION (at sanitized_path/libquery_engine-TEST_PLATFORM.LIBRARY_TYPE.node, resolved by PRISMA_QUERY_ENGINE_LIBRARY)
Migration Engine : migration-engine-cli ENGINE_VERSION (at sanitized_path/migration-engine-TEST_PLATFORM, resolved by PRISMA_MIGRATION_ENGINE_BINARY)
Format Wasm : @prisma/prisma-fmt-wasm CLI_VERSION.ENGINE_VERSION
Default Engines Hash : ENGINE_VERSION
Studio : STUDIO_VERSION
`;

exports[`version version with custom binaries 1`] = `
prisma : 0.0.0
@prisma/client : Not found
Expand Down
2 changes: 1 addition & 1 deletion packages/client/package.json
Expand Up @@ -152,7 +152,7 @@
}
},
"dependencies": {
"@prisma/engines-version": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9"
"@prisma/engines-version": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a"
},
"sideEffects": false
}
2 changes: 1 addition & 1 deletion packages/engines/package.json
Expand Up @@ -8,7 +8,7 @@
"author": "Tim Suchanek <suchanek@prisma.io>",
"devDependencies": {
"@prisma/debug": "workspace:*",
"@prisma/engines-version": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9",
"@prisma/engines-version": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a",
"@prisma/fetch-engine": "workspace:*",
"@prisma/get-platform": "workspace:*",
"@swc/core": "1.3.32",
Expand Down
2 changes: 1 addition & 1 deletion packages/fetch-engine/package.json
Expand Up @@ -15,7 +15,7 @@
"bugs": "https://github.com/prisma/prisma/issues",
"enginesOverride": {},
"devDependencies": {
"@prisma/engines-version": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9",
"@prisma/engines-version": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a",
"@swc/core": "1.3.32",
"@swc/jest": "0.2.24",
"@types/jest": "29.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/internals/package.json
Expand Up @@ -47,7 +47,7 @@
"@prisma/fetch-engine": "workspace:*",
"@prisma/generator-helper": "workspace:*",
"@prisma/get-platform": "workspace:*",
"@prisma/prisma-fmt-wasm": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9",
"@prisma/prisma-fmt-wasm": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a",
"archiver": "5.3.1",
"arg": "5.0.2",
"chalk": "4.1.2",
Expand Down
8 changes: 5 additions & 3 deletions packages/internals/src/engine-commands/getEngineVersion.ts
Expand Up @@ -21,9 +21,11 @@ export async function getEngineVersion(enginePath?: string, binaryName?: BinaryT
const QE = loadLibrary<NodeAPILibraryTypes.Library>(enginePath, platformInfo)
return `${BinaryType.QueryEngineLibrary} ${QE.version().commit}`
} else {
const result = await execa(enginePath, ['--version'])

return result.stdout
// E.g, when enginePath refers to "migration-engine", this returns
// `schema-engine-cli b952e556c57c90e9fe3152674d223600fba2a65d`.
// "migration-engine" will be publicly renamed as "schema-engine" in Prisma 5.
const { stdout } = await execa(enginePath, ['--version'])
return stdout.replace('schema-engine-cli', 'migration-engine-cli')
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/migrate/package.json
Expand Up @@ -17,7 +17,7 @@
"version": "latest"
},
"devDependencies": {
"@prisma/engines-version": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9",
"@prisma/engines-version": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a",
"@prisma/generator-helper": "workspace:*",
"@prisma/internals": "workspace:*",
"@swc/core": "1.3.32",
Expand Down
28 changes: 14 additions & 14 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 047fda8

Please sign in to comment.