Skip to content

Commit 6cf7677

Browse files
authored
chore(deps): bump @remix-run/* to 2.17.5 (#4102)
Bumps the `@remix-run/*` family in the webapp from 2.17.4 to 2.17.5 to keep dependencies current. 2.17.5 pulls `@remix-run/router` 1.23.2 → 1.23.3, so the local route-matching perf patch was rebased onto 1.23.3 (regenerated via `pnpm patch`). It is functionally identical to the previous one - the only difference is that 1.23.3 already hoists `decodePath` out of the match loop upstream, so that hunk is dropped; the per-route-tree branch cache and the compiled-path cache are unchanged. Also updated the `@remix-run/dev>tar-fs` override key to track the new dev version. Verified locally against latest main: `typecheck --filter webapp` passes, `--frozen-lockfile` is consistent, and the dev server boots and server-renders pages cleanly (route matching exercised via the patched router).
1 parent 536731a commit 6cf7677

4 files changed

Lines changed: 210 additions & 601 deletions

File tree

apps/webapp/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@
104104
"@react-aria/datepicker": "^3.9.1",
105105
"@react-stately/datepicker": "^3.9.1",
106106
"@react-types/datepicker": "^3.7.1",
107-
"@remix-run/express": "2.17.4",
108-
"@remix-run/node": "2.17.4",
109-
"@remix-run/react": "2.17.4",
110-
"@remix-run/router": "^1.23.2",
111-
"@remix-run/serve": "2.17.4",
112-
"@remix-run/server-runtime": "2.17.4",
107+
"@remix-run/express": "2.17.5",
108+
"@remix-run/node": "2.17.5",
109+
"@remix-run/react": "2.17.5",
110+
"@remix-run/router": "^1.23.3",
111+
"@remix-run/serve": "2.17.5",
112+
"@remix-run/server-runtime": "2.17.5",
113113
"@remix-run/v1-meta": "^0.1.3",
114114
"@s2-dev/streamstore": "^0.22.10",
115115
"@sentry/remix": "9.46.0",
@@ -242,8 +242,8 @@
242242
"@internal/clickhouse": "workspace:*",
243243
"@internal/replication": "workspace:*",
244244
"@internal/testcontainers": "workspace:*",
245-
"@remix-run/dev": "2.17.4",
246-
"@remix-run/testing": "^2.17.4",
245+
"@remix-run/dev": "2.17.5",
246+
"@remix-run/testing": "^2.17.5",
247247
"@sentry/cli": "2.50.2",
248248
"@swc/core": "^1.3.4",
249249
"@swc/helpers": "^0.4.11",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"antlr4ts@0.5.0-alpha.4": "patches/antlr4ts@0.5.0-alpha.4.patch",
8989
"@window-splitter/state@1.1.3": "patches/@window-splitter__state@1.1.3.patch",
9090
"streamdown@2.5.0": "patches/streamdown@2.5.0.patch",
91-
"@remix-run/router@1.23.2": "patches/@remix-run__router@1.23.2.patch"
91+
"@remix-run/router@1.23.3": "patches/@remix-run__router@1.23.3.patch"
9292
},
9393
"overrides": {
9494
"typescript": "5.5.4",
@@ -98,7 +98,7 @@
9898
"ai@^6": "6.0.116",
9999
"@ai-sdk/provider-utils@^4": "4.0.29",
100100
"express@^4>body-parser": "1.20.3",
101-
"@remix-run/dev@2.17.4>tar-fs": "2.1.4",
101+
"@remix-run/dev@2.17.5>tar-fs": "2.1.4",
102102
"tar@>=7 <7.5.11": "^7.5.11",
103103
"form-data@^2": "2.5.4",
104104
"form-data@^3": "3.0.4",
Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/dist/router.cjs.js b/dist/router.cjs.js
2-
index e634d45fee327b5f9ef63eee8dc1da39b07c79d4..ce1cf6c599e7efa82d51b63d26c0c92e82931083 100644
2+
index 6aa7db6fb5a7182afcdf17b16a3356abfa1e7945..95edbde228beff8dbd13fb2800302e31a932ef25 100644
33
--- a/dist/router.cjs.js
44
+++ b/dist/router.cjs.js
5-
@@ -746,6 +746,11 @@ function convertRoutesToDataRoutes(routes, mapRouteProperties, parentPath, manif
5+
@@ -783,6 +783,11 @@ function convertRoutesToDataRoutes(routes, mapRouteProperties, parentPath, manif
66
*
77
* @see https://reactrouter.com/v6/utils/match-routes
88
*/
@@ -14,7 +14,7 @@ index e634d45fee327b5f9ef63eee8dc1da39b07c79d4..ce1cf6c599e7efa82d51b63d26c0c92e
1414
function matchRoutes(routes, locationArg, basename) {
1515
if (basename === void 0) {
1616
basename = "/";
17-
@@ -758,17 +763,17 @@ function matchRoutesImpl(routes, locationArg, basename, allowPartial) {
17+
@@ -795,8 +800,13 @@ function matchRoutesImpl(routes, locationArg, basename, allowPartial) {
1818
if (pathname == null) {
1919
return null;
2020
}
@@ -28,20 +28,9 @@ index e634d45fee327b5f9ef63eee8dc1da39b07c79d4..ce1cf6c599e7efa82d51b63d26c0c92e
2828
+ __branchCache.set(routes, branches);
2929
+ }
3030
let matches = null;
31-
+ // decodePath(pathname) is loop-invariant — hoisted out (was recomputed per branch).
32-
+ let decoded = decodePath(pathname);
31+
let decoded = decodePath(pathname);
3332
for (let i = 0; matches == null && i < branches.length; ++i) {
34-
- // Incoming pathnames are generally encoded from either window.location
35-
- // or from router.navigate, but we want to match against the unencoded
36-
- // paths in the route definitions. Memory router locations won't be
37-
- // encoded here but there also shouldn't be anything to decode so this
38-
- // should be a safe operation. This avoids needing matchRoutes to be
39-
- // history-aware.
40-
- let decoded = decodePath(pathname);
41-
matches = matchRouteBranch(branches[i], decoded, allowPartial);
42-
}
43-
return matches;
44-
@@ -1078,6 +1083,12 @@ function compilePath(path, caseSensitive, end) {
33+
@@ -1115,6 +1125,12 @@ function compilePath(path, caseSensitive, end) {
4534
if (end === void 0) {
4635
end = true;
4736
}
@@ -54,7 +43,7 @@ index e634d45fee327b5f9ef63eee8dc1da39b07c79d4..ce1cf6c599e7efa82d51b63d26c0c92e
5443
warning(path === "*" || !path.endsWith("*") || path.endsWith("/*"), "Route path \"" + path + "\" will be treated as if it were " + ("\"" + path.replace(/\*$/, "/*") + "\" because the `*` character must ") + "always follow a `/` in the pattern. To get rid of this warning, " + ("please change the route path to \"" + path.replace(/\*$/, "/*") + "\"."));
5544
let params = [];
5645
let regexpSource = "^" + path.replace(/\/*\*?$/, "") // Ignore trailing / and /*, we'll handle it below
57-
@@ -1110,7 +1121,11 @@ function compilePath(path, caseSensitive, end) {
46+
@@ -1147,7 +1163,11 @@ function compilePath(path, caseSensitive, end) {
5847
regexpSource += "(?:(?=\\/|$))";
5948
} else ;
6049
let matcher = new RegExp(regexpSource, caseSensitive ? undefined : "i");

0 commit comments

Comments
 (0)