Merge branch 'main' into chore/stable-to-main-1.6.0

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

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/**

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<AnalyticsPluginInterface> {
   @override

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<APIPluginInterface> {
   @override

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

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.

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<PushNotificationsPluginInterface> {

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

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<UnknownPluginConfig> {

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}

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';

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,52 +28,44 @@ 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';
 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';
 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';

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<String, dynamic>.from(map)

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

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';

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<DeviceInfo> getDeviceInfo() async {
   throw UnsupportedError(
     'No suitable implementation was found on this platform.',

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';

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<String> getApplicationSupportPath() async {

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<String?> getEndpointId(String pinpointAppId);

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.

packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.vm.dart

@@ -25,6 +25,7 @@ Future<void> _run(SendPorts ports) async {
 class ASFWorkerImpl extends ASFWorker {
   @override
   String get name => 'ASFWorker';
+
   @override
   VmEntrypoint get vmEntrypoint => _run;
 }

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.

packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.vm.dart

@@ -25,6 +25,7 @@ Future<void> _run(SendPorts ports) async {
 class ConfirmDeviceWorkerImpl extends ConfirmDeviceWorker {
   @override
   String get name => 'ConfirmDeviceWorker';
+
   @override
   VmEntrypoint get vmEntrypoint => _run;
 }

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.

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;
 }

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.

packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.vm.dart

@@ -25,6 +25,7 @@ Future<void> _run(SendPorts ports) async {
 class SrpInitWorkerImpl extends SrpInitWorker {
   @override
   String get name => 'SrpInitWorker';
+
   @override
   VmEntrypoint get vmEntrypoint => _run;
 }

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.

packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.vm.dart

@@ -25,6 +25,7 @@ Future<void> _run(SendPorts ports) async {
 class SrpPasswordVerifierWorkerImpl extends SrpPasswordVerifierWorker {
   @override
   String get name => 'SrpPasswordVerifierWorker';
+
   @override
   VmEntrypoint get vmEntrypoint => _run;
 }

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}

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}

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}

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}

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}

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}