Merge branch 'main' into release-next

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

Hide file tree

Showing 9 changed files with 41 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -242,7 +242,7 @@ Date: YYYY-MM-DD
 
 ## v2.15.0
 
-Date: 2025-11-19
+Date: 2024-11-19
 
 ### Patch Changes
 

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/templates/cloudflare-workers/tailwind.config.ts b/templates/cloudflare-workers/tailwind.config.ts
@@ -6,14 +6,14 @@ export default {
     extend: {
       fontFamily: {
         sans: [
-          '"Inter"',
+          "Inter",
           "ui-sans-serif",
           "system-ui",
           "sans-serif",
-          '"Apple Color Emoji"',
-          '"Segoe UI Emoji"',
-          '"Segoe UI Symbol"',
-          '"Noto Color Emoji"',
+          "Apple Color Emoji",
+          "Segoe UI Emoji",
+          "Segoe UI Symbol",
+          "Noto Color Emoji",
         ],
       },
     },

diff --git a/templates/cloudflare/tailwind.config.ts b/templates/cloudflare/tailwind.config.ts
@@ -6,14 +6,14 @@ export default {
     extend: {
       fontFamily: {
         sans: [
-          '"Inter"',
+          "Inter",
           "ui-sans-serif",
           "system-ui",
           "sans-serif",
-          '"Apple Color Emoji"',
-          '"Segoe UI Emoji"',
-          '"Segoe UI Symbol"',
-          '"Noto Color Emoji"',
+          "Apple Color Emoji",
+          "Segoe UI Emoji",
+          "Segoe UI Symbol",
+          "Noto Color Emoji",
         ],
       },
     },

diff --git a/templates/express/tailwind.config.ts b/templates/express/tailwind.config.ts
@@ -6,14 +6,14 @@ export default {
     extend: {
       fontFamily: {
         sans: [
-          '"Inter"',
+          "Inter",
           "ui-sans-serif",
           "system-ui",
           "sans-serif",
-          '"Apple Color Emoji"',
-          '"Segoe UI Emoji"',
-          '"Segoe UI Symbol"',
-          '"Noto Color Emoji"',
+          "Apple Color Emoji",
+          "Segoe UI Emoji",
+          "Segoe UI Symbol",
+          "Noto Color Emoji",
         ],
       },
     },

diff --git a/templates/remix-javascript/tailwind.config.js b/templates/remix-javascript/tailwind.config.js
@@ -4,14 +4,14 @@ export default {
     extend: {
       fontFamily: {
         sans: [
-          '"Inter"',
+          "Inter",
           "ui-sans-serif",
           "system-ui",
           "sans-serif",
-          '"Apple Color Emoji"',
-          '"Segoe UI Emoji"',
-          '"Segoe UI Symbol"',
-          '"Noto Color Emoji"',
+          "Apple Color Emoji",
+          "Segoe UI Emoji",
+          "Segoe UI Symbol",
+          "Noto Color Emoji",
         ],
       },
     },

diff --git a/templates/remix/tailwind.config.ts b/templates/remix/tailwind.config.ts
@@ -6,14 +6,14 @@ export default {
     extend: {
       fontFamily: {
         sans: [
-          '"Inter"',
+          "Inter",
           "ui-sans-serif",
           "system-ui",
           "sans-serif",
-          '"Apple Color Emoji"',
-          '"Segoe UI Emoji"',
-          '"Segoe UI Symbol"',
-          '"Noto Color Emoji"',
+          "Apple Color Emoji",
+          "Segoe UI Emoji",
+          "Segoe UI Symbol",
+          "Noto Color Emoji",
         ],
       },
     },

diff --git a/templates/spa/tailwind.config.ts b/templates/spa/tailwind.config.ts
@@ -6,14 +6,14 @@ export default {
     extend: {
       fontFamily: {
         sans: [
-          '"Inter"',
+          "Inter",
           "ui-sans-serif",
           "system-ui",
           "sans-serif",
-          '"Apple Color Emoji"',
-          '"Segoe UI Emoji"',
-          '"Segoe UI Symbol"',
-          '"Noto Color Emoji"',
+          "Apple Color Emoji",
+          "Segoe UI Emoji",
+          "Segoe UI Symbol",
+          "Noto Color Emoji",
         ],
       },
     },