chore: update API.md, update package versions to non-tagged ones (matching dev branch)

.eslint-dictionary.json

@@ -412,6 +412,7 @@
   "ulid",
   "unauth",
   "uncompiled",
+  "uncommented",
   "unicode",
   "unix",
   "unlink",

codebuild_specs/e2e_workflow_base.yml

@@ -136,6 +136,12 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
       depend-on:
         - upb
+    - identifier: gen2_migrations_e2e_test
+      buildspec: codebuild_specs/run_gen2_migrations_e2e_tests_linux.yml
+      depend-on:
+        - build_linux
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
     - identifier: cleanup_resources
       buildspec: codebuild_specs/cleanup_resources.yml
       depend-on:

codebuild_specs/e2e_workflow_generated.yml

@@ -136,6 +136,12 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
       depend-on:
         - upb
+    - identifier: gen2_migrations_e2e_test
+      buildspec: codebuild_specs/run_gen2_migrations_e2e_tests_linux.yml
+      depend-on:
+        - build_linux
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
     - identifier: cleanup_resources
       buildspec: codebuild_specs/cleanup_resources.yml
       depend-on:

packages/amplify-appsync-simulator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-appsync-simulator",
-  "version": "2.16.12-next-4.0",
+  "version": "2.16.11",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",

packages/amplify-category-custom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-custom",
-  "version": "3.1.28-next-4.0",
+  "version": "3.1.27",
   "description": "amplify-cli custom resources plugin",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "aws-cdk-lib": "~2.187.0",
     "execa": "^5.1.1",

packages/amplify-category-hosting/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-hosting",
-  "version": "3.5.41-next-4.0",
+  "version": "3.5.40",
   "description": "amplify-cli hosting plugin",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "test": "jest --logHeapUsage --coverage"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",

packages/amplify-cli/src/domain/command-input.ts

@@ -1,4 +1,4 @@
-import { CommandLineInput } from '@aws-amplify/amplify-cli-core';
+import { CommandLineInput } from '@aws-amplify/amplify-cli-core/src/types';
 
 export class CLIInput implements CommandLineInput {
   argv: Array<string>;

packages/amplify-console-hosting/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@aws-amplify/amplify-console-hosting",
-  "version": "2.5.38-next-4.0",
+  "version": "2.5.37",
   "description": "cli plugin for AWS Amplify Console hosting",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
-    "@aws-amplify/amplify-environment-parameters": "1.9.19-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.18",
     "archiver": "^5.3.0",
     "chalk": "^4.1.1",
     "cli-table3": "^0.6.0",

packages/amplify-console-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-console-integration-tests",
-  "version": "2.11.22-next-4.0",
+  "version": "2.11.21",
   "description": "",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "setup-profile": "ts-node ./src/setup-profile.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@aws-amplify/amplify-e2e-core": "5.7.3",
     "@types/ini": "^1.3.30",
     "aws-sdk": "^2.1464.0",

packages/amplify-dotnet-function-runtime-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-dotnet-function-runtime-provider",
-  "version": "2.1.4-next-4.0",
+  "version": "2.1.3",
   "description": "Provides functionality related to functions in .NET on AWS",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "execa": "^5.1.1",

packages/amplify-dynamodb-simulator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-dynamodb-simulator",
-  "version": "2.9.23-next-4.0",
+  "version": "2.9.22",
   "description": "DynamoDB emulator nodejs wrapper",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "test": "jest --logHeapUsage --passWithNoTests"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "aws-sdk": "^2.1464.0",
     "detect-port": "^1.3.0",
     "execa": "^5.1.1",

packages/amplify-e2e-core/src/init/deleteProject.ts

@@ -27,6 +27,6 @@ export const deleteProject = async (
       .wait('Project deleted locally.')
       .runAsync();
   } catch (e) {
-    console.log('Error on deleting project at:', cwd);
+    console.log('Error on deleting project at:', cwd, e);
   }
 };

packages/amplify-e2e-core/src/init/initProjectHelper.ts

@@ -62,13 +62,7 @@ export function initJSProjectWithProfile(cwd: string, settings?: Partial<typeof
     disableCIDetection: s.disableCIDetection,
   });
 
-  if (s.includeGen2RecommendationPrompt) {
-    chain
-      .wait('Do you want to continue with Amplify Gen 1?')
-      .sendYes()
-      .wait('Why would you like to use Amplify Gen 1?')
-      .sendCarriageReturn();
-  }
+  chain.wait('Do you want to continue with Amplify Gen 1?').sendYes().wait('Why would you like to use Amplify Gen 1?').sendCarriageReturn();
 
   chain
     .wait('Enter a name for the project')

packages/amplify-environment-parameters/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-environment-parameters",
-  "version": "1.9.19-next-4.0",
+  "version": "1.9.18",
   "description": "Amplify CLI environment parameter manager",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "generate-schemas": "mkdirp lib/schemas src/schemas && ts-json-schema-generator --path src/backend-parameters.d.ts --type BackendParameters --no-type-check --out lib/schemas/BackendParameters.schema.json && copyfiles --flat lib/schemas/BackendParameters.schema.json src/schemas"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "ajv": "^6.12.6",
     "lodash": "^4.17.21"
   },

packages/amplify-frontend-ios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-frontend-ios",
-  "version": "3.7.12-next-4.0",
+  "version": "3.7.11",
   "description": "amplify-cli front-end plugin for xcode projects",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
     "graphql-config": "^2.2.1",

packages/amplify-frontend-javascript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-frontend-javascript",
-  "version": "3.10.22-next-4.0",
+  "version": "3.10.21",
   "description": "amplify-cli front-end plugin for JavaScript projects",
   "scripts": {
     "test": "jest --logHeapUsage",
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@babel/core": "^7.23.2",
     "@babel/plugin-transform-modules-commonjs": "7.10.4",
     "chalk": "^4.1.1",

packages/amplify-gen2-codegen/src/backend/synthesizer.ts

@@ -380,7 +380,7 @@ export class BackendSynthesizer {
     return [providerSetupDeclaration, forEachStatement];
   }
 
-  private createNestedObjectExpression(object: Record<string, any>, gen2PropertyMap: Map<string, string>): ts.ObjectLiteralExpression {
+  private createNestedObjectExpression(object: any, gen2PropertyMap: Map<string, string>): ts.ObjectLiteralExpression {
     const objectLiterals = [];
     const clientSecretKey = 'ClientSecret';
 
@@ -467,7 +467,7 @@ export class BackendSynthesizer {
               objectLiterals.push(this.createListPropertyAssignment(mappedProperty, value));
             }
           }
-        } else if (typeof value == 'object') {
+        } else if (typeof value == 'object' && value !== null) {
           objectLiterals.push(
             factory.createPropertyAssignment(factory.createIdentifier(key), this.createNestedObjectExpression(value, gen2PropertyMap)),
           );

packages/amplify-gen2-codegen/src/npm_package/renderer.test.ts

@@ -23,6 +23,7 @@ const installedDependencies: Record<keyof AmplifyPackageVersions, IsDevDependenc
   'aws-cdk-lib': true,
   '@aws-amplify/backend': true,
   '@aws-amplify/backend-cli': true,
+  '@aws-amplify/backend-data': true,
   'ci-info': true,
   '@types/node': true,
 };

packages/amplify-gen2-codegen/src/npm_package/renderer.ts

@@ -1,6 +1,7 @@
 export type AmplifyDevDependencies = {
   '@aws-amplify/backend': string;
   '@aws-amplify/backend-cli': string;
+  '@aws-amplify/backend-data': string;
   'aws-cdk': string;
   'aws-cdk-lib': string;
   'ci-info': string;
@@ -34,6 +35,7 @@ export const patchNpmPackageJson = (packageJson: PackageJson, packageVersions: P
       ...(packageJson.devDependencies ?? {}),
       '@aws-amplify/backend': withDefault(packageVersions['@aws-amplify/backend']),
       '@aws-amplify/backend-cli': withDefault(packageVersions['@aws-amplify/backend-cli']),
+      '@aws-amplify/backend-data': withDefault(packageVersions['@aws-amplify/backend-data']),
       'aws-cdk': withDefault(packageVersions['aws-cdk']),
       'aws-cdk-lib': withDefault(packageVersions['aws-cdk-lib']),
       'ci-info': withDefault(packageVersions['ci-info']),

packages/amplify-go-function-runtime-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-go-function-runtime-provider",
-  "version": "2.3.51-next-4.0",
+  "version": "2.3.50",
   "description": "Provides functionality related to functions in Go 1.x on AWS",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "archiver": "^5.3.0",
     "execa": "^5.1.1",

packages/amplify-java-function-runtime-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-java-function-runtime-provider",
-  "version": "2.3.51-next-4.0",
+  "version": "2.3.50",
   "description": "Provides functionality related to functions in JAVA on AWS",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

packages/amplify-migration-e2e/jest.config.js

@@ -14,7 +14,7 @@ module.exports = {
   testEnvironmentOptions: {
     url: 'http://localhost',
   },
-  testRegex: '(src/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$',
+  testRegex: 'src/__tests__/migration_codegen_e2e.test.ts',
   collectCoverage: false,
   collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/__tests__/**', '!src/**/*.test.(ts|tsx|js|jsx)$', '!**/*.d.ts'],
   reporters: [