Merge branch 'main' into release-next

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

@@ -23,7 +23,7 @@ jobs:
           token: ${{ secrets.FORMAT_PAT }}
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4

.github/workflows/deployments.yml

@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
@@ -73,7 +73,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
@@ -111,7 +111,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
@@ -150,7 +150,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
@@ -192,7 +192,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4

.github/workflows/format.yml

@@ -22,7 +22,7 @@ jobs:
           token: ${{ secrets.FORMAT_PAT }}
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4

.github/workflows/lint.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4

.github/workflows/nightly.yml

@@ -35,7 +35,7 @@ jobs:
           fetch-depth: 0
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4

.github/workflows/release-experimental.yml

@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 0
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
           fetch-depth: 0
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
@@ -76,7 +76,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4

.github/workflows/shared-build.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v4

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

@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node ${{ matrix.node }}
         uses: actions/setup-node@v4

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

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 📦 Setup pnpm
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
 
       - name: ⎔ Setup node ${{ matrix.node }}
         uses: actions/setup-node@v4

contributors.yml

@@ -139,6 +139,7 @@
 - dario-piotrowicz
 - davecalnan
 - davecranwell-vocovo
+- david-crespo
 - DavidHollins6
 - davongit
 - dcramer
@@ -164,6 +165,7 @@
 - dnsbty
 - dogukanakkaya
 - dokeet
+- domluther
 - donavon
 - Drew-Daniels
 - dschlabach
@@ -328,6 +330,7 @@
 - jrubins
 - jsbmg
 - jsgv
+- jsparkdev
 - jssisodiya
 - jstafman
 - juhanakristian
@@ -440,6 +443,7 @@
 - Mattinton
 - mattkindy
 - mattmazzola
+- mattpocock
 - mattstobbs
 - maxprilutskiy
 - maxrchung
@@ -471,6 +475,7 @@
 - mochi-sann
 - mohammadhosseinbagheri
 - monitaure
+- monsterdeveloper
 - mootari
 - morinokami
 - mrkhosravian
@@ -650,6 +655,7 @@
 - toufiqnuur
 - toyozaki
 - TrySound
+- Tsukina-7mochi
 - ttsirkia
 - turkerdev
 - tvanantwerp

docs/guides/envvars.md

@@ -46,19 +46,19 @@ export async function loader() {
 }
 ```
 
-If you're using the `@remix-run/cloudflare-pages` adapter, env variables work a little differently. Since Cloudflare Pages are powered by Functions, you'll need to define your local environment variables in the [`.dev.vars`][dev-vars] file. It has the same syntax as `.env` example file mentioned above.
+If you're using the `@remix-run/cloudflare-pages` or `@remix-run/cloudflare` adapters, env variables work a little differently. You'll need to define your local environment variables in the [`.dev.vars`][dev-vars] file. It has the same syntax as `.env` example file mentioned above.
 
-Then, they'll be available via Remix's `context.env` in your `loader`/`action` functions:
+Then, they'll be available via Remix's `context.cloudflare.env` in your `loader`/`action` functions:
 
 ```tsx
 export const loader = async ({
   context,
 }: LoaderFunctionArgs) => {
-  console.log(context.env.SOME_SECRET);
+  console.log(context.cloudflare.env.SOME_SECRET);
 };
 ```
 
-Note that `.env` files are only for development. You should not use them in production, so Remix doesn't load them when running `remix serve`. You'll need to follow your host's guides on adding secrets to your production server, via the links below.
+Note that `.env` and `.dev.vars` files are only for development. You should not use them in production, so Remix doesn't load them when running `remix serve`. You'll need to follow your host's guides on adding secrets to your production server, via the links below.
 
 ### Production
 

docs/guides/resource-routes.md

@@ -43,7 +43,7 @@ export default function Report() {
 
 It's linking to a PDF version of the page. To make this work we can create a Resource Route below it. Notice that it has no component: that makes it a Resource Route.
 
-```tsx filename=app/routes/reports.$id.pdf.tsx
+```tsx filename=app/routes/reports.$id[.pdf].tsx
 export async function loader({
   params,
 }: LoaderFunctionArgs) {

docs/guides/single-fetch.md

@@ -152,7 +152,7 @@ You can do this in any file covered by your `tsconfig.json` > `include`.
 We recommend you do this in your `vite.config.ts` to keep it colocated with the `future.v3_singleFetch` future flag in the Remix plugin:
 
 ```ts
-declare module "@remix-run/node" {
+declare module "@remix-run/server-runtime" {
   // or cloudflare, deno, etc.
   interface Future {
     v3_singleFetch: true;

docs/other-api/create-remix.md

@@ -35,11 +35,11 @@ npx create-remix@latest --help
 ```sh
 npm create remix@latest <projectDir>
 # or
-yarn create remix <projectDir>
+yarn create remix@latest <projectDir>
 # or
-pnpm create remix <projectDir>
+pnpm create remix@latest <projectDir>
 # or
-bunx create-remix <projectDir>
+bunx create-remix@latest <projectDir>
 ```
 
 ### `create-remix --template`

docs/start/tutorial.md

@@ -168,7 +168,7 @@ export default function Contact() {
   const contact = {
     first: "Your",
     last: "Name",
-    avatar: "https://placekitten.com/200/200",
+    avatar: "https://placecats.com/200/200",
     twitter: "your_handle",
     notes: "Some notes",
     favorite: true,
@@ -634,11 +634,11 @@ export default function EditContact() {
       <p>
         <span>Name</span>
         <input
-          defaultValue={contact.first}
           aria-label="First name"
+          defaultValue={contact.first}
           name="first"
-          type="text"
           placeholder="First"
+          type="text"
         />
         <input
           aria-label="Last name"
@@ -732,11 +732,11 @@ Open up `contacts.$contactId_.edit.tsx` and look at the `form` elements. Notice
 
 ```tsx filename=app/routes/contacts.$contactId_.edit.tsx lines=[4]
 <input
-  defaultValue={contact.first}
   aria-label="First name"
+  defaultValue={contact.first}
   name="first"
-  type="text"
   placeholder="First"
+  type="text"
 />
 ```
 

integration/helpers/node-template/package.json

@@ -16,7 +16,7 @@
     "@remix-run/react": "workspace:*",
     "@remix-run/serve": "workspace:*",
     "@remix-run/server-runtime": "workspace:*",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "isbot": "^4.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

integration/helpers/vite-cloudflare-template/package.json

@@ -26,7 +26,7 @@
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
     "typescript": "^5.1.6",
-    "vite": "5.1.3",
+    "vite": "5.1.8",
     "vite-tsconfig-paths": "^4.2.1",
     "wrangler": "^3.24.0"
   },

integration/helpers/vite-template/package.json

@@ -17,7 +17,7 @@
     "@remix-run/serve": "workspace:*",
     "@vanilla-extract/css": "^1.10.0",
     "@vanilla-extract/vite-plugin": "^3.9.2",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "isbot": "^4.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -30,7 +30,7 @@
     "@types/react-dom": "^18.2.7",
     "eslint": "^8.38.0",
     "typescript": "^5.1.6",
-    "vite": "5.1.0",
+    "vite": "5.1.8",
     "vite-env-only": "^2.0.0",
     "vite-tsconfig-paths": "^4.2.1",
     "wrangler": "^3.24.0"

integration/package.json

@@ -23,7 +23,7 @@
     "cross-spawn": "^7.0.3",
     "dedent": "^0.7.0",
     "execa": "^5.1.1",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
     "glob": "8.0.3",

package.json

@@ -118,7 +118,7 @@
     "remark-gfm": "3.0.1",
     "remark-parse": "^10.0.1",
     "remark-stringify": "^10.0.2",
-    "rollup": "^2.36.1",
+    "rollup": "^2.79.2",
     "rollup-plugin-copy": "^3.3.0",
     "semver": "^7.3.7",
     "simple-git": "^3.16.0",
@@ -129,7 +129,7 @@
     "unified": "^10.1.2",
     "unist-util-remove": "^3.1.0",
     "unist-util-visit": "^4.1.1",
-    "vite": "5.1.3",
+    "vite": "5.1.8",
     "vite-tsconfig-paths": "^4.2.2",
     "wait-on": "^7.0.1",
     "wrangler": "^3.72.3"

packages/create-remix/CHANGELOG.md

@@ -146,7 +146,7 @@ No significant changes to this package were made in this release. [See the relea
 
 ### Patch Changes
 
-- Allow dots in github repo shorthand notation folder names (i.e., `npx create-remix --template remix-run/examples/socket.io`) ([#7277](https://github.com/remix-run/remix/pull/7277))
+- Allow dots in github repo shorthand notation folder names (i.e., `npx create-remix@latest --template remix-run/examples/socket.io`) ([#7277](https://github.com/remix-run/remix/pull/7277))
 
 ## 1.19.3
 

packages/remix-dev/package.json

@@ -47,7 +47,7 @@
     "esbuild-plugins-node-modules-polyfill": "^1.6.0",
     "execa": "5.1.1",
     "exit-hook": "2.2.1",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
     "gunzip-maybe": "^1.4.2",
@@ -73,7 +73,7 @@
     "set-cookie-parser": "^2.6.0",
     "tar-fs": "^2.1.1",
     "tsconfig-paths": "^4.0.0",
-    "ws": "^7.4.5"
+    "ws": "^7.5.10"
   },
   "devDependencies": {
     "@remix-run/cloudflare": "workspace:*",
@@ -102,7 +102,7 @@
     "msw": "^1.2.3",
     "strip-ansi": "^6.0.1",
     "tiny-invariant": "^1.2.0",
-    "vite": "5.1.3",
+    "vite": "5.1.8",
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {

packages/remix-express/package.json

@@ -23,13 +23,13 @@
     "@types/express": "^4.17.9",
     "@types/node": "^18.17.1",
     "@types/supertest": "^2.0.10",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "node-mocks-http": "^1.10.1",
     "supertest": "^6.3.3",
     "typescript": "^5.1.6"
   },
   "peerDependencies": {
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "typescript": "^5.1.0"
   },
   "peerDependenciesMeta": {