From d564820b671a2a9405ebd8226e1f67abcd3e465f Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 8 Dec 2025 15:49:06 -0500 Subject: [PATCH 1/2] Move typescript dep to a pnpm catalog --- .../package.json | 2 +- integration/helpers/rsc-parcel/package.json | 2 +- .../helpers/rsc-vite-framework/package.json | 2 +- integration/helpers/rsc-vite/package.json | 2 +- .../helpers/vite-5-template/package.json | 2 +- .../helpers/vite-6-template/package.json | 2 +- .../helpers/vite-7-beta-template/package.json | 2 +- .../package.json | 2 +- .../vite-rolldown-template/package.json | 2 +- integration/package.json | 2 +- package.json | 2 +- packages/create-react-router/package.json | 2 +- packages/react-router-architect/package.json | 2 +- packages/react-router-cloudflare/package.json | 2 +- .../__tests__/fixtures/basic/package.json | 2 +- packages/react-router-dev/package.json | 2 +- packages/react-router-dom/package.json | 2 +- packages/react-router-express/package.json | 2 +- packages/react-router-fs-routes/package.json | 2 +- packages/react-router-node/package.json | 2 +- .../package.json | 2 +- packages/react-router-serve/package.json | 2 +- packages/react-router/package.json | 2 +- playground/framework-express/package.json | 2 +- .../framework-rolldown-vite/package.json | 2 +- playground/framework-spa/package.json | 2 +- playground/framework-vite-5/package.json | 2 +- playground/framework-vite-7-beta/package.json | 2 +- playground/framework/package.json | 2 +- playground/middleware/package.json | 2 +- playground/rsc-vite-framework/package.json | 2 +- playground/rsc-vite/package.json | 2 +- .../split-route-modules-spa/package.json | 2 +- playground/split-route-modules/package.json | 2 +- .../vite-plugin-cloudflare/package.json | 2 +- pnpm-lock.yaml | 74 ++++++++++--------- pnpm-workspace.yaml | 3 + tutorials/address-book/package.json | 2 +- 38 files changed, 79 insertions(+), 70 deletions(-) diff --git a/integration/helpers/cloudflare-dev-proxy-template/package.json b/integration/helpers/cloudflare-dev-proxy-template/package.json index e0924047e4..9d0d96e3e9 100644 --- a/integration/helpers/cloudflare-dev-proxy-template/package.json +++ b/integration/helpers/cloudflare-dev-proxy-template/package.json @@ -25,7 +25,7 @@ "@react-router/remix-routes-option-adapter": "workspace:*", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "wrangler": "^4.23.0" }, diff --git a/integration/helpers/rsc-parcel/package.json b/integration/helpers/rsc-parcel/package.json index 7fd29c8772..3a411d74a2 100644 --- a/integration/helpers/rsc-parcel/package.json +++ b/integration/helpers/rsc-parcel/package.json @@ -33,7 +33,7 @@ "path-browserify": "^1.0.0", "querystring-es3": "^0.2.1", "stream-http": "^3.1.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "url": "^0.11.0" }, "dependencies": { diff --git a/integration/helpers/rsc-vite-framework/package.json b/integration/helpers/rsc-vite-framework/package.json index 34ddd12805..a8406d33c3 100644 --- a/integration/helpers/rsc-vite-framework/package.json +++ b/integration/helpers/rsc-vite-framework/package.json @@ -23,7 +23,7 @@ "@vitejs/plugin-react": "^4.5.2", "@vitejs/plugin-rsc": "0.4.30", "cross-env": "^7.0.3", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-env-only": "^3.0.1", "vite-tsconfig-paths": "^4.2.1" diff --git a/integration/helpers/rsc-vite/package.json b/integration/helpers/rsc-vite/package.json index a60dd4ccee..4fb9f8cd5e 100644 --- a/integration/helpers/rsc-vite/package.json +++ b/integration/helpers/rsc-vite/package.json @@ -16,7 +16,7 @@ "@types/react": "^19.1.8", "@types/react-dom": "^19.1.6", "@vitejs/plugin-react": "^4.5.2", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0" }, "dependencies": { diff --git a/integration/helpers/vite-5-template/package.json b/integration/helpers/vite-5-template/package.json index 859249cab7..ce99b52770 100644 --- a/integration/helpers/vite-5-template/package.json +++ b/integration/helpers/vite-5-template/package.json @@ -30,7 +30,7 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "eslint": "^8.38.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^5.1.0", "vite-env-only": "^3.0.1", "vite-tsconfig-paths": "^4.2.1" diff --git a/integration/helpers/vite-6-template/package.json b/integration/helpers/vite-6-template/package.json index 71fee2d06f..1e4ff4d638 100644 --- a/integration/helpers/vite-6-template/package.json +++ b/integration/helpers/vite-6-template/package.json @@ -30,7 +30,7 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "eslint": "^8.38.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-env-only": "^3.0.1", "vite-tsconfig-paths": "^4.2.1" diff --git a/integration/helpers/vite-7-beta-template/package.json b/integration/helpers/vite-7-beta-template/package.json index f0b9b5ce3f..ac808b4d9c 100644 --- a/integration/helpers/vite-7-beta-template/package.json +++ b/integration/helpers/vite-7-beta-template/package.json @@ -30,7 +30,7 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "eslint": "^8.38.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "7.0.0-beta.0", "vite-env-only": "^3.0.1", "vite-tsconfig-paths": "^4.2.1" diff --git a/integration/helpers/vite-plugin-cloudflare-template/package.json b/integration/helpers/vite-plugin-cloudflare-template/package.json index 2f7e498957..6f27ff49bf 100644 --- a/integration/helpers/vite-plugin-cloudflare-template/package.json +++ b/integration/helpers/vite-plugin-cloudflare-template/package.json @@ -26,7 +26,7 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "eslint": "^8.38.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-tsconfig-paths": "^4.2.1", "wrangler": "^4.23.0" diff --git a/integration/helpers/vite-rolldown-template/package.json b/integration/helpers/vite-rolldown-template/package.json index d02d6f0012..850bb59d5f 100644 --- a/integration/helpers/vite-rolldown-template/package.json +++ b/integration/helpers/vite-rolldown-template/package.json @@ -31,7 +31,7 @@ "@types/react-dom": "^18.2.7", "cross-env": "^7.0.3", "eslint": "^8.38.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "npm:rolldown-vite@6.3.0-beta.5", "vite-env-only": "^3.0.1", "vite-tsconfig-paths": "^4.2.1" diff --git a/integration/package.json b/integration/package.json index 7870ece8b3..624bc21515 100644 --- a/integration/package.json +++ b/integration/package.json @@ -43,7 +43,7 @@ "strip-ansi": "^6.0.1", "strip-indent": "^3.0.0", "type-fest": "^4.0.0", - "typescript": "^5.1.0", + "typescript": "catalog:", "vite": "^6.3.0", "vite-env-only": "^3.0.1", "vite-tsconfig-paths": "^4.2.2", diff --git a/package.json b/package.json index c6ff5c7248..4b2bacc12a 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "remark-stringify": "^10.0.2", "semver": "^7.5.4", "typedoc": "^0.28.7", - "typescript": "^5.4.5", + "typescript": "catalog:", "unified": "^10.1.2", "unist-util-remove": "^3.1.0", "vite": "^6.3.0" diff --git a/packages/create-react-router/package.json b/packages/create-react-router/package.json index 36ad0775d1..bfc5ef4717 100644 --- a/packages/create-react-router/package.json +++ b/packages/create-react-router/package.json @@ -59,7 +59,7 @@ "msw": "^2.7.5", "tiny-invariant": "^1.2.0", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "wireit": "0.14.9" }, "engines": { diff --git a/packages/react-router-architect/package.json b/packages/react-router-architect/package.json index f1fad143e1..57fd974520 100644 --- a/packages/react-router-architect/package.json +++ b/packages/react-router-architect/package.json @@ -62,7 +62,7 @@ "react-dom": "^19.1.0", "react-router": "workspace:*", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "wireit": "0.14.9" }, "peerDependencies": { diff --git a/packages/react-router-cloudflare/package.json b/packages/react-router-cloudflare/package.json index 41e8b707ed..50ebf2c091 100644 --- a/packages/react-router-cloudflare/package.json +++ b/packages/react-router-cloudflare/package.json @@ -48,7 +48,7 @@ "@cloudflare/workers-types": "^4.20250803.0", "react-router": "workspace:*", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "wireit": "0.14.9" }, "peerDependencies": { diff --git a/packages/react-router-dev/__tests__/fixtures/basic/package.json b/packages/react-router-dev/__tests__/fixtures/basic/package.json index 856736d5c6..7f7a18736e 100644 --- a/packages/react-router-dev/__tests__/fixtures/basic/package.json +++ b/packages/react-router-dev/__tests__/fixtures/basic/package.json @@ -21,7 +21,7 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "eslint": "^8.38.0", - "typescript": "^5.1.6" + "typescript": "catalog:" }, "engines": { "node": ">=20.0.0" diff --git a/packages/react-router-dev/package.json b/packages/react-router-dev/package.json index 257e5564a9..41377fbb1a 100644 --- a/packages/react-router-dev/package.json +++ b/packages/react-router-dev/package.json @@ -112,7 +112,7 @@ "fast-glob": "3.2.11", "react-router": "workspace:^", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "wireit": "0.14.9", "wrangler": "^4.23.0" diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json index 727dfb361c..504260000f 100644 --- a/packages/react-router-dom/package.json +++ b/packages/react-router-dom/package.json @@ -64,7 +64,7 @@ "react": "^19.1.0", "react-dom": "^19.1.0", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "wireit": "0.14.9" }, "peerDependencies": { diff --git a/packages/react-router-express/package.json b/packages/react-router-express/package.json index 3ad6f94aaf..c2db94f0d9 100644 --- a/packages/react-router-express/package.json +++ b/packages/react-router-express/package.json @@ -59,7 +59,7 @@ "node-mocks-http": "^1.10.1", "supertest": "^6.3.3", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "wireit": "0.14.9" }, "peerDependencies": { diff --git a/packages/react-router-fs-routes/package.json b/packages/react-router-fs-routes/package.json index 479a5fba0e..1466e2b117 100644 --- a/packages/react-router-fs-routes/package.json +++ b/packages/react-router-fs-routes/package.json @@ -43,7 +43,7 @@ "devDependencies": { "@react-router/dev": "workspace:*", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "wireit": "0.14.9" }, "peerDependencies": { diff --git a/packages/react-router-node/package.json b/packages/react-router-node/package.json index 8a9c08565e..fea355b44c 100644 --- a/packages/react-router-node/package.json +++ b/packages/react-router-node/package.json @@ -55,7 +55,7 @@ "devDependencies": { "react-router": "workspace:*", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "wireit": "0.14.9" }, "peerDependencies": { diff --git a/packages/react-router-remix-routes-option-adapter/package.json b/packages/react-router-remix-routes-option-adapter/package.json index 81bcc81091..907591f457 100644 --- a/packages/react-router-remix-routes-option-adapter/package.json +++ b/packages/react-router-remix-routes-option-adapter/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@react-router/dev": "workspace:*", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "wireit": "0.14.9" }, "peerDependencies": { diff --git a/packages/react-router-serve/package.json b/packages/react-router-serve/package.json index 2e1cc65520..364b84f6f3 100644 --- a/packages/react-router-serve/package.json +++ b/packages/react-router-serve/package.json @@ -54,7 +54,7 @@ "@types/morgan": "^1.9.2", "@types/source-map-support": "^0.5.6", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "wireit": "0.14.9" }, "engines": { diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 944f04dffa..513e4d19c6 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -137,7 +137,7 @@ "react-dom": "^19.1.0", "react-test-renderer": "^19.1.0", "tsup": "^8.3.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "undici": "^6.19.2", "wireit": "0.14.9" }, diff --git a/playground/framework-express/package.json b/playground/framework-express/package.json index 260e87bd0c..9c7f20fc14 100644 --- a/playground/framework-express/package.json +++ b/playground/framework-express/package.json @@ -29,7 +29,7 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "cross-env": "^7.0.3", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-tsconfig-paths": "^4.2.1" }, diff --git a/playground/framework-rolldown-vite/package.json b/playground/framework-rolldown-vite/package.json index 32d5acafd8..e535f3bd2d 100644 --- a/playground/framework-rolldown-vite/package.json +++ b/playground/framework-rolldown-vite/package.json @@ -23,7 +23,7 @@ "@react-router/dev": "workspace:*", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "npm:rolldown-vite@6.3.0-beta.3", "vite-tsconfig-paths": "^4.2.1" }, diff --git a/playground/framework-spa/package.json b/playground/framework-spa/package.json index 569488836c..28174bea1f 100644 --- a/playground/framework-spa/package.json +++ b/playground/framework-spa/package.json @@ -21,7 +21,7 @@ "@react-router/dev": "workspace:*", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-tsconfig-paths": "^4.2.1" }, diff --git a/playground/framework-vite-5/package.json b/playground/framework-vite-5/package.json index b63e03428d..792c86f3cd 100644 --- a/playground/framework-vite-5/package.json +++ b/playground/framework-vite-5/package.json @@ -22,7 +22,7 @@ "@react-router/dev": "workspace:*", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^5.1.0", "vite-tsconfig-paths": "^4.2.1" }, diff --git a/playground/framework-vite-7-beta/package.json b/playground/framework-vite-7-beta/package.json index 4a72eb7f94..ab1a67ff0e 100644 --- a/playground/framework-vite-7-beta/package.json +++ b/playground/framework-vite-7-beta/package.json @@ -22,7 +22,7 @@ "@react-router/dev": "workspace:*", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "7.0.0-beta.0", "vite-tsconfig-paths": "^4.2.1" }, diff --git a/playground/framework/package.json b/playground/framework/package.json index fe277b943b..2037d8c417 100644 --- a/playground/framework/package.json +++ b/playground/framework/package.json @@ -22,7 +22,7 @@ "@react-router/dev": "workspace:*", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-tsconfig-paths": "^4.2.1" }, diff --git a/playground/middleware/package.json b/playground/middleware/package.json index 3fb820e171..104de23ef4 100644 --- a/playground/middleware/package.json +++ b/playground/middleware/package.json @@ -33,7 +33,7 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "tsx": "^4.19.3", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-tsconfig-paths": "^4.2.1" }, diff --git a/playground/rsc-vite-framework/package.json b/playground/rsc-vite-framework/package.json index e3f055695d..dfc63c9354 100644 --- a/playground/rsc-vite-framework/package.json +++ b/playground/rsc-vite-framework/package.json @@ -24,7 +24,7 @@ "cross-env": "^7.0.3", "remark-frontmatter": "^5.0.0", "remark-mdx-frontmatter": "^5.2.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0" }, "dependencies": { diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json index 1b11e72937..2f5e9612d9 100644 --- a/playground/rsc-vite/package.json +++ b/playground/rsc-vite/package.json @@ -17,7 +17,7 @@ "@vitejs/plugin-react": "^4.5.2", "@vitejs/plugin-rsc": "0.4.30", "cross-env": "^7.0.3", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0" }, "dependencies": { diff --git a/playground/split-route-modules-spa/package.json b/playground/split-route-modules-spa/package.json index 60b10804ff..be51a3cabe 100644 --- a/playground/split-route-modules-spa/package.json +++ b/playground/split-route-modules-spa/package.json @@ -21,7 +21,7 @@ "@react-router/dev": "workspace:*", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-tsconfig-paths": "^4.2.1" }, diff --git a/playground/split-route-modules/package.json b/playground/split-route-modules/package.json index 7a03ad810e..e80548fbcb 100644 --- a/playground/split-route-modules/package.json +++ b/playground/split-route-modules/package.json @@ -22,7 +22,7 @@ "@react-router/dev": "workspace:*", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-tsconfig-paths": "^4.2.1" }, diff --git a/playground/vite-plugin-cloudflare/package.json b/playground/vite-plugin-cloudflare/package.json index ddb69f978e..b418187226 100644 --- a/playground/vite-plugin-cloudflare/package.json +++ b/playground/vite-plugin-cloudflare/package.json @@ -26,7 +26,7 @@ "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "eslint": "^8.38.0", - "typescript": "^5.1.6", + "typescript": "catalog:", "vite": "^6.3.0", "vite-tsconfig-paths": "^4.2.1", "wrangler": "^4.23.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index af765b3984..ab7f846332 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,12 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +catalogs: + default: + typescript: + specifier: ^5.4.5 + version: 5.4.5 + overrides: '@types/react': ^18.2.18 '@types/react-dom': ^18.2.7 @@ -151,7 +157,7 @@ importers: specifier: ^0.28.7 version: 0.28.7(typescript@5.4.5) typescript: - specifier: ^5.4.5 + specifier: 'catalog:' version: 5.4.5 unified: specifier: ^10.1.2 @@ -271,7 +277,7 @@ importers: specifier: ^4.0.0 version: 4.40.1 typescript: - specifier: ^5.1.0 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -326,7 +332,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -405,7 +411,7 @@ importers: specifier: ^3.1.0 version: 3.2.0 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 url: specifier: ^0.11.0 @@ -454,7 +460,7 @@ importers: specifier: 0.4.30 version: 0.4.30(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.4.1(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.8.0)) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -521,7 +527,7 @@ importers: specifier: ^7.0.3 version: 7.0.3 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -588,7 +594,7 @@ importers: specifier: ^8.38.0 version: 8.57.0 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^5.1.0 @@ -655,7 +661,7 @@ importers: specifier: ^8.38.0 version: 8.57.0 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -722,7 +728,7 @@ importers: specifier: ^8.38.0 version: 8.57.0 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: 7.0.0-beta.0 @@ -777,7 +783,7 @@ importers: specifier: ^8.38.0 version: 8.57.0 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -847,7 +853,7 @@ importers: specifier: ^8.38.0 version: 8.57.0 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: npm:rolldown-vite@6.3.0-beta.5 @@ -926,7 +932,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 wireit: specifier: 0.14.9 @@ -972,7 +978,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 undici: specifier: ^6.19.2 @@ -1015,7 +1021,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 wireit: specifier: 0.14.9 @@ -1033,7 +1039,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 wireit: specifier: 0.14.9 @@ -1181,7 +1187,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -1209,7 +1215,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 wireit: specifier: 0.14.9 @@ -1246,7 +1252,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 wireit: specifier: 0.14.9 @@ -1265,7 +1271,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 wireit: specifier: 0.14.9 @@ -1284,7 +1290,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 wireit: specifier: 0.14.9 @@ -1299,7 +1305,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 wireit: specifier: 0.14.9 @@ -1351,7 +1357,7 @@ importers: specifier: ^8.3.0 version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 wireit: specifier: 0.14.9 @@ -1388,7 +1394,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -1449,7 +1455,7 @@ importers: specifier: ^7.0.3 version: 7.0.3 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -1492,7 +1498,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: npm:rolldown-vite@6.3.0-beta.3 @@ -1529,7 +1535,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -1569,7 +1575,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^5.1.0 @@ -1609,7 +1615,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: 7.0.0-beta.0 @@ -1682,7 +1688,7 @@ importers: specifier: ^4.19.3 version: 4.19.3 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -1807,7 +1813,7 @@ importers: specifier: ^7.0.3 version: 7.0.3 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -1874,7 +1880,7 @@ importers: specifier: ^5.2.0 version: 5.2.0 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -1911,7 +1917,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -1948,7 +1954,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 @@ -2000,7 +2006,7 @@ importers: specifier: ^8.38.0 version: 8.57.0 typescript: - specifier: ^5.1.6 + specifier: 'catalog:' version: 5.4.5 vite: specifier: ^6.3.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1ae1e9a316..0ce39dc0f3 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -3,3 +3,6 @@ packages: - "integration/helpers/*" - "packages/*" - "playground/*" + +catalog: + typescript: ^5.4.5 diff --git a/tutorials/address-book/package.json b/tutorials/address-book/package.json index 8ac7ab7797..50a6298d57 100644 --- a/tutorials/address-book/package.json +++ b/tutorials/address-book/package.json @@ -24,7 +24,7 @@ "@types/react": "^19.0.1", "@types/react-dom": "^19.0.1", "cross-env": "^7.0.3", - "typescript": "^5.7.2", + "typescript": "catalog:", "vite": "^5.4.11" }, "engines": { From 73152bbe15be538b30ffd0b288108bc267c7dbdc Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 8 Dec 2025 15:55:12 -0500 Subject: [PATCH 2/2] Move tsup and wireit to pmnpm catalog --- packages/create-react-router/package.json | 4 +- packages/react-router-architect/package.json | 4 +- packages/react-router-cloudflare/package.json | 4 +- packages/react-router-dev/package.json | 4 +- packages/react-router-dom/package.json | 4 +- packages/react-router-express/package.json | 4 +- packages/react-router-fs-routes/package.json | 4 +- packages/react-router-node/package.json | 4 +- .../package.json | 4 +- packages/react-router-serve/package.json | 4 +- packages/react-router/package.json | 4 +- pnpm-lock.yaml | 50 +++++++++++-------- pnpm-workspace.yaml | 2 + 13 files changed, 52 insertions(+), 44 deletions(-) diff --git a/packages/create-react-router/package.json b/packages/create-react-router/package.json index bfc5ef4717..26c47f68bd 100644 --- a/packages/create-react-router/package.json +++ b/packages/create-react-router/package.json @@ -58,9 +58,9 @@ "esbuild-register": "^3.6.0", "msw": "^2.7.5", "tiny-invariant": "^1.2.0", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", - "wireit": "0.14.9" + "wireit": "catalog:" }, "engines": { "node": ">=18.0.0" diff --git a/packages/react-router-architect/package.json b/packages/react-router-architect/package.json index 57fd974520..14467077cb 100644 --- a/packages/react-router-architect/package.json +++ b/packages/react-router-architect/package.json @@ -61,9 +61,9 @@ "react": "^19.1.0", "react-dom": "^19.1.0", "react-router": "workspace:*", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", - "wireit": "0.14.9" + "wireit": "catalog:" }, "peerDependencies": { "@react-router/node": "workspace:^", diff --git a/packages/react-router-cloudflare/package.json b/packages/react-router-cloudflare/package.json index 50ebf2c091..2ddc2cc21a 100644 --- a/packages/react-router-cloudflare/package.json +++ b/packages/react-router-cloudflare/package.json @@ -47,9 +47,9 @@ "devDependencies": { "@cloudflare/workers-types": "^4.20250803.0", "react-router": "workspace:*", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", - "wireit": "0.14.9" + "wireit": "catalog:" }, "peerDependencies": { "@cloudflare/workers-types": "^4.0.0", diff --git a/packages/react-router-dev/package.json b/packages/react-router-dev/package.json index 41377fbb1a..f73d3f62f8 100644 --- a/packages/react-router-dev/package.json +++ b/packages/react-router-dev/package.json @@ -111,10 +111,10 @@ "express": "^4.19.2", "fast-glob": "3.2.11", "react-router": "workspace:^", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", "vite": "^6.3.0", - "wireit": "0.14.9", + "wireit": "catalog:", "wrangler": "^4.23.0" }, "peerDependencies": { diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json index 504260000f..ea3dbf8e17 100644 --- a/packages/react-router-dom/package.json +++ b/packages/react-router-dom/package.json @@ -63,9 +63,9 @@ "devDependencies": { "react": "^19.1.0", "react-dom": "^19.1.0", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", - "wireit": "0.14.9" + "wireit": "catalog:" }, "peerDependencies": { "react": ">=18", diff --git a/packages/react-router-express/package.json b/packages/react-router-express/package.json index c2db94f0d9..ac0b9f25e7 100644 --- a/packages/react-router-express/package.json +++ b/packages/react-router-express/package.json @@ -58,9 +58,9 @@ "express": "^4.19.2", "node-mocks-http": "^1.10.1", "supertest": "^6.3.3", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", - "wireit": "0.14.9" + "wireit": "catalog:" }, "peerDependencies": { "express": "^4.17.1 || ^5", diff --git a/packages/react-router-fs-routes/package.json b/packages/react-router-fs-routes/package.json index 1466e2b117..a300658843 100644 --- a/packages/react-router-fs-routes/package.json +++ b/packages/react-router-fs-routes/package.json @@ -42,9 +42,9 @@ }, "devDependencies": { "@react-router/dev": "workspace:*", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", - "wireit": "0.14.9" + "wireit": "catalog:" }, "peerDependencies": { "@react-router/dev": "workspace:^", diff --git a/packages/react-router-node/package.json b/packages/react-router-node/package.json index fea355b44c..7f66913b97 100644 --- a/packages/react-router-node/package.json +++ b/packages/react-router-node/package.json @@ -54,9 +54,9 @@ }, "devDependencies": { "react-router": "workspace:*", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", - "wireit": "0.14.9" + "wireit": "catalog:" }, "peerDependencies": { "react-router": "workspace:*", diff --git a/packages/react-router-remix-routes-option-adapter/package.json b/packages/react-router-remix-routes-option-adapter/package.json index 907591f457..f390d249e6 100644 --- a/packages/react-router-remix-routes-option-adapter/package.json +++ b/packages/react-router-remix-routes-option-adapter/package.json @@ -38,9 +38,9 @@ }, "devDependencies": { "@react-router/dev": "workspace:*", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", - "wireit": "0.14.9" + "wireit": "catalog:" }, "peerDependencies": { "@react-router/dev": "workspace:^", diff --git a/packages/react-router-serve/package.json b/packages/react-router-serve/package.json index 364b84f6f3..eca5cbb23b 100644 --- a/packages/react-router-serve/package.json +++ b/packages/react-router-serve/package.json @@ -53,9 +53,9 @@ "@types/express": "^4.17.9", "@types/morgan": "^1.9.2", "@types/source-map-support": "^0.5.6", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", - "wireit": "0.14.9" + "wireit": "catalog:" }, "engines": { "node": ">=20.0.0" diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 513e4d19c6..b3d48f7605 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -136,10 +136,10 @@ "react": "^19.1.0", "react-dom": "^19.1.0", "react-test-renderer": "^19.1.0", - "tsup": "^8.3.0", + "tsup": "catalog:", "typescript": "catalog:", "undici": "^6.19.2", - "wireit": "0.14.9" + "wireit": "catalog:" }, "peerDependencies": { "react": ">=18", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ab7f846332..7196c2391b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,9 +6,15 @@ settings: catalogs: default: + tsup: + specifier: ^8.3.0 + version: 8.5.0 typescript: specifier: ^5.4.5 version: 5.4.5 + wireit: + specifier: 0.14.9 + version: 0.14.9 overrides: '@types/react': ^18.2.18 @@ -929,13 +935,13 @@ importers: specifier: ^1.2.0 version: 1.3.3 tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' version: 5.4.5 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 packages/react-router: @@ -975,7 +981,7 @@ importers: specifier: ^19.1.0 version: 19.1.0(react@19.1.0) tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' @@ -984,7 +990,7 @@ importers: specifier: ^6.19.2 version: 6.20.1 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 packages/react-router-architect: @@ -1018,13 +1024,13 @@ importers: specifier: workspace:* version: link:../react-router tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' version: 5.4.5 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 packages/react-router-cloudflare: @@ -1036,13 +1042,13 @@ importers: specifier: workspace:* version: link:../react-router tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' version: 5.4.5 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 packages/react-router-dev: @@ -1184,7 +1190,7 @@ importers: specifier: workspace:^ version: link:../react-router tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' @@ -1193,7 +1199,7 @@ importers: specifier: ^6.3.0 version: 6.4.1(@types/node@20.11.30)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.8.0) wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 wrangler: specifier: ^4.23.0 @@ -1212,13 +1218,13 @@ importers: specifier: ^19.1.0 version: 19.1.0(react@19.1.0) tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' version: 5.4.5 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 packages/react-router-express: @@ -1249,13 +1255,13 @@ importers: specifier: ^6.3.3 version: 6.3.4 tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' version: 5.4.5 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 packages/react-router-fs-routes: @@ -1268,13 +1274,13 @@ importers: specifier: workspace:* version: link:../react-router-dev tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' version: 5.4.5 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 packages/react-router-node: @@ -1287,13 +1293,13 @@ importers: specifier: workspace:* version: link:../react-router tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' version: 5.4.5 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 packages/react-router-remix-routes-option-adapter: @@ -1302,13 +1308,13 @@ importers: specifier: workspace:* version: link:../react-router-dev tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' version: 5.4.5 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 packages/react-router-serve: @@ -1354,13 +1360,13 @@ importers: specifier: ^0.5.6 version: 0.5.10 tsup: - specifier: ^8.3.0 + specifier: 'catalog:' version: 8.5.0(@swc/core@1.11.24)(jiti@2.4.2)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.8.0) typescript: specifier: 'catalog:' version: 5.4.5 wireit: - specifier: 0.14.9 + specifier: 'catalog:' version: 0.14.9 playground/framework: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 0ce39dc0f3..386bf483ee 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -6,3 +6,5 @@ packages: catalog: typescript: ^5.4.5 + tsup: ^8.3.0 + wireit: 0.14.9