Merge branch 'main' into release-next

.github/workflows/deduplicate-yarn.yml

@@ -23,7 +23,7 @@ jobs:
           token: ${{ secrets.FORMAT_PAT }}
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: "yarn"

.github/workflows/deployments.yml

@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: npm
@@ -70,7 +70,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: npm
@@ -105,7 +105,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: npm
@@ -141,7 +141,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: npm
@@ -180,7 +180,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: npm

.github/workflows/format.yml

@@ -22,7 +22,7 @@ jobs:
           token: ${{ secrets.FORMAT_PAT }}
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: "yarn"

.github/workflows/lint.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: "yarn"

.github/workflows/nightly.yml

@@ -35,7 +35,7 @@ jobs:
           fetch-depth: 0
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: "yarn"

.github/workflows/release-experimental.yml

@@ -47,7 +47,7 @@ jobs:
           fetch-depth: 0
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: "yarn"

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
           fetch-depth: 0
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: "yarn"
@@ -73,7 +73,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: "npm"

.github/workflows/shared-build.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: "yarn"

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

@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node ${{ matrix.node }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: "yarn"

.github/workflows/shared-test-unit.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ⎔ Setup node ${{ matrix.node }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: "yarn"

.github/workflows/stacks.yml

@@ -28,7 +28,7 @@ jobs:
             name: "grunge"
     steps:
       - name: ⎔ Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
 
@@ -37,7 +37,7 @@ jobs:
           npx -y create-remix@${{ inputs.version }} ${{ matrix.stack.name }} --template ${{ matrix.stack.repo }} --no-install --no-git-init
 
       - name: ⎔ Setup dependency caching
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: npm
           cache-dependency-path: ${{ matrix.stack.name }}/package.json
@@ -90,7 +90,7 @@ jobs:
         run: unzip ${{ matrix.stack.name }}.zip
 
       - name: ⎔ Setup node and dependency caching
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: npm
@@ -130,7 +130,7 @@ jobs:
         run: unzip ${{ matrix.stack.name }}.zip
 
       - name: ⎔ Setup node and dependency caching
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: npm
@@ -170,7 +170,7 @@ jobs:
         run: unzip ${{ matrix.stack.name }}.zip
 
       - name: ⎔ Setup node and dependency caching
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: npm
@@ -213,7 +213,7 @@ jobs:
         run: unzip ${{ matrix.stack.name }}.zip
 
       - name: ⎔ Setup node and dependency caching
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: npm

contributors.yml

@@ -300,6 +300,7 @@
 - kimdontdoit
 - KingSora
 - kishanhitk
+- kiyadotdev
 - klauspaiva
 - knowler
 - konradkalemba
@@ -487,6 +488,7 @@
 - sergiocarneiro
 - sergiodxa
 - shairez
+- shamsup
 - shashankboosi
 - shininglovestar
 - shubhaguha
@@ -509,6 +511,7 @@
 - stephenwade
 - SufianBabri
 - supachaidev
+- syeef
 - Synvox
 - tagraves
 - takagimeow
@@ -545,6 +548,7 @@
 - viveleroi
 - vkrol
 - vlindhol
+- vm
 - vmosyaykin
 - vorcigernix
 - wangbinyq
@@ -593,3 +597,5 @@
 - TrySound
 - rogepi
 - fredericoo
+- SeanGroff
+- jmarbutt

docs/discussion/form-vs-fetcher.md

@@ -43,7 +43,7 @@ These actions are generally more subtle and don't require a context switch for t
 
 - **Updating a Single Field**: Maybe a user wants to change the name of an item in a list or update a specific property of a record. This action is minor and doesn't necessitate a new page or URL.
 
-- **Deleting a Record from a List**: In a list view, if a user deletes an item, they likely expect to remain on the list view, with that item simply disappearing.
+- **Deleting a Record from a List**: In a list view, if a user deletes an item, they likely expect to remain on the list view, with that item no longer in the list.
 
 - **Creating a Record in a List View**: When adding a new item to a list, it often makes sense for the user to remain in that context, seeing their new item added to the list without a full page transition.
 

docs/discussion/state-management.md

@@ -233,7 +233,7 @@ function Sidebar() {
 }
 ```
 
-By initializing the state within an effect, there's potential for a mismatch between the server-rendered state and the state stored in local storage. This discrepancy wll lead to brief UI flickering shortly after the page renders and should be avoided.
+By initializing the state within an effect, there's potential for a mismatch between the server-rendered state and the state stored in local storage. This discrepancy will lead to brief UI flickering shortly after the page renders and should be avoided.
 
 #### Cookies
 

docs/file-conventions/remix-config.md

@@ -246,7 +246,7 @@ There are a few conventions that Remix uses you should be aware of.
 
 [minimatch]: https://npm.im/minimatch
 [dilum_sanjaya]: https://twitter.com/DilumSanjaya
-[an_awesome_visualization]: https://remix-routing-demo.netlify.app
+[an_awesome_visualization]: https://interactive-remix-routing-v2.netlify.app
 [remix_dev]: ../other-api/dev#remix-dev
 [app_directory]: #appdirectory
 [css_side_effect_imports]: ../styling/css-imports

docs/guides/errors.md

@@ -17,7 +17,7 @@ Remix will automatically catch errors and render the nearest error boundary for
 
 ## Root Error Boundary
 
-If you used one of the starter templates you should already have an [`ErrorBoundary`][error-boundary] in your `app/root.tsx` file. You’ll want to edit that right away because that’s what your users will see whenever an uncaught error is thrown.
+By default, Remix ships with a default `ErrorBoundary` built-in, but we hope you'll want to add a little branding to your own global error boundary. You can do so by exporting your own [`ErrorBoundary`][error-boundary] from `app/root.tsx`. This is what your users will see whenever an uncaught error is thrown.
 
 ```tsx
 export function ErrorBoundary() {

docs/guides/form-validation.md

@@ -84,19 +84,21 @@ import {
 } from "@remix-run/react";
 
 export default function Signup() {
-  const { errors } = useActionData<typeof useAction>();
+  const actionData = useActionData<typeof action>();
 
   return (
     <Form method="post">
       <p>
         <input type="email" name="email" />
-        {errors?.email ? <em>{errors.email}</em> : null}
+        {actionData?.errors?.email ? (
+          <em>{actionData?.errors.email}</em>
+        ) : null}
       </p>
 
       <p>
         <input type="password" name="password" />
-        {errors?.password ? (
-          <em>{errors.password}</em>
+        {actionData?.errors?.password ? (
+          <em>{actionData?.errors.password}</em>
         ) : null}
       </p>
 

docs/guides/templates.md

@@ -19,7 +19,7 @@ npx create-remix@latest
 If you are not interested in using TypeScript, you can install the simpler Javascript template instead:
 
 ```shellscript nonumber
-npx create-remix --template remix-run/remix/templates/remix-javascript
+npx create-remix@latest --template remix-run/remix/templates/remix-javascript
 ```
 
 This is a great place to start if you're just looking to try out Remix for the first time. You can always extend this starting point yourself or migrate to a more advanced template later.
@@ -29,12 +29,12 @@ This is a great place to start if you're just looking to try out Remix for the f
 If you want more control over your server or wish to deploy to a non-node runtime—such as [Arc][arc], [Cloudflare][cloudflare], or [Deno][deno]—then you can try one of our \[official templates]\[official-templates] from the Remix repository:
 
 ```shellscript nonumber
-npx create-remix --template remix-run/remix/templates/arc
-npx create-remix --template remix-run/remix/templates/cloudflare-pages
-npx create-remix --template remix-run/remix/templates/cloudflare-workers
-npx create-remix --template remix-run/remix/templates/deno
-npx create-remix --template remix-run/remix/templates/express
-npx create-remix --template remix-run/remix/templates/fly
+npx create-remix@latest --template remix-run/remix/templates/arc
+npx create-remix@latest --template remix-run/remix/templates/cloudflare-pages
+npx create-remix@latest --template remix-run/remix/templates/cloudflare-workers
+npx create-remix@latest --template remix-run/remix/templates/deno
+npx create-remix@latest --template remix-run/remix/templates/express
+npx create-remix@latest --template remix-run/remix/templates/fly
 ```
 
 ### Third-Party Templates

docs/route/error-boundary.md

@@ -49,6 +49,6 @@ export function ErrorBoundary() {
 }
 ```
 
-[error-boundaries]: https://reactjs.org/docs/error-boundaries.html
+[error-boundaries]: https://react.dev/reference/react/Component#catching-rendering-errors-with-an-error-boundary
 [use-route-error]: ../hooks/use-route-error
 [is-route-error-response]: ../utils/is-route-error-response

docs/route/should-revalidate.md

@@ -31,6 +31,8 @@ During client-side transitions, Remix will optimize reloading of routes that are
 
 This function lets apps further optimize by returning `false` when Remix is about to reload a route. If you define this function on a route module, Remix will defer to your function on every navigation and every revalidation after an action is called. Again, this makes it possible for your UI to get out of sync with your server if you do it wrong, so be careful.
 
+`fetcher.load` calls also revalidate, but because they load a specific URL, they don't have to worry about route param or URL search param revalidations. `fetcher.load`'s only revalidate by default after action submissions and explicit revalidation requests via [`useRevalidator`][userevalidator].
+
 ## `actionResult`
 
 When a submission causes the revalidation this will be the result of the action—either action data or an error if the action failed. It's common to include some information in the action result to instruct `shouldRevalidate` to revalidate or not.
@@ -248,3 +250,4 @@ export function shouldRevalidate({
 ```
 
 [url-params]: ../file-conventions/routes#dynamic-segments
+[userevalidator]: ../hooks/use-revalidator

packages/remix-dev/package.json

@@ -24,7 +24,7 @@
     "@babel/plugin-syntax-decorators": "^7.22.10",
     "@babel/plugin-syntax-jsx": "^7.21.4",
     "@babel/preset-typescript": "^7.21.5",
-    "@babel/traverse": "^7.21.5",
+    "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.22.5",
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",

templates/express/package.json

@@ -4,7 +4,7 @@
   "type": "module",
   "scripts": {
     "build": "remix build",
-    "dev": "remix dev --manual -c \"node server.js\"",
+    "dev": "remix dev --manual -c \"node --watch-path server.js --watch server.js\"",
     "start": "cross-env NODE_ENV=production node ./server.js",
     "typecheck": "tsc"
   },