From cbb3f21be8f5fae6b22fa5e4b96be2bd243d51c7 Mon Sep 17 00:00:00 2001 From: Will Pfleger Date: Thu, 21 May 2026 14:28:02 -0400 Subject: [PATCH] fix(deps): upgrade pnpm to v11 with versioned patch keys pnpm v11 requires version-qualified keys in patchedDependencies and uses a new lockfile format. The old patch context no longer matched isomorphic-git@1.38.1 (upstream changed node/default exports to node+default conditions), so the patch was regenerated using pnpm patch-commit to restore explicit import/require conditions for bundler compatibility. Also approves esbuild post-install script, which pnpm v11 now gates behind allowBuilds. --- bin/{.pnpm-10.31.0.pkg => .pnpm-11.1.3.pkg} | 0 bin/pnpm | 2 +- package.json | 2 +- patches/isomorphic-git.patch | 21 ------------------- patches/isomorphic-git@1.38.1.patch | 23 +++++++++++++++++++++ pnpm-lock.yaml | 13 ++++-------- pnpm-workspace.yaml | 4 +++- 7 files changed, 32 insertions(+), 33 deletions(-) rename bin/{.pnpm-10.31.0.pkg => .pnpm-11.1.3.pkg} (100%) delete mode 100644 patches/isomorphic-git.patch create mode 100644 patches/isomorphic-git@1.38.1.patch diff --git a/bin/.pnpm-10.31.0.pkg b/bin/.pnpm-11.1.3.pkg similarity index 100% rename from bin/.pnpm-10.31.0.pkg rename to bin/.pnpm-11.1.3.pkg diff --git a/bin/pnpm b/bin/pnpm index 8084199cb..aeb396c42 120000 --- a/bin/pnpm +++ b/bin/pnpm @@ -1 +1 @@ -.pnpm-10.31.0.pkg \ No newline at end of file +.pnpm-11.1.3.pkg \ No newline at end of file diff --git a/package.json b/package.json index e0252a9c8..928dd1091 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "sprout-workspace", "private": true, - "packageManager": "pnpm@10.33.4", + "packageManager": "pnpm@11.1.3", "scripts": { "check": "pnpm -r check" }, diff --git a/patches/isomorphic-git.patch b/patches/isomorphic-git.patch deleted file mode 100644 index 82195b6f5..000000000 --- a/patches/isomorphic-git.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/package.json b/package.json -index 3111ab7abfd119fac72b374a0c111e236af10259..bb2e968f8eff5ef09bb1dd6316dfa4a2e3daeabe 100644 ---- a/package.json -+++ b/package.json -@@ -8,8 +8,14 @@ - "module": "./index.js", - "exports": { - ".": { -- "types": "./index.d.cts", -- "default": "./index.cjs" -+ "import": { -+ "types": "./index.d.ts", -+ "default": "./index.js" -+ }, -+ "require": { -+ "types": "./index.d.cts", -+ "default": "./index.cjs" -+ } - }, - "./http/node": { - "import": { diff --git a/patches/isomorphic-git@1.38.1.patch b/patches/isomorphic-git@1.38.1.patch new file mode 100644 index 000000000..2a3c99df4 --- /dev/null +++ b/patches/isomorphic-git@1.38.1.patch @@ -0,0 +1,23 @@ +diff --git a/package.json b/package.json +index 330b0513126e2ace570d8ba5664b49a2903a9b37..46e5b3e5fa7297e2cd6c47eb8eb4f4de504e4c5d 100644 +--- a/package.json ++++ b/package.json +@@ -8,13 +8,13 @@ + "module": "./index.js", + "exports": { + ".": { +- "node": { +- "types": "./index.d.cts", +- "default": "./index.cjs" +- }, +- "default": { ++ "import": { + "types": "./index.d.ts", + "default": "./index.js" ++ }, ++ "require": { ++ "types": "./index.d.cts", ++ "default": "./index.cjs" + } + }, + "./http/node": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba38b49d1..3eb7b69b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,9 +5,7 @@ settings: excludeLinksFromLockfile: false patchedDependencies: - isomorphic-git: - hash: 5b43d4f88847fa3640b2babcef47638b012883aff16efacd3818d29bfa690cb1 - path: patches/isomorphic-git.patch + isomorphic-git@1.38.1: e9b414a60d4cf1d8aa18f7a779483984e821989967c235662566e94ef0238d3f importers: @@ -242,7 +240,7 @@ importers: version: 2.1.1 isomorphic-git: specifier: ^1.37.6 - version: 1.38.1(patch_hash=5b43d4f88847fa3640b2babcef47638b012883aff16efacd3818d29bfa690cb1) + version: 1.38.1(patch_hash=e9b414a60d4cf1d8aa18f7a779483984e821989967c235662566e94ef0238d3f) lucide-react: specifier: ^0.577.0 version: 0.577.0(react@19.2.6) @@ -1226,7 +1224,6 @@ packages: resolution: {integrity: sha512-J3Yh9PzzF1Ovah2At+lHiGQdsYgArxBbXv/zHfSyaiFQEqvNv7DcW98pCrmdjCZBrqBiKrKKe2V+aaSGWuBe/w==} cpu: [arm] os: [linux] - libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.60.4': resolution: {integrity: sha512-BFDEZMYfUvLn37ONE1yMBojPxnMlTFsdyNoqncT0qFq1mAfllL+ATMMJd8TeuVMiX84s1KbcxcZbXInmcO2mRg==} @@ -1238,7 +1235,6 @@ packages: resolution: {integrity: sha512-pc9EYOSlOgdQ2uPl1o9PF6/kLSgaUosia7gOuS8mB69IxJvlclko1MECXysjs5ryez1/5zjYqx3+xYU0TU6R1A==} cpu: [arm64] os: [linux] - libc: [musl] '@rollup/rollup-linux-loong64-gnu@4.60.4': resolution: {integrity: sha512-NxnomyxYerDh5n4iLrNa+sH+Z+U4BMEE46V2PgQ/hoB909i8gV1M5wPojWg9fk1jWpO3IQnOs20K4wyZuFLEFQ==} @@ -1474,7 +1470,6 @@ packages: engines: {node: '>= 10'} cpu: [riscv64] os: [linux] - libc: [glibc] '@tauri-apps/cli-linux-x64-gnu@2.11.2': resolution: {integrity: sha512-Ru4gwJKPG0ctVGchRGpRup4Y4lW2SSfFnrbQcyHhCliKy4g8Qz97TrUgCur4CbWyAgKxvGh3SjrkA0LDYzDGiw==} @@ -3029,7 +3024,7 @@ packages: engines: {node: '>= 0.4'} wrappy@1.0.2: - resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} + resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=} yallist@3.1.1: resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} @@ -4835,7 +4830,7 @@ snapshots: isbot@5.1.40: {} - isomorphic-git@1.38.1(patch_hash=5b43d4f88847fa3640b2babcef47638b012883aff16efacd3818d29bfa690cb1): + isomorphic-git@1.38.1(patch_hash=e9b414a60d4cf1d8aa18f7a779483984e821989967c235662566e94ef0238d3f): dependencies: async-lock: 1.4.1 clean-git-ref: 2.0.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 99ed8a6b3..be32818c9 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,5 +1,7 @@ packages: - "desktop" - "web" +allowBuilds: + esbuild: true patchedDependencies: - isomorphic-git: patches/isomorphic-git.patch + isomorphic-git@1.38.1: patches/isomorphic-git@1.38.1.patch