Merge branch 'dev' into markdalgleish/handle-new-config-file

Author: pcattori

.changeset/afraid-games-rush.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Fix `react-router` module augmentation for `NodeNext`

.changeset/angry-students-pay.md

@@ -0,0 +1,13 @@
+---
+"@react-router/dev": minor
+"react-router": minor
+---
+
+Added a new `react-router.config.ts` `routeDiscovery` option to configure Lazy Route Discovery behavior.
+
+- By default, Lazy Route Discovery is enabled and makes manifest requests to the `/__manifest` path:
+  - `routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" }`
+- You can modify the manifest path used:
+  - `routeDiscovery: { mode: "lazy", manifestPath: "/custom-manifest" }`
+- Or you can disable this feature entirely and include all routes in the manifest on initial document load:
+  - `routeDiscovery: { mode: "initial" }`

.changeset/bright-experts-grab.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Support project root directories without a `package.json` if it exists in a parent directory

.changeset/cold-seals-count.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+When providing a custom Vite config path via the CLI `--config`/`-c` flag, default the project root directory to the directory containing the Vite config when not explicitly provided

.changeset/curvy-queens-hug.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Fix hydration error if a server `loader` returned `undefined`

.changeset/dirty-balloons-stare.md

@@ -0,0 +1,7 @@
+---
+"@react-router/dev": patch
+---
+
+In a `routes.ts` context, ensure the `--mode` flag is respected for `import.meta.env.MODE`
+
+Previously, `import.meta.env.MODE` within a `routes.ts` context was always `"development"` for the `dev` and `typegen --watch` commands, but otherwise resolved to `"production"`. These defaults are still in place, but if a `--mode` flag is provided, this will now take precedence.

.changeset/dull-hotels-battle.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Ensure consistent project root directory resolution logic in CLI commands

.changeset/eleven-oranges-cheat.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+When executing `react-router.config.ts` and `routes.ts` with `vite-node`, ensure that PostCSS config files are ignored

.changeset/forty-ants-teach.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Fix `handleError` `params` values on `.data` requests for routes with a dynamic param as the last URL segment

.changeset/little-cups-deliver.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+When `future.unstable_viteEnvironmentApi` is enabled, ensure that `build.assetsDir` in Vite config is respected when `environments.client.build.assetsDir` is not configured

.changeset/pink-candles-allow.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Don't trigger an `ErrorBoundary` UI before the reload when we detect a manifest verison mismatch in Lazy Route Discovery

.changeset/rude-cobras-warn.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Fix "Status message is not supported by HTTP/2" error during dev when using HTTPS

.changeset/silly-ligers-dress.md

@@ -3,6 +3,7 @@ node_modules/
 pnpm-lock.yaml
 /docs/api
 examples/**/dist/
+/integration/helpers/vite-plugin-cloudflare-template/worker-configuration.d.ts
 /playground/
 /playground-local/
 packages/**/dist/

.changeset/silver-peas-shop.md

@@ -1,16 +1,13 @@
 name: Branch
 
-# main/dev/release-* branches will get the full run across
+# main/dev branches will get the full run across
 # all OS/browsers for multiple node versions
 
 on:
   push:
     branches:
       - main
       - dev
-      - release-*
-    tags:
-      - "v0.0.0-nightly-*"
     paths-ignore:
       - ".changeset/**"
       - "decisions/**"

.changeset/sour-eggs-give.md

@@ -22,7 +22,8 @@ jobs:
           node-version-file: ".nvmrc"
           cache: "pnpm"
 
-      - uses: google/wireit@setup-github-actions-caching/v2
+      # TODO: Track and renable once this has been fixed: https://github.com/google/wireit/issues/1297
+      # - uses: google/wireit@setup-github-actions-caching/v2
 
       - name: Disable GitHub Actions Annotations
         run: |

.eslintignore

@@ -45,7 +45,8 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: "pnpm"
 
-      - uses: google/wireit@setup-github-actions-caching/v2
+      # TODO: Track and renable once this has been fixed: https://github.com/google/wireit/issues/1297
+      # - uses: google/wireit@setup-github-actions-caching/v2
 
       - name: Disable GitHub Actions Annotations
         run: |

.github/workflows/integration-full.yml

@@ -45,7 +45,8 @@ jobs:
           cache: pnpm
           check-latest: true
 
-      - uses: google/wireit@setup-github-actions-caching/v2
+      # TODO: Track and renable once this has been fixed: https://github.com/google/wireit/issues/1297
+      # - uses: google/wireit@setup-github-actions-caching/v2
 
       - name: Disable GitHub Actions Annotations
         run: |

.github/workflows/shared-build.yml

@@ -1,7 +1,6 @@
 .DS_Store
 npm-debug.log
 
-/docs/api/
 /website/build/
 node_modules/