[pull] main from remix-run:main

.github/workflows/pr-actions.yml

@@ -40,7 +40,7 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: 📥 Download result from upstream workflow
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: pr-checks-result
           github-token: ${{ github.token }}

.github/workflows/pr-checks.yml

@@ -47,7 +47,7 @@ jobs:
         run: node scripts/pr.ts check
 
       - name: 📤 Upload result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: pr-checks-result
           path: pr-checks-result.json

.github/workflows/preview.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Build/push branch (push)
         if: github.event_name == 'push'
         run: |
-          pnpm run setup-installable-branch preview/dev
+          pnpm run previews:branch preview/dev
           git push --force --set-upstream origin preview/dev
           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 setup-installable-branch preview/pr-${{ github.event.pull_request.number }}
+          pnpm run previews:branch 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 pr-preview comment ${{ github.event.pull_request.number }} preview/pr-${{ github.event.pull_request.number }}
+          pnpm run previews:pr 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 setup-installable-branch ${{ inputs.installableBranch }}
+          pnpm run previews:branch ${{ 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 pr-preview cleanup ${{ github.event.pull_request.number }} preview/pr-${{ github.event.pull_request.number }}
+          pnpm run previews:pr cleanup ${{ github.event.pull_request.number }} preview/pr-${{ github.event.pull_request.number }}

package.json

@@ -22,9 +22,9 @@
     "format:check": "prettier --ignore-path .prettierignore --check .",
     "lint": "eslint --cache .",
     "playground": "node ./scripts/playground.js",
-    "pr-preview": "node ./scripts/pr-preview.ts",
+    "previews:branch": "node ./scripts/previews/branch.ts",
+    "previews:pr": "node ./scripts/previews/pr.ts",
     "release-comments": "node scripts/release-comments.ts",
-    "setup-installable-branch": "node scripts/setup-installable-branch.ts",
     "test": "jest",
     "test:inspect": "node --inspect-brk ./node_modules/.bin/jest",
     "typegen": "pnpm run --recursive --parallel typegen",

scripts/setup-installable-branch.ts → scripts/previews/branch.ts

@@ -1,7 +1,7 @@
 import * as fsp from "node:fs/promises";
 import * as path from "node:path";
 import * as util from "node:util";
-import { logAndExec } from "./utils/process.ts";
+import { logAndExec } from "../utils/process.ts";
 
 /**
  * This script prepares a base branch (usually `dev`) to be PNPM-installable

scripts/pr-preview.ts → scripts/previews/pr.ts

@@ -11,7 +11,7 @@
  * - `cleanup <pr-number>`: Deletes the preview branch from the remote repository
  *   and adds a cleanup notification comment to the PR.
  *
- * Usage: `node pr-preview.ts <command> <pr-number>`
+ * Usage: `node scripts/previews/pr.ts <command> <pr-number>`
  */
 
 import { parseArgs } from "node:util";
@@ -21,8 +21,8 @@ import {
   deletePrComment,
   getPrComments,
   updatePrComment,
-} from "./utils/github.ts";
-import { logAndExec } from "./utils/process.ts";
+} from "../utils/github.ts";
+import { logAndExec } from "../utils/process.ts";
 
 const STICKY_MARKER = "<!-- pr-preview-comment-sticky -->";
 const CLEANUP_MARKER = "<!-- pr-preview-comment-cleanup -->";
@@ -57,7 +57,7 @@ if (commands[command]) {
 }
 
 function printUsage() {
-  console.error("Usage: node pr-preview.ts <command> <args>");
+  console.error("Usage: node scripts/previews/pr.ts <command> <args>");
   console.error(
     "  comment <pr-number> <preview-branch> - Add preview comment to PR",
   );