Merge branch 'main' into release/v1.2.0

.eslintrc.js

@@ -2,9 +2,25 @@ module.exports = {
   root: true,
   extends: [
     require.resolve("./packages/remix-eslint-config/index.js"),
-    require.resolve("./packages/remix-eslint-config/jest.js")
+    require.resolve("./packages/remix-eslint-config/jest.js"),
+    "plugin:markdown/recommended"
   ],
   overrides: [
+    {
+      // all ```jsx & ```tsx code blocks in .md files
+      files: ["**/*.md/*.jsx", "**/*.md/*.tsx"],
+      rules: {
+        "react/jsx-no-undef": "off"
+      }
+    },
+    {
+      // all ```ts & ```tsx code blocks in .md files
+      files: ["**/*.md/*.ts", "**/*.md/*.tsx"],
+      rules: {
+        "@typescript-eslint/no-unused-expressions": "off",
+        "@typescript-eslint/no-unused-vars": "off"
+      }
+    },
     {
       files: [
         "packages/create-remix/templates/cloudflare-workers/**/*.js",

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,55 +1,30 @@
 name: 🐛 Bug Report
 description: Something is wrong with Remix.
-title: "[Bug]: "
 labels:
   - bug
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for contributing!
+        Thank you for helping to improve Remix!
 
-        Do you need some help?
-        ======================
-        The issue tracker is meant for feature requests and bug reports only. This isn't the best place for
-        support or usage questions. Questions here don't have as much visibility as they do elsewhere. Before
-        you ask a question, here are some resources to get help first:
+        ## The best bug report is a failing test!
 
-        - Read the docs: https://remix.run/docs
-        - Explore examples: https://github.com/remix-run/remix/tree/dev/examples
-        - Look for/ask questions on Stack Overflow: https://stackoverflow.com/questions/ask?tags=remix
-        - Ask in GitHub Discussions: https://github.com/remix-run/remix/discussions
-        - Ask in chat: https://rmx.as/discord
+        The fastest way to get a bug fixed is to add a failing test and send a pull request. **It's usually easy to do with our bug report test template**.
+
+        1. Click the "Fork" button
+        2. Open up the file [`integration/bug-report-test.ts`](https://github.com/remix-run/remix/blob/dev/integration/bug-report-test.ts) on your machine
+        3. Follow the instructions!
+
+        ## I'd rather just report the bug
+
+        That's fine too! Go ahead and fill out this form.
 
-        ### Test Case Starter:
-        https://stackblitz.com/github/remix-run/remix/tree/dev/examples/basic?file=app/root.tsx
-  - type: checkboxes
-    id: packages
-    attributes:
-      label: Which Remix packages are impacted?
-      options:
-        - label: "`remix` (Remix core)"
-        - label: "`create-remix`"
-        - label: "`@remix-run/architect`"
-        - label: "`@remix-run/cloudflare-workers`"
-        - label: "`@remix-run/dev`"
-        - label: "`@remix-run/express`"
-        - label: "`@remix-run/netlify`"
-        - label: "`@remix-run/node`"
-        - label: "`@remix-run/react`"
-        - label: "`@remix-run/serve`"
-        - label: "`@remix-run/server-runtime`"
-        - label: "`@remix-run/vercel`"
   - type: input
     attributes:
       label: What version of Remix are you using?
     validations:
       required: true
-  - type: input
-    attributes:
-      label: What version of Node are you using? Minimum supported version is 14.
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: Steps to Reproduce

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,12 @@
 blank_issues_enabled: false
+contact_links:
+  - name: Get Help
+    url: https://github.com/remix-run/remix/discussions/new?category=q-a
+    about:
+      If you can't get something to work the way you expect, open a question in
+      the Remix discussions.
+  - name: Feature Request
+    url: https://github.com/remix-run/remix/discussions/new?category=ideas
+    about:
+      We appreciate you taking the time to improve Remix with your ideas, but we
+      use the Discussions for this instead of the issues tab 🙂.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+<!--
+
+👋 Hey, thanks for your interest in contributing to Remix!
+
+**Please ask first before starting work on any significant new features.**
+
+It's never a fun experience to have your pull request declined after investing a
+lot of time and effort into a new feature. To avoid this from happening, we
+request that contributors create a
+[Feature Request discussion](https://github.com/remix-run/remix/discussions/new?category=ideas)
+to first discuss any significant new features.
+
+https://github.com/remix-run/remix/blob/main/CONTRIBUTING.md
+
+-->

.github/workflows/format.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v2
         with:
-          token: ${{ secrets.GH_BOT_TOKEN }}
+          token: ${{ secrets.FORMAT_PAT }}
 
       - name: Use Node.js
         uses: actions/setup-node@v2
@@ -41,6 +41,6 @@ jobs:
             echo "💿 no formatting changed"
             exit 0
           fi
-          git commit -m "chore: format" -m "formatted $GITHUB_SHA"
+          git commit -m "chore: format"
           git push
           echo "💿 pushed formatting changes https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"

.github/workflows/no-response.yml

@@ -9,29 +9,17 @@ on:
 
 jobs:
   noResponse:
+    if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
+
     steps:
       - uses: lee-dohm/[email protected]
         with:
+          closeComment: >
+            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! 🙂
+          daysUntilClose: 10
+          responseRequiredLabel: needs-response
           token: ${{ github.token }}
-
-inputs:
-  closeComment:
-    description: Comment to post when closing an Issue for lack of response. Set to `false` to disable.
-    default: >
-      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! 🙂
-  daysUntilClose:
-    description: Number of days of inactivity before an Issue is closed for lack of response
-    default: 10
-  responseRequiredColor:
-    description: Color for the `responseRequiredLabel`
-    default: ffffff
-  responseRequiredLabel:
-    description: Label indicating that a response from the original author is required
-    default: needs-response
-  token:
-    description: Token to access the GitHub API
-    required: true