From 4158b395c79615ca96f63bde273897d232058dd1 Mon Sep 17 00:00:00 2001 From: RowanGillUKHSA Date: Mon, 4 Aug 2025 15:49:56 +0100 Subject: [PATCH 1/2] chore/upgrade-prisma-client upgrade prisma to 6.12 --- queue-model/package.json | 4 ++-- runner/package.json | 2 +- submitter/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/queue-model/package.json b/queue-model/package.json index ac7f3825fc..7b32dfafba 100644 --- a/queue-model/package.json +++ b/queue-model/package.json @@ -32,10 +32,10 @@ "eslint": "^8.10.0", "eslint-plugin-import": "^2.25.4", "eslint-plugin-tsdoc": "^0.2.14", - "prisma": "5.22.0", + "prisma": "6.12.0", "typescript": "4.9.5" }, "dependencies": { - "@prisma/client": "5.22.0" + "@prisma/client": "6.12.0" } } diff --git a/runner/package.json b/runner/package.json index 31e1e7d98b..5e9e637c3f 100644 --- a/runner/package.json +++ b/runner/package.json @@ -122,7 +122,7 @@ "lodash-es": "^4.17.21", "nodemon": "^3.0.2", "pino": "8.15.1", - "prisma": "5.22.0", + "prisma": "6.12.0", "sass": "^1.49.9", "sinon": "^13.0.1", "typescript": "4.9.5" diff --git a/submitter/package.json b/submitter/package.json index 715936ac63..caa7e7026b 100644 --- a/submitter/package.json +++ b/submitter/package.json @@ -53,7 +53,7 @@ "jest": "^26.6.3", "jest-mock-extended": "^3.0.5", "nodemon": "^3.0.1", - "prisma": "5.22.0", + "prisma": "6.12.0", "typescript": "4.9.5" }, "pkg": { From 015159d9db801399c3aaa98ef2c86ced62672408 Mon Sep 17 00:00:00 2001 From: RowanGillUKHSA Date: Tue, 5 Aug 2025 08:45:52 +0100 Subject: [PATCH 2/2] LOPS3-587-xgov-flakey-pipeline Rebuilt yarn --- yarn.lock | 135 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 56 deletions(-) diff --git a/yarn.lock b/yarn.lock index 31147eb098..6b14b20d25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3667,61 +3667,73 @@ __metadata: languageName: node linkType: hard -"@prisma/client@npm:5.22.0": - version: 5.22.0 - resolution: "@prisma/client@npm:5.22.0" +"@prisma/client@npm:6.12.0": + version: 6.12.0 + resolution: "@prisma/client@npm:6.12.0" peerDependencies: prisma: "*" + typescript: ">=5.1.0" peerDependenciesMeta: prisma: optional: true - checksum: 2a4db1e631528644ad8e726f26fbbcd692fbf3483a872185797cc34ba2531d17288841d7fa753439da29937706d7cd515fa1fc06f01b9e375c2232e2943c169e + typescript: + optional: true + checksum: 3d6d9354b57872b58b97c01e3e90d1359d9dc47fd081f0db8ce81af0b3a1f5277678424c5a5a2f6a801ec0c87db3612da1e8be18913ee62ec54e6b4428eb6c96 languageName: node linkType: hard -"@prisma/debug@npm:5.22.0": - version: 5.22.0 - resolution: "@prisma/debug@npm:5.22.0" - checksum: ee263d933c3ab92e93aee78771e5040a510316d96ce69c64cfd65d21e59646b9c5a047446ce7965651563d001150ef763485474bd43ca8a6544ab7ce604d2ffa +"@prisma/config@npm:6.12.0": + version: 6.12.0 + resolution: "@prisma/config@npm:6.12.0" + dependencies: + jiti: 2.4.2 + checksum: b06b8fb9f8f07e44dcba250e059551d0439c82b5c2957385d5132e9040e7e40e5bc7bc3620cc671092b880552ad6f7247ae76d8288851ab06c8d01bfba6c7dfc languageName: node linkType: hard -"@prisma/engines-version@npm:5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2": - version: 5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2 - resolution: "@prisma/engines-version@npm:5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2" - checksum: 9ea0689474db5da01d14ec6b24b348c282ce7fc6874a15c7dc7910398a52ef44f67a10b24dee8e41386b4611bdbbc10679145cba5b092f7989cf0543bbf5b078 +"@prisma/debug@npm:6.12.0": + version: 6.12.0 + resolution: "@prisma/debug@npm:6.12.0" + checksum: eebf9aed967964f8187cc7b3df0205e25f99a2874163b09031a7283748f038d841a076809b1c593a01dc198d1736f562f11b06e66be01edbf1642a3a2f357174 languageName: node linkType: hard -"@prisma/engines@npm:5.22.0": - version: 5.22.0 - resolution: "@prisma/engines@npm:5.22.0" +"@prisma/engines-version@npm:6.12.0-15.8047c96bbd92db98a2abc7c9323ce77c02c89dbc": + version: 6.12.0-15.8047c96bbd92db98a2abc7c9323ce77c02c89dbc + resolution: "@prisma/engines-version@npm:6.12.0-15.8047c96bbd92db98a2abc7c9323ce77c02c89dbc" + checksum: 108e213a2cc3f85cf11c74c8b17f16f89b36cfc1a2146f918c935da0b9f9f3b0b1c59cdb4edf30c81767182ab9de5730330105af25d8b9cb6eacf400be4f7dfd + languageName: node + linkType: hard + +"@prisma/engines@npm:6.12.0": + version: 6.12.0 + resolution: "@prisma/engines@npm:6.12.0" dependencies: - "@prisma/debug": 5.22.0 - "@prisma/engines-version": 5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2 - "@prisma/fetch-engine": 5.22.0 - "@prisma/get-platform": 5.22.0 - checksum: b66d08f4291af401a1dc75f096bbd980383bf4334221e5dd6be67882a0a91661d994d4b80f94a683b13bbf9062412eb194263df2f7925d53d1e20bfc6c4ede73 + "@prisma/debug": 6.12.0 + "@prisma/engines-version": 6.12.0-15.8047c96bbd92db98a2abc7c9323ce77c02c89dbc + "@prisma/fetch-engine": 6.12.0 + "@prisma/get-platform": 6.12.0 + checksum: ab52544ce07ca375f4dbda448952a9ae7a920f9aa0385a7a02a082a12392c20fa2a0e450951dd4255a9918ec92ef4acc87290993c3bb9fa2cd55c4600b6c8919 languageName: node linkType: hard -"@prisma/fetch-engine@npm:5.22.0": - version: 5.22.0 - resolution: "@prisma/fetch-engine@npm:5.22.0" +"@prisma/fetch-engine@npm:6.12.0": + version: 6.12.0 + resolution: "@prisma/fetch-engine@npm:6.12.0" dependencies: - "@prisma/debug": 5.22.0 - "@prisma/engines-version": 5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2 - "@prisma/get-platform": 5.22.0 - checksum: d65def9fe4a86ef05041738d12cb730cc8b948379e11ac3e3fa2db08d5640a70467b623b4bb0d6d3f4da86c135f6c6da61867c1658eab430dd0e3939382d3a41 + "@prisma/debug": 6.12.0 + "@prisma/engines-version": 6.12.0-15.8047c96bbd92db98a2abc7c9323ce77c02c89dbc + "@prisma/get-platform": 6.12.0 + checksum: 16ebe12e4d9ae03defcc08fee43cc8f4cd29edf57032df1c88070576fb23dd99de3dbc10a6dea702c8e5ff24e57e99efc050a7c65821b1c1a4575eac64a19540 languageName: node linkType: hard -"@prisma/get-platform@npm:5.22.0": - version: 5.22.0 - resolution: "@prisma/get-platform@npm:5.22.0" +"@prisma/get-platform@npm:6.12.0": + version: 6.12.0 + resolution: "@prisma/get-platform@npm:6.12.0" dependencies: - "@prisma/debug": 5.22.0 - checksum: 6d1f47dc586560c3518dadcf1cccaa8d624d1268e5d74a12277cc6ecf7cb2f530ec34b8019faa2c22eb29243efe3733d3c9005ec36dc84cd766d2794fa7b0025 + "@prisma/debug": 6.12.0 + checksum: 64a9594088eb840fa10f3e42e3ef6428a136cb5736cb133824ce220216b5179352254e37e296568bf2afaa0db3eb8a600f120d9e91e08a1b18fb515474140112 languageName: node linkType: hard @@ -5081,13 +5093,13 @@ __metadata: "@babel/eslint-plugin": ^7.22.10 "@babel/preset-env": ^7.23.3 "@babel/preset-typescript": ^7.23.3 - "@prisma/client": 5.22.0 + "@prisma/client": 6.12.0 "@types/node": ^20.4.6 babel-eslint: ^10.1.0 eslint: ^8.10.0 eslint-plugin-import: ^2.25.4 eslint-plugin-tsdoc: ^0.2.14 - prisma: 5.22.0 + prisma: 6.12.0 typescript: 4.9.5 languageName: unknown linkType: soft @@ -5176,7 +5188,7 @@ __metadata: nunjucks: ^3.2.3 pg-boss: ^10.1.3 pino: 8.15.1 - prisma: 5.22.0 + prisma: 6.12.0 resolve: ^1.19.0 sass: ^1.49.9 schmervice: ^1.6.0 @@ -5220,7 +5232,7 @@ __metadata: jest-mock-extended: ^3.0.5 nodemon: ^3.0.1 pino: 8.15.1 - prisma: 5.22.0 + prisma: 6.12.0 schmervice: ^1.6.0 typescript: 4.9.5 languageName: unknown @@ -11025,16 +11037,6 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:2.3.3, fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": - version: 2.3.3 - resolution: "fsevents@npm:2.3.3" - dependencies: - node-gyp: latest - checksum: 11e6ea6fea15e42461fc55b4b0e4a0a3c654faa567f1877dbd353f39156f69def97a69936d1746619d656c4b93de2238bf731f6085a03a50cabf287c9d024317 - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@npm:^1.2.7": version: 1.2.13 resolution: "fsevents@npm:1.2.13" @@ -11046,11 +11048,12 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@2.3.3#~builtin, fsevents@patch:fsevents@^2.1.2#~builtin, fsevents@patch:fsevents@^2.3.2#~builtin, fsevents@patch:fsevents@~2.3.2#~builtin": +"fsevents@npm:^2.1.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": version: 2.3.3 - resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=18f3a7" + resolution: "fsevents@npm:2.3.3" dependencies: node-gyp: latest + checksum: 11e6ea6fea15e42461fc55b4b0e4a0a3c654faa567f1877dbd353f39156f69def97a69936d1746619d656c4b93de2238bf731f6085a03a50cabf287c9d024317 conditions: os=darwin languageName: node linkType: hard @@ -11065,6 +11068,15 @@ __metadata: languageName: node linkType: hard +"fsevents@patch:fsevents@^2.1.2#~builtin, fsevents@patch:fsevents@^2.3.2#~builtin, fsevents@patch:fsevents@~2.3.2#~builtin": + version: 2.3.3 + resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=18f3a7" + dependencies: + node-gyp: latest + conditions: os=darwin + languageName: node + linkType: hard + "function-bind@npm:^1.1.1, function-bind@npm:^1.1.2": version: 1.1.2 resolution: "function-bind@npm:1.1.2" @@ -14188,6 +14200,15 @@ __metadata: languageName: node linkType: hard +"jiti@npm:2.4.2": + version: 2.4.2 + resolution: "jiti@npm:2.4.2" + bin: + jiti: lib/jiti-cli.mjs + checksum: c6c30c7b6b293e9f26addfb332b63d964a9f143cdd2cf5e946dbe5143db89f7c1b50ad9223b77fb1f6ddb0b9c5ecef995fea024ecf7d2861d285d779cde66e1e + languageName: node + linkType: hard + "jju@npm:~1.4.0": version: 1.4.0 resolution: "jju@npm:1.4.0" @@ -17440,18 +17461,20 @@ __metadata: languageName: node linkType: hard -"prisma@npm:5.22.0": - version: 5.22.0 - resolution: "prisma@npm:5.22.0" +"prisma@npm:6.12.0": + version: 6.12.0 + resolution: "prisma@npm:6.12.0" dependencies: - "@prisma/engines": 5.22.0 - fsevents: 2.3.3 - dependenciesMeta: - fsevents: + "@prisma/config": 6.12.0 + "@prisma/engines": 6.12.0 + peerDependencies: + typescript: ">=5.1.0" + peerDependenciesMeta: + typescript: optional: true bin: prisma: build/index.js - checksum: 75a098b80f656f339ec5c89fe0c88e21b410c31eba77b84ad812cfc40cd78c1c26adcab757931427af26c10367d78773b97376747fd37feb99ee401115c85458 + checksum: a8f18bfe55514048ceb2263467472032a0d0b8f2ac95510bc493c903efa57cf06dfa32bf5fdd16da360e11e86e207f1e24b258215a01efbcace4c45b39dd958c languageName: node linkType: hard