From 1ae3b228420729ed27b1d1cf2ac8c3b286a2b5c7 Mon Sep 17 00:00:00 2001 From: Kingston Date: Wed, 1 Apr 2026 12:07:58 +0200 Subject: [PATCH 1/2] chore: Upgrade Turborepo from 2.5.0 to 2.9.0 --- .changeset/upgrade-turborepo.md | 5 + .../baseplate/generated/package.json | 2 +- examples/blog-with-auth/package.json | 2 +- .../baseplate/generated/package.json | 2 +- examples/todo-with-better-auth/package.json | 2 +- package.json | 2 +- .../src/constants/core-packages.ts | 2 +- pnpm-lock.yaml | 118 +++++++++--------- 8 files changed, 70 insertions(+), 65 deletions(-) create mode 100644 .changeset/upgrade-turborepo.md diff --git a/.changeset/upgrade-turborepo.md b/.changeset/upgrade-turborepo.md new file mode 100644 index 000000000..860460885 --- /dev/null +++ b/.changeset/upgrade-turborepo.md @@ -0,0 +1,5 @@ +--- +'@baseplate-dev/core-generators': patch +--- + +Upgrade Turborepo from 2.5.0 to 2.9.0 diff --git a/examples/blog-with-auth/baseplate/generated/package.json b/examples/blog-with-auth/baseplate/generated/package.json index 71ab1afd0..a87e767ca 100644 --- a/examples/blog-with-auth/baseplate/generated/package.json +++ b/examples/blog-with-auth/baseplate/generated/package.json @@ -29,7 +29,7 @@ "devDependencies": { "prettier": "3.8.1", "prettier-plugin-packagejson": "3.0.0", - "turbo": "2.5.0", + "turbo": "2.9.0", "typescript": "5.9.3" }, "packageManager": "pnpm@10.33.0", diff --git a/examples/blog-with-auth/package.json b/examples/blog-with-auth/package.json index 71ab1afd0..a87e767ca 100644 --- a/examples/blog-with-auth/package.json +++ b/examples/blog-with-auth/package.json @@ -29,7 +29,7 @@ "devDependencies": { "prettier": "3.8.1", "prettier-plugin-packagejson": "3.0.0", - "turbo": "2.5.0", + "turbo": "2.9.0", "typescript": "5.9.3" }, "packageManager": "pnpm@10.33.0", diff --git a/examples/todo-with-better-auth/baseplate/generated/package.json b/examples/todo-with-better-auth/baseplate/generated/package.json index 85cc116bc..f8e669d07 100644 --- a/examples/todo-with-better-auth/baseplate/generated/package.json +++ b/examples/todo-with-better-auth/baseplate/generated/package.json @@ -29,7 +29,7 @@ "devDependencies": { "prettier": "3.8.1", "prettier-plugin-packagejson": "3.0.0", - "turbo": "2.5.0", + "turbo": "2.9.0", "typescript": "5.9.3" }, "packageManager": "pnpm@10.33.0", diff --git a/examples/todo-with-better-auth/package.json b/examples/todo-with-better-auth/package.json index 85cc116bc..f8e669d07 100644 --- a/examples/todo-with-better-auth/package.json +++ b/examples/todo-with-better-auth/package.json @@ -29,7 +29,7 @@ "devDependencies": { "prettier": "3.8.1", "prettier-plugin-packagejson": "3.0.0", - "turbo": "2.5.0", + "turbo": "2.9.0", "typescript": "5.9.3" }, "packageManager": "pnpm@10.33.0", diff --git a/package.json b/package.json index 2cbbf58fa..3a8c7a182 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "oxlint": "catalog:", "oxlint-tsgolint": "0.17.0", "prettier": "catalog:", - "turbo": "2.5.0", + "turbo": "2.9.0", "typescript": "catalog:", "vitest": "catalog:", "workspace-meta": "0.1.4" diff --git a/packages/core-generators/src/constants/core-packages.ts b/packages/core-generators/src/constants/core-packages.ts index 626997e01..207bb9bce 100644 --- a/packages/core-generators/src/constants/core-packages.ts +++ b/packages/core-generators/src/constants/core-packages.ts @@ -32,5 +32,5 @@ export const CORE_PACKAGES = { axios: '1.13.5', // Monorepo - turbo: '2.5.0', + turbo: '2.9.0', } as const; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e36dfaf31..fecdbc5fd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -116,8 +116,8 @@ importers: specifier: 'catalog:' version: 3.8.1 turbo: - specifier: 2.5.0 - version: 2.5.0 + specifier: 2.9.0 + version: 2.9.0 typescript: specifier: 'catalog:' version: 5.9.3 @@ -4255,6 +4255,36 @@ packages: '@tsconfig/vite-react@7.0.2': resolution: {integrity: sha512-lEj4y5SPRcH+bjw0tyuxrEnPqQUwfQzBKgd1YamD9xyet9zLwh2gwy5F8w/Nxg5DjdgYVjjKo5aLJUf0BTDz4w==} + '@turbo/darwin-64@2.9.0': + resolution: {integrity: sha512-owaWYafOebw2en9INuP321/fSN82pIQl38VLgIDd6YJ7+jUasEkORQEkWUC8aAqsIsukLhbGdPnklzUqBwBijQ==} + cpu: [x64] + os: [darwin] + + '@turbo/darwin-arm64@2.9.0': + resolution: {integrity: sha512-1Jj+CXYexJraJ/vvNg5fN9cyVKx/KJyDcWVHvqZWc3aMCC/M4+HxUtnrMu1MEttv5gA4vKOGwa2FCJ9VmfSUGg==} + cpu: [arm64] + os: [darwin] + + '@turbo/linux-64@2.9.0': + resolution: {integrity: sha512-OcCTATltui6jKitb+PaYwiIkLi3bjBP9+9e7gyh0jbivXKoeIFQniMMXbXScQY28zidHw300Ym5itxBMsT/tGw==} + cpu: [x64] + os: [linux] + + '@turbo/linux-arm64@2.9.0': + resolution: {integrity: sha512-+NaycIHwYmwt5WLa6V5OZGgtvPwUTwenA7cYLHo+QBsGW7uGROPvOpFU0WED2C5KcGvlu4GP9ks3Ih6Cg5oZew==} + cpu: [arm64] + os: [linux] + + '@turbo/windows-64@2.9.0': + resolution: {integrity: sha512-HCFf7WXdGWzCQw76/34l/BdYC9tzOihYAQX6ks34WY6MnhpPPAO9YbfV1c/SBcTIjpnQhoAGEBBYrQQ9h7R18w==} + cpu: [x64] + os: [win32] + + '@turbo/windows-arm64@2.9.0': + resolution: {integrity: sha512-/pdxvCMtom9qYplukZzacCL96Vht/datjiRYc3M1geknY+mg8+f047xLxe98PwNhX1sZyovea4RtH8bNU7JLGA==} + cpu: [arm64] + os: [win32] + '@tybys/wasm-util@0.10.1': resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} @@ -8080,38 +8110,8 @@ packages: engines: {node: '>=18.0.0'} hasBin: true - turbo-darwin-64@2.5.0: - resolution: {integrity: sha512-fP1hhI9zY8hv0idym3hAaXdPi80TLovmGmgZFocVAykFtOxF+GlfIgM/l4iLAV9ObIO4SUXPVWHeBZQQ+Hpjag==} - cpu: [x64] - os: [darwin] - - turbo-darwin-arm64@2.5.0: - resolution: {integrity: sha512-p9sYq7kXH7qeJwIQE86cOWv/xNqvow846l6c/qWc26Ib1ci5W7V0sI5thsrP3eH+VA0d+SHalTKg5SQXgNQBWA==} - cpu: [arm64] - os: [darwin] - - turbo-linux-64@2.5.0: - resolution: {integrity: sha512-1iEln2GWiF3iPPPS1HQJT6ZCFXynJPd89gs9SkggH2EJsj3eRUSVMmMC8y6d7bBbhBFsiGGazwFIYrI12zs6uQ==} - cpu: [x64] - os: [linux] - - turbo-linux-arm64@2.5.0: - resolution: {integrity: sha512-bKBcbvuQHmsX116KcxHJuAcppiiBOfivOObh2O5aXNER6mce7YDDQJy00xQQNp1DhEfcSV2uOsvb3O3nN2cbcA==} - cpu: [arm64] - os: [linux] - - turbo-windows-64@2.5.0: - resolution: {integrity: sha512-9BCo8oQ7BO7J0K913Czbc3tw8QwLqn2nTe4E47k6aVYkM12ASTScweXPTuaPFP5iYXAT6z5Dsniw704Ixa5eGg==} - cpu: [x64] - os: [win32] - - turbo-windows-arm64@2.5.0: - resolution: {integrity: sha512-OUHCV+ueXa3UzfZ4co/ueIHgeq9B2K48pZwIxKSm5VaLVuv8M13MhM7unukW09g++dpdrrE1w4IOVgxKZ0/exg==} - cpu: [arm64] - os: [win32] - - turbo@2.5.0: - resolution: {integrity: sha512-PvSRruOsitjy6qdqwIIyolv99+fEn57gP6gn4zhsHTEcCYgXPhv6BAxzAjleS8XKpo+Y582vTTA9nuqYDmbRuA==} + turbo@2.9.0: + resolution: {integrity: sha512-T1PcaG7rej+JLqCyIwwu9NqKiWsoTrEsiSMj4aS9xlPsXoAZw+N8yZjKRdh1WwcQPrAeB0qswgPDoHG59hF4CQ==} hasBin: true tw-animate-css@1.2.9: @@ -10479,6 +10479,24 @@ snapshots: '@tsconfig/vite-react@7.0.2': {} + '@turbo/darwin-64@2.9.0': + optional: true + + '@turbo/darwin-arm64@2.9.0': + optional: true + + '@turbo/linux-64@2.9.0': + optional: true + + '@turbo/linux-arm64@2.9.0': + optional: true + + '@turbo/windows-64@2.9.0': + optional: true + + '@turbo/windows-arm64@2.9.0': + optional: true + '@tybys/wasm-util@0.10.1': dependencies: tslib: 2.8.1 @@ -14718,32 +14736,14 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - turbo-darwin-64@2.5.0: - optional: true - - turbo-darwin-arm64@2.5.0: - optional: true - - turbo-linux-64@2.5.0: - optional: true - - turbo-linux-arm64@2.5.0: - optional: true - - turbo-windows-64@2.5.0: - optional: true - - turbo-windows-arm64@2.5.0: - optional: true - - turbo@2.5.0: + turbo@2.9.0: optionalDependencies: - turbo-darwin-64: 2.5.0 - turbo-darwin-arm64: 2.5.0 - turbo-linux-64: 2.5.0 - turbo-linux-arm64: 2.5.0 - turbo-windows-64: 2.5.0 - turbo-windows-arm64: 2.5.0 + '@turbo/darwin-64': 2.9.0 + '@turbo/darwin-arm64': 2.9.0 + '@turbo/linux-64': 2.9.0 + '@turbo/linux-arm64': 2.9.0 + '@turbo/windows-64': 2.9.0 + '@turbo/windows-arm64': 2.9.0 tw-animate-css@1.2.9: {} From 934e75053310c57288056ae05cc36cfc8ff256df Mon Sep 17 00:00:00 2001 From: Kingston Date: Wed, 1 Apr 2026 12:14:29 +0200 Subject: [PATCH 2/2] Avoid inherting npm_ and pnpm_ vars in run:all/run:example commands --- examples/blog-with-auth/pnpm-lock.yaml | 118 +++++++++--------- examples/todo-with-better-auth/pnpm-lock.yaml | 118 +++++++++--------- scripts/run-all.sh | 11 +- scripts/run-example.sh | 11 +- scripts/run-examples.sh | 11 +- 5 files changed, 148 insertions(+), 121 deletions(-) diff --git a/examples/blog-with-auth/pnpm-lock.yaml b/examples/blog-with-auth/pnpm-lock.yaml index d75e6a94d..42a210771 100644 --- a/examples/blog-with-auth/pnpm-lock.yaml +++ b/examples/blog-with-auth/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: 3.0.0 version: 3.0.0(prettier@3.8.1) turbo: - specifier: 2.5.0 - version: 2.5.0 + specifier: 2.9.0 + version: 2.9.0 typescript: specifier: 5.9.3 version: 5.9.3 @@ -2570,6 +2570,36 @@ packages: resolution: {integrity: sha512-cHHDnewHozgjpI+MIVp9tcib6lYEQK5MyUr0ChHpHFGBl8Xei55rohFK0I0ve/GKoHeioaK42Smd8OixPp6CTg==} engines: {node: '>=12'} + '@turbo/darwin-64@2.9.0': + resolution: {integrity: sha512-owaWYafOebw2en9INuP321/fSN82pIQl38VLgIDd6YJ7+jUasEkORQEkWUC8aAqsIsukLhbGdPnklzUqBwBijQ==} + cpu: [x64] + os: [darwin] + + '@turbo/darwin-arm64@2.9.0': + resolution: {integrity: sha512-1Jj+CXYexJraJ/vvNg5fN9cyVKx/KJyDcWVHvqZWc3aMCC/M4+HxUtnrMu1MEttv5gA4vKOGwa2FCJ9VmfSUGg==} + cpu: [arm64] + os: [darwin] + + '@turbo/linux-64@2.9.0': + resolution: {integrity: sha512-OcCTATltui6jKitb+PaYwiIkLi3bjBP9+9e7gyh0jbivXKoeIFQniMMXbXScQY28zidHw300Ym5itxBMsT/tGw==} + cpu: [x64] + os: [linux] + + '@turbo/linux-arm64@2.9.0': + resolution: {integrity: sha512-+NaycIHwYmwt5WLa6V5OZGgtvPwUTwenA7cYLHo+QBsGW7uGROPvOpFU0WED2C5KcGvlu4GP9ks3Ih6Cg5oZew==} + cpu: [arm64] + os: [linux] + + '@turbo/windows-64@2.9.0': + resolution: {integrity: sha512-HCFf7WXdGWzCQw76/34l/BdYC9tzOihYAQX6ks34WY6MnhpPPAO9YbfV1c/SBcTIjpnQhoAGEBBYrQQ9h7R18w==} + cpu: [x64] + os: [win32] + + '@turbo/windows-arm64@2.9.0': + resolution: {integrity: sha512-/pdxvCMtom9qYplukZzacCL96Vht/datjiRYc3M1geknY+mg8+f047xLxe98PwNhX1sZyovea4RtH8bNU7JLGA==} + cpu: [arm64] + os: [win32] + '@tybys/wasm-util@0.10.0': resolution: {integrity: sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==} @@ -5546,38 +5576,8 @@ packages: engines: {node: '>=18.0.0'} hasBin: true - turbo-darwin-64@2.5.0: - resolution: {integrity: sha512-fP1hhI9zY8hv0idym3hAaXdPi80TLovmGmgZFocVAykFtOxF+GlfIgM/l4iLAV9ObIO4SUXPVWHeBZQQ+Hpjag==} - cpu: [x64] - os: [darwin] - - turbo-darwin-arm64@2.5.0: - resolution: {integrity: sha512-p9sYq7kXH7qeJwIQE86cOWv/xNqvow846l6c/qWc26Ib1ci5W7V0sI5thsrP3eH+VA0d+SHalTKg5SQXgNQBWA==} - cpu: [arm64] - os: [darwin] - - turbo-linux-64@2.5.0: - resolution: {integrity: sha512-1iEln2GWiF3iPPPS1HQJT6ZCFXynJPd89gs9SkggH2EJsj3eRUSVMmMC8y6d7bBbhBFsiGGazwFIYrI12zs6uQ==} - cpu: [x64] - os: [linux] - - turbo-linux-arm64@2.5.0: - resolution: {integrity: sha512-bKBcbvuQHmsX116KcxHJuAcppiiBOfivOObh2O5aXNER6mce7YDDQJy00xQQNp1DhEfcSV2uOsvb3O3nN2cbcA==} - cpu: [arm64] - os: [linux] - - turbo-windows-64@2.5.0: - resolution: {integrity: sha512-9BCo8oQ7BO7J0K913Czbc3tw8QwLqn2nTe4E47k6aVYkM12ASTScweXPTuaPFP5iYXAT6z5Dsniw704Ixa5eGg==} - cpu: [x64] - os: [win32] - - turbo-windows-arm64@2.5.0: - resolution: {integrity: sha512-OUHCV+ueXa3UzfZ4co/ueIHgeq9B2K48pZwIxKSm5VaLVuv8M13MhM7unukW09g++dpdrrE1w4IOVgxKZ0/exg==} - cpu: [arm64] - os: [win32] - - turbo@2.5.0: - resolution: {integrity: sha512-PvSRruOsitjy6qdqwIIyolv99+fEn57gP6gn4zhsHTEcCYgXPhv6BAxzAjleS8XKpo+Y582vTTA9nuqYDmbRuA==} + turbo@2.9.0: + resolution: {integrity: sha512-T1PcaG7rej+JLqCyIwwu9NqKiWsoTrEsiSMj4aS9xlPsXoAZw+N8yZjKRdh1WwcQPrAeB0qswgPDoHG59hF4CQ==} hasBin: true tw-animate-css@1.2.9: @@ -8135,6 +8135,24 @@ snapshots: '@tanstack/virtual-file-routes@1.154.7': {} + '@turbo/darwin-64@2.9.0': + optional: true + + '@turbo/darwin-arm64@2.9.0': + optional: true + + '@turbo/linux-64@2.9.0': + optional: true + + '@turbo/linux-arm64@2.9.0': + optional: true + + '@turbo/windows-64@2.9.0': + optional: true + + '@turbo/windows-arm64@2.9.0': + optional: true + '@tybys/wasm-util@0.10.0': dependencies: tslib: 2.8.1 @@ -11274,32 +11292,14 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - turbo-darwin-64@2.5.0: - optional: true - - turbo-darwin-arm64@2.5.0: - optional: true - - turbo-linux-64@2.5.0: - optional: true - - turbo-linux-arm64@2.5.0: - optional: true - - turbo-windows-64@2.5.0: - optional: true - - turbo-windows-arm64@2.5.0: - optional: true - - turbo@2.5.0: + turbo@2.9.0: optionalDependencies: - turbo-darwin-64: 2.5.0 - turbo-darwin-arm64: 2.5.0 - turbo-linux-64: 2.5.0 - turbo-linux-arm64: 2.5.0 - turbo-windows-64: 2.5.0 - turbo-windows-arm64: 2.5.0 + '@turbo/darwin-64': 2.9.0 + '@turbo/darwin-arm64': 2.9.0 + '@turbo/linux-64': 2.9.0 + '@turbo/linux-arm64': 2.9.0 + '@turbo/windows-64': 2.9.0 + '@turbo/windows-arm64': 2.9.0 tw-animate-css@1.2.9: {} diff --git a/examples/todo-with-better-auth/pnpm-lock.yaml b/examples/todo-with-better-auth/pnpm-lock.yaml index 7fd44c666..821b794d4 100644 --- a/examples/todo-with-better-auth/pnpm-lock.yaml +++ b/examples/todo-with-better-auth/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: 3.0.0 version: 3.0.0(prettier@3.8.1) turbo: - specifier: 2.5.0 - version: 2.5.0 + specifier: 2.9.0 + version: 2.9.0 typescript: specifier: 5.9.3 version: 5.9.3 @@ -3128,6 +3128,36 @@ packages: resolution: {integrity: sha512-cHHDnewHozgjpI+MIVp9tcib6lYEQK5MyUr0ChHpHFGBl8Xei55rohFK0I0ve/GKoHeioaK42Smd8OixPp6CTg==} engines: {node: '>=12'} + '@turbo/darwin-64@2.9.0': + resolution: {integrity: sha512-owaWYafOebw2en9INuP321/fSN82pIQl38VLgIDd6YJ7+jUasEkORQEkWUC8aAqsIsukLhbGdPnklzUqBwBijQ==} + cpu: [x64] + os: [darwin] + + '@turbo/darwin-arm64@2.9.0': + resolution: {integrity: sha512-1Jj+CXYexJraJ/vvNg5fN9cyVKx/KJyDcWVHvqZWc3aMCC/M4+HxUtnrMu1MEttv5gA4vKOGwa2FCJ9VmfSUGg==} + cpu: [arm64] + os: [darwin] + + '@turbo/linux-64@2.9.0': + resolution: {integrity: sha512-OcCTATltui6jKitb+PaYwiIkLi3bjBP9+9e7gyh0jbivXKoeIFQniMMXbXScQY28zidHw300Ym5itxBMsT/tGw==} + cpu: [x64] + os: [linux] + + '@turbo/linux-arm64@2.9.0': + resolution: {integrity: sha512-+NaycIHwYmwt5WLa6V5OZGgtvPwUTwenA7cYLHo+QBsGW7uGROPvOpFU0WED2C5KcGvlu4GP9ks3Ih6Cg5oZew==} + cpu: [arm64] + os: [linux] + + '@turbo/windows-64@2.9.0': + resolution: {integrity: sha512-HCFf7WXdGWzCQw76/34l/BdYC9tzOihYAQX6ks34WY6MnhpPPAO9YbfV1c/SBcTIjpnQhoAGEBBYrQQ9h7R18w==} + cpu: [x64] + os: [win32] + + '@turbo/windows-arm64@2.9.0': + resolution: {integrity: sha512-/pdxvCMtom9qYplukZzacCL96Vht/datjiRYc3M1geknY+mg8+f047xLxe98PwNhX1sZyovea4RtH8bNU7JLGA==} + cpu: [arm64] + os: [win32] + '@tybys/wasm-util@0.10.0': resolution: {integrity: sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==} @@ -6285,38 +6315,8 @@ packages: engines: {node: '>=18.0.0'} hasBin: true - turbo-darwin-64@2.5.0: - resolution: {integrity: sha512-fP1hhI9zY8hv0idym3hAaXdPi80TLovmGmgZFocVAykFtOxF+GlfIgM/l4iLAV9ObIO4SUXPVWHeBZQQ+Hpjag==} - cpu: [x64] - os: [darwin] - - turbo-darwin-arm64@2.5.0: - resolution: {integrity: sha512-p9sYq7kXH7qeJwIQE86cOWv/xNqvow846l6c/qWc26Ib1ci5W7V0sI5thsrP3eH+VA0d+SHalTKg5SQXgNQBWA==} - cpu: [arm64] - os: [darwin] - - turbo-linux-64@2.5.0: - resolution: {integrity: sha512-1iEln2GWiF3iPPPS1HQJT6ZCFXynJPd89gs9SkggH2EJsj3eRUSVMmMC8y6d7bBbhBFsiGGazwFIYrI12zs6uQ==} - cpu: [x64] - os: [linux] - - turbo-linux-arm64@2.5.0: - resolution: {integrity: sha512-bKBcbvuQHmsX116KcxHJuAcppiiBOfivOObh2O5aXNER6mce7YDDQJy00xQQNp1DhEfcSV2uOsvb3O3nN2cbcA==} - cpu: [arm64] - os: [linux] - - turbo-windows-64@2.5.0: - resolution: {integrity: sha512-9BCo8oQ7BO7J0K913Czbc3tw8QwLqn2nTe4E47k6aVYkM12ASTScweXPTuaPFP5iYXAT6z5Dsniw704Ixa5eGg==} - cpu: [x64] - os: [win32] - - turbo-windows-arm64@2.5.0: - resolution: {integrity: sha512-OUHCV+ueXa3UzfZ4co/ueIHgeq9B2K48pZwIxKSm5VaLVuv8M13MhM7unukW09g++dpdrrE1w4IOVgxKZ0/exg==} - cpu: [arm64] - os: [win32] - - turbo@2.5.0: - resolution: {integrity: sha512-PvSRruOsitjy6qdqwIIyolv99+fEn57gP6gn4zhsHTEcCYgXPhv6BAxzAjleS8XKpo+Y582vTTA9nuqYDmbRuA==} + turbo@2.9.0: + resolution: {integrity: sha512-T1PcaG7rej+JLqCyIwwu9NqKiWsoTrEsiSMj4aS9xlPsXoAZw+N8yZjKRdh1WwcQPrAeB0qswgPDoHG59hF4CQ==} hasBin: true tw-animate-css@1.2.9: @@ -9661,6 +9661,24 @@ snapshots: '@tanstack/virtual-file-routes@1.154.7': {} + '@turbo/darwin-64@2.9.0': + optional: true + + '@turbo/darwin-arm64@2.9.0': + optional: true + + '@turbo/linux-64@2.9.0': + optional: true + + '@turbo/linux-arm64@2.9.0': + optional: true + + '@turbo/windows-64@2.9.0': + optional: true + + '@turbo/windows-arm64@2.9.0': + optional: true + '@tybys/wasm-util@0.10.0': dependencies: tslib: 2.8.1 @@ -12958,32 +12976,14 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - turbo-darwin-64@2.5.0: - optional: true - - turbo-darwin-arm64@2.5.0: - optional: true - - turbo-linux-64@2.5.0: - optional: true - - turbo-linux-arm64@2.5.0: - optional: true - - turbo-windows-64@2.5.0: - optional: true - - turbo-windows-arm64@2.5.0: - optional: true - - turbo@2.5.0: + turbo@2.9.0: optionalDependencies: - turbo-darwin-64: 2.5.0 - turbo-darwin-arm64: 2.5.0 - turbo-linux-64: 2.5.0 - turbo-linux-arm64: 2.5.0 - turbo-windows-64: 2.5.0 - turbo-windows-arm64: 2.5.0 + '@turbo/darwin-64': 2.9.0 + '@turbo/darwin-arm64': 2.9.0 + '@turbo/linux-64': 2.9.0 + '@turbo/linux-arm64': 2.9.0 + '@turbo/windows-64': 2.9.0 + '@turbo/windows-arm64': 2.9.0 tw-animate-css@1.2.9: {} diff --git a/scripts/run-all.sh b/scripts/run-all.sh index 4879a0325..1674e4479 100755 --- a/scripts/run-all.sh +++ b/scripts/run-all.sh @@ -19,11 +19,20 @@ for dir in "$ROOT_DIR"/examples/*/package.json; do [ -f "$dir" ] && DIRS+=("$(dirname "$dir")") done +# Collect npm_/pnpm_ env vars injected by the pnpm script runner +# so they don't leak into example project commands +UNSET_ARGS=() +while IFS='=' read -r key _; do + case "$key" in + npm_*|pnpm_*) UNSET_ARGS+=("-u" "$key") ;; + esac +done < <(env) + for dir in "${DIRS[@]}"; do name="${dir#"$ROOT_DIR"/}" if [ "$dir" = "$ROOT_DIR" ]; then name="root" fi echo ">>> Running in $name: $*" - (cd "$dir" && "$@") + (cd "$dir" && env "${UNSET_ARGS[@]}" "$@") done diff --git a/scripts/run-example.sh b/scripts/run-example.sh index 61bba27ba..87ac1e1da 100755 --- a/scripts/run-example.sh +++ b/scripts/run-example.sh @@ -33,5 +33,14 @@ if [ ! -d "$EXAMPLE_DIR" ]; then exit 1 fi +# Collect npm_/pnpm_ env vars injected by the pnpm script runner +# so they don't leak into example project commands +UNSET_ARGS=() +while IFS='=' read -r key _; do + case "$key" in + npm_*|pnpm_*) UNSET_ARGS+=("-u" "$key") ;; + esac +done < <(env) + echo ">>> Running in examples/$EXAMPLE_NAME: $*" -(cd "$EXAMPLE_DIR" && "$@") +(cd "$EXAMPLE_DIR" && env "${UNSET_ARGS[@]}" "$@") diff --git a/scripts/run-examples.sh b/scripts/run-examples.sh index 2fa7258a6..2320c4cd4 100755 --- a/scripts/run-examples.sh +++ b/scripts/run-examples.sh @@ -19,8 +19,17 @@ for dir in "$ROOT_DIR"/examples/*/package.json; do [ -f "$dir" ] && DIRS+=("$(dirname "$dir")") done +# Collect npm_/pnpm_ env vars injected by the pnpm script runner +# so they don't leak into example project commands +UNSET_ARGS=() +while IFS='=' read -r key _; do + case "$key" in + npm_*|pnpm_*) UNSET_ARGS+=("-u" "$key") ;; + esac +done < <(env) + for dir in "${DIRS[@]}"; do name="${dir#"$ROOT_DIR"/}" echo ">>> Running in $name: $*" - (cd "$dir" && "$@") + (cd "$dir" && env "${UNSET_ARGS[@]}" "$@") done