Skip to content

Commit

Permalink
merging dev into feature branch (#11820)
Browse files Browse the repository at this point in the history
* chore: migrate custom category from inquirer to prompter library

* chore: Replace inquirer with amplify-prompts in amplify-category-analytics package

* fix: custom category prompter tests

* refactor: clean up dependencies in package.json, update messaging in pinpoing-walktrhough, update e2e tests for kinesis and pinpoint prompts

* chore: bump codegen version

* test: update snapshot after codegen version change

* chore: bump api category dependencies to @aws-amplify/amplify-category-api@4.1.5

* fix:  cfn ambda outputs when forcePush flag is used

* fix: add to migration test list

* fix: address comments

* fix: removes git clone windows test

* chore: removes redundant import

* fix: revert windows test

* fix: extract api call

* fix: set NoEcho flag on OAuth creds CFN param

* chore(release): Publish latest [ci skip]

 - amplify-app@4.3.7
 - @aws-amplify/amplify-appsync-simulator@2.9.1
 - amplify-category-analytics@4.3.1
 - @aws-amplify/amplify-category-auth@2.14.1
 - @aws-amplify/amplify-category-custom@2.6.1
 - amplify-category-function@4.2.3
 - amplify-category-geo@2.10.2
 - amplify-category-hosting@3.4.7
 - amplify-category-interactions@4.2.1
 - amplify-category-notifications@2.22.1
 - amplify-category-predictions@4.2.3
 - @aws-amplify/amplify-category-storage@3.6.3
 - amplify-category-xr@3.3.7
 - amplify-cli-core@3.5.1
 - @aws-amplify/cli-extensibility-helper@2.4.7
 - @aws-amplify/cli@10.6.2
 - @aws-amplify/cli-internal@10.6.2
 - amplify-console-hosting@2.3.7
 - @aws-amplify/amplify-console-integration-tests@2.6.2
 - amplify-container-hosting@2.5.8
 - amplify-dotnet-function-template-provider@2.4.1
 - amplify-dynamodb-simulator@2.5.3
 - @aws-amplify/amplify-e2e-core@4.6.1
 - amplify-e2e-tests@3.16.1
 - @aws-amplify/amplify-environment-parameters@1.3.1
 - amplify-frontend-ios@3.5.7
 - amplify-frontend-javascript@3.7.3
 - amplify-go-function-runtime-provider@2.3.7
 - amplify-graphql-migration-tests@2.3.6
 - amplify-java-function-runtime-provider@2.3.7
 - @aws-amplify/amplify-migration-tests@5.3.1
 - amplify-nodejs-function-runtime-provider@2.3.7
 - amplify-nodejs-function-template-provider@2.6.2
 - @aws-amplify/amplify-opensearch-simulator@1.1.2
 - amplify-provider-awscloudformation@6.10.1
 - amplify-python-function-runtime-provider@2.4.7
 - amplify-util-mock@4.7.2
 - @aws-amplify/amplify-util-uibuilder@1.6.5

* ci: e2e multi-core optimizations (#11685)

* ci: migrated to new test strategy

* chore: add other tests and migration too

* chore: cleanup

* chore: cleanup

* chore: cleanup unused e2e tests

* chore: remove generated file

* chore: remove parallelization blocker

* chore: force parallel runs

* chore: cleanup test list

* chore: disable retries and cleanup exclusions

* chore: bump test count to fill gaps

* chore: move random id earlier in project name

* chore: update yarn version

* chore: fix typo

* chore: try to fix delete issues

* chore: fix teardown on delete error

* ci: create custom file system mutex

* chore: cleanup logs

* ci: increase randomness of initial lock creation

* chore: move migration tests to small isolated vms

* chore: adjust concurrency

* chore: update naming

* ci: update reporter to better handle concurrent tests

* ci: add use parent account exceptions

* chore: cleanup naming, fix windows artifacts

* chore: use data to optimize test scheduling

* chore: cleanup

* chore: cleanup

* chore: fix call flow

* chore: workaround duplicate spinner bugs

* ci: split api_2 test

* chore: increase push timeout

* ci: add method to run solo tests

* ci: configure retries compatible with worker pools

* ci: workaround concurrent polling limits

* chore: fix bug with solo tests

* chore: move import & geo tests to run solo

* chore: add artifact scripts

* chore: trigger workflow results

* ci: fix artifact path

* chore: cleanup

* chore: add timer spy

* ci: update test lists

* chore: cleanup

* ci: fix retries

* ci: move delays to createProjectDir

* ci: use same script for e2e as linux on windows

* chore: split storage-1 test

* ci: fix config

* ci: add bash env

* ci: reduce timeout on push

* ci: update test lists

* ci: update test lists

* ci: lower timeout and enable concurrent migration testing

* ci: update test list

* ci: restructure migration test setups

* ci: cleanup to use file names instead of old job names

* chore: refactor

* ci: fix dependencies

* ci: attempt to fix retry on windows

* chore: revert retry changes

* chore: undo changes to addCircleCiTags

* chore: address PR feedback

* chore: undo changes to spinners

* chore: cleanup unused files

* chore: lint & formatting

* chore: lint, remove unused import

* chore: undo changes to initialize-env.ts

* chore: removed overly complicated and confusing logic in pinpoint walkthrough

* ci: windows smoke test list (#11797)

* ci: migrated to new test strategy

* chore: add other tests and migration too

* chore: cleanup

* chore: cleanup

* chore: cleanup unused e2e tests

* chore: remove generated file

* chore: remove parallelization blocker

* chore: force parallel runs

* chore: cleanup test list

* chore: disable retries and cleanup exclusions

* chore: bump test count to fill gaps

* chore: move random id earlier in project name

* chore: update yarn version

* chore: fix typo

* chore: try to fix delete issues

* chore: fix teardown on delete error

* ci: create custom file system mutex

* chore: cleanup logs

* ci: increase randomness of initial lock creation

* chore: move migration tests to small isolated vms

* chore: adjust concurrency

* chore: update naming

* ci: update reporter to better handle concurrent tests

* ci: add use parent account exceptions

* chore: cleanup naming, fix windows artifacts

* chore: use data to optimize test scheduling

* chore: cleanup

* chore: cleanup

* chore: fix call flow

* chore: workaround duplicate spinner bugs

* ci: split api_2 test

* chore: increase push timeout

* ci: add method to run solo tests

* ci: configure retries compatible with worker pools

* ci: workaround concurrent polling limits

* chore: fix bug with solo tests

* chore: move import & geo tests to run solo

* chore: add artifact scripts

* chore: trigger workflow results

* ci: fix artifact path

* chore: cleanup

* chore: add timer spy

* ci: update test lists

* chore: cleanup

* ci: fix retries

* ci: move delays to createProjectDir

* ci: use same script for e2e as linux on windows

* chore: split storage-1 test

* ci: fix config

* ci: add bash env

* ci: reduce timeout on push

* ci: update test lists

* ci: update test lists

* ci: lower timeout and enable concurrent migration testing

* ci: update test list

* ci: restructure migration test setups

* ci: cleanup to use file names instead of old job names

* chore: refactor

* ci: fix dependencies

* ci: attempt to fix retry on windows

* chore: revert retry changes

* chore: undo changes to addCircleCiTags

* chore: address PR feedback

* chore: undo changes to spinners

* chore: cleanup unused files

* chore: lint & formatting

* chore: lint, remove unused import

* chore: undo changes to initialize-env.ts

* ci: windows smoke test list for non-dev branches

* chore: remove verify-api pre-push hook (#11799)

* fix: remove production env variable from amplify script execution

* fix: do not overload NODE_ENV env parameter for usage data filtering

* fix: do not overload NODE_ENV env parameter for usage data filtering

* fix: do not overload NODE_ENV env parameter for usage data filtering

* fix: test timeouts on simulator tests (#11804)

* ci: fix staleness filters (#11801)

* ci: fix staleness filters

* ci: only delete stale apps & stacks

* chore: refactor

* chore: migrate interactions category from inquirer to prompter library

* fix: default values for interactions prompter

* chore: addressed PR feedback

* chore: addressed PR feedback

* chore: Persist downstream exceptions in usage metrics (#11711)

* chore: Persist downstream exceptions in usage metrics

* fix variable name case

* chore: Populate cfn exceptions messages in AmplifyFault (#11764)

* chore: Persist cfn exceptions in usage metrics

* Add a tab between different cfn error messages

* refactor filtering the stacks with error

* build(deps): bump json5 from 1.0.1 to 1.0.2 (#11697)

Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: fix cleanup script throttling (#11716)

* ci: update cleanup script to reduce throttling

* chore: add extract api file

* ci: fix condition

* chore: cleanup

* chore: add back logs

* chore: move cleanup to start to avoid deleting apps while running

* chore: update cleanup script

* chore: revert build change

* chore: fix md file

* chore: cleanup

* chore: address pr feedback

* chore: comments

* chore: refactor

* chore: fix lint issues

* chore: feature flag for Lazy Loading and Custom Selection Set support (#11566)

* chore: feature flag for iOS LazyReference and ModelPath support

* update FF naming

* chore: add debug command to all e2e tests

* fix: status command with --debug flag

* feat: revamp help command (#11667)

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command (resolving merge conflicts)

* feat: revamp help command (remove non-null assertions)

* feat: revamp help command (remove non-null assertions)

* feat: revamp help command (revisions)

* feat: revamp help command (revisions)

* feat: revamp help command (revisions)

* feat: revamp help command (update to use array find)

* feat: revamp help command (switch to single quotes)

* feat: revamp help command (switch to single quotes)

* feat: revamp help command (put imports on same line)

* feat: revamp help command (extract api)

* feat: revamp help command (prettier on help-helpers)

* feat: revamp help command (fix tag line)

* feat: revamp help command (changing test names)

* feat: revamp help command (refactoring preserveHelpInformation)

* fix(global-prefix): remove global-prefix package (#11408)

* fix: update prepush hook to clean and rebuild before running verify extract api (#11753)

* chore: add codeql scanning (#11518)

* chore: add codeql scanning

* fix: added quality scan to codeql

* fix: make prompter multi-select indicator more distinct (#11742)

* Convert back to async method

* Add some method comments

* fix type in the comments

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: awsluja <110861985+awsluja@users.noreply.github.com>
Co-authored-by: Michael Law <1365977+lawmicha@users.noreply.github.com>
Co-authored-by: Pavel Lazar <lazar.pavel@gmail.com>
Co-authored-by: Zachary Goldberg <117126550+goldbez@users.noreply.github.com>
Co-authored-by: MorCohenAres <85824494+MorCohenAres@users.noreply.github.com>
Co-authored-by: Spencer Stolworthy <sdstolworthy@gmail.com>
Co-authored-by: Edward Foyle <foyleef@amazon.com>

* chore: addressed PR feedback

* chore: script to allow simple collection of coverage from all projects (#11798)

* chore: add coverage collection script for local unit tests runs

* fix: remove unused import

* fix: updated dev dependencies

* fix: added file level doc, filtered out unwanted coverage on e2e, lib, and test files

* fix: more descriptive filename for the script

* chore: addressed PR feedback

* fix: prompt string to match e2e (#11816)

Co-authored-by: Akshay Upadhyay <akz@amazon.com>

* chore: correctly filter failed cfn events for displaying error messages (#11815)

* chore: do not filter AWS::CloudFormation::Stack type failure events if they have valid error message

* Update packages/amplify-provider-awscloudformation/src/aws-utils/aws-cfn.js

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Pavel Lazar <lazar.pavel@gmail.com>
Co-authored-by: kuhlmanp <119457106+kuhlmanp@users.noreply.github.com>
Co-authored-by: phani-srikar <phanisrikar93ume@gmail.com>
Co-authored-by: Al Harris <alharris@amazon.com>
Co-authored-by: Akshay Upadhyay <akz@amazon.com>
Co-authored-by: Edward Foyle <foyleef@amazon.com>
Co-authored-by: aws-amplify-bot <aws@amazon.com>
Co-authored-by: Pavel Lazar <85319655+lazpavel@users.noreply.github.com>
Co-authored-by: Danielle Adams <damsnmd@amazon.com>
Co-authored-by: awsluja <110861985+awsluja@users.noreply.github.com>
Co-authored-by: Spencer Stolworthy <sdstolworthy@gmail.com>
Co-authored-by: Amplifiyer <51211245+Amplifiyer@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michael Law <1365977+lawmicha@users.noreply.github.com>
Co-authored-by: Zachary Goldberg <117126550+goldbez@users.noreply.github.com>
Co-authored-by: MorCohenAres <85824494+MorCohenAres@users.noreply.github.com>
Co-authored-by: Spencer Stolworthy <sstol@amazon.com>
Co-authored-by: akshbhu <39866697+akshbhu@users.noreply.github.com>
  • Loading branch information
19 people authored Jan 20, 2023
1 parent 7a08767 commit d5063d8
Show file tree
Hide file tree
Showing 177 changed files with 5,533 additions and 3,077 deletions.
66 changes: 22 additions & 44 deletions .circleci/config.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -384,25 +384,7 @@ jobs:
command: |
source .circleci/local_publish_helpers.sh
verifyPkgCli
graphql_e2e_tests:
<<: *defaults
steps:
- restore_cache:
key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
- restore_cache:
key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
- run:
name: Run GraphQL end-to-end tests
command: |
source .circleci/local_publish_helpers.sh
cd packages/graphql-transformers-e2e-tests/
retry yarn e2e --maxWorkers=3 $TEST_SUITE
environment:
AMPLIFY_CLI_DISABLE_LOGGING: 'true'
no_output_timeout: 90m
- store_test_results:
path: ~/repo/packages/graphql-transformers-e2e-tests/
amplify_sudo_install_test:
<<: *defaults
steps:
Expand Down Expand Up @@ -490,8 +472,8 @@ jobs:
source .circleci/local_publish_helpers.sh
changeNpmGlobalPath
cd packages/amplify-migration-tests
retry yarn run migration_v5.2.0 --maxWorkers=3 $TEST_SUITE
no_output_timeout: 90m
retry yarn run migration_v5.2.0 --no-cache --maxWorkers= $TEST_SUITE
no_output_timeout: 65m
- run: *scan_e2e_test_artifacts
- store_test_results:
path: ~/repo/packages/amplify-migration-tests/
Expand Down Expand Up @@ -520,8 +502,8 @@ jobs:
source .circleci/local_publish_helpers.sh
changeNpmGlobalPath
cd packages/amplify-migration-tests
retry yarn run migration_v6.1.0 --maxWorkers=3 $TEST_SUITE
no_output_timeout: 90m
retry yarn run migration_v6.1.0 --no-cache --maxWorkers=3 $TEST_SUITE
no_output_timeout: 65m
- run: *scan_e2e_test_artifacts
- store_test_results:
path: ~/repo/packages/amplify-migration-tests/
Expand Down Expand Up @@ -552,8 +534,8 @@ jobs:
cd packages/amplify-migration-tests
unset IS_AMPLIFY_CI
echo $IS_AMPLIFY_CI
retry yarn run migration_v10.5.1 --maxWorkers=3 $TEST_SUITE
no_output_timeout: 90m
retry yarn run migration_v10.5.1 --no-cache --maxWorkers=3 $TEST_SUITE
no_output_timeout: 65m
- run: *scan_e2e_test_artifacts
- store_test_results:
path: ~/repo/packages/amplify-migration-tests/
Expand Down Expand Up @@ -582,7 +564,7 @@ jobs:
source .circleci/local_publish_helpers.sh
changeNpmGlobalPath
cd packages/amplify-migration-tests
retry yarn run migration_v4.28.2_nonmultienv_layers --maxWorkers=3 $TEST_SUITE
retry yarn run migration_v4.28.2_nonmultienv_layers --no-cache --maxWorkers=3 $TEST_SUITE
no_output_timeout: 90m
- run: *scan_e2e_test_artifacts
- store_test_results:
Expand Down Expand Up @@ -612,7 +594,7 @@ jobs:
source .circleci/local_publish_helpers.sh
changeNpmGlobalPath
cd packages/amplify-migration-tests
retry yarn run migration_v4.52.0_multienv_layers --maxWorkers=3 $TEST_SUITE
retry yarn run migration_v4.52.0_multienv_layers --no-cache --maxWorkers=3 $TEST_SUITE
no_output_timeout: 90m
- run: *scan_e2e_test_artifacts
- store_test_results:
Expand Down Expand Up @@ -640,7 +622,7 @@ jobs:
source .circleci/local_publish_helpers.sh
amplify -v
cd packages/amplify-console-integration-tests
retry yarn run console-integration --maxWorkers=3
retry yarn run console-integration --no-cache --maxWorkers=3
name: 'Run Amplify Console integration tests'
no_output_timeout: 90m
- run: *scan_e2e_test_artifacts
Expand Down Expand Up @@ -886,6 +868,13 @@ jobs:
sleep 60
done
no_output_timeout: 180m
- run:
name: 'Collect Results'
command: yarn workflow-results
- run: *scan_e2e_test_artifacts
- store_artifacts:
path: ~/repo/artifacts

working_directory: ~/repo

workflows:
Expand Down Expand Up @@ -947,18 +936,6 @@ workflows:
- beta
- release
- /tagged-release-without-e2e-tests\/.*/
- graphql_e2e_tests:
context:
- e2e-test-context
filters:
branches:
only:
- dev
- /run-e2e-with-rc\/.*/
- /tagged-release\/.*/
- /run-e2e\/.*/
requires:
- upload_pkg_binaries
- integration_test:
context:
- e2e-test-context
Expand Down Expand Up @@ -1184,7 +1161,6 @@ workflows:
requires:
- test
- mock_e2e_tests
- graphql_e2e_tests
- integration_test
- amplify_e2e_tests_pkg
- amplify_sudo_install_test
Expand Down Expand Up @@ -1290,9 +1266,11 @@ commands:
shell: bash.exe
command: |
source .circleci/local_publish_helpers.sh
source $BASH_ENV
amplify version
cd packages/amplify-e2e-tests
retry yarn run e2e --force-exit --detectOpenHandles --maxWorkers=3 $TEST_SUITE
no_output_timeout: 60m
retry yarn run e2e --no-cache --maxWorkers=3 $TEST_SUITE
no_output_timeout: 65m
- when:
condition:
or:
Expand All @@ -1306,7 +1284,7 @@ commands:
source $BASH_ENV
amplify version
retry runE2eTest
no_output_timeout: 90m
no_output_timeout: 65m
scan_e2e_test_artifacts:
description: 'Scan And Cleanup E2E Test Artifacts'
parameters:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
source .circleci/local_publish_helpers.sh
amplify -v
cd packages/amplify-console-integration-tests
retry yarn run console-integration --maxWorkers=3
retry yarn run console-integration --no-cache --maxWorkers=3
name: Run Amplify Console integration tests
no_output_timeout: 90m
- run:
Expand Down
11 changes: 5 additions & 6 deletions .circleci/local_publish_helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ function setAwsAccountCredentials {
export AWS_ACCESS_KEY_ID_ORIG=$AWS_ACCESS_KEY_ID
export AWS_SECRET_ACCESS_KEY_ORIG=$AWS_SECRET_ACCESS_KEY
export AWS_SESSION_TOKEN_ORIG=$AWS_SESSION_TOKEN
# introduce a delay of up to 5 minutes to allow for more even spread aws list-accounts calls due to throttling
sleep $[ ( $RANDOM % 300 ) + 1 ]s
# introduce a delay of up to 1 minute to allow for more even spread aws list-accounts calls due to throttling
sleep $[ ( $RANDOM % 60 ) + 1 ]s
if [[ "$OSTYPE" == "msys" ]]; then
# windows provided by circleci has this OSTYPE
useChildAccountCredentials
Expand All @@ -276,11 +276,10 @@ function runE2eTest {

if [ -f $FAILED_TEST_REGEX_FILE ]; then
# read the content of failed tests
failedTests=$(<$FAILED_TEST_REGEX_FILE)
# adding --force-exit per https://github.com/facebook/jest/issues/9473
yarn run e2e --force-exit --detectOpenHandles --maxWorkers=3 $TEST_SUITE -t "$failedTests"
failedTests=$(<$FAILED_TEST_REGEX_FILE)=
yarn run e2e --no-cache --maxWorkers=3 $TEST_SUITE -t "$failedTests"
else
yarn run e2e --force-exit --detectOpenHandles --maxWorkers=3 $TEST_SUITE
yarn run e2e --no-cache --maxWorkers=3 $TEST_SUITE
fi
}

Expand Down
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = {
ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features
sourceType: 'module', // Allows for the use of imports
project: ['tsconfig.base.json', 'packages/amplify-cli/tsconfig.json'],
tsconfigRootDir: __dirname,
ecmaFeatures: {
jsx: true, // Allows for the parsing of JSX
arrowFunctions: true,
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
**/.DS_Store
.circleci/generated_config.yml
scripts/cci-job.data.json
scripts/cci-test.data.json
artifacts/cci-workflow-results.json
artifacts/cci-workflow-results.html
build
!packages/amplify-graphql-model-transformer/src/__tests__/overrides/build/
!packages/amplify-graphql-function-transformer/src/__tests__/overrides/build/
Expand Down
3 changes: 1 addition & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"files.exclude": {
"**/.git": true,
"**/node_modules": true,
"**/build": true,
"**/coverage": true
"**/build": true
},
"editor.formatOnSave": true,
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
Expand Down
3 changes: 3 additions & 0 deletions artifacts/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CircleCI Workflow results are stored in this artifacts directory.

After each e2e run, you can locate the artifact file here & observe the workflow results summary.
18 changes: 12 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.1.0",
"description": "amplify-cli",
"scripts": {
"coverage:collect": "ts-node ./scripts/collect-test-coverage.ts",
"addwords": "node ./scripts/add-to-dict.js",
"test-changed": "nx affected --target=test",
"test": "nx run-many --target=test --all",
Expand All @@ -28,6 +29,8 @@
"link-win": "node ./scripts/link-bin.js packages/amplify-cli/bin/amplify amplify-dev",
"link-aa-win": "node ./scripts/link-bin.js packages/amplify-app/bin/amplify-app amplify-app-dev",
"setup-dev-win": "yarn dev-build && yarn link-win && yarn link-aa-win",
"update-test-timing-data": "ts-node ./scripts/cci-get-job-metrics.ts && ts-node ./scripts/cci-extract-test-timings-from-job-metrics.ts",
"workflow-results": "yarn ts-node ./scripts/cci-workflow-results.ts",
"split-e2e-tests": "yarn ts-node ./scripts/split-e2e-tests.ts && git add .circleci/config.yml",
"verify-commit": "yarn ts-node ./scripts/verify-commit.ts",
"pkg-clean": "rimraf build out pkg/node_modules pkg/yarn.lock",
Expand Down Expand Up @@ -64,7 +67,7 @@
"husky": {
"hooks": {
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
"pre-push": "yarn verify-api-extract:clean && yarn build-tests-changed && yarn split-e2e-tests",
"pre-push": "yarn build-tests-changed && yarn split-e2e-tests",
"pre-commit": "yarn verify-commit"
}
},
Expand Down Expand Up @@ -96,7 +99,7 @@
"@commitlint/prompt": "^16.2.3",
"@microsoft/api-extractor": "^7.33.5",
"@types/glob": "^7.1.1",
"@types/jest": "^26.0.20",
"@types/jest": "^27.0.0",
"@types/js-yaml": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^5.34.0",
"@typescript-eslint/parser": "^5.34.0",
Expand All @@ -111,7 +114,7 @@
"eslint-import-resolver-typescript": "^2.0.0",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^26.1.1",
"eslint-plugin-jest": "^27.0.0",
"eslint-plugin-jsdoc": "^37.9.6",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prefer-arrow": "^1.2.3",
Expand All @@ -120,8 +123,11 @@
"execa": "^5.1.1",
"glob": "^7.2.0",
"husky": "^3.1.0",
"jest": "^26.6.3",
"jest-circus": "^26.6.3",
"istanbul-lib-coverage": "^3.2.0",
"istanbul-lib-report": "^3.0.0",
"istanbul-reports": "^3.1.5",
"jest": "^27.0.0",
"jest-circus": "^27.0.0",
"jest-junit": "^12.0.0",
"js-yaml": "^4.0.0",
"lnk": "1.1.0",
Expand All @@ -130,7 +136,7 @@
"nx": "^14.8.3",
"pkg": "^5.4.1",
"rimraf": "^3.0.0",
"ts-jest": "^26.4.4",
"ts-jest": "^27.0.0",
"ts-node": "^8.10.1",
"typescript": "^4.5.5"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/amplify-app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [4.3.7](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@4.3.6...amplify-app@4.3.7) (2023-01-17)

**Note:** Version bump only for package amplify-app





## [4.3.6](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@4.3.5...amplify-app@4.3.6) (2023-01-03)

**Note:** Version bump only for package amplify-app
Expand Down
6 changes: 3 additions & 3 deletions packages/amplify-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "amplify-app",
"version": "4.3.6",
"version": "4.3.7",
"description": "Amplify CLI",
"repository": {
"type": "git",
Expand Down Expand Up @@ -30,8 +30,8 @@
"dependencies": {
"amplify-frontend-android": "3.4.0",
"amplify-frontend-flutter": "1.3.5",
"amplify-frontend-ios": "3.5.6",
"amplify-frontend-javascript": "3.7.2",
"amplify-frontend-ios": "3.5.7",
"amplify-frontend-javascript": "3.7.3",
"chalk": "^4.1.1",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/amplify-appsync-simulator/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.9.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.9.0...@aws-amplify/amplify-appsync-simulator@2.9.1) (2023-01-17)

**Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator





# [2.9.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.8.0...@aws-amplify/amplify-appsync-simulator@2.9.0) (2023-01-03)


Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-appsync-simulator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/amplify-appsync-simulator",
"version": "2.9.0",
"version": "2.9.1",
"description": "An AppSync Simulator to test AppSync API.",
"repository": {
"type": "git",
Expand Down Expand Up @@ -32,7 +32,7 @@
"dependencies": {
"@graphql-tools/schema": "^8.3.1",
"@graphql-tools/utils": "^8.5.1",
"amplify-cli-core": "3.5.0",
"amplify-cli-core": "3.5.1",
"amplify-prompts": "2.6.2",
"amplify-velocity-template": "1.4.8",
"aws-sdk": "^2.1233.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/amplify-category-analytics/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [4.3.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-analytics@4.3.0...amplify-category-analytics@4.3.1) (2023-01-17)

**Note:** Version bump only for package amplify-category-analytics





# [4.3.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-analytics@4.2.1...amplify-category-analytics@4.3.0) (2023-01-03)


Expand Down
7 changes: 3 additions & 4 deletions packages/amplify-category-analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "amplify-category-analytics",
"version": "4.3.0",
"version": "4.3.1",
"description": "amplify-cli analytics plugin",
"repository": {
"type": "git",
Expand All @@ -22,11 +22,10 @@
"extract-api": "ts-node ../../scripts/extract-api.ts"
},
"dependencies": {
"@aws-amplify/amplify-environment-parameters": "1.3.0",
"amplify-cli-core": "3.5.0",
"@aws-amplify/amplify-environment-parameters": "1.3.1",
"amplify-cli-core": "3.5.1",
"amplify-prompts": "2.6.2",
"fs-extra": "^8.1.0",
"inquirer": "^7.3.3",
"uuid": "^8.3.2"
},
"jest": {
Expand Down
Loading

0 comments on commit d5063d8

Please sign in to comment.