diff --git a/packages/go_router_builder/CHANGELOG.md b/packages/go_router_builder/CHANGELOG.md index 598414fd496..c09cc587430 100644 --- a/packages/go_router_builder/CHANGELOG.md +++ b/packages/go_router_builder/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.1 + +- Fixes unnecessary whitespace in generated `RelativeGoRouteData`. + ## 4.0.0 - Make Route mixins public. diff --git a/packages/go_router_builder/README.md b/packages/go_router_builder/README.md index 35f70c93396..a410250ced6 100644 --- a/packages/go_router_builder/README.md +++ b/packages/go_router_builder/README.md @@ -13,7 +13,7 @@ dependencies: dev_dependencies: # ...along with your other dev-dependencies build_runner: ^2.6.0 - go_router_builder: ^3.3.0 + go_router_builder: ^4.0.1 ``` ### Source code diff --git a/packages/go_router_builder/example/lib/go_relative.g.dart b/packages/go_router_builder/example/lib/go_relative.g.dart index 6863a5c5606..ef565d171a9 100644 --- a/packages/go_router_builder/example/lib/go_relative.g.dart +++ b/packages/go_router_builder/example/lib/go_relative.g.dart @@ -20,12 +20,10 @@ RouteBase get $homeRoute => GoRouteData.$route( routes: [ RelativeGoRouteData.$route( path: 'details/:detailId', - factory: $DetailsRoute._fromState, routes: [ RelativeGoRouteData.$route( path: 'settings/:settingId', - factory: $SettingsRoute._fromState, ), ], @@ -34,12 +32,10 @@ RouteBase get $homeRoute => GoRouteData.$route( ), RelativeGoRouteData.$route( path: 'details/:detailId', - factory: $DetailsRoute._fromState, routes: [ RelativeGoRouteData.$route( path: 'settings/:settingId', - factory: $SettingsRoute._fromState, ), ], diff --git a/packages/go_router_builder/example/lib/readme_excerpts.g.dart b/packages/go_router_builder/example/lib/readme_excerpts.g.dart index 01204eba7f1..9cfd76b05eb 100644 --- a/packages/go_router_builder/example/lib/readme_excerpts.g.dart +++ b/packages/go_router_builder/example/lib/readme_excerpts.g.dart @@ -360,7 +360,6 @@ mixin $MyGoRouteData on GoRouteData { RouteBase get $detailsRoute => RelativeGoRouteData.$route( path: 'details', - factory: $DetailsRoute._fromState, ); diff --git a/packages/go_router_builder/lib/src/route_config.dart b/packages/go_router_builder/lib/src/route_config.dart index f07486b7444..b1eab450219 100644 --- a/packages/go_router_builder/lib/src/route_config.dart +++ b/packages/go_router_builder/lib/src/route_config.dart @@ -572,11 +572,10 @@ mixin $_mixinName on $routeDataClassName { } @override - String get routeConstructorParameters => ''' - path: ${escapeDartString(path)}, - ${caseSensitive ? '' : 'caseSensitive: $caseSensitive,'} - ${parentNavigatorKey == null ? '' : 'parentNavigatorKey: $parentNavigatorKey,'} -'''; + String get routeConstructorParameters => + 'path: ${escapeDartString(path)},' + '${caseSensitive ? '' : 'caseSensitive: $caseSensitive,'}' + '${parentNavigatorKey == null ? '' : 'parentNavigatorKey: $parentNavigatorKey,'}'; @override String get routeDataClassName => 'RelativeGoRouteData'; diff --git a/packages/go_router_builder/pubspec.yaml b/packages/go_router_builder/pubspec.yaml index 755b7485392..25e088a51c7 100644 --- a/packages/go_router_builder/pubspec.yaml +++ b/packages/go_router_builder/pubspec.yaml @@ -2,7 +2,7 @@ name: go_router_builder description: >- A builder that supports generated strongly-typed route helpers for package:go_router -version: 4.0.0 +version: 4.0.1 repository: https://github.com/flutter/packages/tree/main/packages/go_router_builder issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router_builder%22 diff --git a/packages/go_router_builder/tool/run_tests.dart b/packages/go_router_builder/tool/run_tests.dart index 02ec8083270..23b1f5bc414 100644 --- a/packages/go_router_builder/tool/run_tests.dart +++ b/packages/go_router_builder/tool/run_tests.dart @@ -61,12 +61,8 @@ Future main() async { } // Apply consistent formatting to both generated and expected code for comparison. - final String generated = formatter.format( - results.join().replaceAll('\n', ''), - ); - final String expected = formatter.format( - expectResult.replaceAll('\n', ''), - ); + final String generated = formatter.format(results.join('\n\n').trim()); + final String expected = formatter.format(expectResult.trim()); expect(generated, equals(expected)); }, timeout: const Timeout(Duration(seconds: 100))); }