From 1717a48549f2c72a878ba9d605fb858ce16002af Mon Sep 17 00:00:00 2001 From: Mirko Mucaria Date: Mon, 10 Oct 2022 17:01:19 +0200 Subject: [PATCH 1/9] fixes #108437 support for iterable, list and set in for TypedGoRoute --- packages/go_router/lib/src/route_data.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/go_router/lib/src/route_data.dart b/packages/go_router/lib/src/route_data.dart index efa9e85a46d2..d57734040364 100644 --- a/packages/go_router/lib/src/route_data.dart +++ b/packages/go_router/lib/src/route_data.dart @@ -59,7 +59,7 @@ abstract class GoRouteData { /// A helper function used by generated code. /// /// Should not be used directly. - static String $location(String path, {Map? queryParams}) => + static String $location(String path, {Map? queryParams}) => Uri.parse(path) .replace( queryParameters: From b3bddbcfbdd733577f2c70aaab74bf6d4f67b551 Mon Sep 17 00:00:00 2001 From: Mirko Mucaria Date: Wed, 23 Nov 2022 10:52:21 +0100 Subject: [PATCH 2/9] temporary fix for analyzer ci, will be fixed in go_router_builder code generator --- packages/go_router_builder/example/lib/all_types.g.dart | 2 +- packages/go_router_builder/example/lib/main.g.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/go_router_builder/example/lib/all_types.g.dart b/packages/go_router_builder/example/lib/all_types.g.dart index 71ab56e2a1fb..2d6ac3f17763 100644 --- a/packages/go_router_builder/example/lib/all_types.g.dart +++ b/packages/go_router_builder/example/lib/all_types.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs +// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks part of 'all_types.dart'; diff --git a/packages/go_router_builder/example/lib/main.g.dart b/packages/go_router_builder/example/lib/main.g.dart index 0f87baaff2ac..10c11a3c0c1c 100644 --- a/packages/go_router_builder/example/lib/main.g.dart +++ b/packages/go_router_builder/example/lib/main.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs +// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks part of 'main.dart'; From 579af61b78faaeaf9f480d2b0515a93445f58292 Mon Sep 17 00:00:00 2001 From: Mirko Mucaria Date: Tue, 29 Nov 2022 14:22:01 +0100 Subject: [PATCH 3/9] Revert "temporary fix for analyzer ci, will be fixed in go_router_builder code generator" This reverts commit 6ae5026c0df976c6003b1e4aee10ed95c6601783. --- packages/go_router_builder/example/lib/all_types.g.dart | 2 +- packages/go_router_builder/example/lib/main.g.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/go_router_builder/example/lib/all_types.g.dart b/packages/go_router_builder/example/lib/all_types.g.dart index 2d6ac3f17763..71ab56e2a1fb 100644 --- a/packages/go_router_builder/example/lib/all_types.g.dart +++ b/packages/go_router_builder/example/lib/all_types.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks +// ignore_for_file: always_specify_types, public_member_api_docs part of 'all_types.dart'; diff --git a/packages/go_router_builder/example/lib/main.g.dart b/packages/go_router_builder/example/lib/main.g.dart index 10c11a3c0c1c..0f87baaff2ac 100644 --- a/packages/go_router_builder/example/lib/main.g.dart +++ b/packages/go_router_builder/example/lib/main.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks +// ignore_for_file: always_specify_types, public_member_api_docs part of 'main.dart'; From 5ed42ea6cd4889dcca468ab92d88a7e411e08956 Mon Sep 17 00:00:00 2001 From: Mirko Mucaria Date: Tue, 29 Nov 2022 14:30:50 +0100 Subject: [PATCH 4/9] added temporary ignore directive --- packages/go_router_builder/example/lib/all_types.g.dart | 2 +- packages/go_router_builder/example/lib/main.g.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/go_router_builder/example/lib/all_types.g.dart b/packages/go_router_builder/example/lib/all_types.g.dart index 71ab56e2a1fb..2d6ac3f17763 100644 --- a/packages/go_router_builder/example/lib/all_types.g.dart +++ b/packages/go_router_builder/example/lib/all_types.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs +// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks part of 'all_types.dart'; diff --git a/packages/go_router_builder/example/lib/main.g.dart b/packages/go_router_builder/example/lib/main.g.dart index 0f87baaff2ac..10c11a3c0c1c 100644 --- a/packages/go_router_builder/example/lib/main.g.dart +++ b/packages/go_router_builder/example/lib/main.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs +// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks part of 'main.dart'; From 92a3d6ebabf2019005bcdb5282fe967bc39924af Mon Sep 17 00:00:00 2001 From: Mirko Mucaria Date: Wed, 7 Dec 2022 14:44:59 +0100 Subject: [PATCH 5/9] Revert "added temporary ignore directive" This reverts commit 48bdeb5abba23847e90ec0ba3c788b279e87eddb. --- packages/go_router_builder/example/lib/all_types.g.dart | 2 +- packages/go_router_builder/example/lib/main.g.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/go_router_builder/example/lib/all_types.g.dart b/packages/go_router_builder/example/lib/all_types.g.dart index 2d6ac3f17763..71ab56e2a1fb 100644 --- a/packages/go_router_builder/example/lib/all_types.g.dart +++ b/packages/go_router_builder/example/lib/all_types.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks +// ignore_for_file: always_specify_types, public_member_api_docs part of 'all_types.dart'; diff --git a/packages/go_router_builder/example/lib/main.g.dart b/packages/go_router_builder/example/lib/main.g.dart index 10c11a3c0c1c..0f87baaff2ac 100644 --- a/packages/go_router_builder/example/lib/main.g.dart +++ b/packages/go_router_builder/example/lib/main.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks +// ignore_for_file: always_specify_types, public_member_api_docs part of 'main.dart'; From f052106a5005ec6612cea1719c464d0351471b4e Mon Sep 17 00:00:00 2001 From: Mirko Mucaria Date: Wed, 7 Dec 2022 15:23:11 +0100 Subject: [PATCH 6/9] fix merge conflict and temoporary remove go_router_builder/example analysis checks --- analysis_options.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/analysis_options.yaml b/analysis_options.yaml index 498d19dfb4ae..656724aaad9d 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -19,6 +19,7 @@ analyzer: # Ignore generated files - '**/*.g.dart' - '**/*.mocks.dart' # Mockito @GenerateMocks + - 'packages/go_router_builder/example/*' # TODO(skogsfrae): remove in https://github.com/flutter/packages/pull/2679 linter: rules: From d2a6ad311e6614798210cfcf3f06c45db048516d Mon Sep 17 00:00:00 2001 From: Mirko Mucaria Date: Wed, 7 Dec 2022 17:56:09 +0100 Subject: [PATCH 7/9] fix temoporary go_router_builder/example analysis checks and restored global analysis --- analysis_options.yaml | 1 - packages/go_router_builder/example/lib/all_types.g.dart | 2 +- packages/go_router_builder/example/lib/main.g.dart | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 656724aaad9d..498d19dfb4ae 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -19,7 +19,6 @@ analyzer: # Ignore generated files - '**/*.g.dart' - '**/*.mocks.dart' # Mockito @GenerateMocks - - 'packages/go_router_builder/example/*' # TODO(skogsfrae): remove in https://github.com/flutter/packages/pull/2679 linter: rules: diff --git a/packages/go_router_builder/example/lib/all_types.g.dart b/packages/go_router_builder/example/lib/all_types.g.dart index 71ab56e2a1fb..2d6ac3f17763 100644 --- a/packages/go_router_builder/example/lib/all_types.g.dart +++ b/packages/go_router_builder/example/lib/all_types.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs +// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks part of 'all_types.dart'; diff --git a/packages/go_router_builder/example/lib/main.g.dart b/packages/go_router_builder/example/lib/main.g.dart index 0f87baaff2ac..10c11a3c0c1c 100644 --- a/packages/go_router_builder/example/lib/main.g.dart +++ b/packages/go_router_builder/example/lib/main.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs +// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks part of 'main.dart'; From fc79f9cf083f02dcfcaef92f33a6fcea25d4608c Mon Sep 17 00:00:00 2001 From: Mirko Mucaria Date: Tue, 7 Feb 2023 15:19:06 +0100 Subject: [PATCH 8/9] fix ci --- packages/go_router_builder/example/lib/all_types.g.dart | 2 +- packages/go_router_builder/example/lib/main.g.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/go_router_builder/example/lib/all_types.g.dart b/packages/go_router_builder/example/lib/all_types.g.dart index 2d6ac3f17763..71ab56e2a1fb 100644 --- a/packages/go_router_builder/example/lib/all_types.g.dart +++ b/packages/go_router_builder/example/lib/all_types.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks +// ignore_for_file: always_specify_types, public_member_api_docs part of 'all_types.dart'; diff --git a/packages/go_router_builder/example/lib/main.g.dart b/packages/go_router_builder/example/lib/main.g.dart index 10c11a3c0c1c..0f87baaff2ac 100644 --- a/packages/go_router_builder/example/lib/main.g.dart +++ b/packages/go_router_builder/example/lib/main.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: always_specify_types, public_member_api_docs, unnecessary_null_checks +// ignore_for_file: always_specify_types, public_member_api_docs part of 'main.dart'; From a50d46ab9e85a0c4280af75d08e46f1b8f46efc0 Mon Sep 17 00:00:00 2001 From: Mirko Mucaria Date: Thu, 16 Feb 2023 18:23:34 +0100 Subject: [PATCH 9/9] version --- packages/go_router/CHANGELOG.md | 4 ++++ packages/go_router/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md index 52448e9d5788..2d340dfb44b0 100644 --- a/packages/go_router/CHANGELOG.md +++ b/packages/go_router/CHANGELOG.md @@ -1,3 +1,7 @@ +## 6.0.8 + +* Adds support for Iterables, Lists and Sets in query params for TypedGoRoute. [#108437](https://github.com/flutter/flutter/issues/108437). + ## 6.0.7 - Add observers parameter to the ShellRoute that will be passed to the nested Navigator. diff --git a/packages/go_router/pubspec.yaml b/packages/go_router/pubspec.yaml index 1584da40271c..d7d83e54a8c8 100644 --- a/packages/go_router/pubspec.yaml +++ b/packages/go_router/pubspec.yaml @@ -1,7 +1,7 @@ name: go_router description: A declarative router for Flutter based on Navigation 2 supporting deep linking, data-driven routes and more -version: 6.0.7 +version: 6.0.8 repository: https://github.com/flutter/packages/tree/main/packages/go_router issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22