Skip to content

Commit

Permalink
Merge branch 'main' into auth/feat-customRoleArn
Browse files Browse the repository at this point in the history
  • Loading branch information
sammartinez authored Feb 18, 2021
2 parents 6263f15 + 104b278 commit f575d74
Show file tree
Hide file tree
Showing 74 changed files with 2,356 additions and 295 deletions.
75 changes: 71 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -414,19 +414,26 @@ jobs:
steps:
- prepare_test_env
- integ_test_js:
test_name: 'Vue Authenticator'
test_name: 'Legacy Vue Authenticator'
framework: vue
category: auth
sample_name: amplify-authenticator-legacy
spec: authenticator
browser: << parameters.browser >>
- integ_test_js:
test_name: 'Vue Authenticator'
test_name: 'Vue 2 Authenticator'
framework: vue
category: auth
sample_name: amplify-authenticator
spec: ui-amplify-authenticator
browser: << parameters.browser >>
- integ_test_js:
test_name: 'Vue 3 Authenticator'
framework: vue
category: auth
sample_name: authenticator-vue3
spec: ui-amplify-authenticator
browser: << parameters.browser >>
- integ_test_js:
test_name: 'Vue Custom Authenticator'
framework: vue
Expand Down Expand Up @@ -478,13 +485,19 @@ jobs:
steps:
- prepare_test_env
- integ_test_js:
test_name: 'Vue Interactions'
test_name: 'Vue 2 Interactions'
framework: vue
category: interactions
sample_name: chatbot-component
spec: chatbot-component
browser: << parameters.browser >>

- integ_test_js:
test_name: 'Vue 3 Interactions'
framework: vue
category: interactions
sample_name: chatbot-component-vue3
spec: chatbot-component
browser: << parameters.browser >>
integ_angular_interactions:
parameters:
browser:
Expand Down Expand Up @@ -534,6 +547,22 @@ jobs:
sample_name: storageApp
spec: storage
browser: << parameters.browser >>
integ_react_storage_multipart_progress:
parameters:
browser:
type: string
executor: js-test-executor
<<: *test_env_vars
working_directory: ~/amplify-js-samples-staging/samples/react/storage/multi-part-upload-with-progress
steps:
- prepare_test_env
- integ_test_js:
test_name: 'React Storage Multi-Part Upload with Progress'
framework: react
category: storage
sample_name: multi-part-upload-with-progress
spec: multi-part-upload-with-progress
browser: << parameters.browser >>
integ_react_storage_ui:
executor: js-test-executor
<<: *test_env_vars
Expand Down Expand Up @@ -570,6 +599,13 @@ jobs:
steps:
- integ_test_rn_ios

integ_rn_ios_storage_multipart_progress:
executor: macos-executor
<<: *test_env_vars
working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress
steps:
- integ_test_rn_ios

integ_rn_ios_push_notifications:
executor: macos-executor
<<: *test_env_vars
Expand All @@ -584,6 +620,13 @@ jobs:
steps:
- integ_test_rn_android

integ_rn_android_storage_multipart_progress:
executor: macos-executor
<<: *test_env_vars
working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress
steps:
- integ_test_rn_android

integ_datastore_auth:
parameters:
scenario:
Expand Down Expand Up @@ -771,6 +814,15 @@ workflows:
matrix:
parameters:
<<: *test_browsers
- integ_react_storage_multipart_progress:
requires:
- integ_setup
- build
filters:
<<: *releasable_branches
matrix:
parameters:
<<: *test_browsers
- integ_react_storage_ui:
requires:
- integ_setup
Expand All @@ -792,6 +844,12 @@ workflows:
- build
filters:
<<: *releasable_branches
- integ_rn_ios_storage_multipart_progress:
requires:
- integ_setup
- build
filters:
<<: *releasable_branches
- integ_rn_ios_push_notifications:
requires:
- integ_setup
Expand All @@ -804,6 +862,12 @@ workflows:
- build
filters:
<<: *releasable_branches
- integ_rn_android_storage_multipart_progress:
requires:
- integ_setup
- build
filters:
<<: *releasable_branches
- integ_datastore_auth:
requires:
- integ_setup
Expand All @@ -821,6 +885,7 @@ workflows:
- integ_react_predictions
- integ_react_datastore
- integ_react_storage
- integ_react_storage_multipart_progress
- integ_react_storage_ui
- integ_react_interactions
- integ_angular_interactions
Expand All @@ -830,8 +895,10 @@ workflows:
- integ_angular_auth
- integ_vue_auth
- integ_rn_ios_storage
- integ_rn_ios_storage_multipart_progress
- integ_rn_ios_push_notifications
- integ_rn_android_storage
- integ_rn_android_storage_multipart_progress
- integ_datastore_auth
- post_release:
filters:
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/bundle-size-action/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"bundlewatch": {
"files": [
{
"path": ".next/static/chunks/pages/index-d6a61784a8ae4ca7feaf.js",
"path": ".next/static/chunks/pages/index-*.js",
"maxSize": "215kB"
}
]
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/bundle-size-action/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@
},
{
"path": "dist/Amplify+Auth.js.min.js",
"maxSize": "70kB"
"maxSize": "75kB"
},
{
"path": "dist/Amplify+Auth+Storage.js.min.js",
"maxSize": "110kB"
"maxSize": "115kB"
},
{
"path": "dist/Amplify+Storage.js.min.js",
"maxSize": "75kB"
},
{
"path": "dist/withSSRContext.js.min.js",
"maxSize": "140kB"
"maxSize": "145kB"
},
{
"path": "dist/withSSRContext+Storage.js.min.js",
"maxSize": "175kB"
"maxSize": "180kB"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/bundle-size-action/webpack4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
{
"path": "dist/Amplify+Auth.js.min.js",
"maxSize": "200kB"
"maxSize": "215kB"
}
]
},
Expand Down
1 change: 1 addition & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ exemptLabels:
- tracked
- question
- needs-discussion
- backlog
staleLabel: pending-close-response-required
markComment: >
This issue has been automatically marked as stale because it has not had
Expand Down
34 changes: 34 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,40 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [4.5.10](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@4.5.9...amazon-cognito-identity-js@4.5.10) (2021-02-03)


### Bug Fixes

* **amazon-cognito-identity-js:** add default value for options ([#7664](https://github.com/aws-amplify/amplify-js/issues/7664)) ([4ecf425](https://github.com/aws-amplify/amplify-js/commit/4ecf4256e54db42e49c55db8ca14f7dd2b206af1))





## [4.5.9](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@4.5.8...amazon-cognito-identity-js@4.5.9) (2021-02-01)


### Bug Fixes

* **amazon-cognito-identity-js:** make options optional ([#7654](https://github.com/aws-amplify/amplify-js/issues/7654)) ([08277af](https://github.com/aws-amplify/amplify-js/commit/08277aff76688c091e05c593cb802f90a9c771a6))





## [4.5.8](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@4.5.7...amazon-cognito-identity-js@4.5.8) (2021-01-29)


### Bug Fixes

* **@aws-amplify/auth, amazon-cognito-identity-js:** Include clientMetadata for token refresh ([#7633](https://github.com/aws-amplify/amplify-js/issues/7633)) ([3a9efb0](https://github.com/aws-amplify/amplify-js/commit/3a9efb0b596cf2795d7e1424f011f8e59058ecfb))
* **amazon-cognito-identity-js:** add .web.js version for cryptoSecureRandomInt ([#7521](https://github.com/aws-amplify/amplify-js/issues/7521)) ([13b7ccd](https://github.com/aws-amplify/amplify-js/commit/13b7ccd49b3314580b597dc177f400c1b68e930f))





## [4.5.7](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@4.5.6...amazon-cognito-identity-js@4.5.7) (2021-01-07)

**Note:** Version bump only for package amazon-cognito-identity-js
Expand Down
Loading

0 comments on commit f575d74

Please sign in to comment.