Merge branch 'master' of github.com:aws-amplify/amplify-js into ui-co…

…mponents/master

.circleci/config.yml

@@ -89,7 +89,6 @@ jobs:
             echo $SSH_HOST_PUBLIC_KEY >> ~/.ssh/known_hosts
             git clone $AMPLIFY_JS_SAMPLES_STAGING_URL
             cd amplify-js-samples-staging
-            git checkout modularization
             yarn
       - save_cache:
           key: amplify-js-{{ .Branch }}-{{ checksum "amplify-js-samples-staging/yarn.lock" }}
@@ -415,7 +414,6 @@ workflows:
                 - master
                 - ui-components/master
                 - 1.0-stable
-                - modularization
           requires:
             - build
       - integ_react_predictions:
@@ -426,7 +424,6 @@ workflows:
                 - master
                 - ui-components/master
                 - 1.0-stable
-                - modularization
           requires:
             - integ_setup
       - integ_react_auth:
@@ -437,7 +434,6 @@ workflows:
                 - master
                 - ui-components/master
                 - 1.0-stable
-                - modularization
           requires:
             - integ_setup
       - integ_angular_auth:
@@ -447,7 +443,6 @@ workflows:
                 - release
                 - master
                 - 1.0-stable
-                - modularization
           requires:
             - integ_setup
       - integ_vue_auth:
@@ -457,7 +452,6 @@ workflows:
                 - release
                 - master
                 - 1.0-stable
-                - modularization
           requires:
             - integ_setup
       - integ_rn_ios_storage:
@@ -478,7 +472,6 @@ workflows:
                 - beta
                 - ui-components/master
                 - 1.0-stable
-                - modularization
           requires:
             - unit_test
             - integ_react_predictions

package.json

@@ -19,12 +19,10 @@
 		"lint": "lerna run lint",
 		"link-all": "yarn unlink-all && lerna exec --no-bail --parallel yarn link",
 		"unlink-all": "lerna exec --no-bail --parallel -- yarn unlink; exit 0",
-		"publish:master": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=unstable --preid=unstable --exact",
+		"publish:master": "lerna publish --conventional-commits --force-publish \"*\" --yes --dist-tag=unstable --preid=unstable --exact",
 		"publish:beta": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=beta --preid=beta --exact",
 		"publish:release": "lerna publish --conventional-commits --yes --message 'chore(release): Publish [ci skip]'",
-		"publish:1.0-stable": "lerna publish --conventional-commits --yes --dist-tag=stable-1.0 --message 'chore(release): Publish [ci skip]'",
-		"publish:modularization": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=preview --preid=preview --exact",
-		"publish:ui-components/master": "lerna publish --canary --force-publish \"*\" --dist-tag=ui-preview --preid=ui-preview --exact"
+		"publish:1.0-stable": "lerna publish --conventional-commits --yes --dist-tag=stable-1.0 --message 'chore(release): Publish [ci skip]'"
 	},
 	"husky": {
 		"hooks": {

packages/amazon-cognito-identity-js/CHANGELOG.md

@@ -3,11 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [4.1.0](https://github.com/aws-amplify/amplify-js/compare/[email protected]@4.1.0) (2020-03-31)
+# [4.1.0](https://github.com/aws-amplify/amplify-js/compare/[email protected]@4.1.0) (2020-03-31)
+
+### Bug Fixes
+
+- **amazon-cognito-identity-js:** linting config ([#4097](https://github.com/aws-amplify/amplify-js/issues/4097)) ([7674f96](https://github.com/aws-amplify/amplify-js/commit/7674f96f8a99bcc7b73ee4eb1c2a84db7de28ae3))
+- **amazon-cognito-identity-js:** linting config ([#4097](https://github.com/aws-amplify/amplify-js/issues/4097)) ([173baf5](https://github.com/aws-amplify/amplify-js/commit/173baf5bd14c0e52e61e35ea44b8d3dc4c703c4c))
 
 ### Features
 
-- **@aws-amplify/ui-components:** User agent tracking for UI component packages ([#4804](https://github.com/aws-amplify/amplify-js/issues/4804)) ([15a0a2f](https://github.com/aws-amplify/amplify-js/commit/15a0a2fadeb96543721a6733faeb509efc26e1e2))
+- **@aws-amplify/core:** [Delivers [#168673137](https://github.com/aws-amplify/amplify-js/issues/168673137)] Migrate core category to aws sdk V3 ([#4077](https://github.com/aws-amplify/amplify-js/issues/4077)) ([beb73a4](https://github.com/aws-amplify/amplify-js/commit/beb73a4b1c051654750f5bdc3b20cde3a3aba37d))
+
+### Reverts
+
+- Revert "Publish" ([1319d31](https://github.com/aws-amplify/amplify-js/commit/1319d319b69717e76660fbfa6f1a845195c6d635))
+
+## [3.2.7](https://github.com/aws-amplify/amplify-js/compare/[email protected]@3.2.7) (2020-03-30)
+
+**Note:** Version bump only for package amazon-cognito-identity-js
 
 ## [3.2.6](https://github.com/aws-amplify/amplify-js/compare/[email protected]@3.2.6) (2020-03-25)
 

packages/amplify-ui/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.0.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui@2.0.0...@aws-amplify/[email protected]) (2020-03-31)
+## [2.0.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui@1.1.6...@aws-amplify/[email protected]) (2020-03-31)
 
 **Note:** Version bump only for package @aws-amplify/ui
 

packages/analytics/CHANGELOG.md

@@ -3,7 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.0.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-31)
+# [3.1.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-31)
+
+
+### Features
+
+* **@aws-amplify/core:** [Delivers [#168673137](https://github.com/aws-amplify/amplify-js/issues/168673137)] Migrate core category to aws sdk V3 ([#4077](https://github.com/aws-amplify/amplify-js/issues/4077)) ([beb73a4](https://github.com/aws-amplify/amplify-js/commit/beb73a4b1c051654750f5bdc3b20cde3a3aba37d))
+* append amplify user agent to all V3 SDK calls ([#4564](https://github.com/aws-amplify/amplify-js/issues/4564)) ([175d4c3](https://github.com/aws-amplify/amplify-js/commit/175d4c34ccb9cd5674c228db14513827d1c80d3f))
+
+
+### Reverts
+
+* Revert "Publish" ([1319d31](https://github.com/aws-amplify/amplify-js/commit/1319d319b69717e76660fbfa6f1a845195c6d635))
+
+
+
+
+
+## [2.2.8](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-30)
 
 **Note:** Version bump only for package @aws-amplify/analytics
 

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/analytics",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Analytics category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -37,7 +37,11 @@
   },
   "homepage": "https://aws-amplify.github.io/",
   "dependencies": {
+<<<<<<< HEAD
     "@aws-amplify/cache": "3.0.1",
+=======
+    "@aws-amplify/cache": "3.1.0",
+>>>>>>> 8bb1334bc090c44be9916f2fc3e09d0fe15d787d
     "@aws-amplify/core": "3.1.0",
     "@aws-sdk/client-firehose": "1.0.0-beta.3",
     "@aws-sdk/client-kinesis": "1.0.0-beta.3",

packages/api-graphql/CHANGELOG.md

@@ -3,18 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [1.1.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-31)
+## 1.0.2 (2020-03-31)
 
-### Bug Fixes
-
-- **@ui-components/master:** force TypeScript@~3.6.4 ([#4789](https://github.com/aws-amplify/amplify-js/issues/4789)) ([6d1019f](https://github.com/aws-amplify/amplify-js/commit/6d1019fa242e6574b8dca10de0ae7ed96bbcfa9f))
+**Note:** Version bump only for package @aws-amplify/api-graphql
 
-### Features
 
-- **@aws-amplify/ui-components:** Storybook ([#4973](https://github.com/aws-amplify/amplify-js/issues/4973)) ([bfbb46a](https://github.com/aws-amplify/amplify-js/commit/bfbb46af6be247a9aebd934e0f88227f621d7d8a))
 
-## 1.0.1 (2020-01-10)
 
-**Note:** Version bump only for package @aws-amplify/api-graphql
 
 # Change Log

packages/api-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/api-graphql",
-  "version": "1.1.0",
+  "version": "1.0.2",
   "description": "Api-graphql category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -38,7 +38,11 @@
   "dependencies": {
     "@aws-amplify/api-rest": "1.0.2",
     "@aws-amplify/auth": "3.1.0",
+<<<<<<< HEAD
     "@aws-amplify/cache": "3.0.1",
+=======
+    "@aws-amplify/cache": "3.1.0",
+>>>>>>> 8bb1334bc090c44be9916f2fc3e09d0fe15d787d
     "@aws-amplify/core": "3.1.0",
     "graphql": "14.0.0",
     "uuid": "^3.2.1",

packages/api-rest/CHANGELOG.md

@@ -3,11 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.0.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-31)
-
-**Note:** Version bump only for package @aws-amplify/api-rest
-
-## 1.0.1 (2020-01-10)
+## 1.0.2 (2020-03-31)
 
 **Note:** Version bump only for package @aws-amplify/api-rest
 

packages/api/CHANGELOG.md

@@ -3,7 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.0.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-31)
+# [3.1.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-31)
+
+
+### Bug Fixes
+
+* **@aws-amplify/api:** expose tree-shaking for Webpack ([768a5f2](https://github.com/aws-amplify/amplify-js/commit/768a5f2bed0b1ecdfc9518c313a4a550a703fea7))
+
+
+### Features
+
+* **@aws-amplify/api:** publish ES2015/ESM artifacts ([68e0870](https://github.com/aws-amplify/amplify-js/commit/68e087056a0798d465b2c16d6f043e2ae8fd5a7c))
+* **@aws-amplify/core:** publish ES2015/ESM artifacts ([d73d5e1](https://github.com/aws-amplify/amplify-js/commit/d73d5e14b5e6a46b36dc00045029693a229046d4))
+
+
+### Reverts
+
+* Revert "Publish" ([1319d31](https://github.com/aws-amplify/amplify-js/commit/1319d319b69717e76660fbfa6f1a845195c6d635))
+
+
+
+
+
+## [2.2.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-30)
 
 **Note:** Version bump only for package @aws-amplify/api
 

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/api",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Api category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -38,7 +38,11 @@
     "@types/zen-observable": "^0.8.0"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@aws-amplify/api-graphql": "1.1.0",
+=======
+    "@aws-amplify/api-graphql": "1.0.2",
+>>>>>>> 8bb1334bc090c44be9916f2fc3e09d0fe15d787d
     "@aws-amplify/api-rest": "1.0.2"
   },
   "peerDependencies": {

packages/auth/CHANGELOG.md

@@ -3,11 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [3.1.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-31)
+# [3.1.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-31)
+
+
+### Bug Fixes
+
+* **@aws-amplify/auth:** expose tree-shaking for Webpack ([7ad2d4e](https://github.com/aws-amplify/amplify-js/commit/7ad2d4e7a2673481ab45b416caed7593b7973f32))
+* **core, auth, aws-amplify-react:** fix tests ([bdd162c](https://github.com/aws-amplify/amplify-js/commit/bdd162c2dd03488168a299f8dd8c554f76ca8a12))
+
 
 ### Features
 
-- **@aws-amplify/ui-components:** User agent tracking for UI component packages ([#4804](https://github.com/aws-amplify/amplify-js/issues/4804)) ([15a0a2f](https://github.com/aws-amplify/amplify-js/commit/15a0a2fadeb96543721a6733faeb509efc26e1e2))
+* **@aws-amplify/auth:** publish ES2015/ESM artifacts ([6cf2c22](https://github.com/aws-amplify/amplify-js/commit/6cf2c22b9a9013092fa81ee51ff5f280d6152e1d))
+* **@aws-amplify/core:** [Delivers [#168673137](https://github.com/aws-amplify/amplify-js/issues/168673137)] Migrate core category to aws sdk V3 ([#4077](https://github.com/aws-amplify/amplify-js/issues/4077)) ([beb73a4](https://github.com/aws-amplify/amplify-js/commit/beb73a4b1c051654750f5bdc3b20cde3a3aba37d))
+
+
+### Reverts
+
+* Revert "Publish" ([1319d31](https://github.com/aws-amplify/amplify-js/commit/1319d319b69717e76660fbfa6f1a845195c6d635))
+
+
+
+
+
+## [2.1.8](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-30)
+
+**Note:** Version bump only for package @aws-amplify/auth
 
 ## [2.1.7](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-03-25)
 

packages/auth/package.json

@@ -35,7 +35,7 @@
   },
   "homepage": "https://aws-amplify.github.io/",
   "dependencies": {
-    "@aws-amplify/cache": "3.0.1",
+    "@aws-amplify/cache": "3.1.0",
     "@aws-amplify/core": "3.1.0",
     "amazon-cognito-identity-js": "4.1.0",
     "crypto-js": "^3.3.0"

packages/aws-amplify-angular/CHANGELOG.md

@@ -3,7 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [5.0.1](https://github.com/aws-amplify/amplify-js/compare/[email protected]@5.0.1) (2020-03-31)
+## [5.0.1](https://github.com/aws-amplify/amplify-js/compare/[email protected]@5.0.1) (2020-03-31)
+
+### Bug Fixes
+
+- **aws-amplify-angular:** declare @aws-amplify/core as rollup external ([20a8bf8](https://github.com/aws-amplify/amplify-js/commit/20a8bf843b7284f0738763b2dcaac0f59d770ef3))
+
+### Reverts
+
+- Revert "Publish" ([1319d31](https://github.com/aws-amplify/amplify-js/commit/1319d319b69717e76660fbfa6f1a845195c6d635))
+
+## [4.1.9](https://github.com/aws-amplify/amplify-js/compare/[email protected]@4.1.9) (2020-03-30)
 
 **Note:** Version bump only for package aws-amplify-angular
 

packages/aws-amplify-react-native/CHANGELOG.md

@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [4.0.1](https://github.com/aws-amplify/amplify-js/compare/[email protected]@4.0.1) (2020-03-31)
+## [4.0.1](https://github.com/aws-amplify/amplify-js/compare/[email protected]@4.0.1) (2020-03-31)
+
+**Note:** Version bump only for package aws-amplify-react-native
+
+## [3.2.3](https://github.com/aws-amplify/amplify-js/compare/[email protected]@3.2.3) (2020-03-30)
 
 **Note:** Version bump only for package aws-amplify-react-native
 

packages/aws-amplify-react/CHANGELOG.md

@@ -3,7 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [4.0.1](https://github.com/aws-amplify/amplify-js/compare/[email protected]@4.0.1) (2020-03-31)
+# [4.1.0](https://github.com/aws-amplify/amplify-js/compare/[email protected]@4.1.0) (2020-03-31)
+
+
+### Bug Fixes
+
+* **aws-amplify-react:** BREAKING - Remove "import '[@aws-amplify](https://github.com/aws-amplify)… ([#5138](https://github.com/aws-amplify/amplify-js/issues/5138)) ([1cad8b9](https://github.com/aws-amplify/amplify-js/commit/1cad8b9214ff798eedefeee1b07fdfc2e020fc05))
+* **core, auth, aws-amplify-react:** fix tests ([bdd162c](https://github.com/aws-amplify/amplify-js/commit/bdd162c2dd03488168a299f8dd8c554f76ca8a12))
+
+
+### Features
+
+* **aws-amplify-react): publish ES2015/ESM artifacts:** publish ES2015/ESM artifacts ([3a60350](https://github.com/aws-amplify/amplify-js/commit/3a6035028c2b61744bd1154e7125eed38339b140))
+
+
+### Reverts
+
+* Revert "Publish" ([1319d31](https://github.com/aws-amplify/amplify-js/commit/1319d319b69717e76660fbfa6f1a845195c6d635))
+
+
+
+
+
+## [3.1.9](https://github.com/aws-amplify/amplify-js/compare/[email protected]@3.1.9) (2020-03-30)
 
 **Note:** Version bump only for package aws-amplify-react
 

packages/aws-amplify-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-amplify-react",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",

packages/aws-amplify-vue/CHANGELOG.md

@@ -3,9 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.0.1](https://github.com/aws-amplify/amplify-js/compare/[email protected]@2.0.1) (2020-03-31)
+# [2.1.0](https://github.com/aws-amplify/amplify-js/compare/[email protected]@2.1.0) (2020-03-31)
+
+
+### Features
+
+* **@aws-amplify/storage:** S3 upload progress reporting and multipart upload ([#4558](https://github.com/aws-amplify/amplify-js/issues/4558)) ([64b0bec](https://github.com/aws-amplify/amplify-js/commit/64b0bec958c7d31b1b82208e397b3013a98de625)), closes [#4404](https://github.com/aws-amplify/amplify-js/issues/4404) [#4474](https://github.com/aws-amplify/amplify-js/issues/4474)
+
+
+
 
-**Note:** Version bump only for package aws-amplify-vue
 
 ## [1.1.4](https://github.com/aws-amplify/amplify-js/compare/[email protected]@1.1.4) (2020-02-07)
 

packages/aws-amplify-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-amplify-vue",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "private": false,
   "author": "Amazon Web Services",