Merge branch 'main' into chore/feature-attribute-exists

.github/dependabot.yaml

@@ -69,6 +69,9 @@ updates:
       drift:
         patterns:
           - "drift"
+      drift_dev:
+        patterns:
+          - "drift_dev"
       ffigen:
         patterns:
           - "ffigen"
@@ -126,6 +129,20 @@ updates:
       test:
         patterns:
           - "test"
+  - package-ecosystem: "pub"
+    directory: "infra"
+    schedule:
+      interval: "daily"
+    ignore:
+      # Ignore patch version bumps
+      - dependency-name: "*"
+        update-types:
+          - "version-update:semver-patch"
+      # Ignore all repo packages
+      - dependency-name: "amplify_core"
+      - dependency-name: "aws_common"
+      - dependency-name: "amplify_lints"
+      - dependency-name: "aws_signature_v4"
   - package-ecosystem: "pub"
     directory: "actions"
     schedule:
@@ -190,20 +207,6 @@ updates:
       - dependency-name: "amplify_datastore_plugin_interface"
       - dependency-name: "amplify_storage_s3"
       - dependency-name: "amplify_storage_s3_dart"
-  - package-ecosystem: "pub"
-    directory: "infra"
-    schedule:
-      interval: "daily"
-    ignore:
-      # Ignore patch version bumps
-      - dependency-name: "*"
-        update-types:
-          - "version-update:semver-patch"
-      # Ignore all repo packages
-      - dependency-name: "amplify_core"
-      - dependency-name: "aws_common"
-      - dependency-name: "amplify_lints"
-      - dependency-name: "aws_signature_v4"
   - package-ecosystem: "pub"
     directory: "packages/aft"
     schedule:
@@ -811,6 +814,9 @@ updates:
       built_value_generator:
         patterns:
           - "built_value_generator"
+      drift_dev:
+        patterns:
+          - "drift_dev"
       test:
         patterns:
           - "test"
@@ -1633,6 +1639,9 @@ updates:
       drift:
         patterns:
           - "drift"
+      drift_dev:
+        patterns:
+          - "drift_dev"
       build_runner:
         patterns:
           - "build_runner"
@@ -1657,6 +1666,9 @@ updates:
       drift:
         patterns:
           - "drift"
+      drift_dev:
+        patterns:
+          - "drift_dev"
       build_runner:
         patterns:
           - "build_runner"
@@ -1691,6 +1703,9 @@ updates:
       build_web_compilers:
         patterns:
           - "build_web_compilers"
+      drift_dev:
+        patterns:
+          - "drift_dev"
       test:
         patterns:
           - "test"
@@ -1721,6 +1736,9 @@ updates:
       build_web_compilers:
         patterns:
           - "build_web_compilers"
+      drift_dev:
+        patterns:
+          - "drift_dev"
   - package-ecosystem: "pub"
     directory: "packages/common/amplify_db_common_dart/example"
     schedule:
@@ -1748,6 +1766,9 @@ updates:
       build_web_compilers:
         patterns:
           - "build_web_compilers"
+      drift_dev:
+        patterns:
+          - "drift_dev"
   - package-ecosystem: "pub"
     directory: "packages/example_common"
     schedule:
@@ -3003,6 +3024,9 @@ updates:
       built_value_generator:
         patterns:
           - "built_value_generator"
+      drift_dev:
+        patterns:
+          - "drift_dev"
       json_serializable:
         patterns:
           - "json_serializable"
@@ -3199,6 +3223,9 @@ updates:
       build_runner:
         patterns:
           - "build_runner"
+      drift_dev:
+        patterns:
+          - "drift_dev"
       json_serializable:
         patterns:
           - "json_serializable"

.github/workflows/dart_dart2js.yaml

@@ -82,5 +82,5 @@ jobs:
 
       - name: Run Tests
         if: "always() && steps.bootstrap.conclusion == 'success'"
-        run: dart run build_runner test --release --delete-conflicting-outputs -- -p ${{ matrix.browser }}
+        run: dart run build_runner build test --release --delete-conflicting-outputs && dart test -p ${{ matrix.browser }}
         working-directory: ${{ inputs.working-directory }}

.github/workflows/dart_ddc.yaml

@@ -82,7 +82,7 @@ jobs:
 
       - name: Run Tests
         if: "always() && steps.bootstrap.conclusion == 'success'"
-        run: dart run build_runner test --delete-conflicting-outputs -- -p ${{ matrix.browser }}
+        run: dart run build_runner build test --delete-conflicting-outputs && dart test -p ${{ matrix.browser }}
         working-directory: ${{ inputs.working-directory }}
 
       - name: Log success/failure

.github/workflows/e2e_android.yaml

@@ -32,10 +32,9 @@ jobs:
         channel:
           - beta
           - stable
-        # Skips e2e tests against beta on PRs, except for auth
-        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && 'beta') || 'NONE' }}
 
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # 3.5.3

.github/workflows/e2e_ios.yaml

@@ -25,10 +25,9 @@ jobs:
         channel:
           - beta
           - stable
-        # Skips e2e tests against beta on PRs, except for auth
-        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

.github/workflows/e2e_linux.yaml

@@ -26,10 +26,9 @@ jobs:
         channel:
           - beta
           - stable
-        # Skips e2e tests against beta on PRs, except for auth
-        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

.github/workflows/e2e_web.yaml

@@ -26,10 +26,9 @@ jobs:
         channel:
           - beta
           - stable
-        # Skips e2e tests against beta on PRs, except for auth
-        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

.github/workflows/e2e_windows.yaml

@@ -26,10 +26,9 @@ jobs:
         channel:
           - beta
           - stable
-        # Skips e2e tests against beta on PRs, except for auth
-        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

actions/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   collection: ^1.18.0
   js: ^0.6.7
   json_annotation: ">=4.8.1 <4.9.0"
-  path: ^1.8.3
+  path: ">=1.8.0 <2.0.0"
   process: ^5.0.0
   retry: ^3.1.2
   source_map_stack_trace: ^2.1.1

packages/aft/pubspec.yaml

@@ -11,10 +11,10 @@ dependencies:
   async: ^2.10.0
   aws_common: ">=0.4.2+5 <0.5.0"
   built_collection: ^5.0.0
-  built_value: ">=8.6.0 <8.8.0"
+  built_value: ">=8.6.0 <8.9.0"
   checked_yaml: ^2.0.0
   cli_util: ^0.3.5
-  code_builder: 4.7.0
+  code_builder: 4.10.0
   collection: ^1.16.0
   file: ">=6.0.0 <8.0.0"
   git: any # override
@@ -65,7 +65,7 @@ dependency_overrides:
 dev_dependencies:
   amplify_lints: ">=2.0.2 <2.1.0"
   build_runner: ^2.4.0
-  built_value_generator: 8.7.0
+  built_value_generator: 8.8.1
   checks: ^0.2.2
   json_serializable: 6.7.1
   test: ^1.22.1

packages/aft/test/model_test.dart

@@ -124,7 +124,7 @@ void main() {
       final previewPackage = await d
           .package(
             'preview_pkg',
-            sdkConstraint: '^3.2.0-0',
+            sdkConstraint: '^3.3.0-0',
           )
           .create();
       expect(

packages/amplify/amplify_flutter/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.6.1
+
+### Fixes
+- fix(api): GraphQL Model Helpers support lowercase model names #4143 (#4144)
+- fix(core): pub docs ([#4049](https://github.com/aws-amplify/amplify-flutter/pull/4049))
+- fix(datastore): emit observeQuery snapshot when model create mutation results in an updated model ([#4084](https://github.com/aws-amplify/amplify-flutter/pull/4084))
+
 ## 1.6.0
 
 ### Features

packages/amplify/amplify_flutter/pubspec.yaml

@@ -1,6 +1,6 @@
 name: amplify_flutter
 description: The top level Flutter package for the AWS Amplify libraries.
-version: 1.6.0
+version: 1.6.1
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify/amplify_flutter
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues

packages/amplify_core/.pubignore

@@ -1,6 +1 @@
-# Ignore
-doc/*
-
-# Allow
-!doc/lib/*
-!doc/static/*
+doc/api/*

packages/amplify_core/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.6.3
+
+### Fixes
+- fix(auth): forget local device only if matches ([#4060](https://github.com/aws-amplify/amplify-flutter/pull/4060))
+- fix: Bumped built_value to ">=8.6.0 <8.9.0" and built_value_generator to 8.8.1
+- fix: Bumped drift to ">=2.14.0 <2.15.0" and drift_dev to ">=2.14.0 <2.15.0".
+- fix: Bumped path to ">=1.8.0 <2.0.0"
+
+## 1.6.2
+
+### Fixes
+- fix(api): GraphQL Model Helpers support lowercase model names #4143 (#4144)
+- fix(core): pub docs ([#4049](https://github.com/aws-amplify/amplify-flutter/pull/4049))
+- fix(datastore): emit observeQuery snapshot when model create mutation results in an updated model ([#4084](https://github.com/aws-amplify/amplify-flutter/pull/4084))
+
 ## 1.6.1
 
 ### Fixes

packages/amplify_core/lib/src/types/api/graphql/graphql_request.dart

@@ -74,4 +74,39 @@ class GraphQLRequest<T> with AWSSerializable<Map<String, Object?>> {
           'authorizationMode': authorizationMode!.name,
         if (decodePath != null) 'decodePath': decodePath,
       };
+
+  /// Creates a copy of this request with the given fields replaced with the new values.
+  /// If no new value is given, the old value is used.
+  ///
+  /// ```dart
+  /// final original = ModelQueries.list(
+  ///   Blog.classType,
+  /// );
+  /// final modified = original.copyWith(
+  ///   document: yourCustomQuery,
+  /// );
+  /// ```
+  ///
+  /// Useful in advanced scenarios where you want to modify the request before sending it.
+  ///
+  /// See https://docs.amplify.aws/lib/graphqlapi/advanced-workflows/q/platform/flutter/.
+  GraphQLRequest<T> copyWith({
+    String? document,
+    String? apiName,
+    Map<String, String>? headers,
+    APIAuthorizationType? authorizationMode,
+    Map<String, dynamic>? variables,
+    String? decodePath,
+    ModelType? modelType,
+  }) {
+    return GraphQLRequest<T>(
+      document: document ?? this.document,
+      apiName: apiName ?? this.apiName,
+      headers: headers ?? this.headers,
+      authorizationMode: authorizationMode ?? this.authorizationMode,
+      variables: variables ?? this.variables,
+      decodePath: decodePath ?? this.decodePath,
+      modelType: modelType ?? this.modelType,
+    );
+  }
 }

packages/amplify_core/pubspec.yaml

@@ -1,6 +1,6 @@
 name: amplify_core
 description: The base package containing common types and utilities that are shared across the Amplify Flutter packages.
-version: 1.6.1
+version: 1.6.3
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_core
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,7 +10,7 @@ environment:
 
 dependencies:
   async: ^2.10.0
-  aws_common: ">=0.6.0 <0.7.0"
+  aws_common: ">=0.6.2 <0.7.0"
   aws_signature_v4: ">=0.5.0 <0.6.0"
   collection: ^1.15.0
   graphs: ^2.1.0
@@ -20,10 +20,10 @@ dependencies:
   meta: ^1.7.0
   retry: ^3.1.0
   stack_trace: ^1.10.0
-  uuid: ">=3.0.6 <=3.0.7"
+  uuid: ">=3.0.6 <5.0.0"
 
 dev_dependencies:
-  amplify_lints: ">=3.0.1 <3.1.0"
+  amplify_lints: ">=3.0.2 <3.1.0"
   build_runner: ^2.4.0
   build_test: ^2.1.5
   build_version: ^2.1.1

packages/amplify_datastore_plugin_interface/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.6.1
+
+### Fixes
+- fix(datastore): emit observeQuery snapshot when model create mutation results in an updated model ([#4084](https://github.com/aws-amplify/amplify-flutter/pull/4084))
+
 ## 1.6.0
 
 - Minor bug fixes and improvements

packages/amplify_datastore_plugin_interface/pubspec.yaml

@@ -1,6 +1,6 @@
 name: amplify_datastore_plugin_interface
 description: The platform interface for the DataStore module of Amplify Flutter.
-version: 1.6.0
+version: 1.6.1
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_datastore_plugin_interface
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -10,7 +10,7 @@ environment:
   flutter: ">=3.10.0"
 
 dependencies:
-  amplify_core: ">=1.6.0 <1.7.0"
+  amplify_core: ">=1.6.2 <1.7.0"
   collection: ^1.15.0
   flutter:
     sdk: flutter