Merge branch 'release-next' into dev

CHANGELOG.md

@@ -13,33 +13,37 @@ We manage release notes in this file instead of the paginated Github Releases Pa
   <summary>Table of Contents</summary>
 
 - [Remix Releases](#remix-releases)
+  - [v2.3.1](#v231)
+    - [Patch Changes](#patch-changes)
+    - [Updated Dependencies](#updated-dependencies)
+    - [Changes by Package](#changes-by-package)
   - [v2.3.0](#v230)
     - [What's Changed](#whats-changed)
       - [Stabilized `useBlocker`](#stabilized-useblocker)
       - [`unstable_flushSync` API](#unstable_flushsync-api)
     - [Minor Changes](#minor-changes)
-    - [Patch Changes](#patch-changes)
-    - [Updated Dependencies](#updated-dependencies)
-    - [Changes by Package](#changes-by-package)
+    - [Patch Changes](#patch-changes-1)
+    - [Updated Dependencies](#updated-dependencies-1)
+    - [Changes by Package](#changes-by-package-1)
   - [v2.2.0](#v220)
     - [What's Changed](#whats-changed-1)
       - [Vite!](#vite)
       - [New Fetcher APIs](#new-fetcher-apis)
       - [Persistence Future Flag](#persistence-future-flag)
     - [Minor Changes](#minor-changes-1)
-    - [Patch Changes](#patch-changes-1)
-    - [Updated Dependencies](#updated-dependencies-1)
-    - [Changes by Package](#changes-by-package-1)
+    - [Patch Changes](#patch-changes-2)
+    - [Updated Dependencies](#updated-dependencies-2)
+    - [Changes by Package](#changes-by-package-2)
   - [v2.1.0](#v210)
     - [What's Changed](#whats-changed-2)
       - [View Transitions](#view-transitions)
       - [Stable `createRemixStub`](#stable-createremixstub)
     - [Minor Changes](#minor-changes-2)
-    - [Patch Changes](#patch-changes-2)
-    - [Updated Dependencies](#updated-dependencies-2)
-    - [Changes by Package](#changes-by-package-2)
-  - [v2.0.1](#v201)
     - [Patch Changes](#patch-changes-3)
+    - [Updated Dependencies](#updated-dependencies-3)
+    - [Changes by Package](#changes-by-package-3)
+  - [v2.0.1](#v201)
+    - [Patch Changes](#patch-changes-4)
     - [Changes by Package 🔗](#changes-by-package-)
   - [v2.0.0](#v200)
     - [Breaking Changes](#breaking-changes)
@@ -51,8 +55,8 @@ We manage release notes in this file instead of the paginated Github Releases Pa
         - [Breaking Type Changes](#breaking-type-changes)
     - [New Features](#new-features)
     - [Other Notable Changes](#other-notable-changes)
-    - [Updated Dependencies](#updated-dependencies-3)
-    - [Changes by Package](#changes-by-package-3)
+    - [Updated Dependencies](#updated-dependencies-4)
+    - [Changes by Package](#changes-by-package-4)
 
 </details>
 
@@ -98,6 +102,41 @@ To add a new release, copy from this template:
 
 -->
 
+## v2.3.1
+
+### Patch Changes
+
+- `@remix-run/dev`: Support `nonce` prop on `LiveReload` component in Vite dev ([#8014](https://github.com/remix-run/remix/pull/8014))
+- `@remix-run/dev`: Ensure code-split JS files in the server build's assets directory aren't cleaned up after Vite build ([#8042](https://github.com/remix-run/remix/pull/8042))
+- `@remix-run/dev`: Fix redundant copying of assets from `public` directory in Vite build ([#8039](https://github.com/remix-run/remix/pull/8039))
+  - This ensures that static assets aren't duplicated in the server build directory
+  - This also fixes an issue where the build would break if `assetsBuildDirectory` was deeply nested within the `public` directory
+
+### Updated Dependencies
+
+- [`[email protected]`](https://github.com/remix-run/react-router/releases/tag/react-router%406.20.0)
+- [`@remix-run/[email protected]`](https://github.com/remix-run/react-router/blob/main/packages/router/CHANGELOG.md#1130)
+
+### Changes by Package
+
+- [`create-remix`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/create-remix/CHANGELOG.md#231)
+- [`@remix-run/architect`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-architect/CHANGELOG.md#231)
+- [`@remix-run/cloudflare`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-cloudflare/CHANGELOG.md#231)
+- [`@remix-run/cloudflare-pages`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-cloudflare-pages/CHANGELOG.md#231)
+- [`@remix-run/cloudflare-workers`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-cloudflare-workers/CHANGELOG.md#231)
+- [`@remix-run/css-bundle`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-css-bundle/CHANGELOG.md#231)
+- [`@remix-run/deno`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-deno/CHANGELOG.md#231)
+- [`@remix-run/dev`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-dev/CHANGELOG.md#231)
+- [`@remix-run/eslint-config`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-eslint-config/CHANGELOG.md#231)
+- [`@remix-run/express`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-express/CHANGELOG.md#231)
+- [`@remix-run/node`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-node/CHANGELOG.md#231)
+- [`@remix-run/react`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-react/CHANGELOG.md#231)
+- [`@remix-run/serve`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-serve/CHANGELOG.md#231)
+- [`@remix-run/server-runtime`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-server-runtime/CHANGELOG.md#231)
+- [`@remix-run/testing`](https://github.com/remix-run/remix/blob/remix%402.3.1/packages/remix-testing/CHANGELOG.md#231)
+
+**Full Changelog**: [`v2.3.0...v2.3.1`](https://github.com/remix-run/remix/compare/[email protected]@2.3.1)
+
 ## v2.3.0
 
 ### What's Changed

contributors.yml

@@ -484,9 +484,10 @@
 - ryanflorence
 - ryanjames1729
 - ryankshaw
-- sarahse
+- sambostock
 - sandulat
 - sandstone991
+- sarahse
 - sbernheim4
 - schpet
 - scottybrown
@@ -613,3 +614,6 @@
 - mrkstwrt
 - AltanS
 - fayez-nazzal
+- SeanRoberts
+- yasoob
+- mccuna

docs/discussion/hot-module-replacement.md

@@ -153,7 +153,7 @@ Now if you change the key `stuff` to `things`:
 
 ```diff
   export const loader = async () => {
--   return json({ things: "some things" })
+-   return json({ stuff: "some things" })
 +   return json({ things: "some things" })
   }
 

docs/guides/templates.md

@@ -76,7 +76,7 @@ What you're left with is everything completely set up for you to just get to wor
 - [The Indie Stack][indie_stack]: Deployed to a long-running Node.js server with a persistent SQLite database. This stack is great for websites with dynamic data that you control (blogs, marketing, content sites). It's also a perfect, low-complexity bootstrap for MVPs, prototypes, and proof-of-concepts that can later be updated to the Blues stack easily.
 - [The Grunge Stack][grunge_stack]: Deployed to a serverless function running Node.js with DynamoDB for persistence. Intended for folks who want to deploy a production-grade application on AWS infrastructure serving millions of users.
 
-You can use these stacks by proving the `--template` option when running `create-remix`, for example:
+You can use these stacks by providing the `--template` option when running `create-remix`, for example:
 
 ```shellscript nonumber
 npx create-remix@latest --template remix-run/blues-stack

docs/hooks/use-resolved-path.md

@@ -22,7 +22,7 @@ This is useful when building links from relative values and used internally for
 
 ## Additional Resources
 
-- [`resolvePath`][resolve-path]
+- [`resolvePath`][rr-resolve-path]
 
 [nav-link-component]: ../components/nav-link
-[resolve-path]: ../utils/resolve-path
+[rr-resolve-path]: https://reactrouter.com/utils/resolve-path

docs/other-api/dev.md

@@ -197,18 +197,29 @@ For example, you can use `NODE_OPTIONS` to set Node's `--require` flag when runn
 }
 ```
 
+If you're using ESM as the default module system you will need to set the `--import` flag instead of `--require`:
+
+```json filename=package.json
+{
+  "scripts": {
+    "dev": "remix dev -c \"npm run dev:app\"",
+    "dev:app": "cross-env NODE_OPTIONS=\"--import ./mocks/index.js\" remix-serve ./build/index.js"
+  }
+}
+```
+
 Next, you can use `REMIX_DEV_ORIGIN` to let MSW forward internal "dev ready" messages on `/ping`:
 
 ```ts
-import { rest } from "msw";
+import { http, passthrough } from "msw";
 
 const REMIX_DEV_PING = new URL(
   process.env.REMIX_DEV_ORIGIN
 );
 REMIX_DEV_PING.pathname = "/ping";
 
 export const server = setupServer(
-  rest.post(REMIX_DEV_PING.href, (req) => req.passthrough())
+  http.post(REMIX_DEV_PING.href, () => passthrough())
   // ... other request handlers go here ...
 );
 ```

packages/create-remix/CHANGELOG.md

@@ -1,5 +1,9 @@
 # `create-remix`
 
+## 2.3.1
+
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.3.1.
+
 ## 2.3.0
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.3.0.

packages/create-remix/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {

packages/remix-architect/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.3.0
 
 ### Patch Changes

packages/remix-architect/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@architect/functions": "^5.2.0",
-    "@remix-run/node": "2.3.0",
+    "@remix-run/node": "2.3.1",
     "@types/aws-lambda": "^8.10.82"
   },
   "devDependencies": {

packages/remix-cloudflare-pages/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.3.0
 
 ### Patch Changes

packages/remix-cloudflare-pages/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "module": "dist/esm/index.js",
   "dependencies": {
-    "@remix-run/cloudflare": "2.3.0"
+    "@remix-run/cloudflare": "2.3.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",

packages/remix-cloudflare-workers/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.3.0
 
 ### Patch Changes

packages/remix-cloudflare-workers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -16,7 +16,7 @@
   "module": "dist/esm/index.js",
   "dependencies": {
     "@cloudflare/kv-asset-handler": "^0.1.3",
-    "@remix-run/cloudflare": "2.3.0"
+    "@remix-run/cloudflare": "2.3.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",

packages/remix-cloudflare/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.3.0
 
 ### Patch Changes

packages/remix-cloudflare/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@cloudflare/kv-asset-handler": "^0.1.3",
-    "@remix-run/server-runtime": "2.3.0"
+    "@remix-run/server-runtime": "2.3.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",

packages/remix-css-bundle/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @remix-run/css-bundle
 
+## 2.3.1
+
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.3.1.
+
 ## 2.3.0
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.3.0.

packages/remix-css-bundle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {

packages/remix-deno/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.3.0
 
 ### Patch Changes

packages/remix-deno/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
@@ -15,7 +15,7 @@
   "license": "MIT",
   "sideEffects": false,
   "dependencies": {
-    "@remix-run/server-runtime": "2.3.0",
+    "@remix-run/server-runtime": "2.3.1",
     "mime": "^3.0.0"
   },
   "peerDependencies": {