From f15691e28e2f387a8041b38f25cc3a1668620e7d Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Fri, 6 Dec 2024 16:14:30 +0100 Subject: [PATCH] chore: upgrade to pnpm 9 (#5077) --- .../test-driver-adapters-template.yml | 2 +- .github/workflows/wasm-benchmarks.yml | 2 +- Makefile | 2 +- flake.lock | 24 +++++++++---------- nix/shell.nix | 2 +- .../driver-adapters/executor/package.json | 2 +- query-engine/driver-adapters/package.json | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/test-driver-adapters-template.yml b/.github/workflows/test-driver-adapters-template.yml index eb45af278bc4..d0598355f375 100644 --- a/.github/workflows/test-driver-adapters-template.yml +++ b/.github/workflows/test-driver-adapters-template.yml @@ -42,7 +42,7 @@ jobs: - name: "Setup pnpm" uses: pnpm/action-setup@v4.0.0 with: - version: 8 + version: 9 - name: "Login to Docker Hub" uses: docker/login-action@v3 diff --git a/.github/workflows/wasm-benchmarks.yml b/.github/workflows/wasm-benchmarks.yml index cfbe4ca7b531..695a2c1a3829 100644 --- a/.github/workflows/wasm-benchmarks.yml +++ b/.github/workflows/wasm-benchmarks.yml @@ -34,7 +34,7 @@ jobs: - name: "Setup pnpm" uses: pnpm/action-setup@v4.0.0 with: - version: 8 + version: 9 - name: "Login to Docker Hub" uses: docker/login-action@v3 diff --git a/Makefile b/Makefile index f823d3389004..94066b92d8d8 100644 --- a/Makefile +++ b/Makefile @@ -405,7 +405,7 @@ build-driver-adapters-kit: build-driver-adapters build-driver-adapters: ensure-prisma-present @echo "Building driver adapters..." - @cd ../prisma && pnpm --filter "*adapter*" i + @cd ../prisma && pnpm i @echo "Driver adapters build completed."; ensure-prisma-present: diff --git a/flake.lock b/flake.lock index 56dc877677c2..28dbb14d0b9a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1732906089, - "narHash": "sha256-NvYSSiKsC0rqn9yY0a9zglLXrFp92EwKhTFZC38voCQ=", + "lastModified": 1733418579, + "narHash": "sha256-0fJaoI4B9Nn67E1P44usZhZHkSSyWdAI23HU+X+HJCQ=", "owner": "ipetkov", "repo": "crane", - "rev": "9ed3180f45c2d1499e5af98c4ab7ffee8e886f5f", + "rev": "62e50137688d953557f156f01e2ad2a25b22d66c", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", + "lastModified": 1733452419, + "narHash": "sha256-eh2i2GtqdWVOP7yjiWtB8FMUWktCZ4vjo81n6g5mSiE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", + "rev": "020701e6057992329a7cfafc6e3c5d5658bbcf79", "type": "github" }, "original": { diff --git a/nix/shell.nix b/nix/shell.nix index f2767cbcf2ce..9e8cfd11b0c0 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -13,7 +13,7 @@ in nodejs_20 nodejs_20.pkgs.typescript-language-server - pnpm_8 + pnpm_9 binaryen cargo-insta diff --git a/query-engine/driver-adapters/executor/package.json b/query-engine/driver-adapters/executor/package.json index a0057e8611e5..5d770fb484f0 100644 --- a/query-engine/driver-adapters/executor/package.json +++ b/query-engine/driver-adapters/executor/package.json @@ -1,7 +1,7 @@ { "engines": { "node": ">=18.18", - "pnpm": ">=8.6.6" + "pnpm": "^9.14.2" }, "name": "executor", "version": "0.0.1", diff --git a/query-engine/driver-adapters/package.json b/query-engine/driver-adapters/package.json index 6008f231104b..4a52a6ceb45a 100644 --- a/query-engine/driver-adapters/package.json +++ b/query-engine/driver-adapters/package.json @@ -4,8 +4,8 @@ "version": "0.0.2", "description": "", "engines": { - "node": ">=16.13", - "pnpm": ">=8.6.6 <9" + "node": ">=18.18", + "pnpm": "^9.14.2" }, "license": "Apache-2.0", "scripts": {