Merge branch 'dev' into fix/useSearchParams

Author: timdorr

.eslintignore

@@ -3,10 +3,12 @@ node_modules/
 pnpm-lock.yaml
 /docs/api
 examples/**/dist/
+/integration/helpers/vite-plugin-cloudflare-template/worker-configuration.d.ts
 /playground/
 /playground-local/
 packages/**/dist/
 packages/react-router-dom/server.d.ts
 packages/react-router-dom/server.js
 packages/react-router-dom/server.mjs
 tutorial/dist/
+public/

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -20,7 +20,7 @@ body:
 
         If you'd rather open a GitHub issue, here are other ways to share a reproduction (ordered from most helpful to least):
 
-        - 🥇 Link to a [StackBlitz](https://remix.new) environment
+        - 🥇 Link to a [StackBlitz](https://reactrouter.com/new) environment
         - 🥈 Link to a GitHub repository
         - 🥉 Description of project including template, config files, `package.json` scripts, etc.
 

.github/workflows/integration-full.yml

@@ -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/**"

.github/workflows/release.yml

@@ -66,7 +66,7 @@ jobs:
     name: 🦋 Find Package
     needs: [release]
     runs-on: ubuntu-latest
-    if: github.repository == 'remix-run/react-router' && needs.release.outputs.published == 'true'
+    if: github.repository == 'remix-run/react-router' && github.ref_name != 'release-v6' && needs.release.outputs.published == 'true'
     outputs:
       package_version: ${{ steps.find_package_version.outputs.package_version }}
     steps:
@@ -92,6 +92,6 @@ jobs:
 
   comment:
     name: 📝 Comment on related issues and pull requests
-    if: github.repository == 'remix-run/react-router' && needs.find_package_version.outputs.package_version != ''
+    if: github.repository == 'remix-run/react-router' && github.ref_name != 'release-v6' && needs.find_package_version.outputs.package_version != ''
     needs: [release, find_package_version]
     uses: ./.github/workflows/release-comments.yml

.github/workflows/shared-build.yml

@@ -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: |

.github/workflows/shared-integration.yml

@@ -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/test.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: |

.gitignore

@@ -1,7 +1,6 @@
 .DS_Store
 npm-debug.log
 
-/docs/api/
 /website/build/
 node_modules/
 
@@ -30,6 +29,7 @@ node_modules/
 .eslintcache
 .tmp
 tsup.config.bundled_*.mjs
+build.utils.d.ts
 /.env
 /NOTES.md
 

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
+}