Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/floppy-years-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@shopify/remix-oxygen': patch
'skeleton': patch
'@shopify/hydrogen': patch
'@shopify/cli-hydrogen': patch
---

Update React Router to 7.12.0 with stabilized future flags

This release uses React Router's newly stabilized future flags (`v8_splitRouteModules`, `v8_middleware`) instead of their unstable counterparts
12 changes: 6 additions & 6 deletions cookbook/recipes/express/patches/package.json.f30b0a.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ index e9ebd1d3..00a7b42d 100644
},
"prettier": "@shopify/prettier-config",
"dependencies": {
+ "@react-router/express": "7.9.2",
+ "@react-router/node": "7.9.2",
+ "@react-router/express": "7.12.0",
+ "@react-router/node": "7.12.0",
+ "@remix-run/eslint-config": "^2.16.1",
"@shopify/hydrogen": "2025.7.0",
+ "compression": "^1.7.4",
Expand All @@ -31,16 +31,16 @@ index e9ebd1d3..00a7b42d 100644
+ "morgan": "^1.10.0",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not quite sure what these patches are for but we recently updated compression/morgan to address an underlying CVE (remix-run/react-router#14652) so if they are being patched it should meet those new minimum versions. But ideally they don't need to be patched?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently, these patches are just used as "recipes" in the dev docs. Here is the link to this specific one. I will bump this morgan version in the express recipe as a follow-up so it reflects best practices for security :) Thanks Matt!

"react": "18.3.1",
"react-dom": "18.3.1",
"react-router": "7.9.2",
"react-router-dom": "7.9.2"
"react-router": "7.12.0",
"react-router-dom": "7.12.0"
},
"devDependencies": {
- "@eslint/compat": "^1.2.5",
- "@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.18.0",
"@graphql-codegen/cli": "5.0.2",
"@react-router/dev": "7.9.2",
"@react-router/fs-routes": "7.9.2",
"@react-router/dev": "7.12.0",
"@react-router/fs-routes": "7.12.0",
"@shopify/cli": "3.85.4",
"@shopify/hydrogen-codegen": "^0.3.3",
- "@shopify/mini-oxygen": "^4.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ index e9ebd1d3..e51634ee 100644
"react": "18.3.1",
"react-dom": "18.3.1",
+ "react-intersection-observer": "^8.34.0",
"react-router": "7.9.2",
"react-router-dom": "7.9.2"
"react-router": "7.12.0",
"react-router-dom": "7.12.0"
},
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ index e9ebd1d3..1731cce2 100644
@@ -21,7 +21,9 @@
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router": "7.9.2",
- "react-router-dom": "7.9.2"
+ "react-router-dom": "7.9.2",
"react-router": "7.12.0",
- "react-router-dom": "7.12.0"
+ "react-router-dom": "7.12.0",
+ "slate": "^0.101.4",
+ "slate-react": "^0.101.3"
},
Expand Down
118 changes: 73 additions & 45 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"react": "18.3.1",
"react-dom": "18.3.1",
"react-intersection-observer": "^8.32.0",
"react-router": "7.9.2",
"react-router-dom": "7.9.2",
"react-router": "7.12.0",
"react-router-dom": "7.12.0",
"uuid": "^11.1.0"
},
"devDependencies": {
Expand All @@ -72,8 +72,8 @@
"@eslint/js": "9.19.0",
"@playwright/test": "^1.57.0",
"@qwik.dev/partytown": "^0.11.2",
"@react-router/dev": "7.9.2",
"@react-router/fs-routes": "7.9.2",
"@react-router/dev": "7.12.0",
"@react-router/fs-routes": "7.12.0",
"@shopify/cli": "3.85.4",
"@total-typescript/ts-reset": "^0.6.1",
"@types/eslint": "9.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"test:watch": "cross-env SHOPIFY_UNIT_TEST=1 LANG=en-US.UTF-8 vitest --test-timeout=60000"
},
"devDependencies": {
"@react-router/dev": "7.9.2",
"@react-router/dev": "7.12.0",
"@types/diff": "^5.0.2",
"@types/gunzip-maybe": "^1.4.0",
"@types/prettier": "^2.7.2",
Expand Down Expand Up @@ -60,7 +60,7 @@
},
"peerDependencies": {
"@graphql-codegen/cli": "^5.0.2",
"@react-router/dev": "7.9.2",
"@react-router/dev": "7.12.0",
"@shopify/hydrogen-codegen": "^0.3.3",
"@shopify/mini-oxygen": "^4.0.0",
"graphql-config": "^5.0.3",
Expand Down
Loading