Skip to content

Commit e960efe

Browse files
brophdawg11brophdawg11
committed
Merge branch 'release-next' into dev
2 parents 9bc6d95 + a5ef66c commit e960efe

File tree

49 files changed

+184
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+184
-77
lines changed

‎.changeset/fresh-countries-care.md

-5
This file was deleted.

‎CHANGELOG.md

+13-3
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,19 @@ Date: YYYY-MM-DD
240240
241241
-->
242242

243+
## v2.15.1
244+
245+
Date: 2024-12-09
246+
247+
### Patch Changes
248+
249+
- `create-remix` - Move `fs-extra` from `devDependencies` to `dependencies` ([#10300](https://github.com/remix-run/remix/pull/10300))
250+
251+
**Full Changelog**: [`v2.15.0...v2.15.1`](https://github.com/remix-run/remix/compare/[email protected]@2.15.1)
252+
243253
## v2.15.0
244254

245-
Date: 2025-11-19
255+
Date: 2024-11-19
246256

247257
### Patch Changes
248258

@@ -296,8 +306,8 @@ Date: 2024-11-08
296306

297307
### Patch Changes
298308

299-
- Fix `defaultShouldRevalidate` value when using single fetch ([#10139](https://github.com/remix-run/remix/pull/10139))
300-
- Update externally-accessed resource routes warning to cover null usage as well ([#10145](https://github.com/remix-run/remix/pull/10145))
309+
- `@remix-run/react` - Fix `defaultShouldRevalidate` value when using Single Fetch ([#10139](https://github.com/remix-run/remix/pull/10139))
310+
- `@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))
301311

302312
### Updated Dependencies
303313

‎contributors.yml

+5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
- apeltop
5252
- appden
5353
- Aprillion
54+
- Ar1f007
5455
- arange
5556
- archwebio
5657
- arekmaz
@@ -232,6 +233,7 @@
232233
- gotgenes
233234
- GOWxx
234235
- graham42
236+
- greg-hoarau
235237
- GregBrimble
236238
- GSt4r
237239
- guatedude2
@@ -553,13 +555,15 @@
553555
- pyr0gan
554556
- ramiroazar
555557
- RATIU5
558+
- raulfdm
556559
- raulrpearson
557560
- real34
558561
- realjokele
559562
- redabacha
560563
- reggie3
561564
- reichhartd
562565
- remix-run-bot
566+
- rhryansu
563567
- richardhunghhw
564568
- riencoertjens
565569
- risv1
@@ -630,6 +634,7 @@
630634
- sobrinho
631635
- souredoutlook
632636
- squidpunch
637+
- staticWagomU
633638
- staylor
634639
- stephanerangaya
635640
- stephenwade

‎docs/start/future-flags.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ export async function loader({}: LoaderFunctionArgs) {
454454
}
455455
```
456456

457-
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:
457+
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:
458458

459459
```diff
460460
-import { json } from "@remix-run/node";
@@ -542,7 +542,7 @@ remix({
542542
This package matches the API of React Router v7's `@react-router/dev/routes`, making the React Router v7 migration as easy as possible.
543543

544544
```shellscript nonumber
545-
npm install --dev @remix-run/route-config
545+
npm install -D @remix-run/route-config
546546
```
547547

548548
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
564564
👉 **Install `@remix-run/fs-routes` and use it in `routes.ts`**
565565

566566
```shellscript nonumber
567-
npm install --dev @remix-run/fs-routes
567+
npm install -D @remix-run/fs-routes
568568
```
569569

570570
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
573573
574574
```ts filename=app/routes.ts
575575
import { flatRoutes } from "@remix-run/fs-routes";
576-
import type { RouteConfig } from "@remix-run/route-config";
577576

578-
export const routes: RouteConfig = flatRoutes();
577+
export default flatRoutes();
579578
```
580579

581580
👉 **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
587586
To get started, first install the adapter:
588587

589588
```shellscript nonumber
590-
npm install --dev @remix-run/routes-option-adapter
589+
npm install -D @remix-run/routes-option-adapter
591590
```
592591

593592
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.

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"typecheck": "tsc"
1212
},
1313
"dependencies": {
14-
"@remix-run/cloudflare": "2.15.0",
15-
"@remix-run/cloudflare-pages": "2.15.0",
16-
"@remix-run/react": "2.15.0",
14+
"@remix-run/cloudflare": "2.15.1",
15+
"@remix-run/cloudflare-pages": "2.15.1",
16+
"@remix-run/react": "2.15.1",
1717
"isbot": "^4.1.0",
1818
"miniflare": "^3.20231030.4",
1919
"react": "^18.2.0",

‎packages/create-remix/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# `create-remix`
22

3+
## 2.15.1
4+
5+
### Patch Changes
6+
7+
- Move `fs-extra` from `devDependencies` to `dependencies` ([#10300](https://github.com/remix-run/remix/pull/10300))
8+
39
## 2.15.0
410

511
## 2.14.0

‎packages/create-remix/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-remix",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Create a new Remix app",
55
"homepage": "https://remix.run",
66
"bugs": {

‎packages/remix-architect/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `@remix-run/architect`
22

3+
## 2.15.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@remix-run/[email protected]`
9+
310
## 2.15.0
411

512
### Patch Changes

‎packages/remix-architect/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/architect",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Architect server request handler for Remix",
55
"bugs": {
66
"url": "https://github.com/remix-run/remix/issues"

‎packages/remix-cloudflare-pages/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `@remix-run/cloudflare-pages`
22

3+
## 2.15.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@remix-run/[email protected]`
9+
310
## 2.15.0
411

512
### Patch Changes

‎packages/remix-cloudflare-pages/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/cloudflare-pages",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Cloudflare Pages request handler for Remix",
55
"bugs": {
66
"url": "https://github.com/remix-run/remix/issues"

‎packages/remix-cloudflare-workers/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `@remix-run/cloudflare-workers`
22

3+
## 2.15.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@remix-run/[email protected]`
9+
310
## 2.15.0
411

512
### Patch Changes

‎packages/remix-cloudflare-workers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/cloudflare-workers",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Cloudflare worker request handler for Remix",
55
"bugs": {
66
"url": "https://github.com/remix-run/remix/issues"

‎packages/remix-cloudflare/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `@remix-run/cloudflare`
22

3+
## 2.15.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@remix-run/[email protected]`
9+
310
## 2.15.0
411

512
### Patch Changes

‎packages/remix-cloudflare/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/cloudflare",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Cloudflare platform abstractions for Remix",
55
"bugs": {
66
"url": "https://github.com/remix-run/remix/issues"

‎packages/remix-css-bundle/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# `@remix-run/css-bundle`
22

3+
## 2.15.1
4+
35
## 2.15.0
46

57
## 2.14.0

‎packages/remix-css-bundle/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/css-bundle",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "CSS bundle href when using CSS bundling features in Remix",
55
"homepage": "https://remix.run",
66
"bugs": {

‎packages/remix-deno/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `@remix-run/deno`
22

3+
## 2.15.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@remix-run/[email protected]`
9+
310
## 2.15.0
411

512
### Patch Changes

‎packages/remix-deno/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/deno",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Deno platform abstractions for Remix",
55
"homepage": "https://remix.run",
66
"main": "./index.ts",

‎packages/remix-dev/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# `@remix-run/dev`
22

3+
## 2.15.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@remix-run/[email protected]`
9+
- `@remix-run/[email protected]`
10+
311
## 2.15.0
412

513
### Patch Changes

‎packages/remix-dev/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/dev",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Dev tools and CLI for Remix",
55
"homepage": "https://remix.run",
66
"bugs": {
@@ -108,8 +108,8 @@
108108
"wrangler": "^3.28.2"
109109
},
110110
"peerDependencies": {
111-
"@remix-run/react": "^2.15.0",
112-
"@remix-run/serve": "^2.15.0",
111+
"@remix-run/react": "^2.15.1",
112+
"@remix-run/serve": "^2.15.1",
113113
"typescript": "^5.1.0",
114114
"vite": "^5.1.0",
115115
"wrangler": "^3.28.2"

‎packages/remix-eslint-config/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# `@remix-run/eslint-config`
22

3+
## 2.15.1
4+
35
## 2.15.0
46

57
## 2.14.0

‎packages/remix-eslint-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/eslint-config",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "ESLint configuration for Remix projects",
55
"bugs": {
66
"url": "https://github.com/remix-run/remix/issues"

‎packages/remix-express/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `@remix-run/express`
22

3+
## 2.15.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@remix-run/[email protected]`
9+
310
## 2.15.0
411

512
### Patch Changes

‎packages/remix-express/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/express",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Express server request handler for Remix",
55
"bugs": {
66
"url": "https://github.com/remix-run/remix/issues"

‎packages/remix-fs-routes/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# `@remix-run/fs-routes`
22

3+
## 2.15.1
4+
35
## 2.15.0
46

57
## 2.14.0

‎packages/remix-fs-routes/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/fs-routes",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Config-based file system routing conventions, for use within routes.ts",
55
"bugs": {
66
"url": "https://github.com/remix-run/remix/issues"
@@ -22,8 +22,8 @@
2222
"typescript": "^5.1.6"
2323
},
2424
"peerDependencies": {
25-
"@remix-run/dev": "^2.15.0",
26-
"@remix-run/route-config": "^2.15.0",
25+
"@remix-run/dev": "^2.15.1",
26+
"@remix-run/route-config": "^2.15.1",
2727
"typescript": "^5.1.0"
2828
},
2929
"peerDependenciesMeta": {

‎packages/remix-node/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `@remix-run/node`
22

3+
## 2.15.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@remix-run/[email protected]`
9+
310
## 2.15.0
411

512
### Patch Changes

‎packages/remix-node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/node",
3-
"version": "2.15.0",
3+
"version": "2.15.1",
44
"description": "Node.js platform abstractions for Remix",
55
"bugs": {
66
"url": "https://github.com/remix-run/remix/issues"

0 commit comments

Comments
 (0)