From 1767f23b131ab5849f1b2a211fd35cf595bbacde Mon Sep 17 00:00:00 2001 From: Elijah Quartey Date: Wed, 1 Nov 2023 12:18:26 -0500 Subject: [PATCH 1/4] fix(core): pub docs (#4049) --- packages/amplify_core/dartdoc_options.yaml | 6 +++--- packages/amplify_core/doc/{static => }/auth.md | 0 packages/amplify_core/doc/{static => }/favicon.png | Bin 3 files changed, 3 insertions(+), 3 deletions(-) rename packages/amplify_core/doc/{static => }/auth.md (100%) rename packages/amplify_core/doc/{static => }/favicon.png (100%) diff --git a/packages/amplify_core/dartdoc_options.yaml b/packages/amplify_core/dartdoc_options.yaml index c8c4a7e792..0db369166c 100644 --- a/packages/amplify_core/dartdoc_options.yaml +++ b/packages/amplify_core/dartdoc_options.yaml @@ -1,10 +1,10 @@ dartdoc: categories: - Auth: - markdown: doc/static/auth.md + "Auth": + markdown: doc/auth.md categoryOrder: - Auth - favicon: doc/static/favicon.png + favicon: doc/favicon.png nodoc: - lib/src/config/analytics/** - lib/src/config/api/** diff --git a/packages/amplify_core/doc/static/auth.md b/packages/amplify_core/doc/auth.md similarity index 100% rename from packages/amplify_core/doc/static/auth.md rename to packages/amplify_core/doc/auth.md diff --git a/packages/amplify_core/doc/static/favicon.png b/packages/amplify_core/doc/favicon.png similarity index 100% rename from packages/amplify_core/doc/static/favicon.png rename to packages/amplify_core/doc/favicon.png From b3e9349922ca8325db96e7fa7c443ae72d4a6ba9 Mon Sep 17 00:00:00 2001 From: NikaHsn Date: Wed, 1 Nov 2023 12:07:36 -0700 Subject: [PATCH 2/4] chore(deps): Bump code_builder version (#4050) --- packages/aft/pubspec.yaml | 2 +- .../lib/src/asf/asf_worker.worker.js.dart | 1 + .../lib/src/asf/asf_worker.worker.vm.dart | 1 + .../lib/src/flows/device/confirm_device_worker.worker.js.dart | 1 + .../lib/src/flows/device/confirm_device_worker.worker.vm.dart | 1 + .../srp/srp_device_password_verifier_worker.worker.js.dart | 1 + .../srp/srp_device_password_verifier_worker.worker.vm.dart | 1 + .../lib/src/flows/srp/srp_init_worker.worker.js.dart | 1 + .../lib/src/flows/srp/srp_init_worker.worker.vm.dart | 1 + .../src/flows/srp/srp_password_verifier_worker.worker.js.dart | 1 + .../src/flows/srp/srp_password_verifier_worker.worker.vm.dart | 1 + .../lib/src/worker/secure_storage_worker.worker.js.dart | 1 + .../lib/src/worker/secure_storage_worker.worker.vm.dart | 1 + packages/smithy/smithy_codegen/pubspec.yaml | 2 +- packages/worker_bee/worker_bee_builder/pubspec.yaml | 2 +- pubspec.yaml | 2 +- 16 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/aft/pubspec.yaml b/packages/aft/pubspec.yaml index f5aa941441..12dd781783 100644 --- a/packages/aft/pubspec.yaml +++ b/packages/aft/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: built_value: ">=8.6.0 <8.7.0" checked_yaml: ^2.0.0 cli_util: ^0.3.5 - code_builder: 4.6.0 + code_builder: 4.7.0 collection: ^1.16.0 file: ">=6.0.0 <8.0.0" git: any # override diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.js.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.js.dart index 18a8a67542..a1c724e4c0 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.js.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.js.dart @@ -7,6 +7,7 @@ import 'package:aws_common/aws_common.dart'; class ASFWorkerImpl extends ASFWorker { @override String get name => 'ASFWorker'; + @override String get jsEntrypoint { // Flutter web release builds must use the bundled asset. diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.vm.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.vm.dart index 99a8e22164..03565fb37e 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.vm.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.vm.dart @@ -25,6 +25,7 @@ Future _run(SendPorts ports) async { class ASFWorkerImpl extends ASFWorker { @override String get name => 'ASFWorker'; + @override VmEntrypoint get vmEntrypoint => _run; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.js.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.js.dart index 46b8e5b90a..7ac15bcd8b 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.js.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.js.dart @@ -7,6 +7,7 @@ import 'package:aws_common/aws_common.dart'; class ConfirmDeviceWorkerImpl extends ConfirmDeviceWorker { @override String get name => 'ConfirmDeviceWorker'; + @override String get jsEntrypoint { // Flutter web release builds must use the bundled asset. diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.vm.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.vm.dart index 7c29ece607..6a76f9c9dd 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.vm.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.vm.dart @@ -25,6 +25,7 @@ Future _run(SendPorts ports) async { class ConfirmDeviceWorkerImpl extends ConfirmDeviceWorker { @override String get name => 'ConfirmDeviceWorker'; + @override VmEntrypoint get vmEntrypoint => _run; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.js.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.js.dart index d2ecacb6c6..d19e7ed7c0 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.js.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.js.dart @@ -8,6 +8,7 @@ class SrpDevicePasswordVerifierWorkerImpl extends SrpDevicePasswordVerifierWorker { @override String get name => 'SrpDevicePasswordVerifierWorker'; + @override String get jsEntrypoint { // Flutter web release builds must use the bundled asset. diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.vm.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.vm.dart index ce4813a010..4c7cbe3723 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.vm.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.vm.dart @@ -26,6 +26,7 @@ class SrpDevicePasswordVerifierWorkerImpl extends SrpDevicePasswordVerifierWorker { @override String get name => 'SrpDevicePasswordVerifierWorker'; + @override VmEntrypoint get vmEntrypoint => _run; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.js.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.js.dart index db3636b2d9..d3db92f44f 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.js.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.js.dart @@ -7,6 +7,7 @@ import 'package:aws_common/aws_common.dart'; class SrpInitWorkerImpl extends SrpInitWorker { @override String get name => 'SrpInitWorker'; + @override String get jsEntrypoint { // Flutter web release builds must use the bundled asset. diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.vm.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.vm.dart index 4bf83f0b7a..b02aaa6dd8 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.vm.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.vm.dart @@ -25,6 +25,7 @@ Future _run(SendPorts ports) async { class SrpInitWorkerImpl extends SrpInitWorker { @override String get name => 'SrpInitWorker'; + @override VmEntrypoint get vmEntrypoint => _run; } diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.js.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.js.dart index 6ebd4de33a..bca44f8a8e 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.js.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.js.dart @@ -7,6 +7,7 @@ import 'package:aws_common/aws_common.dart'; class SrpPasswordVerifierWorkerImpl extends SrpPasswordVerifierWorker { @override String get name => 'SrpPasswordVerifierWorker'; + @override String get jsEntrypoint { // Flutter web release builds must use the bundled asset. diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.vm.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.vm.dart index 1ae7f12b7b..8c4cdc593e 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.vm.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.vm.dart @@ -25,6 +25,7 @@ Future _run(SendPorts ports) async { class SrpPasswordVerifierWorkerImpl extends SrpPasswordVerifierWorker { @override String get name => 'SrpPasswordVerifierWorker'; + @override VmEntrypoint get vmEntrypoint => _run; } diff --git a/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.js.dart b/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.js.dart index 77da0b62ff..1b79fc39b0 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.js.dart +++ b/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.js.dart @@ -7,6 +7,7 @@ import 'package:aws_common/aws_common.dart'; class SecureStorageWorkerImpl extends SecureStorageWorker { @override String get name => 'SecureStorageWorker'; + @override String get jsEntrypoint { // Flutter web release builds must use the bundled asset. diff --git a/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.vm.dart b/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.vm.dart index 32abdc487c..b9ef02fb62 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.vm.dart +++ b/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.vm.dart @@ -25,6 +25,7 @@ Future _run(SendPorts ports) async { class SecureStorageWorkerImpl extends SecureStorageWorker { @override String get name => 'SecureStorageWorker'; + @override VmEntrypoint get vmEntrypoint => _run; } diff --git a/packages/smithy/smithy_codegen/pubspec.yaml b/packages/smithy/smithy_codegen/pubspec.yaml index 026040e665..2d2c4a9b11 100644 --- a/packages/smithy/smithy_codegen/pubspec.yaml +++ b/packages/smithy/smithy_codegen/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: build_cli_annotations: ^2.0.0 built_collection: ^5.1.1 built_value: ">=8.6.0 <8.7.0" - code_builder: 4.6.0 + code_builder: 4.7.0 collection: ^1.15.0 crclib: ^3.0.0 dart_style: 2.3.2 diff --git a/packages/worker_bee/worker_bee_builder/pubspec.yaml b/packages/worker_bee/worker_bee_builder/pubspec.yaml index f0e4814cdb..4a0b59ce65 100644 --- a/packages/worker_bee/worker_bee_builder/pubspec.yaml +++ b/packages/worker_bee/worker_bee_builder/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: analyzer: ">=5.1.0 <7.0.0" async: ^2.10.0 build: ^2.2.1 - code_builder: 4.6.0 + code_builder: 4.7.0 collection: ^1.15.0 dart_style: 2.3.2 meta: ^1.7.0 diff --git a/pubspec.yaml b/pubspec.yaml index 90750b4533..72b7db588e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: build_web_compilers: ^4.0.0 built_value: ">=8.6.0 <8.7.0" built_value_generator: 8.6.1 - code_builder: 4.6.0 + code_builder: 4.7.0 connectivity_plus: ">=4.0.1 <6.0.0" # This must exactly match what's included in `dart format` # on stable so that CI checks pass for generated code. From 58627462da1c57fcedbbb6fc54848a80930abb85 Mon Sep 17 00:00:00 2001 From: NikaHsn Date: Wed, 1 Nov 2023 12:08:08 -0700 Subject: [PATCH 3/4] chore(deps): Bump lints and flutter_lints version (#4051) --- .../category/amplify_analytics_category.dart | 2 +- .../src/category/amplify_api_category.dart | 2 +- .../category/amplify_datastore_category.dart | 2 +- .../amplify_notifications_category.dart | 2 +- .../amplify_push_notifications_category.dart | 2 +- .../category/amplify_storage_category.dart | 2 +- .../src/types/analytics/analytics_types.dart | 5 ++-- .../lib/src/types/auth/auth_types.dart | 29 +++++++------------ packages/amplify_lints/pubspec.yaml | 4 +-- .../device_info_provider.dart | 6 ---- .../device_info_provider_stub.dart | 6 +++- .../flutter_path_provider.dart | 3 -- .../flutter_path_provider_stub.dart | 4 ++- .../confirm_sign_in_form_field.dart | 2 +- .../confirm_sign_up_form_field.dart | 2 +- .../form_fields/mfa_selection_form_field.dart | 2 +- .../reset_password_form_field.dart | 2 +- .../form_fields/sign_in_form_field.dart | 2 +- .../form_fields/sign_up_form_field.dart | 2 +- .../form_fields/totp_setup_form_field.dart | 2 +- .../form_fields/verify_user_form_field.dart | 2 +- packages/smithy/goldens/pubspec.yaml | 2 +- packages/test/pub_server/lib/src/server.dart | 2 +- 23 files changed, 38 insertions(+), 51 deletions(-) diff --git a/packages/amplify_core/lib/src/category/amplify_analytics_category.dart b/packages/amplify_core/lib/src/category/amplify_analytics_category.dart index 49ddb59658..06e7a8f594 100644 --- a/packages/amplify_core/lib/src/category/amplify_analytics_category.dart +++ b/packages/amplify_core/lib/src/category/amplify_analytics_category.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of amplify_interface; +part of 'amplify_categories.dart'; class AnalyticsCategory extends AmplifyCategory { @override diff --git a/packages/amplify_core/lib/src/category/amplify_api_category.dart b/packages/amplify_core/lib/src/category/amplify_api_category.dart index 832d3c9341..bb4bda9392 100644 --- a/packages/amplify_core/lib/src/category/amplify_api_category.dart +++ b/packages/amplify_core/lib/src/category/amplify_api_category.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of amplify_interface; +part of 'amplify_categories.dart'; class APICategory extends AmplifyCategory { @override diff --git a/packages/amplify_core/lib/src/category/amplify_datastore_category.dart b/packages/amplify_core/lib/src/category/amplify_datastore_category.dart index 76a1bacc5a..1041db75ec 100644 --- a/packages/amplify_core/lib/src/category/amplify_datastore_category.dart +++ b/packages/amplify_core/lib/src/category/amplify_datastore_category.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of amplify_interface; +part of 'amplify_categories.dart'; /// Interface for DataStore category. This expose all the APIs that /// are supported by this category's plugins. This class will accept plugins to diff --git a/packages/amplify_core/lib/src/category/amplify_notifications_category.dart b/packages/amplify_core/lib/src/category/amplify_notifications_category.dart index a4aa88c4c6..a59e2a1501 100644 --- a/packages/amplify_core/lib/src/category/amplify_notifications_category.dart +++ b/packages/amplify_core/lib/src/category/amplify_notifications_category.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of amplify_interface; +part of 'amplify_categories.dart'; /// {@template amplify_core.amplify_notifications_category} /// Top-Level Category for Notifications. diff --git a/packages/amplify_core/lib/src/category/amplify_push_notifications_category.dart b/packages/amplify_core/lib/src/category/amplify_push_notifications_category.dart index 1613e8e852..ede1168dcd 100644 --- a/packages/amplify_core/lib/src/category/amplify_push_notifications_category.dart +++ b/packages/amplify_core/lib/src/category/amplify_push_notifications_category.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of amplify_interface; +part of 'amplify_categories.dart'; class PushNotificationsCategory extends AmplifyCategory { diff --git a/packages/amplify_core/lib/src/category/amplify_storage_category.dart b/packages/amplify_core/lib/src/category/amplify_storage_category.dart index 2a8d158b25..448e1dc1ed 100644 --- a/packages/amplify_core/lib/src/category/amplify_storage_category.dart +++ b/packages/amplify_core/lib/src/category/amplify_storage_category.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of amplify_interface; +part of 'amplify_categories.dart'; /// {@template amplify_core.amplify_storage_category} /// The Amplify Storage category provides an interface for interacting with diff --git a/packages/amplify_core/lib/src/types/analytics/analytics_types.dart b/packages/amplify_core/lib/src/types/analytics/analytics_types.dart index ca1b4e7e49..677df6940c 100644 --- a/packages/amplify_core/lib/src/types/analytics/analytics_types.dart +++ b/packages/amplify_core/lib/src/types/analytics/analytics_types.dart @@ -1,15 +1,14 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -/// Exception Types. +// Exception Types. export '../exception/amplify_exception.dart' show AnalyticsException, InvalidEventException, NetworkException, UnknownException; - -/// API Types. +// API Types. export 'analytics/analytics_event.dart'; export 'analytics/custom_properties.dart'; export 'analytics/user_profile.dart'; diff --git a/packages/amplify_core/lib/src/types/auth/auth_types.dart b/packages/amplify_core/lib/src/types/auth/auth_types.dart index 90ae525acc..bca9c61662 100644 --- a/packages/amplify_core/lib/src/types/auth/auth_types.dart +++ b/packages/amplify_core/lib/src/types/auth/auth_types.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -/// Exceptions +// Exceptions export '../exception/amplify_exception.dart' show AuthException, @@ -14,8 +14,7 @@ export '../exception/amplify_exception.dart' AuthValidationException, NetworkException, UnknownException; - -/// Attributes +// Attributes export 'attribute/auth_next_update_attribute_step.dart'; export 'attribute/auth_update_attribute_step.dart'; export 'attribute/auth_user_attribute.dart'; @@ -29,23 +28,19 @@ export 'attribute/send_user_attribute_verification_code_result.dart'; export 'attribute/update_user_attribute_options.dart'; export 'attribute/update_user_attribute_result.dart'; export 'attribute/update_user_attributes_options.dart'; - -/// Common +// Common export 'auth_code_delivery_details.dart'; export 'auth_device.dart'; export 'auth_next_step.dart'; - -/// Hub +// Hub export 'hub/auth_hub_event.dart'; - -/// MFA +// MFA export 'mfa/mfa_preference.dart'; export 'mfa/totp_setup_details.dart'; export 'mfa/totp_setup_options.dart'; export 'mfa/user_mfa_preference.dart'; export 'mfa/verify_totp_setup_options.dart'; - -/// Password +// Password export 'password/auth_reset_password_step.dart'; export 'password/confirm_reset_password_options.dart'; export 'password/reset_password_options.dart'; @@ -53,15 +48,13 @@ export 'password/reset_password_result.dart'; export 'password/reset_password_step.dart'; export 'password/update_password_options.dart'; export 'password/update_password_result.dart'; - -/// Session +// Session export 'session/auth_session.dart'; export 'session/auth_user.dart'; export 'session/fetch_auth_session_options.dart'; export 'session/get_current_user_options.dart'; export 'session/sign_in_details.dart'; - -/// Sign In +// Sign In export 'sign_in/auth_next_sign_in_step.dart'; export 'sign_in/auth_provider.dart'; export 'sign_in/auth_sign_in_step.dart'; @@ -69,12 +62,10 @@ export 'sign_in/confirm_sign_in_options.dart'; export 'sign_in/sign_in_options.dart'; export 'sign_in/sign_in_result.dart'; export 'sign_in/sign_in_with_web_ui_options.dart'; - -/// Sign Out +// Sign Out export 'sign_out/sign_out_options.dart'; export 'sign_out/sign_out_result.dart'; - -/// Sign Up +// Sign Up export 'sign_up/auth_next_sign_up_step.dart'; export 'sign_up/auth_sign_up_step.dart'; export 'sign_up/confirm_sign_up_options.dart'; diff --git a/packages/amplify_lints/pubspec.yaml b/packages/amplify_lints/pubspec.yaml index caec621d36..da475ab414 100644 --- a/packages/amplify_lints/pubspec.yaml +++ b/packages/amplify_lints/pubspec.yaml @@ -9,5 +9,5 @@ environment: sdk: ^3.0.0 dependencies: - flutter_lints: ^2.0.0 - lints: ^2.1.0 + flutter_lints: ^3.0.0 + lints: ^3.0.0 diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/src/device_context_info_provider/device_info_provider/device_info_provider.dart b/packages/analytics/amplify_analytics_pinpoint/lib/src/device_context_info_provider/device_info_provider/device_info_provider.dart index f9dc2bcde7..4e4da89cdd 100644 --- a/packages/analytics/amplify_analytics_pinpoint/lib/src/device_context_info_provider/device_info_provider/device_info_provider.dart +++ b/packages/analytics/amplify_analytics_pinpoint/lib/src/device_context_info_provider/device_info_provider/device_info_provider.dart @@ -1,12 +1,6 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -/// {@template amplify_analytics_pinpoint.device_info_provider} -/// Provides DeviceInfo from Flutter -> Dart. -/// {@endtemplate} - -/// Multi platform class that provides DeviceInfo. -/// Requires Flutter specific dependencies. export 'device_info_provider_stub.dart' if (dart.library.html) 'device_info_provider_html.dart' if (dart.library.io) 'device_info_provider_io.dart'; diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/src/device_context_info_provider/device_info_provider/device_info_provider_stub.dart b/packages/analytics/amplify_analytics_pinpoint/lib/src/device_context_info_provider/device_info_provider/device_info_provider_stub.dart index 34fb1446ca..5d5d6ba9ba 100644 --- a/packages/analytics/amplify_analytics_pinpoint/lib/src/device_context_info_provider/device_info_provider/device_info_provider_stub.dart +++ b/packages/analytics/amplify_analytics_pinpoint/lib/src/device_context_info_provider/device_info_provider/device_info_provider_stub.dart @@ -3,7 +3,11 @@ import 'package:amplify_analytics_pinpoint/src/device_context_info_provider/device_info_provider/device_info.dart'; -/// Retrieve DeviceInfo +/// {@template amplify_analytics_pinpoint.device_info_provider} +/// Multi platform class that provides DeviceInfo from Flutter -> Dart. +/// Requires Flutter specific dependencies. +/// {@endtemplate} + Future getDeviceInfo() async { throw UnsupportedError( 'No suitable implementation was found on this platform.', diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/src/flutter_path_provider/flutter_path_provider.dart b/packages/analytics/amplify_analytics_pinpoint/lib/src/flutter_path_provider/flutter_path_provider.dart index 875927bdd9..a82439198a 100644 --- a/packages/analytics/amplify_analytics_pinpoint/lib/src/flutter_path_provider/flutter_path_provider.dart +++ b/packages/analytics/amplify_analytics_pinpoint/lib/src/flutter_path_provider/flutter_path_provider.dart @@ -1,9 +1,6 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -/// {@template amplify_analytics_pinpoint.flutter_path_provider} -/// Provides device storage location. -/// {@endtemplate} export 'flutter_path_provider_stub.dart' if (dart.library.html) 'flutter_path_provider_html.dart' if (dart.library.io) 'flutter_path_provider_io.dart'; diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/src/flutter_path_provider/flutter_path_provider_stub.dart b/packages/analytics/amplify_analytics_pinpoint/lib/src/flutter_path_provider/flutter_path_provider_stub.dart index c712e7d43c..7d671a41ec 100644 --- a/packages/analytics/amplify_analytics_pinpoint/lib/src/flutter_path_provider/flutter_path_provider_stub.dart +++ b/packages/analytics/amplify_analytics_pinpoint/lib/src/flutter_path_provider/flutter_path_provider_stub.dart @@ -4,7 +4,9 @@ // ignore: implementation_imports import 'package:amplify_analytics_pinpoint_dart/src/impl/flutter_provider_interfaces/cached_events_path_provider.dart'; -/// {@macro amplify_analytics_pinpoint.flutter_path_provider} +/// {@template amplify_analytics_pinpoint.flutter_path_provider} +/// Provides device storage location. +/// {@endtemplate} class FlutterPathProvider implements CachedEventsPathProvider { @override Future getApplicationSupportPath() async { diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_in_form_field.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_in_form_field.dart index 4b657669ba..409faffa3f 100644 --- a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_in_form_field.dart +++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_in_form_field.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of authenticator.form_field; +part of '../form_field.dart'; /// {@category Prebuilt Widgets} /// {@template amplify_authenticator.confirm_sign_in_form_field} diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_up_form_field.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_up_form_field.dart index c3495b9b64..c262ba3888 100644 --- a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_up_form_field.dart +++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_up_form_field.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of authenticator.form_field; +part of '../form_field.dart'; /// {@category Prebuilt Widgets} /// {@template amplify_authenticator.confirm_sign_up_form_field} diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/mfa_selection_form_field.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/mfa_selection_form_field.dart index c7c18fb5f7..f5587071d0 100644 --- a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/mfa_selection_form_field.dart +++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/mfa_selection_form_field.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of authenticator.form_field; +part of '../form_field.dart'; /// {@category Prebuilt Widgets} /// {@template amplify_authenticator.mfa_selection_form_field} diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/reset_password_form_field.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/reset_password_form_field.dart index 2710d48357..01d0dd854e 100644 --- a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/reset_password_form_field.dart +++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/reset_password_form_field.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of authenticator.form_field; +part of '../form_field.dart'; /// {@category Prebuilt Widgets} /// {@template amplify_authenticator.confirm_sign_up_form_field} diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_in_form_field.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_in_form_field.dart index 9d015ab46e..d65618fa04 100644 --- a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_in_form_field.dart +++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_in_form_field.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of authenticator.form_field; +part of '../form_field.dart'; /// {@category Prebuilt Widgets} /// {@template amplify_authenticator.sign_in_form_field} diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_up_form_field.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_up_form_field.dart index 8c9d00679c..94b9e39517 100644 --- a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_up_form_field.dart +++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_up_form_field.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of authenticator.form_field; +part of '../form_field.dart'; /// {@category Prebuilt Widgets} /// {@template amplify_authenticator.sign_up_form_field} diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/totp_setup_form_field.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/totp_setup_form_field.dart index 3faa90a16c..a5398cf2cb 100644 --- a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/totp_setup_form_field.dart +++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/totp_setup_form_field.dart @@ -3,7 +3,7 @@ // ignore_for_file: use_build_context_synchronously -part of authenticator.form_field; +part of '../form_field.dart'; /// {@category Prebuilt Widgets} /// {@template amplify_authenticator.instruction_form_field} diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/verify_user_form_field.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/verify_user_form_field.dart index 5e73bd1042..124a421813 100644 --- a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/verify_user_form_field.dart +++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/verify_user_form_field.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -part of authenticator.form_field; +part of '../form_field.dart'; /// {@category Prebuilt Widgets} /// {@template amplify_authenticator.verify_user_form_field} diff --git a/packages/smithy/goldens/pubspec.yaml b/packages/smithy/goldens/pubspec.yaml index f69aebcf0b..c80fb814a2 100644 --- a/packages/smithy/goldens/pubspec.yaml +++ b/packages/smithy/goldens/pubspec.yaml @@ -26,7 +26,7 @@ dev_dependencies: args: ^2.3.1 file: ">=6.0.0 <8.0.0" glob: ^2.0.2 - lints: ^2.0.0 + lints: ^3.0.0 path: any pubspec_parse: ^1.2.0 smithy_codegen: diff --git a/packages/test/pub_server/lib/src/server.dart b/packages/test/pub_server/lib/src/server.dart index 13d86859e6..0aa06950f6 100644 --- a/packages/test/pub_server/lib/src/server.dart +++ b/packages/test/pub_server/lib/src/server.dart @@ -294,7 +294,7 @@ class PubServer { Handler get handler => const Pipeline() .addMiddleware(_loggerMiddleware) .addMiddleware(corsMiddleware) - .addHandler(_$PubServerRouter(this)); + .addHandler(_$PubServerRouter(this).call); } /// Allows access from Web UI. From 80b29a57bef1880370ced3c686838947298b2062 Mon Sep 17 00:00:00 2001 From: NikaHsn Date: Wed, 1 Nov 2023 14:52:11 -0700 Subject: [PATCH 4/4] chore(repo): fix beta lints issues (#4053) --- packages/amplify_core/lib/src/config/amplify_plugin_config.dart | 2 +- packages/amplify_core/lib/src/state_machine/exception.dart | 2 +- packages/amplify_core/lib/src/types/models/auth_rule.dart | 2 +- .../legacy_native_data_provider.dart | 1 + packages/smithy/smithy/lib/src/types/timestamp.dart | 2 +- .../src/storage_s3_service/service/task/s3_download_task.dart | 2 +- .../storage_s3_service/transfer/database/transfer_record.dart | 2 +- packages/worker_bee/worker_bee/lib/src/common.dart | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/amplify_core/lib/src/config/amplify_plugin_config.dart b/packages/amplify_core/lib/src/config/amplify_plugin_config.dart index c09e0a951e..feb6a406b1 100644 --- a/packages/amplify_core/lib/src/config/amplify_plugin_config.dart +++ b/packages/amplify_core/lib/src/config/amplify_plugin_config.dart @@ -20,7 +20,7 @@ abstract class AmplifyPluginConfig with AWSSerializable { /// {@template amplify_core.unknown_plugin_config_factory} /// A plugin factory for unknown plugin configs. -/// @{endtemplate} +/// {@endtemplate} @internal class UnknownPluginConfigFactory extends AmplifyPluginConfigFactory { diff --git a/packages/amplify_core/lib/src/state_machine/exception.dart b/packages/amplify_core/lib/src/state_machine/exception.dart index 0e6078f3fa..79ff04f08c 100644 --- a/packages/amplify_core/lib/src/state_machine/exception.dart +++ b/packages/amplify_core/lib/src/state_machine/exception.dart @@ -3,7 +3,7 @@ import 'package:aws_common/aws_common.dart'; -/// (@template amplify_core.state_machine.precondition_exception) +/// {@template amplify_core.state_machine.precondition_exception} /// An exception raised within a state machine when an event could not be /// processed due to some precondition not being met. /// {@endtemplate} diff --git a/packages/amplify_core/lib/src/types/models/auth_rule.dart b/packages/amplify_core/lib/src/types/models/auth_rule.dart index a6de882818..399715581b 100644 --- a/packages/amplify_core/lib/src/types/models/auth_rule.dart +++ b/packages/amplify_core/lib/src/types/models/auth_rule.dart @@ -76,7 +76,7 @@ class AuthRule { 'groupClaim': groupClaim, 'groups': groups, 'groupsField': groupsField, - 'provider': provider != null ? provider!.name : null, + 'provider': provider?.name, 'operations': operations?.map((op) => op.name).toList(), }; return Map.from(map) diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/flutter_provider_interfaces/legacy_native_data_provider.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/flutter_provider_interfaces/legacy_native_data_provider.dart index d450404a31..c573e3b7f2 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/flutter_provider_interfaces/legacy_native_data_provider.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/flutter_provider_interfaces/legacy_native_data_provider.dart @@ -4,6 +4,7 @@ import 'dart:async'; /// {@template amplify_analytics_pinpoint.flutter_legacy_native_data_provider} +/// {@endtemplate} abstract class LegacyNativeDataProvider { /// Get stored Pinpoint Endpoint Id. Future getEndpointId(String pinpointAppId); diff --git a/packages/smithy/smithy/lib/src/types/timestamp.dart b/packages/smithy/smithy/lib/src/types/timestamp.dart index fc23aa3884..36a995d4ed 100644 --- a/packages/smithy/smithy/lib/src/types/timestamp.dart +++ b/packages/smithy/smithy/lib/src/types/timestamp.dart @@ -15,7 +15,7 @@ import 'package:smithy/ast.dart'; /// {@template aws.smithy.timestamp} /// A [DateTime] wrapper which provides custom formatting and parsing options /// for use with Smithy services. -/// @{endtemplate} +/// {@endtemplate} class Timestamp { /// {@macro aws.smithy.timestamp} Timestamp(DateTime timestamp) : _timestamp = timestamp.stripMicroseconds(); diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/service/task/s3_download_task.dart b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/service/task/s3_download_task.dart index 165ba2851b..cb16ea5468 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/service/task/s3_download_task.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/service/task/s3_download_task.dart @@ -15,7 +15,7 @@ import 'package:smithy_aws/smithy_aws.dart' as smithy_aws; /// {@template amplify_storage_s3_dart.download_task} /// A task created to fulfill a download operation. -/// {@template} +/// {@endtemplate} @internal class S3DownloadTask { /// {@macro amplify_storage_s3_dart.download_task} diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/transfer_record.dart b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/transfer_record.dart index 57d35e9f68..3607e8a0ed 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/transfer_record.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/transfer_record.dart @@ -10,7 +10,7 @@ part 'transfer_record.g.dart'; /// {@template amplify_storage_s3_dart.transfer_data} /// the type used by Storage S3 plugin upload operations when using s3 multipart upload. /// it is persisted to TransferDatabase. -/// {@endtemplate amplify_storage_s3_dart.transfer_data} +/// {@endtemplate} @JsonSerializable() class TransferRecord { /// {@macro amplify_storage_s3_dart.transfer_data} diff --git a/packages/worker_bee/worker_bee/lib/src/common.dart b/packages/worker_bee/worker_bee/lib/src/common.dart index bb45a18954..9dcd1e17f2 100644 --- a/packages/worker_bee/worker_bee/lib/src/common.dart +++ b/packages/worker_bee/worker_bee/lib/src/common.dart @@ -20,7 +20,7 @@ final _voidType = _typeOf(); /// {@endtemplate} abstract class WorkerBeeCommon implements AWSLoggerPlugin, Closeable { - /// {@template worker_bee.worker_bee_common} + /// {@macro worker_bee.worker_bee_common} WorkerBeeCommon({ Serializers? serializers, }) : serializers = serializers == null