Skip to content

Commit

Permalink
Merge branch 'main' into fix/subscription_completion
Browse files Browse the repository at this point in the history
  • Loading branch information
stocaaro authored May 26, 2022
2 parents 42a2683 + 9e3792f commit 86b72d9
Show file tree
Hide file tree
Showing 72 changed files with 1,500 additions and 848 deletions.
52 changes: 26 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1073,22 +1073,22 @@ jobs:
spec: << parameters.scenario >>
browser: firefox

integ_duplicate_packages:
parameters:
browser:
type: string
executor: js-test-executor
<<: *test_env_vars
working_directory: ~/amplify-js-samples-staging/samples/react/version-conflict/duplicate-packages
steps:
- prepare_test_env
- integ_test_js:
test_name: 'Duplicate Package Errors'
framework: react
category: version-conflict
sample_name: duplicate-packages
spec: duplicate-packages
browser: << parameters.browser >>
# integ_duplicate_packages:
# parameters:
# browser:
# type: string
# executor: js-test-executor
# <<: *test_env_vars
# working_directory: ~/amplify-js-samples-staging/samples/react/version-conflict/duplicate-packages
# steps:
# - prepare_test_env
# - integ_test_js:
# test_name: 'Duplicate Package Errors'
# framework: react
# category: version-conflict
# sample_name: duplicate-packages
# spec: duplicate-packages
# browser: << parameters.browser >>
integ_auth_test_cypress_no_ui:
working_directory: ~/amplify-js-samples-staging/
executor: js-test-executor
Expand Down Expand Up @@ -1532,15 +1532,15 @@ workflows:
matrix:
parameters:
<<: *datastore_auth_scenarios
- integ_duplicate_packages:
requires:
- integ_setup
- build
filters:
<<: *releasable_branches
matrix:
parameters:
<<: *test_browsers
# - integ_duplicate_packages:
# requires:
# - integ_setup
# - build
# filters:
# <<: *releasable_branches
# matrix:
# parameters:
# <<: *test_browsers
- integ_react_geo:
requires:
- integ_setup
Expand Down Expand Up @@ -1592,7 +1592,7 @@ workflows:
- integ_rn_ios_datastore_sqlite_adapter
- integ_datastore_auth
- integ_datastore_auth_v2
- integ_duplicate_packages
# - integ_duplicate_packages
- integ_auth_test_cypress_no_ui
- integ_react_graphql_api
- integ_react_geo
Expand Down
11 changes: 11 additions & 0 deletions packages/amazon-cognito-identity-js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [5.2.9](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@5.2.8...amazon-cognito-identity-js@5.2.9) (2022-05-23)


### Bug Fixes

* docs for amazon-cognito-identity-js ([#9909](https://github.com/aws-amplify/amplify-js/issues/9909)) ([08e01b1](https://github.com/aws-amplify/amplify-js/commit/08e01b1c09cfab73f2eb1b1b18fe1a696e2a028f))





## [5.2.8](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@5.2.7...amazon-cognito-identity-js@5.2.8) (2022-03-10)

**Note:** Version bump only for package amazon-cognito-identity-js
Expand Down
2 changes: 1 addition & 1 deletion packages/amazon-cognito-identity-js/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ cognitoUser.forgotPassword({
//Optional automatic callback
inputVerificationCode: function(data) {
console.log('Code sent to: ' + data);
var code = document.getElementById('code').value;
var verificationCode = document.getElementById('code').value;
var newPassword = document.getElementById('new_password').value;
cognitoUser.confirmPassword(verificationCode, newPassword, {
onSuccess() {
Expand Down
2 changes: 1 addition & 1 deletion packages/amazon-cognito-identity-js/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "amazon-cognito-identity-js",
"description": "Amazon Cognito Identity Provider JavaScript SDK",
"version": "5.2.8",
"version": "5.2.9",
"author": {
"name": "Amazon Web Services",
"email": "aws@amazon.com",
Expand Down
24 changes: 24 additions & 0 deletions packages/amplify-ui-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.0.51](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@1.0.50...@aws-amplify/ui-angular@1.0.51) (2022-05-24)

**Note:** Version bump only for package @aws-amplify/ui-angular





## [1.0.50](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@1.0.49...@aws-amplify/ui-angular@1.0.50) (2022-05-23)

**Note:** Version bump only for package @aws-amplify/ui-angular





## [1.0.49](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@1.0.48...@aws-amplify/ui-angular@1.0.49) (2022-05-12)

**Note:** Version bump only for package @aws-amplify/ui-angular





## [1.0.48](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@1.0.47...@aws-amplify/ui-angular@1.0.48) (2022-05-03)

**Note:** Version bump only for package @aws-amplify/ui-angular
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-ui-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aws-amplify/ui-angular",
"private": "true",
"version": "1.0.48",
"version": "1.0.51",
"description": "Angular specific wrapper for @aws-amplify/ui-components",
"publishConfig": {
"access": "public"
Expand Down Expand Up @@ -32,7 +32,7 @@
"dist/"
],
"dependencies": {
"@aws-amplify/ui-components": "1.9.19"
"@aws-amplify/ui-components": "1.9.22"
},
"devDependencies": {
"@angular/compiler-cli": "^7.2.1",
Expand Down
24 changes: 24 additions & 0 deletions packages/amplify-ui-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.9.22](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@1.9.21...@aws-amplify/ui-components@1.9.22) (2022-05-24)

**Note:** Version bump only for package @aws-amplify/ui-components





## [1.9.21](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@1.9.20...@aws-amplify/ui-components@1.9.21) (2022-05-23)

**Note:** Version bump only for package @aws-amplify/ui-components





## [1.9.20](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@1.9.19...@aws-amplify/ui-components@1.9.20) (2022-05-12)

**Note:** Version bump only for package @aws-amplify/ui-components





## [1.9.19](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@1.9.18...@aws-amplify/ui-components@1.9.19) (2022-05-03)

**Note:** Version bump only for package @aws-amplify/ui-components
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-ui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aws-amplify/ui-components",
"private": "true",
"version": "1.9.19",
"version": "1.9.22",
"description": "Core Amplify UI Component Library",
"module": "dist/index.mjs",
"main": "dist/index.js",
Expand Down Expand Up @@ -43,7 +43,7 @@
"uuid": "^8.2.0"
},
"devDependencies": {
"@aws-amplify/auth": "4.5.3",
"@aws-amplify/auth": "4.5.6",
"@stencil/angular-output-target": "^0.0.2",
"@stencil/core": "1.15.0",
"@stencil/eslint-plugin": "0.2.1",
Expand Down
24 changes: 24 additions & 0 deletions packages/amplify-ui-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.2.42](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@1.2.41...@aws-amplify/ui-react@1.2.42) (2022-05-24)

**Note:** Version bump only for package @aws-amplify/ui-react





## [1.2.41](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@1.2.40...@aws-amplify/ui-react@1.2.41) (2022-05-23)

**Note:** Version bump only for package @aws-amplify/ui-react





## [1.2.40](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@1.2.39...@aws-amplify/ui-react@1.2.40) (2022-05-12)

**Note:** Version bump only for package @aws-amplify/ui-react





## [1.2.39](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@1.2.38...@aws-amplify/ui-react@1.2.39) (2022-05-03)

**Note:** Version bump only for package @aws-amplify/ui-react
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-ui-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@aws-amplify/ui-react",
"private": "true",
"sideEffects": false,
"version": "1.2.39",
"version": "1.2.42",
"description": "React specific wrapper for @aws-amplify/ui-components",
"publishConfig": {
"access": "public"
Expand Down Expand Up @@ -33,7 +33,7 @@
"typescript": "^3.3.4000"
},
"dependencies": {
"@aws-amplify/ui-components": "1.9.19"
"@aws-amplify/ui-components": "1.9.22"
},
"peerDependencies": {
"react": ">= 16.7.0",
Expand Down
24 changes: 24 additions & 0 deletions packages/amplify-ui-storybook/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.0.42](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@2.0.41...@aws-amplify/ui-storybook@2.0.42) (2022-05-24)

**Note:** Version bump only for package @aws-amplify/ui-storybook





## [2.0.41](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@2.0.40...@aws-amplify/ui-storybook@2.0.41) (2022-05-23)

**Note:** Version bump only for package @aws-amplify/ui-storybook





## [2.0.40](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@2.0.39...@aws-amplify/ui-storybook@2.0.40) (2022-05-12)

**Note:** Version bump only for package @aws-amplify/ui-storybook





## [2.0.39](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@2.0.38...@aws-amplify/ui-storybook@2.0.39) (2022-05-03)

**Note:** Version bump only for package @aws-amplify/ui-storybook
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-ui-storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/ui-storybook",
"version": "2.0.39",
"version": "2.0.42",
"private": true,
"dependencies": {
"@aws-amplify/ui-react": "0.2.38",
Expand All @@ -10,7 +10,7 @@
"@types/node": "^12.0.0",
"@types/react": "^16.9.0",
"@types/react-dom": "^16.9.0",
"aws-amplify": "4.3.21",
"aws-amplify": "4.3.24",
"react": "^16.12.0",
"react-app-polyfill": "^1.0.6",
"react-dom": "^16.12.0",
Expand Down
24 changes: 24 additions & 0 deletions packages/amplify-ui-vue/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.1.36](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@1.1.35...@aws-amplify/ui-vue@1.1.36) (2022-05-24)

**Note:** Version bump only for package @aws-amplify/ui-vue





## [1.1.35](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@1.1.34...@aws-amplify/ui-vue@1.1.35) (2022-05-23)

**Note:** Version bump only for package @aws-amplify/ui-vue





## [1.1.34](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@1.1.33...@aws-amplify/ui-vue@1.1.34) (2022-05-12)

**Note:** Version bump only for package @aws-amplify/ui-vue





## [1.1.33](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@1.1.32...@aws-amplify/ui-vue@1.1.33) (2022-05-03)

**Note:** Version bump only for package @aws-amplify/ui-vue
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-ui-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@aws-amplify/ui-vue",
"private": "true",
"sideEffects": true,
"version": "1.1.33",
"version": "1.1.36",
"description": "Vue specific wrapper for @aws-amplify/ui-components",
"publishConfig": {
"access": "public"
Expand All @@ -18,7 +18,7 @@
"url": "https://github.com/aws-amplify/amplify-js.git"
},
"dependencies": {
"@aws-amplify/ui-components": "1.9.19"
"@aws-amplify/ui-components": "1.9.22"
},
"devDependencies": {
"rimraf": "^3.0.2"
Expand Down
24 changes: 24 additions & 0 deletions packages/analytics/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [5.2.9](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@5.2.8...@aws-amplify/analytics@5.2.9) (2022-05-24)

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





## [5.2.8](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@5.2.7...@aws-amplify/analytics@5.2.8) (2022-05-23)

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





## [5.2.7](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@5.2.6...@aws-amplify/analytics@5.2.7) (2022-05-12)

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





## [5.2.6](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@5.2.5...@aws-amplify/analytics@5.2.6) (2022-05-03)

**Note:** Version bump only for package @aws-amplify/analytics
Expand Down
Loading

0 comments on commit 86b72d9

Please sign in to comment.