Merge branch 'dev' into markdalgleish/remove-v1-headers

remix-run · Jul 30, 2023 · 14dd46e · 14dd46e
2 parents 40290c4 + cfd3313
commit 14dd46e
Show file tree

Hide file tree

Showing 101 changed files with 403 additions and 1,829 deletions.
diff --git a/.changeset/decouple-css-bundle-from-dev.md b/.changeset/decouple-css-bundle-from-dev.md
@@ -0,0 +1,8 @@
+---
+"@remix-run/css-bundle": patch
+"@remix-run/dev": patch
+---
+
+Decouple the `@remix-run/dev` package from the contents of the `@remix-run/css-bundle` package.
+
+The contents of the `@remix-run/css-bundle` package are now entirely managed by the Remix compiler. Even though it's still recommended that your Remix dependencies all share the same version, this change ensures that there are no runtime errors when upgrading `@remix-run/dev` without upgrading `@remix-run/css-bundle`.
diff --git a/.changeset/v2-route-convention.md b/.changeset/v2-route-convention.md
@@ -0,0 +1,8 @@
+---
+"@remix-run/dev": major
+"@remix-run/react": major
+"@remix-run/server-runtime": major
+"@remix-run/testing": major
+---
+
+Remove `v2_routeConvention` flag. The flat route file convention is now standard.