Merge branch 'release-next' into dev

remix-run · Dec 9, 2024 · e960efe · e960efe
2 parents 9bc6d95 + a5ef66c
commit e960efe
Show file tree

Hide file tree

Showing 49 changed files with 184 additions and 77 deletions.
diff --git a/.changeset/fresh-countries-care.md b/.changeset/fresh-countries-care.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -240,9 +240,19 @@ Date: YYYY-MM-DD
 
 -->
 
+## v2.15.1
+
+Date: 2024-12-09
+
+### Patch Changes
+
+- `create-remix` - Move `fs-extra` from `devDependencies` to `dependencies` ([#10300](https://github.com/remix-run/remix/pull/10300))
+
+**Full Changelog**: [`v2.15.0...v2.15.1`](https://github.com/remix-run/remix/compare/remix@2.15.0...remix@2.15.1)
+
 ## v2.15.0
 
-Date: 2025-11-19
+Date: 2024-11-19
 
 ### Patch Changes
 
@@ -296,8 +306,8 @@ Date: 2024-11-08
 
 ### Patch Changes
 
-- Fix `defaultShouldRevalidate` value when using single fetch ([#10139](https://github.com/remix-run/remix/pull/10139))
-- Update externally-accessed resource routes warning to cover null usage as well ([#10145](https://github.com/remix-run/remix/pull/10145))
+- `@remix-run/react` - Fix `defaultShouldRevalidate` value when using Single Fetch ([#10139](https://github.com/remix-run/remix/pull/10139))
+- `@remix-run/server-runtime` - Update externally-accessed resource routes warning to cover `null` usage as well ([#10145](https://github.com/remix-run/remix/pull/10145))
 
 ### Updated Dependencies
 

diff --git a/contributors.yml b/contributors.yml
@@ -51,6 +51,7 @@
 - apeltop
 - appden
 - Aprillion
+- Ar1f007
 - arange
 - archwebio
 - arekmaz
@@ -232,6 +233,7 @@
 - gotgenes
 - GOWxx
 - graham42
+- greg-hoarau
 - GregBrimble
 - GSt4r
 - guatedude2
@@ -553,13 +555,15 @@
 - pyr0gan
 - ramiroazar
 - RATIU5
+- raulfdm
 - raulrpearson
 - real34
 - realjokele
 - redabacha
 - reggie3
 - reichhartd
 - remix-run-bot
+- rhryansu
 - richardhunghhw
 - riencoertjens
 - risv1
@@ -630,6 +634,7 @@
 - sobrinho
 - souredoutlook
 - squidpunch
+- staticWagomU
 - staylor
 - stephanerangaya
 - stephenwade

diff --git a/docs/start/future-flags.md b/docs/start/future-flags.md
@@ -454,7 +454,7 @@ export async function loader({}: LoaderFunctionArgs) {
 }
 ```
 
-If you were using the second parameter of `json`/`defer` to set a custom status or headers on your response, you can continue doing do via the new `data` API:
+If you were using the second parameter of `json`/`defer` to set a custom status or headers on your response, you can continue doing so via the new `data` API:
 
 ```diff
 -import { json } from "@remix-run/node";
@@ -542,7 +542,7 @@ remix({
 This package matches the API of React Router v7's `@react-router/dev/routes`, making the React Router v7 migration as easy as possible.
 
 ```shellscript nonumber
-npm install --dev @remix-run/route-config
+npm install -D @remix-run/route-config
 ```
 
 This provides the core `RouteConfig` type as well as a set of helpers for configuring routes in code.
@@ -564,7 +564,7 @@ This is a good way to check that your new `routes.ts` file is being picked up su
 👉 **Install `@remix-run/fs-routes` and use it in `routes.ts`**
 
 ```shellscript nonumber
-npm install --dev @remix-run/fs-routes
+npm install -D @remix-run/fs-routes
 ```
 
 This package matches the API of React Router v7's `@react-router/fs-routes`, making the React Router v7 migration as easy as possible.
@@ -573,9 +573,8 @@ This package matches the API of React Router v7's `@react-router/fs-routes`, mak
 
 ```ts filename=app/routes.ts
 import { flatRoutes } from "@remix-run/fs-routes";
-import type { RouteConfig } from "@remix-run/route-config";
 
-export const routes: RouteConfig = flatRoutes();
+export default flatRoutes();
 ```
 
 👉 **If you used the `routes` config option, add `@remix-run/routes-option-adapter` and use it in `routes.ts`**
@@ -587,7 +586,7 @@ To make migration easier, an adapter package is available that converts Remix's
 To get started, first install the adapter:
 
 ```shellscript nonumber
-npm install --dev @remix-run/routes-option-adapter
+npm install -D @remix-run/routes-option-adapter
 ```
 
 This package matches the API of React Router v7's `@react-router/remix-routes-option-adapter`, making the React Router v7 migration as easy as possible.

diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.15.0",
-    "@remix-run/cloudflare-pages": "2.15.0",
-    "@remix-run/react": "2.15.0",
+    "@remix-run/cloudflare": "2.15.1",
+    "@remix-run/cloudflare-pages": "2.15.1",
+    "@remix-run/react": "2.15.1",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",

diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,11 @@
 # `create-remix`
 
+## 2.15.1
+
+### Patch Changes
+
+- Move `fs-extra` from `devDependencies` to `dependencies` ([#10300](https://github.com/remix-run/remix/pull/10300))
+
 ## 2.15.0
 
 ## 2.14.0

diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {

diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.15.1`
+
 ## 2.15.0
 
 ### Patch Changes

diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.15.1`
+
 ## 2.15.0
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.15.1`
+
 ## 2.15.0
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.15.1`
+
 ## 2.15.0
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/css-bundle`
 
+## 2.15.1
+
 ## 2.15.0
 
 ## 2.14.0

diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {

diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.15.1`
+
 ## 2.15.0
 
 ### Patch Changes

diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",

diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.15.1`
+  - `@remix-run/server-runtime@2.15.1`
+
 ## 2.15.0
 
 ### Patch Changes

diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -108,8 +108,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.15.0",
-    "@remix-run/serve": "^2.15.0",
+    "@remix-run/react": "^2.15.1",
+    "@remix-run/serve": "^2.15.1",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"

diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.15.1
+
 ## 2.15.0
 
 ## 2.14.0

diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.15.1`
+
 ## 2.15.0
 
 ### Patch Changes

diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-fs-routes/CHANGELOG.md b/packages/remix-fs-routes/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/fs-routes`
 
+## 2.15.1
+
 ## 2.15.0
 
 ## 2.14.0

diff --git a/packages/remix-fs-routes/package.json b/packages/remix-fs-routes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/fs-routes",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Config-based file system routing conventions, for use within routes.ts",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -22,8 +22,8 @@
     "typescript": "^5.1.6"
   },
   "peerDependencies": {
-    "@remix-run/dev": "^2.15.0",
-    "@remix-run/route-config": "^2.15.0",
+    "@remix-run/dev": "^2.15.1",
+    "@remix-run/route-config": "^2.15.1",
     "typescript": "^5.1.0"
   },
   "peerDependenciesMeta": {

diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.15.1`
+
 ## 2.15.0
 
 ### Patch Changes

diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"