fix(dart_frog_cli): route mounting order (#1931)

felangel · web-flow · commit a8b60b216241 · 2026-02-28T11:56:42.000-06:00
diff --git a/.github/workflows/examples_kitchen_sink.yaml b/.github/workflows/examples_kitchen_sink.yaml
@@ -33,10 +33,3 @@ jobs:
     with:
       setup: rm pubspec_overrides.yaml && dart pub global activate --source path ../../packages/dart_frog_cli
       working_directory: examples/kitchen_sink
-
-  docker_custom:
-    uses: ./.github/workflows/.docker_tests.yaml
-    with:
-      setup: rm pubspec_overrides.yaml && dart pub global activate --source path ../../packages/dart_frog_cli
-      docker_directory: .
-      working_directory: examples/kitchen_sink
diff --git a/bricks/create_dart_frog/__brick__/test/routes/index_test.dart b/bricks/create_dart_frog/__brick__/test/routes/index_test.dart
@@ -14,10 +14,7 @@ void main() {
       final context = _MockRequestContext();
       final response = route.onRequest(context);
       expect(response.statusCode, equals(HttpStatus.ok));
-      expect(
-        response.body(),
-        completion(equals('Welcome to Dart Frog!')),
-      );
+      expect(response.body(), completion(equals('Welcome to Dart Frog!')));
     });
   });
 }
diff --git a/bricks/dart_frog_dev_server/hooks/pre_gen.dart b/bricks/dart_frog_dev_server/hooks/pre_gen.dart
@@ -58,11 +58,7 @@ Future<void> preGen(
   context.vars = {
     'host': context.vars['host'] ?? '',
     'port': context.vars['port'] ?? '8080',
-    'directories': configuration.directories
-        .map((c) => c.toJson())
-        .toList()
-        .reversed
-        .toList(),
+    'directories': configuration.directories.map((c) => c.toJson()).toList(),
     'routes': configuration.routes.map((r) => r.toJson()).toList(),
     'middleware': configuration.middleware.map((m) => m.toJson()).toList(),
     'globalMiddleware': configuration.globalMiddleware != null
diff --git a/bricks/dart_frog_prod_server/hooks/pre_gen.dart b/bricks/dart_frog_prod_server/hooks/pre_gen.dart
@@ -158,11 +158,7 @@ Future<void> preGen(
   final addDockerfile = !customDockerFile.existsSync();
 
   context.vars = {
-    'directories': configuration.directories
-        .map((c) => c.toJson())
-        .toList()
-        .reversed
-        .toList(),
+    'directories': configuration.directories.map((c) => c.toJson()).toList(),
     'routes': configuration.routes.map((r) => r.toJson()).toList(),
     'middleware': configuration.middleware.map((m) => m.toJson()).toList(),
     'globalMiddleware': configuration.globalMiddleware != null
diff --git a/bricks/dart_frog_prod_server/hooks/test/src/disable_workspace_resolution_test.dart b/bricks/dart_frog_prod_server/hooks/test/src/disable_workspace_resolution_test.dart
@@ -81,9 +81,8 @@ void main() {
         expect(
           pubspecOverrides.readAsStringSync(),
           equals('''
-resolution: null
 dependency_overrides: {}
-'''),
+resolution: null'''),
         );
       });
     });
@@ -158,13 +157,16 @@ $workspaceRootDartFrogOverride
           ) as File;
           expect(
             pubspecOverrides.readAsStringSync(),
-            equals(
-              '''
-$originalPubspecOverridesContent
-$workspaceRootDartFrogOverride
+            equals('''
+dependency_overrides:
+  dart_frog:
+    git:
+      url: https://github.com/dart-frog-dev/dart_frog
+      path: packages/dart_frog
+  foo:
+    path: ./path/to/foo
 resolution: null
-''',
-            ),
+'''),
           );
         });
       });
diff --git a/examples/basic_authentication/pubspec_overrides.yaml b/examples/basic_authentication/pubspec_overrides.yaml
@@ -5,6 +5,3 @@ dependency_overrides:
     path: ../../packages/dart_frog_auth
   dart_frog_lint:
     path: ../../packages/dart_frog_lint
-  # Remove when coverage reporting is fixed.
-  #  https://github.com/dart-lang/test/pull/2594
-  test: 1.26.3
diff --git a/examples/bearer_authentication/pubspec_overrides.yaml b/examples/bearer_authentication/pubspec_overrides.yaml
@@ -5,6 +5,3 @@ dependency_overrides:
     path: ../../packages/dart_frog_auth
   dart_frog_lint:
     path: ../../packages/dart_frog_lint
-  # Remove when coverage reporting is fixed.
-  #  https://github.com/dart-lang/test/pull/2594
-  test: 1.26.3
diff --git a/examples/counter/pubspec_overrides.yaml b/examples/counter/pubspec_overrides.yaml
@@ -3,6 +3,3 @@ dependency_overrides:
     path: ../../packages/dart_frog
   dart_frog_lint:
     path: ../../packages/dart_frog_lint
-  # Remove when coverage reporting is fixed.
-  #  https://github.com/dart-lang/test/pull/2594
-  test: 1.26.3
diff --git a/examples/echo/pubspec_overrides.yaml b/examples/echo/pubspec_overrides.yaml
@@ -3,6 +3,3 @@ dependency_overrides:
     path: ../../packages/dart_frog
   dart_frog_lint:
     path: ../../packages/dart_frog_lint
-  # Remove when coverage reporting is fixed.
-  #  https://github.com/dart-lang/test/pull/2594
-  test: 1.26.3
diff --git a/examples/hello_world/pubspec_overrides.yaml b/examples/hello_world/pubspec_overrides.yaml
@@ -3,6 +3,3 @@ dependency_overrides:
     path: ../../packages/dart_frog
   dart_frog_lint:
     path: ../../packages/dart_frog_lint
-  # Remove when coverage reporting is fixed.
-  #  https://github.com/dart-lang/test/pull/2594
-  test: 1.26.3
diff --git a/examples/kitchen_sink/Dockerfile b/examples/kitchen_sink/Dockerfile
diff --git a/examples/kitchen_sink/e2e/users_test.dart b/examples/kitchen_sink/e2e/users_test.dart
@@ -6,7 +6,15 @@ import 'package:test/test.dart';
 void main() {
   group('E2E (/users)', () {
     const greeting = 'Hello';
-    test('GET /users/<id> responds with the "Hello user <id>"', () async {
+    test('GET /users/world responds with "Hello World"', () async {
+      final response = await http.get(
+        Uri.parse('http://localhost:8080/users/world'),
+      );
+      expect(response.statusCode, equals(HttpStatus.ok));
+      expect(response.body, equals('Hello World'));
+    });
+
+    test('GET /users/<id> responds with "Hello user <id>"', () async {
       const id = 'id';
       final response = await http.get(
         Uri.parse('http://localhost:8080/users/$id'),
@@ -15,7 +23,7 @@ void main() {
       expect(response.body, equals('$greeting user $id'));
     });
 
-    test('GET /users/<id>/<name> responds with the "Hello <name> (user <id>)"',
+    test('GET /users/<id>/<name> responds with "Hello <name> (user <id>)"',
         () async {
       const id = 'id';
       const name = 'Frog';
diff --git a/examples/kitchen_sink/pubspec_overrides.yaml b/examples/kitchen_sink/pubspec_overrides.yaml
@@ -3,6 +3,3 @@ dependency_overrides:
     path: ../../packages/dart_frog
   dart_frog_lint:
     path: ../../packages/dart_frog_lint
-  # Remove when coverage reporting is fixed.
-  #  https://github.com/dart-lang/test/pull/2594
-  test: 1.26.3
diff --git a/examples/kitchen_sink/routes/users/world.dart b/examples/kitchen_sink/routes/users/world.dart
@@ -0,0 +1,3 @@
+import 'package:dart_frog/dart_frog.dart';
+
+Response onRequest(RequestContext context) => Response(body: 'Hello World');
diff --git a/examples/todos/pubspec_overrides.yaml b/examples/todos/pubspec_overrides.yaml
@@ -3,6 +3,3 @@ dependency_overrides:
     path: ../../packages/dart_frog
   dart_frog_lint:
     path: ../../packages/dart_frog_lint
-  # Remove when coverage reporting is fixed.
-  #  https://github.com/dart-lang/test/pull/2594
-  test: 1.26.3
diff --git a/examples/web_socket_counter/pubspec_overrides.yaml b/examples/web_socket_counter/pubspec_overrides.yaml
@@ -3,6 +3,3 @@ dependency_overrides:
     path: ../../packages/dart_frog
   dart_frog_lint:
     path: ../../packages/dart_frog_lint
-  # Remove when coverage reporting is fixed.
-  #  https://github.com/dart-lang/test/pull/2594
-  test: 1.26.3
diff --git a/packages/dart_frog_cli/lib/src/commands/build/templates/dart_frog_prod_server_bundle.dart b/packages/dart_frog_cli/lib/src/commands/build/templates/dart_frog_prod_server_bundle.dart
diff --git a/packages/dart_frog_cli/lib/src/commands/dev/templates/dart_frog_dev_server_bundle.dart b/packages/dart_frog_cli/lib/src/commands/dev/templates/dart_frog_dev_server_bundle.dart
