[pull] main from remix-run:main

.github/workflows/deduplicate-lock-file.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           token: ${{ secrets.FORMAT_PAT }}
 

.github/workflows/docs.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           token: ${{ secrets.FORMAT_PAT }}
           ref: ${{ github.event.inputs.branch }}

.github/workflows/format.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           token: ${{ secrets.FORMAT_PAT }}
 

.github/workflows/issue-checks.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Close issue
         env:
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Close issue
         env:

.github/workflows/pr-actions.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       # Check's out the base (main) branch - not the PR branch
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v6

.github/workflows/pr-checks.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v6

.github/workflows/preview.yml

@@ -41,17 +41,17 @@ jobs:
     steps:
       - name: Checkout (push)
         if: github.event_name == 'push'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Checkout (pull_request)
         if: github.event_name == 'pull_request'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Checkout (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ inputs.baseBranch }}
 
@@ -76,7 +76,7 @@ jobs:
       - name: Build/push branch (push)
         if: github.event_name == 'push'
         run: |
-          pnpm run previews:branch preview/main
+          node ./scripts/previews/branch.ts preview/main
           git push --force --set-upstream origin preview/main
           echo "💿 pushed installable branch: https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"
 
@@ -86,17 +86,17 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
-          pnpm run previews:branch preview/pr-${{ github.event.pull_request.number }}
+          node ./scripts/previews/branch.ts preview/pr-${{ github.event.pull_request.number }}
           git push --force --set-upstream origin preview/pr-${{ github.event.pull_request.number }}
           echo "pushed installable branch: https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"
-          pnpm run previews:pr comment ${{ github.event.pull_request.number }} preview/pr-${{ github.event.pull_request.number }}
+          node ./scripts/previews/pr.ts comment ${{ github.event.pull_request.number }} preview/pr-${{ github.event.pull_request.number }}
 
       # Build and normal push for experimental releases to avoid unintended force
       # pushes over remote branches in case of a branch name collision
       - name: Build/push branch (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch'
         run: |
-          pnpm run previews:branch ${{ inputs.installableBranch }}
+          node ./scripts/previews/branch.ts ${{ inputs.installableBranch }}
           git push --set-upstream origin ${{ inputs.installableBranch }}
           echo "💿 pushed installable branch: https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"
 
@@ -106,4 +106,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
-          pnpm run previews:pr cleanup ${{ github.event.pull_request.number }} preview/pr-${{ github.event.pull_request.number }}
+          node ./scripts/previews/pr.ts cleanup ${{ github.event.pull_request.number }} preview/pr-${{ github.event.pull_request.number }}

.github/workflows/release-comments-manual.yml

@@ -16,7 +16,7 @@ jobs:
       pull-requests: write # enable commenting on released pull requests
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
       should_publish: ${{ steps.needs-publish.outputs.should_publish }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Check for change files
         id: check
@@ -78,14 +78,14 @@ jobs:
       pull-requests: write # enable opening a PR for the release
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.ref_name }}
           fetch-depth: 0
           token: ${{ secrets.FORMAT_PAT }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v5
+        uses: pnpm/action-setup@v6
 
       - name: Install Node.js
         uses: actions/setup-node@v6
@@ -111,7 +111,7 @@ jobs:
       id-token: write # enable generation of an ID token for publishing
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v6
@@ -144,7 +144,7 @@ jobs:
       pull-requests: write # enable commenting on released pull requests
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -174,7 +174,7 @@ jobs:
       id-token: write # enable generation of an ID token for publishing
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.event.inputs.branch }}
           fetch-depth: 0 # needed for tags
@@ -206,7 +206,7 @@ jobs:
       id-token: write # enable generation of an ID token for publishing
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.event.inputs.branch }}
           # checkout using a custom token so that we can push later on

.github/workflows/test-integration-run.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ${{ inputs.os }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v6

.github/workflows/test-integration.yml

@@ -50,7 +50,7 @@ jobs:
     steps:
       # Need to checkout the repo so we can use the `gh` CLI
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Select integration suites
         id: suites

.github/workflows/test-unit.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v6

CHANGELOG.md

@@ -23,6 +23,7 @@ We manage release notes in this file instead of the paginated Github Releases Pa
     - [Removed deprecated `meta` `data` fields](#removed-deprecated-meta-data-fields)
     - [Cloudflare Vite Plugin](#cloudflare-vite-plugin)
     - [`@react-router/architect` `useRequestContextDomainName`](#react-routerarchitect-userequestcontextdomainname)
+    - [Pre-rendering Flow](#pre-rendering-flow)
 - [React Router v7 Releases](#react-router-v7-releases)
   - [v7.18.0](#v7180)
     - [CSRF Check Logic Fix](#csrf-check-logic-fix)
@@ -154,6 +155,10 @@ The React Router Cloudflare dev proxy (`@react-router/dev/vite/cloudflare`) has
 
 The `@react-router/architect` `createRequestHandler` `useRequestContextDomainName` option has been removed as that is now the default behavior in v8.
 
+#### Pre-rendering Flow
+
+In v7 we had a `future.unstable_previewServerPrerendering` flag that would opt you into a new pre-rendering flow using the Vite preview server (leveraging the Vite environment API). Now that the Vite environment API is always available on our new Vite 7+ baseline, we dropped this flag and the preview server flow has replaced our old pre-rendering implementation. It _should_ be a non-breaking change but if you see issues, please let us know!
+
 ### Major Changes
 
 - `react-router` - Update minimum Node version to 22.22.0 ([#14928](https://github.com/remix-run/react-router/pull/14928))

package.json

@@ -25,8 +25,6 @@
     "playground": "node ./scripts/playground.js",
     "prerelease:version": "node ./scripts/prerelease.ts version",
     "prerelease:publish": "node ./scripts/prerelease.ts publish",
-    "previews:branch": "node ./scripts/previews/branch.ts",
-    "previews:pr": "node ./scripts/previews/pr.ts",
     "release-comments": "node scripts/release-comments.ts",
     "test": "node --experimental-vm-modules --no-warnings=ExperimentalWarning ./node_modules/jest/bin/jest.js",
     "test:inspect": "node --experimental-vm-modules --no-warnings=ExperimentalWarning --inspect-brk ./node_modules/jest/bin/jest.js",
@@ -49,7 +47,7 @@
       "default"
     ]
   },
-  "packageManager": "pnpm@9.10.0",
+  "packageManager": "pnpm@11.7.0",
   "resolutions": {
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
@@ -97,11 +95,5 @@
   },
   "engines": {
     "node": ">=22.22.0"
-  },
-  "pnpm": {
-    "overrides": {
-      "react-is": "19.1.0",
-      "unified": "11.0.5"
-    }
   }
 }