From ca0d0360e0523cfe29edac04f35d5eb5f73b9005 Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Mon, 23 Jun 2025 15:10:51 -0400 Subject: [PATCH] ci: revert bump pnpm to v10 (#12840) (#12906) The bump to pnpm v10 was causing too many mysterious timeouts in a few places. Reverting until we can fully investigate. --- .github/actions/setup/action.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/post-release-templates.yml | 2 +- .github/workflows/post-release.yml | 2 +- .github/workflows/publish-prerelease.yml | 2 +- .tool-versions | 2 +- package.json | 5 ++--- pnpm-lock.yaml | 16 ++++++---------- pnpm-workspace.yaml | 3 --- test/package.json | 3 --- 10 files changed, 14 insertions(+), 25 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 156f02ef07..197ee65ac7 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -10,7 +10,7 @@ inputs: pnpm-version: description: Pnpm version required: true - default: 10.12.1 + default: 9.7.1 pnpm-run-install: description: Whether to run pnpm install required: false diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a803fabc41..87f4d5340a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ concurrency: env: NODE_VERSION: 23.11.0 - PNPM_VERSION: 10.12.1 + PNPM_VERSION: 9.7.1 DO_NOT_TRACK: 1 # Disable Turbopack telemetry NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry diff --git a/.github/workflows/post-release-templates.yml b/.github/workflows/post-release-templates.yml index 68d857dcd8..f371e8dab7 100644 --- a/.github/workflows/post-release-templates.yml +++ b/.github/workflows/post-release-templates.yml @@ -8,7 +8,7 @@ on: env: NODE_VERSION: 23.11.0 - PNPM_VERSION: 10.12.1 + PNPM_VERSION: 9.7.1 DO_NOT_TRACK: 1 # Disable Turbopack telemetry NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index e0c5d072f2..f455ad2da2 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -13,7 +13,7 @@ on: env: NODE_VERSION: 23.11.0 - PNPM_VERSION: 10.12.1 + PNPM_VERSION: 9.7.1 DO_NOT_TRACK: 1 # Disable Turbopack telemetry NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry diff --git a/.github/workflows/publish-prerelease.yml b/.github/workflows/publish-prerelease.yml index 6db6530609..cdc43c7142 100644 --- a/.github/workflows/publish-prerelease.yml +++ b/.github/workflows/publish-prerelease.yml @@ -8,7 +8,7 @@ on: env: NODE_VERSION: 23.11.0 - PNPM_VERSION: 10.12.1 + PNPM_VERSION: 9.7.1 DO_NOT_TRACK: 1 # Disable Turbopack telemetry NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry diff --git a/.tool-versions b/.tool-versions index ca0f094e8e..51d91bdccc 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -pnpm 10.12.1 +pnpm 9.7.1 nodejs 23.11.0 diff --git a/package.json b/package.json index decfcc752b..35265ed143 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,6 @@ "drizzle-kit": "0.31.0", "drizzle-orm": "0.43.1", "escape-html": "^1.0.3", - "eslint": "9.22.0", "execa": "5.1.1", "form-data": "3.0.1", "fs-extra": "10.1.0", @@ -185,10 +184,10 @@ "turbo": "^2.3.3", "typescript": "5.7.3" }, - "packageManager": "pnpm@10.12.1", + "packageManager": "pnpm@9.7.1", "engines": { "node": "^18.20.2 || >=20.9.0", - "pnpm": "^10.12.1" + "pnpm": "^9.7.0" }, "pnpm": { "overrides": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4be930216d..559d0938c6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,7 +44,7 @@ importers: version: 1.50.0 '@sentry/nextjs': specifier: ^8.33.1 - version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.2(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.1.0-rc.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.11.29)(esbuild@0.25.5)) + version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.2(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.11.29)(esbuild@0.25.5)) '@sentry/node': specifier: ^8.33.1 version: 8.37.1 @@ -105,9 +105,6 @@ importers: escape-html: specifier: ^1.0.3 version: 1.0.3 - eslint: - specifier: 9.22.0 - version: 9.22.0(jiti@1.21.6) execa: specifier: 5.1.1 version: 5.1.1 @@ -1146,7 +1143,7 @@ importers: dependencies: '@sentry/nextjs': specifier: ^8.33.1 - version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.2(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.1.0-rc.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.11.29)(esbuild@0.25.5)) + version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.2(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.11.29)(esbuild@0.25.5)) '@sentry/types': specifier: ^8.33.1 version: 8.37.1 @@ -1794,7 +1791,7 @@ importers: version: link:../packages/ui '@sentry/nextjs': specifier: ^8.33.1 - version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.2(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.1.0-rc.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.11.29)(esbuild@0.25.5)) + version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.2(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.11.29)(esbuild@0.25.5)) '@sentry/react': specifier: ^7.77.0 version: 7.119.2(react@19.1.0) @@ -8175,7 +8172,6 @@ packages: libsql@0.4.7: resolution: {integrity: sha512-T9eIRCs6b0J1SHKYIvD8+KCJMcWZ900iZyxdnSCdqxN12Z1ijzT+jY5nrk72Jw4B0HGzms2NgpryArlJqvc3Lw==} - cpu: [x64, arm64, wasm32] os: [darwin, linux, win32] license-checker@25.0.1: @@ -14127,7 +14123,7 @@ snapshots: '@sentry/utils': 7.119.2 localforage: 1.10.0 - '@sentry/nextjs@8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.2(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.1.0-rc.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.11.29)(esbuild@0.25.5))': + '@sentry/nextjs@8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.2(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.11.29)(esbuild@0.25.5))': dependencies: '@opentelemetry/api': 1.9.0 '@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0) @@ -16945,7 +16941,7 @@ snapshots: execa@8.0.1: dependencies: - cross-spawn: 7.0.6 + cross-spawn: 7.0.5 get-stream: 8.0.1 human-signals: 5.0.0 is-stream: 3.0.0 @@ -17126,7 +17122,7 @@ snapshots: foreground-child@3.3.0: dependencies: - cross-spawn: 7.0.6 + cross-spawn: 7.0.5 signal-exit: 4.1.0 form-data-encoder@2.1.4: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 4d5e8bbcb9..77248f552c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -5,6 +5,3 @@ packages: - 'test' # exclude packages that are inside test directories # - '!**/test/**' - -# Allow all build scripts -neverBuiltDependencies: [] diff --git a/test/package.json b/test/package.json index 4ddc19f2be..07fa27d38a 100644 --- a/test/package.json +++ b/test/package.json @@ -96,8 +96,5 @@ "ts-essentials": "10.0.3", "typescript": "5.7.3", "uuid": "10.0.0" - }, - "pnpm": { - "neverBuiltDependencies": [] } }