From 4ce84549c793e7655adbe3f8dc362e20a26fbabe Mon Sep 17 00:00:00 2001 From: Dan Ditomaso Date: Thu, 20 Feb 2025 22:03:23 -0500 Subject: [PATCH 1/2] fix: update pnpm lock file version --- package.json | 4 ---- pnpm-lock.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index bf03feb1..f36ff8e4 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,6 @@ "npm run format" ] }, - "engines": { - "node": ">=20.0.0", - "pnpm": ">=10.0.0" - }, "repository": { "type": "git", "url": "git+https://github.com/meshtastic/web.git" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7353e1a..95d327e1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '9.0' +lockfileVersion: '10.0' settings: autoInstallPeers: true From 3afbc9a693b722f3d8b37e686a87b5cba33284cd Mon Sep 17 00:00:00 2001 From: Dan Ditomaso Date: Thu, 20 Feb 2025 22:06:06 -0500 Subject: [PATCH 2/2] manually specify pnpm version in gh workflows --- .github/workflows/ci.yml | 2 ++ .github/workflows/pr.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76f226cc..5bc15510 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,8 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v4 + with: + version: 10 - name: Install Dependencies run: pnpm install diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0e3f324a..663956c4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,6 +11,8 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v4 + with: + version: 10 - name: Install Dependencies run: pnpm install