Merge branch 'dev' into patch-1

remix-run · Feb 15, 2024 · d316123 · d316123
2 parents 328dfaa + 3573596
commit d316123
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.changeset/quiet-cups-attack.md b/.changeset/quiet-cups-attack.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Fix type error in Remix config for synchronous `routes` function
diff --git a/packages/remix-dev/config.ts b/packages/remix-dev/config.ts
@@ -67,7 +67,9 @@ export interface AppConfig {
    */
   routes?: (
     defineRoutes: DefineRoutesFunction
-  ) => Promise<ReturnType<DefineRoutesFunction>>;
+  ) =>
+    | ReturnType<DefineRoutesFunction>
+    | Promise<ReturnType<DefineRoutesFunction>>;
 
   /**
    * The path to the browser build, relative to `remix.config.js`. Defaults to