From 31bcdea143e0f7f2093173e8bde0e1be62e0185b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2026 15:28:30 +0000 Subject: [PATCH 1/2] chore(deps-dev): Bump the react-router group with 3 updates Bumps the react-router group with 3 updates: [@react-router/dev](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dev), [@react-router/node](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-node) and [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router). Updates `@react-router/dev` from 7.17.0 to 8.3.1 - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dev/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/@react-router/dev@8.3.1/packages/react-router-dev) Updates `@react-router/node` from 7.18.1 to 8.3.1 - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-node/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/@react-router/node@8.3.1/packages/react-router-node) Updates `react-router` from 7.18.0 to 8.3.1 - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router@8.3.1/packages/react-router) --- updated-dependencies: - dependency-name: "@react-router/dev" dependency-version: 8.3.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: react-router - dependency-name: "@react-router/node" dependency-version: 8.3.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: react-router - dependency-name: react-router dependency-version: 8.3.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: react-router ... Signed-off-by: dependabot[bot] --- packages/react-router/package.json | 6 +- yarn.lock | 189 ++++++++++++----------------- 2 files changed, 81 insertions(+), 114 deletions(-) diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 9ae79ed3ef65..b9987542f453 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -63,10 +63,10 @@ "sentry": "^0.44.0" }, "devDependencies": { - "@react-router/dev": "^7.17.0", - "@react-router/node": "^7.15.0", + "@react-router/dev": "^8.3.1", + "@react-router/node": "^8.3.1", "react": "^18.3.1", - "react-router": "^7.18.0", + "react-router": "^8.3.1", "vite": "^6.4.3" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 48870ca9a512..702d310d3ffd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1637,7 +1637,7 @@ json5 "^2.2.1" semver "^6.3.0" -"@babel/core@^7.12.3", "@babel/core@^7.14.5", "@babel/core@^7.16.10", "@babel/core@^7.17.2", "@babel/core@^7.18.5", "@babel/core@^7.22.11", "@babel/core@^7.22.9", "@babel/core@^7.23.3", "@babel/core@^7.23.7", "@babel/core@^7.24.4", "@babel/core@^7.26.0", "@babel/core@^7.26.8", "@babel/core@^7.27.7", "@babel/core@^7.28.5", "@babel/core@^7.29.0", "@babel/core@^7.29.6": +"@babel/core@^7.12.3", "@babel/core@^7.14.5", "@babel/core@^7.16.10", "@babel/core@^7.17.2", "@babel/core@^7.18.5", "@babel/core@^7.22.11", "@babel/core@^7.22.9", "@babel/core@^7.23.3", "@babel/core@^7.23.7", "@babel/core@^7.24.4", "@babel/core@^7.26.0", "@babel/core@^7.26.8", "@babel/core@^7.28.5", "@babel/core@^7.29.0", "@babel/core@^7.29.6", "@babel/core@^7.29.7": version "7.29.7" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.7.tgz#80c10b17248082968b57a857b91640971f2070f7" integrity sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA== @@ -1676,7 +1676,7 @@ "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" -"@babel/generator@^7.18.10", "@babel/generator@^7.23.6", "@babel/generator@^7.27.5", "@babel/generator@^7.28.5", "@babel/generator@^7.29.7", "@babel/generator@^7.29.8": +"@babel/generator@^7.18.10", "@babel/generator@^7.23.6", "@babel/generator@^7.28.5", "@babel/generator@^7.29.7", "@babel/generator@^7.29.8": version "7.29.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.8.tgz#4b0b887885422643339e09022148a4c4ebaa4979" integrity sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg== @@ -1871,7 +1871,7 @@ "@babel/template" "^7.29.7" "@babel/types" "^7.29.7" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.6", "@babel/parser@^7.25.4", "@babel/parser@^7.26.7", "@babel/parser@^7.27.7", "@babel/parser@^7.28.4", "@babel/parser@^7.28.5", "@babel/parser@^7.29.7", "@babel/parser@^7.29.8", "@babel/parser@^7.4.5": +"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.6", "@babel/parser@^7.25.4", "@babel/parser@^7.26.7", "@babel/parser@^7.28.4", "@babel/parser@^7.28.5", "@babel/parser@^7.29.7", "@babel/parser@^7.29.8", "@babel/parser@^7.4.5": version "7.29.8" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.8.tgz#9653716a2f10c677b98fbc63d4bfb000c302cf17" integrity sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA== @@ -2883,7 +2883,7 @@ "@babel/plugin-transform-react-jsx-development" "^7.29.7" "@babel/plugin-transform-react-pure-annotations" "^7.29.7" -"@babel/preset-typescript@^7.16.7", "@babel/preset-typescript@^7.27.1": +"@babel/preset-typescript@^7.16.7": version "7.28.5" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz#540359efa3028236958466342967522fd8f2a60c" integrity sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g== @@ -2938,7 +2938,7 @@ "@babel/parser" "^7.29.7" "@babel/types" "^7.29.7" -"@babel/traverse@^7.14.5", "@babel/traverse@^7.18.10", "@babel/traverse@^7.23.7", "@babel/traverse@^7.26.8", "@babel/traverse@^7.27.7", "@babel/traverse@^7.28.4", "@babel/traverse@^7.29.7", "@babel/traverse@^7.29.8", "@babel/traverse@^7.4.5": +"@babel/traverse@^7.14.5", "@babel/traverse@^7.18.10", "@babel/traverse@^7.23.7", "@babel/traverse@^7.26.8", "@babel/traverse@^7.28.4", "@babel/traverse@^7.29.7", "@babel/traverse@^7.29.8", "@babel/traverse@^7.4.5": version "7.29.8" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.8.tgz#4111014cdc71a0f95d9471907590baa0b8a6b28a" integrity sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg== @@ -2951,7 +2951,7 @@ "@babel/types" "^7.29.8" debug "^4.3.1" -"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.17", "@babel/types@^7.23.6", "@babel/types@^7.24.7", "@babel/types@^7.25.4", "@babel/types@^7.26.0", "@babel/types@^7.26.8", "@babel/types@^7.27.7", "@babel/types@^7.28.4", "@babel/types@^7.29.7", "@babel/types@^7.29.8", "@babel/types@^7.3.0", "@babel/types@^7.4.4": +"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.17", "@babel/types@^7.23.6", "@babel/types@^7.24.7", "@babel/types@^7.25.4", "@babel/types@^7.26.0", "@babel/types@^7.26.8", "@babel/types@^7.28.4", "@babel/types@^7.29.7", "@babel/types@^7.29.8", "@babel/types@^7.3.0", "@babel/types@^7.4.4": version "7.29.8" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.8.tgz#1229eef31d85156d70fa3f4cd859376d0eaf6863" integrity sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg== @@ -5574,11 +5574,6 @@ semver "^7.5.3" tar "^7.4.0" -"@mjackson/node-fetch-server@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@mjackson/node-fetch-server/-/node-fetch-server-0.2.0.tgz#577c0c25d8aae9f69a97738b7b0d03d1471cdc49" - integrity sha512-EMlH1e30yzmTpGLQjlFmaDAjyOeZhng1/XCd7DExR8PNAnG/G1tyruZxEoUe11ClnwGhGrtsdnyyUx1frSzjng== - "@modelcontextprotocol/client@^2.0.0": version "2.0.0" resolved "https://sfw.security.sentry.io/npm/@modelcontextprotocol/client/-/client-2.0.0.tgz#4dc18c983c7acb40040f08442123e3c5b88d6074" @@ -7291,53 +7286,41 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.1.tgz#eaee5900122c110a3dbcb728c0597014a2621774" integrity sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg== -"@react-router/dev@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@react-router/dev/-/dev-7.17.0.tgz#66c1ecd927f401bcd8e131bc3348bd0fee835859" - integrity sha512-+ITMmv/1xUB+QF6ehCCOIVBNBDuKIEE+3JKCt+kTBvxDTk1s49qHbtCA4TzJYge41pNRGtFIiy5VAksLSVJheg== +"@react-router/dev@^8.3.1": + version "8.3.1" + resolved "https://registry.yarnpkg.com/@react-router/dev/-/dev-8.3.1.tgz#c967acdbd1dc47fcd419c0f20b2d1dd0e2d9893f" + integrity sha512-yvhMiOq+LLmGPgTOYYWjzfapUN4B2/T3nfr8P81bLTiyh0YSx88OAz5y2D/KKS0boF9EoHyhzeMH4ZweMTwjJA== dependencies: - "@babel/core" "^7.27.7" - "@babel/generator" "^7.27.5" - "@babel/parser" "^7.27.7" - "@babel/plugin-syntax-jsx" "^7.27.1" - "@babel/preset-typescript" "^7.27.1" - "@babel/traverse" "^7.27.7" - "@babel/types" "^7.27.7" - "@react-router/node" "7.17.0" - "@remix-run/node-fetch-server" "^0.13.0" - arg "^5.0.1" - babel-dead-code-elimination "^1.0.6" - chokidar "^4.0.0" - dedent "^1.5.3" - es-module-lexer "^1.3.1" - exit-hook "2.2.1" - isbot "^5.1.11" - jsesc "3.0.2" - lodash "^4.17.21" - p-map "^7.0.3" - pathe "^1.1.2" + "@babel/core" "^7.29.7" + "@babel/generator" "^7.29.7" + "@babel/parser" "^7.29.7" + "@babel/traverse" "^7.29.7" + "@babel/types" "^7.29.7" + "@react-router/node" "8.3.1" + "@remix-run/node-fetch-server" "^0.14.1" + babel-dead-code-elimination "^1.0.12" + chokidar "^5.0.0" + dedent "^1.7.2" + es-module-lexer "^2.1.0" + exit-hook "5.1.0" + isbot "^5.1.40" + jsesc "3.1.0" + lodash "^4.18.1" + p-map "^7.0.4" + pathe "^2.0.3" picocolors "^1.1.1" - pkg-types "^2.3.0" - prettier "^3.6.2" - react-refresh "^0.14.0" - semver "^7.3.7" - tinyglobby "^0.2.14" - valibot "^1.2.0" - vite-node "^3.2.2" - -"@react-router/node@7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@react-router/node/-/node-7.17.0.tgz#35a4ae90435589d4ae5bd77b28ddee89f6f347c4" - integrity sha512-RYR47qM9gJ8zV8Ntial5Rkgcst2YnwWXt0Ai34FezzkDK6AILpxpVatEzFEhNRwbSh6JO6iweY7XhfM4/K5dBA== - dependencies: - "@mjackson/node-fetch-server" "^0.2.0" + pkg-types "^2.3.1" + react-refresh "^0.18.0" + semver "^7.8.1" + tinyglobby "^0.2.16" + valibot "^1.4.1" -"@react-router/node@^7.15.0": - version "7.18.1" - resolved "https://registry.yarnpkg.com/@react-router/node/-/node-7.18.1.tgz#4df1148cb777d4363c2999ef493b573a25cb5e21" - integrity sha512-2GhAwa90z/+GMFM8Q5HsgwzakYogbQcZpqpNonhN4YWDRjWkSz+t5jgwNAFvG8ENR8fKGEVEsOHIaNVDfW9Ouw== +"@react-router/node@8.3.1", "@react-router/node@^8.3.1": + version "8.3.1" + resolved "https://registry.yarnpkg.com/@react-router/node/-/node-8.3.1.tgz#e8596192b747d6b4d1ca8993b87d1e652f79f773" + integrity sha512-JQI2vPd0twfHXxRxD1QWxKkCfu5I7bxojgEZFL97EvbJLm1B6p4qeqvGc9hl9g/3ZYbieczQY6ElM3zZjiG4sA== dependencies: - "@mjackson/node-fetch-server" "^0.2.0" + "@remix-run/node-fetch-server" "^0.14.1" "@redis/bloom@1.2.0": version "1.2.0" @@ -7427,10 +7410,10 @@ resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-5.12.1.tgz#15b6deaaf3716bc2633311c0ed18201c9299392d" integrity sha512-c6JL6E3EcZJuNqKFz+KM+l9l5mpcQiKvTwgA3blt5glWJ8hjDk0yeHN3beE/MpqYIQ8UEX44ItQzgkE/gCBELQ== -"@remix-run/node-fetch-server@^0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@remix-run/node-fetch-server/-/node-fetch-server-0.13.0.tgz#93be9c2e0e6f12512be471501e3a86dda295b178" - integrity sha512-1EsNo0ZpgXu/90AWoRZf/oE3RVTUS80tiTUpt+hv5pjtAkw7icN4WskDwz/KdAw5ARbJLMhZBrO1NqThmy/McA== +"@remix-run/node-fetch-server@^0.14.1": + version "0.14.1" + resolved "https://registry.yarnpkg.com/@remix-run/node-fetch-server/-/node-fetch-server-0.14.1.tgz#3c843ff1622dbce1f7836d3f78967ad519a3b4f5" + integrity sha512-pKenF5ysIN5lDCnCyvoUxDhKP0tfnGagvGbZh01xxHG6DJXSIXWVC9NpLSDGjxcxd1CKdCOKuZFleXBF3pChIg== "@remix-run/node@^2.17.5": version "2.17.5" @@ -11106,11 +11089,6 @@ are-we-there-yet@^3.0.0: delegates "^1.0.0" readable-stream "^3.6.0" -arg@^5.0.1: - version "5.0.2" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" - integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== - argparse@2.0.1, argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -11536,7 +11514,7 @@ b4a@^1.6.4: resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9" integrity sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw== -babel-dead-code-elimination@^1.0.10, babel-dead-code-elimination@^1.0.6, babel-dead-code-elimination@^1.0.9: +babel-dead-code-elimination@^1.0.10, babel-dead-code-elimination@^1.0.12, babel-dead-code-elimination@^1.0.9: version "1.0.12" resolved "https://registry.yarnpkg.com/babel-dead-code-elimination/-/babel-dead-code-elimination-1.0.12.tgz#9471fc492fdfb7a0f7348aeacdaff3f1a9ecc6d3" integrity sha512-GERT7L2TiYcYDtYk1IpD+ASAYXjKbLTDPhBtYj7X1NuRMDTMtAx9kyBenub1Ev41lo91OHCKdmP+egTDmfQ7Ig== @@ -12577,7 +12555,7 @@ check-error@^2.1.1: optionalDependencies: fsevents "~2.3.2" -chokidar@^4.0.0, chokidar@^4.0.3: +chokidar@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30" integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA== @@ -13097,7 +13075,7 @@ cookie-es@^2.0.0, cookie-es@^2.0.1: resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-2.0.1.tgz#b113706a7bd1504ffb3740c2d84b86310119142a" integrity sha512-aVf4A4hI2w70LnF7GG+7xDQUkliwiXWXFvTjkip4+b64ygDQ2sJPRSKFDHbxn8o0xu9QzPkMuuiWIXyFSE2slA== -cookie-es@^3.0.0, cookie-es@^3.0.1: +cookie-es@^3.0.0, cookie-es@^3.0.1, cookie-es@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-3.1.1.tgz#c4a8a16cf88cb5a185b23f4a61d6e9a85eb53287" integrity sha512-UaXxwISYJPTr9hwQxMFYZ7kNhSXboMXP+Z3TRX6f1/NyaGPfuNUZOWP1pUEb75B2HjfklIYLVRfWiFZJyC6Npg== @@ -13585,10 +13563,10 @@ decorator-transforms@^2.3.2: dependencies: babel-import-util "^3.0.0" -dedent@^1.5.3: - version "1.5.3" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.3.tgz#99aee19eb9bae55a67327717b6e848d0bf777e5a" - integrity sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ== +dedent@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.2.tgz#34e2264ab538301e27cf7b07bf2369c19baa8dd9" + integrity sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA== deep-eql@^5.0.1: version "5.0.2" @@ -14553,7 +14531,7 @@ es-module-lexer@^0.9.0: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== -es-module-lexer@^1.3.1, es-module-lexer@^1.5.4, es-module-lexer@^1.6.0, es-module-lexer@^1.7.0: +es-module-lexer@^1.5.4, es-module-lexer@^1.6.0, es-module-lexer@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.7.0.tgz#9159601561880a85f2734560a9099b2c31e5372a" integrity sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA== @@ -15458,10 +15436,10 @@ execa@^8.0.1: signal-exit "^4.1.0" strip-final-newline "^3.0.0" -exit-hook@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-2.2.1.tgz#007b2d92c6428eda2b76e7016a34351586934593" - integrity sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw== +exit-hook@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-5.1.0.tgz#f59338d192e150c6997d0af02d72d572d3d635d7" + integrity sha512-INjr2xyxHo7bhAqf5ong++GZPPnpcuBcaXUKt03yf7Fie9yWD7FapL4teOU0+awQazGs5ucBh7xWs/AD+6nhog== expand-tilde@^2.0.0, expand-tilde@^2.0.2: version "2.0.2" @@ -18085,10 +18063,10 @@ isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isbot@^5.1.11, isbot@^5.1.22: - version "5.1.34" - resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.34.tgz#219ee5b4c8c6bbc092e722c0f8d775a3bad17f8b" - integrity sha512-aCMIBSKd/XPRYdiCQTLC8QHH4YT8B3JUADu+7COgYIZPvkeoMcUHMRjZLM9/7V8fCj+l7FSREc1lOPNjzogo/A== +isbot@^5.1.22, isbot@^5.1.40: + version "5.2.2" + resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.2.2.tgz#4c6c4c9b1391a91e490077f9323418693140c416" + integrity sha512-iQcBXcd+Rv/pkubRyGh2utW2j1oPG5hZY6TUhVPpqK4G+o3IbxpJNx04hgksjc/N7GK5pEorUxDeg31cFgEk/w== isexe@^2.0.0: version "2.0.0" @@ -18374,21 +18352,16 @@ jsdom@^26.1.0: ws "^8.18.0" xml-name-validator "^5.0.0" -jsesc@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" - integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== +jsesc@3.1.0, jsesc@^3.0.2, jsesc@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" + integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -jsesc@^3.0.2, jsesc@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" - integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== - json-bigint@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1" @@ -18964,7 +18937,7 @@ lodash.uniq@^4.2.0, lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21: +lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.18.1: version "4.18.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c" integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q== @@ -21708,10 +21681,10 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-map@^7.0.3: - version "7.0.4" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-7.0.4.tgz#b81814255f542e252d5729dca4d66e5ec14935b8" - integrity sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ== +p-map@^7.0.4: + version "7.0.7" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-7.0.7.tgz#a82175dd690468a930b9ae45c2b9829c5bf60fa3" + integrity sha512-VaWRu2i4FJNRtiRWCuuQRgfQ1B7a6+gMSrO+3j0EQi/k0ULfS9kosRxGoiqwzIjZTDI02tGfk5mXXltLg6QtfQ== p-queue@^6.6.2: version "6.6.2" @@ -23014,11 +22987,6 @@ prettier@^2.5.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== -prettier@^3.6.2: - version "3.8.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.1.tgz#edf48977cf991558f4fcbd8a3ba6015ba2a3a173" - integrity sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg== - pretty-bytes@^5.3.0: version "5.6.0" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" @@ -23386,10 +23354,10 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== -react-refresh@^0.14.0: - version "0.14.2" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9" - integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA== +react-refresh@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.18.0.tgz#2dce97f4fe932a4d8142fa1630e475c1729c8062" + integrity sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw== "react-router-3@npm:react-router@3.2.0": version "3.2.0" @@ -23454,13 +23422,12 @@ react-router@6.30.4: dependencies: "@remix-run/router" "1.23.3" -react-router@^7.18.0: - version "7.18.0" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.18.0.tgz#e7d94b54745277aabe3cf93fac938cbebc9c1c5e" - integrity sha512-pTTGt8J+ji1NOmYnjzT+bAJy/1zD+Jp4ziO6cL7T3ZLvXKtusO7BpFqlRXitqpcPVqllsIXFHRMt+2/k3Xn6HQ== +react-router@^8.3.1: + version "8.3.1" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-8.3.1.tgz#d704ca5a564e2bc89ce05a537ab577578e947b7b" + integrity sha512-TEOpiO2g0TJHEOJeRVv4amUFun9v1npCKszvcquNvzETUtJ8udV86ah5eFoHT7g26bsBvT6EiIhqulR8eDF++A== dependencies: - cookie "^1.0.1" - set-cookie-parser "^2.6.0" + cookie-es "^3.1.1" react@^18.3.1: version "18.3.1" @@ -24671,7 +24638,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3, semver@^7.7.2, semver@^7.7.3, semver@^7.7.4, semver@^7.8.5: +semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3, semver@^7.7.2, semver@^7.7.3, semver@^7.7.4, semver@^7.8.1, semver@^7.8.5: version "7.8.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.5.tgz#39b646037dd50c14fb451e7e4cac58ed8b863f69" integrity sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA== @@ -27169,7 +27136,7 @@ uuid@^9.0.0, uuid@^9.0.1: resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== -valibot@^1.2.0: +valibot@^1.4.1: version "1.4.2" resolved "https://registry.yarnpkg.com/valibot/-/valibot-1.4.2.tgz#da857781187f170aeaf4498d463d25028615b0d6" integrity sha512-gjdCvJ6d3RyHAneqxMYMW9QMCwYMb3jpOO0IyHZV1bnRHFBHrX3VkIILt5XYR0WhwHiH7Mty8ovuPZ/O3gamrg== @@ -27296,7 +27263,7 @@ vite-hot-client@^2.2.0: resolved "https://registry.yarnpkg.com/vite-hot-client/-/vite-hot-client-2.2.0.tgz#284fa1afa63cc8781d079515884eb49d2890ac2f" integrity sha512-76Zs9zrHbH7M7wqeyooGQKdX+yg0pQ0xuQ1PbFp4z5a0Lzn2e5IPFoCswnmqZ4GiwqB4Jo3WcDAMO9jARTJl8w== -vite-node@3.2.4, vite-node@^3.2.2: +vite-node@3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-3.2.4.tgz#f3676d94c4af1e76898c162c92728bca65f7bb07" integrity sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg== From 3fc8f7fded7ef84c64ad10c37599f6aa1155debd Mon Sep 17 00:00:00 2001 From: s1gr1d <32902192+s1gr1d@users.noreply.github.com> Date: Fri, 4 Sep 2026 10:41:01 +0200 Subject: [PATCH 2/2] fix type errors --- .../src/server/createSentryHandleRequest.tsx | 4 ++-- .../src/server/wrapSentryHandleRequest.ts | 23 ++++++++++++++----- .../server/createSentryHandleRequest.test.ts | 6 +---- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/packages/react-router/src/server/createSentryHandleRequest.tsx b/packages/react-router/src/server/createSentryHandleRequest.tsx index ce99a78faac5..9340e42fc522 100644 --- a/packages/react-router/src/server/createSentryHandleRequest.tsx +++ b/packages/react-router/src/server/createSentryHandleRequest.tsx @@ -1,10 +1,10 @@ import type { createReadableStreamFromReadable } from '@react-router/node'; import type { ReactNode } from 'react'; import React from 'react'; -import type { AppLoadContext, EntryContext, RouterContextProvider, ServerRouter } from 'react-router'; +import type { EntryContext, RouterContextProvider, ServerRouter } from 'react-router'; import { PassThrough } from 'stream'; import { getMetaTagTransformer } from './getMetaTagTransformer'; -import { wrapSentryHandleRequest } from './wrapSentryHandleRequest'; +import { type AppLoadContext, wrapSentryHandleRequest } from './wrapSentryHandleRequest'; type RenderToPipeableStreamOptions = { [key: string]: unknown; diff --git a/packages/react-router/src/server/wrapSentryHandleRequest.ts b/packages/react-router/src/server/wrapSentryHandleRequest.ts index 8a4af55ce62e..be85485c6384 100644 --- a/packages/react-router/src/server/wrapSentryHandleRequest.ts +++ b/packages/react-router/src/server/wrapSentryHandleRequest.ts @@ -7,15 +7,26 @@ import { updateSpanName, } from '@sentry/core'; import { flushIfServerless } from '@sentry/core/server'; -import type { AppLoadContext, EntryContext, RouterContextProvider } from 'react-router'; +import type { EntryContext, RouterContextProvider } from 'react-router'; import { isInstrumentationApiUsed } from './serverGlobals'; -type OriginalHandleRequestWithoutMiddleware = ( +/** + * React Router v7's `AppLoadContext`, declared here because v8 removed the export: middleware is + * always enabled there, so the load context is always a `RouterContextProvider`. The SDK supports + * both majors, so the shape is mirrored instead of imported. + */ +export interface AppLoadContext { + [key: string]: unknown; +} + +// Generic over the load context so apps that augment `AppLoadContext` via declaration merging keep +// their own shape instead of being widened to the base index signature. +type OriginalHandleRequestWithoutMiddleware = ( request: Request, responseStatusCode: number, responseHeaders: Headers, routerContext: EntryContext, - loadContext: AppLoadContext, + loadContext: LoadContext, ) => Promise; type OriginalHandleRequestWithMiddleware = ( @@ -32,9 +43,9 @@ type OriginalHandleRequestWithMiddleware = ( * @param originalHandle - The original handleRequest function to wrap * @returns A wrapped version of the handle request function with Sentry instrumentation */ -export function wrapSentryHandleRequest( - originalHandle: OriginalHandleRequestWithoutMiddleware, -): OriginalHandleRequestWithoutMiddleware; +export function wrapSentryHandleRequest( + originalHandle: OriginalHandleRequestWithoutMiddleware, +): OriginalHandleRequestWithoutMiddleware; /** * Wraps the original handleRequest function to add Sentry instrumentation. * diff --git a/packages/react-router/test/server/createSentryHandleRequest.test.ts b/packages/react-router/test/server/createSentryHandleRequest.test.ts index cf7e4b4e3007..d8384313f79b 100644 --- a/packages/react-router/test/server/createSentryHandleRequest.test.ts +++ b/packages/react-router/test/server/createSentryHandleRequest.test.ts @@ -48,11 +48,7 @@ describe('createSentryHandleRequest', () => { manifestPath: '/path/to/manifest', }, routeModules: {}, - future: { - v8_middleware: false, - v8_passThroughRequests: false, - v8_trailingSlashAwareDataRequests: false, - }, + future: {}, isSpaMode: false, branches: [], staticHandlerContext: {