From fce782f053cd8545a5d58222b8fa54c5cea72e0d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 14 Feb 2025 20:59:27 +0000 Subject: [PATCH 1/6] Update pnpm to v10 --- package.json | 4 +-- pnpm-lock.yaml | 78 +++++++++++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index a5b7ce7747021..5271da74a532c 100644 --- a/package.json +++ b/package.json @@ -35,9 +35,9 @@ }, "engines": { "node": "^22.9.0", - "pnpm": "^9.15.0" + "pnpm": "^10.0.0" }, - "packageManager": "pnpm@9.15.0", + "packageManager": "pnpm@10.4.0", "pnpm": { "patchedDependencies": { "@wordpress/dataviews": ".pnpm-patches/@wordpress__dataviews@4.12.0.patch" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 610a25bfbb283..fda1ab323d279 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,11 +4,11 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false -pnpmfileChecksum: 4dabxzjqxv2glgjc2d7l77h7ii +pnpmfileChecksum: sha256-YBucKNrqNrqyaEid8sm3n8RLb+lu6lTJ8pFdXxWxqlU= patchedDependencies: '@wordpress/dataviews': - hash: uzs6glhpt3sq2uqjvqzk6vk2ze + hash: 9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1 path: .pnpm-patches/@wordpress__dataviews@4.12.0.patch importers: @@ -547,7 +547,7 @@ importers: version: 10.17.0(react@18.3.1) '@wordpress/dataviews': specifier: 4.13.0 - version: 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': specifier: 5.17.0 version: 5.17.0 @@ -1229,7 +1229,7 @@ importers: version: 10.17.0(react@18.3.1) '@wordpress/dataviews': specifier: 4.13.0 - version: 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': specifier: 5.17.0 version: 5.17.0 @@ -2457,13 +2457,6 @@ importers: webpack-cli: specifier: 6.0.1 version: 6.0.1(webpack@5.94.0) - optionalDependencies: - react: - specifier: 18.3.1 - version: 18.3.1 - react-dom: - specifier: 18.3.1 - version: 18.3.1(react@18.3.1) devDependencies: '@automattic/color-studio': specifier: 4.0.0 @@ -2531,6 +2524,13 @@ importers: typescript: specifier: 5.0.4 version: 5.0.4 + optionalDependencies: + react: + specifier: 18.3.1 + version: 18.3.1 + react-dom: + specifier: 18.3.1 + version: 18.3.1(react@18.3.1) projects/packages/google-analytics: {} @@ -2646,13 +2646,6 @@ importers: wpcom-proxy-request: specifier: ^7.0.3 version: 7.0.6 - optionalDependencies: - react: - specifier: ^18.2.0 - version: 18.3.1 - react-dom: - specifier: ^18.2.0 - version: 18.3.1(react@18.3.1) devDependencies: '@automattic/jetpack-webpack-config': specifier: workspace:* @@ -2702,6 +2695,13 @@ importers: webpack-cli: specifier: 6.0.1 version: 6.0.1(webpack@5.94.0) + optionalDependencies: + react: + specifier: ^18.2.0 + version: 18.3.1 + react-dom: + specifier: ^18.2.0 + version: 18.3.1(react@18.3.1) projects/packages/jitm: devDependencies: @@ -2825,7 +2825,7 @@ importers: version: 10.17.0(react@18.3.1) '@wordpress/dataviews': specifier: 4.12.0 - version: 4.12.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 4.12.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': specifier: 5.17.0 version: 5.17.0 @@ -4359,13 +4359,6 @@ importers: webpack-cli: specifier: 6.0.1 version: 6.0.1(webpack@5.94.0) - optionalDependencies: - react: - specifier: 18.3.1 - version: 18.3.1 - react-dom: - specifier: 18.3.1 - version: 18.3.1(react@18.3.1) devDependencies: '@automattic/color-studio': specifier: 4.0.0 @@ -4496,6 +4489,13 @@ importers: typescript: specifier: 5.0.4 version: 5.0.4 + optionalDependencies: + react: + specifier: 18.3.1 + version: 18.3.1 + react-dom: + specifier: 18.3.1 + version: 18.3.1(react@18.3.1) projects/plugins/jetpack/tests/e2e: devDependencies: @@ -20686,7 +20686,7 @@ snapshots: rememo: 4.0.2 use-memo-one: 1.1.3(react@18.3.1) - '@wordpress/dataviews@4.12.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@wordpress/dataviews@4.12.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@ariakit/react': 0.4.15(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@babel/runtime': 7.25.7 @@ -20708,7 +20708,7 @@ snapshots: - react-dom - supports-color - '@wordpress/dataviews@4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@wordpress/dataviews@4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@ariakit/react': 0.4.15(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@babel/runtime': 7.25.7 @@ -20730,7 +20730,7 @@ snapshots: - react-dom - supports-color - '@wordpress/dataviews@4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@wordpress/dataviews@4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@ariakit/react': 0.4.15(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@babel/runtime': 7.25.7 @@ -20957,7 +20957,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@babel/core@7.26.0)(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(webpack@5.94.0) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/deprecated': 4.17.0 '@wordpress/dom': 4.17.0 @@ -21019,7 +21019,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@babel/core@7.26.0)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/deprecated': 4.17.0 '@wordpress/dom': 4.17.0 @@ -21081,7 +21081,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@babel/core@7.26.0)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(webpack@5.94.0) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/deprecated': 4.17.0 '@wordpress/dom': 4.17.0 @@ -21143,7 +21143,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(webpack@5.94.0) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/deprecated': 4.17.0 '@wordpress/dom': 4.17.0 @@ -21205,7 +21205,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/deprecated': 4.17.0 '@wordpress/dom': 4.17.0 @@ -21320,7 +21320,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@babel/core@7.26.0)(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(webpack@5.94.0) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/element': 6.17.0 '@wordpress/hooks': 4.17.0 @@ -21363,7 +21363,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@babel/core@7.26.0)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/element': 6.17.0 '@wordpress/hooks': 4.17.0 @@ -21406,7 +21406,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@babel/core@7.26.0)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(webpack@5.94.0) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/element': 6.17.0 '@wordpress/hooks': 4.17.0 @@ -21449,7 +21449,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(webpack@5.94.0) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/element': 6.17.0 '@wordpress/hooks': 4.17.0 @@ -21492,7 +21492,7 @@ snapshots: '@wordpress/compose': 7.17.0(react@18.3.1) '@wordpress/core-data': 7.17.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/data': 10.17.0(react@18.3.1) - '@wordpress/dataviews': 4.13.0(patch_hash=uzs6glhpt3sq2uqjvqzk6vk2ze)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@wordpress/dataviews': 4.13.0(patch_hash=9971bdb899e2fb0a4421ab8b7f0a54a41f03b10ef1b51d72946e94f4279e05c1)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@wordpress/date': 5.17.0 '@wordpress/element': 6.17.0 '@wordpress/hooks': 4.17.0 From 939d785b9ad6d7af60dac4fc183198c9076df109 Mon Sep 17 00:00:00 2001 From: tbradsha <32492176+tbradsha@users.noreply.github.com> Date: Fri, 14 Feb 2025 14:16:59 -0700 Subject: [PATCH 2/6] Bump monorepo version reqs --- .github/versions.sh | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/versions.sh b/.github/versions.sh index a96fbbba552b9..fa0039c383a87 100644 --- a/.github/versions.sh +++ b/.github/versions.sh @@ -2,7 +2,7 @@ PHP_VERSION=8.2 COMPOSER_VERSION=2.8.3 NODE_VERSION=22.9.0 -PNPM_VERSION=9.15.0 +PNPM_VERSION=10.4.0 # Other useful version numbers. MIN_PHP_VERSION=7.2 diff --git a/package.json b/package.json index 5271da74a532c..8de6f56400c0e 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ }, "engines": { "node": "^22.9.0", - "pnpm": "^10.0.0" + "pnpm": "^10.4.0" }, "packageManager": "pnpm@10.4.0", "pnpm": { From ac3c8ef6bc4c88161dff35b5262f64dae973caa9 Mon Sep 17 00:00:00 2001 From: tbradsha <32492176+tbradsha@users.noreply.github.com> Date: Fri, 14 Feb 2025 14:19:25 -0700 Subject: [PATCH 3/6] pnpm link is always global now --- tools/cli/commands/cli.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cli/commands/cli.js b/tools/cli/commands/cli.js index 692079b2427c6..acf5b455ebcc0 100644 --- a/tools/cli/commands/cli.js +++ b/tools/cli/commands/cli.js @@ -47,7 +47,7 @@ function cliLink( options ) { [ { title: chalkJetpackGreen( `Enabling global access to the CLI` ), - task: () => command( 'pnpm link --global', options.v, path.resolve( 'tools/cli' ) ), + task: () => command( 'pnpm link', options.v, path.resolve( 'tools/cli' ) ), }, ], opts From 9680549389a5af749993dbeecbdc54ddac5f0ac8 Mon Sep 17 00:00:00 2001 From: tbradsha <32492176+tbradsha@users.noreply.github.com> Date: Mon, 17 Feb 2025 11:09:23 -0700 Subject: [PATCH 4/6] Add new options to config --- .npmrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.npmrc b/.npmrc index c1c907fa86634..e8d63b12334ab 100644 --- a/.npmrc +++ b/.npmrc @@ -27,3 +27,9 @@ resolution-mode = highest jetpack-webpack-config-resolve-conditions=jetpack:src manage-package-manager-versions=false + +# Ensure dependencies were properly built. +strict-dep-builds = true + +# Warn if `node_modules` do not match lockfile. +verify-deps-before-run = warn From 38499cf504259345695ff50fd4bbdedc88452db3 Mon Sep 17 00:00:00 2001 From: tbradsha <32492176+tbradsha@users.noreply.github.com> Date: Mon, 17 Feb 2025 11:34:49 -0700 Subject: [PATCH 5/6] Allow install scripts for specific dependencies --- package.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8de6f56400c0e..1e0e0a987460a 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,13 @@ "pnpm": { "patchedDependencies": { "@wordpress/dataviews": ".pnpm-patches/@wordpress__dataviews@4.12.0.patch" - } + }, + "onlyBuiltDependencies": [ + "@swc/core", + "core-js", + "esbuild", + "svelte-preprocess", + "swiper" + ] } } From 867dbdaa7c21a127aa75c480ba4e9237cfe9b58b Mon Sep 17 00:00:00 2001 From: tbradsha <32492176+tbradsha@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:53:43 -0700 Subject: [PATCH 6/6] Set ignoredBuiltDependencies instead --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1e0e0a987460a..ef24e20ac2e41 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "patchedDependencies": { "@wordpress/dataviews": ".pnpm-patches/@wordpress__dataviews@4.12.0.patch" }, - "onlyBuiltDependencies": [ + "ignoredBuiltDependencies": [ "@swc/core", "core-js", "esbuild",