Merge branch 'dev' into brophdawg11/pathless-route-collision-3

.changeset/expose-error-headers.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/server-runtime": minor
+---
+
+Add `errorHeaders` parameter to the leaf `headers()` function to expose headers from thrown responses that bubble up to ancestor route boundaries.  If the throwing route contains the boundary, then `errorHeaders` will be the same object as `loaderHeaders`/`actionHeaders` for that route.

.changeset/lemon-beers-fetch.md

@@ -0,0 +1,24 @@
+---
+"@remix-run/server-runtime": minor
+"@remix-run/react": minor
+---
+
+Force Typescript to simplify type produced by `Serialize`.
+
+As a result, the following types and functions have simplified return types:
+- SerializeFrom
+- useLoaderData
+- useActionData
+- useFetcher
+
+```ts
+type Data = { hello: string; when: Date }
+
+// BEFORE
+type Unsimplified = SerializeFrom<Data>
+//   ^? SerializeObject<UndefinedToOptional<{ hello: string; when: Date }>>
+
+// AFTER
+type Simplified = SerializeFrom<Data>
+//   ^? { hello: string; when: string }
+```

.eslintrc.js

@@ -9,6 +9,9 @@ module.exports = {
     "plugin:markdown/recommended",
   ],
   plugins: ["markdown"],
+  settings: {
+    "import/internal-regex": "^~/",
+  },
   overrides: [
     {
       files: ["**/*.md/**"],
@@ -28,10 +31,29 @@ module.exports = {
       },
     },
     {
-      files: ["templates/**/*.*"],
+      files: [
+        "**/*.md/*.js?(x)",
+        "**/*.md/*.ts?(x)",
+        "integration/helpers/cf-template/**/*.*",
+        "integration/helpers/deno-template/**/*.*",
+        "integration/helpers/node-template/**/*.*",
+        "packages/remix-dev/config/defaults/**/*.*",
+        "templates/**/*.*",
+      ],
       rules: {
         "prefer-let/prefer-let": OFF,
         "prefer-const": WARN,
+
+        "import/order": [
+          WARN,
+          {
+            alphabetize: { caseInsensitive: true, order: "asc" },
+            groups: ["builtin", "external", "internal", "parent", "sibling"],
+            "newlines-between": "always",
+          },
+        ],
+
+        "react/jsx-no-leaked-render": [WARN, { validStrategies: ["ternary"] }],
       },
     },
   ],

.github/workflows/deployments.yml

@@ -28,16 +28,15 @@ on:
       TEST_VERCEL_USER_ID:
         required: true
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   arc_deploy:
     name: Architect Deploy
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 
@@ -72,6 +71,9 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 
@@ -107,6 +109,9 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 
@@ -143,6 +148,9 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 
@@ -182,6 +190,9 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 
@@ -217,6 +228,9 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 
@@ -249,6 +263,9 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 

.github/workflows/format.yml

@@ -6,16 +6,15 @@ on:
       - main
       - dev
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   format:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
 
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
         with:

.github/workflows/lint.yml

@@ -7,15 +7,14 @@ on:
       - dev
   pull_request:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   lint:
     name: ⬣ Lint
     runs-on: ubuntu-latest
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 

.github/workflows/merged-pr.yml

@@ -0,0 +1,29 @@
+name: 📦 Merged PR
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - dev
+    paths:
+      - "packages/**"
+
+permissions:
+  pull-requests: write
+
+jobs:
+  merged:
+    name: Add label to merged PR
+    if: github.event.pull_request.merged == true && github.repository == 'remix-run/remix'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          retries: 3
+          script: |
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: 'awaiting release',
+            })

.github/workflows/nightly.yml

@@ -5,10 +5,6 @@ on:
   schedule:
     - cron: "0 7 * * *" # every day at 12AM PST
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
   CI: true
 
@@ -26,6 +22,9 @@ jobs:
       # allows this to be used in the `comment` job below - will be undefined if there's no release necessary
       NEXT_VERSION: ${{ steps.version.outputs.NEXT_VERSION }}
     steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
         with:

.github/workflows/no-response.yml

@@ -17,25 +17,18 @@ jobs:
       - name: 🥺 Handle Ghosting
         uses: actions/stale@v8
         with:
+          days-before-close: 10
           close-issue-message: >
-            This issue has been automatically closed because we didn't hear
-            anything from the original author after the previous notice.
+            This issue has been automatically closed because we haven't received a
+            response from the original author 🙈. This automation helps keep the issue
+            tracker clean from issues that are unactionable. Please reach out if you
+            have more information for us! 🙂
           close-pr-message: >
-            This PR has been automatically closed because we didn't hear
-            anything from the original author after the previous notice.
+            This PR has been automatically closed because we haven't received a
+            response from the original author 🙈. This automation helps keep the issue
+            tracker clean from PRs that are unactionable. Please reach out if you
+            have more information for us! 🙂
+          # don't automatically mark issues/PRs as stale
+          days-before-stale: -1
           stale-issue-label: needs-response
-          stale-issue-message: >
-            This issue has been automatically marked stale because we haven't
-            received a response from the original author in a while 🙈. This
-            automation helps keep the issue tracker clean from issues that are
-            not actionable. Please reach out if you have more information for us
-            or you think this issue shouldn't be closed! 🙂 If you don't do so
-            within 7 days, this issue will be automatically closed.
           stale-pr-label: needs-response
-          stale-pr-message: >
-            This PR has been automatically marked stale because we haven't
-            received a response from the original author in a while 🙈. This
-            automation helps keep the issue tracker clean from issues that are
-            not actionable. Please reach out if you have more information for us
-            or you think this issue shouldn't be closed! 🙂 If you don't do so
-            within 7 days, this PR will be automatically closed.