Merge branch 'main' into aws-sdk-v8/main

aws-amplify · Sep 3, 2020 · 10306f4 · 10306f4
2 parents e8c6fa2 + 9bc794d
commit 10306f4
Show file tree

Hide file tree

Showing 96 changed files with 3,104 additions and 792 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -109,7 +109,7 @@ commands:
           name: 'Install << parameters.test_name >> sample'
           command: |
             echo "Current NPM registry: " $(yarn config get registry)
-            yarn
+            ~/amplify-js/.circleci/retry-yarn-script.sh -s 'install' -n 3
       - run:
           name: 'Run cypress tests for << parameters.test_name >> Sample'
           command: |
@@ -140,7 +140,7 @@ commands:
           command: |
             cd << parameters.framework >>/<< parameters.category >>/<< parameters.sample_name >>
             echo "Current NPM registry: " $(yarn config get registry)
-            yarn
+            ~/amplify-js/.circleci/retry-yarn-script.sh -s 'install' -n 3
       - run:
           name: 'Run << parameters.test_name >> UI tests'
           command: |
@@ -173,7 +173,7 @@ commands:
           name: Yarn Install
           command: |
             echo "Current NPM registry: " $(yarn config get registry)
-            yarn install --frozen-lockfile --non-interactive
+            ~/amplify-js/.circleci/retry-yarn-script.sh -s 'install --frozen-lockfile --non-interactive' -n 3
       - restore_pods
       - run:
           name: Install CocoaPods
@@ -256,7 +256,7 @@ commands:
           name: Yarn Install
           command: |
             echo "Current NPM registry: " $(yarn config get registry)
-            yarn install --frozen-lockfile --non-interactive
+            ~/amplify-js/.circleci/retry-yarn-script.sh -s 'install --frozen-lockfile --non-interactive' -n 3
       - run:
           # Install Android Emulator without Android Studio
           command: |

diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
 		"coverage": "codecov || exit 0",
 		"docs": "typedoc packages/**/src --name amplify-js --hideGenerator --excludePrivate --ignoreCompilerErrors --mode file --out docs/api --theme docs/amplify-theme/typedoc/ --readme README.md",
 		"build": "lerna run build --stream",
+		"build:watch": "concurrently 'lerna run build:cjs:watch --parallel' 'lerna run build:esm:watch --parallel' --raw",
 		"build:esm:watch": "lerna run build:esm:watch --parallel",
 		"build:cjs:watch": "lerna run build:cjs:watch --parallel",
 		"clean": "lerna run clean --parallel",

diff --git a/packages/amazon-cognito-identity-js/CHANGELOG.md b/packages/amazon-cognito-identity-js/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.4.0](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@4.3.5...amazon-cognito-identity-js@4.4.0) (2020-09-03)
+
+
+### Bug Fixes
+
+* **amazon-cognito-identity-js:** add "none" to sameSite possible values ([#6682](https://github.com/aws-amplify/amplify-js/issues/6682)) ([cffb932](https://github.com/aws-amplify/amplify-js/commit/cffb932dfd2c7bb1ca246adc451cc7f6dea2a1f6))
+
+
+### Features
+
+* **SSR:** withSSRContext ([#6146](https://github.com/aws-amplify/amplify-js/issues/6146)) ([1cb1afd](https://github.com/aws-amplify/amplify-js/commit/1cb1afd1e56135908dceb2ef6403f0b3e78067fe))
+
+
+
+
+
+## [4.3.5](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@4.3.4...amazon-cognito-identity-js@4.3.5) (2020-09-01)
+
+
+### Bug Fixes
+
+* **@aws-amplify/auth:** incorrect return type for Auth.resendSignUp ([#5112](https://github.com/aws-amplify/amplify-js/issues/5112)) ([9164b37](https://github.com/aws-amplify/amplify-js/commit/9164b37cb7669c9dd08927dde58dccbefad25194))
+* **amazon-cognito-identity-js:** fix parameters in sendMFASelectionAnswer ([#6418](https://github.com/aws-amplify/amplify-js/issues/6418)) ([794c1da](https://github.com/aws-amplify/amplify-js/commit/794c1da170cd98d3def4651751b851f28810bb6e))
+
+
+
+
+
 ## [4.3.4](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@4.3.3...amazon-cognito-identity-js@4.3.4) (2020-08-19)
 
 **Note:** Version bump only for package amazon-cognito-identity-js

diff --git a/packages/amazon-cognito-identity-js/index.d.ts b/packages/amazon-cognito-identity-js/index.d.ts
diff --git a/packages/amazon-cognito-identity-js/package-lock.json b/packages/amazon-cognito-identity-js/package-lock.json
diff --git a/packages/amazon-cognito-identity-js/package.json b/packages/amazon-cognito-identity-js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "amazon-cognito-identity-js",
   "description": "Amazon Cognito Identity Provider JavaScript SDK",
-  "version": "4.3.4",
+  "version": "4.4.0",
   "author": {
     "name": "Amazon Web Services",
     "email": "aws@amazon.com",
@@ -43,10 +43,12 @@
   ],
   "scripts": {
     "clean": "rimraf lib es",
-    "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib",
-    "build:es": "cross-env BABEL_ENV=es babel src --out-dir es",
+    "build:cjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib",
+    "build:cjs:watch": "cross-env BABEL_ENV=commonjs babel src --out-dir lib --watch",
+    "build:esm": "cross-env BABEL_ENV=es babel src --out-dir es",
+    "build:esm:watch": "cross-env BABEL_ENV=es babel src --out-dir es --watch",
     "build:umd": "webpack",
-    "build": "npm run clean && npm run build:commonjs && npm run build:es && npm run build:umd",
+    "build": "npm run clean && npm run build:cjs && npm run build:esm && npm run build:umd",
     "doc": "jsdoc src -d docs",
     "lint": "eslint src",
     "lint2": "eslint enhance-rn.js",
@@ -64,6 +66,7 @@
   "dependencies": {
     "buffer": "4.9.1",
     "crypto-js": "^3.3.0",
+    "isomorphic-unfetch": "^3.0.0",
     "js-cookie": "^2.2.1"
   },
   "devDependencies": {

diff --git a/packages/amazon-cognito-identity-js/src/Client.js b/packages/amazon-cognito-identity-js/src/Client.js
@@ -1,3 +1,5 @@
+import 'isomorphic-unfetch';
+
 import UserAgent from './UserAgent';
 
 class CognitoError extends Error {

diff --git a/packages/amazon-cognito-identity-js/src/CookieStorage.js b/packages/amazon-cognito-identity-js/src/CookieStorage.js
@@ -33,9 +33,14 @@ export default class CookieStorage {
 			this.secure = true;
 		}
 		if (Object.prototype.hasOwnProperty.call(data, 'sameSite')) {
-			if (data.sameSite !== 'strict' && data.sameSite !== 'lax') {
+			if (!['strict','lax','none'].includes(data.sameSite)) {
 				throw new Error(
-					'The sameSite value of cookieStorage must be "lax" or "strict".'
+					'The sameSite value of cookieStorage must be "lax", "strict" or "none".'
+				);
+			}
+			if (data.sameSite === 'none' && !this.secure) {
+				throw new Error(
+					'sameSite = None requires the Secure attribute in latest browser versions.'
 				);
 			}
 			this.sameSite = data.sameSite;

diff --git a/packages/amplify-ui-angular/CHANGELOG.md b/packages/amplify-ui-angular/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.4.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@0.3.0...@aws-amplify/ui-angular@0.4.0) (2020-09-03)
+
+
+### Features
+
+* **SSR:** withSSRContext ([#6146](https://github.com/aws-amplify/amplify-js/issues/6146)) ([1cb1afd](https://github.com/aws-amplify/amplify-js/commit/1cb1afd1e56135908dceb2ef6403f0b3e78067fe))
+
+
+
+
+
+# [0.3.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@0.2.15...@aws-amplify/ui-angular@0.3.0) (2020-09-01)
+
+
+### Features
+
+* **@aws-amplify/ui-components:** Add Chatbot UI to main ([#6684](https://github.com/aws-amplify/amplify-js/issues/6684)) ([4e25f92](https://github.com/aws-amplify/amplify-js/commit/4e25f923723441c6fb705584fcc3349214806558)), closes [#5024](https://github.com/aws-amplify/amplify-js/issues/5024) [#6648](https://github.com/aws-amplify/amplify-js/issues/6648) [#6652](https://github.com/aws-amplify/amplify-js/issues/6652) [#6678](https://github.com/aws-amplify/amplify-js/issues/6678)
+
+
+
+
+
 ## [0.2.15](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@0.2.14...@aws-amplify/ui-angular@0.2.15) (2020-08-19)
 
 **Note:** Version bump only for package @aws-amplify/ui-angular

diff --git a/packages/amplify-ui-angular/package.json b/packages/amplify-ui-angular/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/ui-angular",
-	"version": "0.2.15",
+	"version": "0.4.0",
 	"description": "Angular specific wrapper for @aws-amplify/ui-components",
 	"publishConfig": {
 		"access": "public"
@@ -31,7 +31,7 @@
 		"dist/"
 	],
 	"dependencies": {
-		"@aws-amplify/ui-components": "^0.6.2"
+		"@aws-amplify/ui-components": "^0.8.0"
 	},
 	"devDependencies": {
 		"@angular/compiler-cli": "^7.2.1",

diff --git a/packages/amplify-ui-angular/tsconfig.json b/packages/amplify-ui-angular/tsconfig.json
@@ -8,6 +8,7 @@
 		"fullTemplateTypeCheck": false
 	},
 	"compilerOptions": {
+		"skipLibCheck": true,
 		"alwaysStrict": true,
 		"strict": true,
 		"allowSyntheticDefaultImports": true,

diff --git a/packages/amplify-ui-components/CHANGELOG.md b/packages/amplify-ui-components/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.8.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@0.7.0...@aws-amplify/ui-components@0.8.0) (2020-09-03)
+
+
+### Features
+
+* **SSR:** withSSRContext ([#6146](https://github.com/aws-amplify/amplify-js/issues/6146)) ([1cb1afd](https://github.com/aws-amplify/amplify-js/commit/1cb1afd1e56135908dceb2ef6403f0b3e78067fe))
+
+
+
+
+
+# [0.7.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@0.6.2...@aws-amplify/ui-components@0.7.0) (2020-09-01)
+
+
+### Features
+
+* **@aws-amplify/ui-components:** Add Chatbot UI to main ([#6684](https://github.com/aws-amplify/amplify-js/issues/6684)) ([4e25f92](https://github.com/aws-amplify/amplify-js/commit/4e25f923723441c6fb705584fcc3349214806558)), closes [#5024](https://github.com/aws-amplify/amplify-js/issues/5024) [#6648](https://github.com/aws-amplify/amplify-js/issues/6648) [#6652](https://github.com/aws-amplify/amplify-js/issues/6652) [#6678](https://github.com/aws-amplify/amplify-js/issues/6678)
+
+
+
+
+
 ## [0.6.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@0.6.1...@aws-amplify/ui-components@0.6.2) (2020-08-19)
 
 **Note:** Version bump only for package @aws-amplify/ui-components

diff --git a/packages/amplify-ui-components/package.json b/packages/amplify-ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-components",
-  "version": "0.6.2",
+  "version": "0.8.0",
   "description": "Core Amplify UI Component Library",
   "module": "dist/index.mjs",
   "main": "dist/index.js",
@@ -30,6 +30,7 @@
     "storybook": "concurrently 'start-storybook -p 3000 -s ./www' 'yarn:stencil:watch' --raw",
     "build-with-test": "npm run clean && npm test && npm run stencil",
     "build": "npm run clean && npm run stencil --ci",
+    "build:esm:watch": "npm run clean && npm run stencil:watch",
     "build:watch": "npm run clean && npm run stencil:watch",
     "clean": "rimraf dist .stencil"
   },
@@ -38,6 +39,8 @@
     "uuid": "^8.2.0"
   },
   "devDependencies": {
+    "@aws-amplify/auth": "^3.4.0",
+    "@aws-amplify/core": "^3.5.0",
     "@stencil/angular-output-target": "^0.0.2",
     "@stencil/core": "1.15.0",
     "@stencil/eslint-plugin": "0.2.1",

diff --git a/packages/amplify-ui-react/CHANGELOG.md b/packages/amplify-ui-react/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.17](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@0.2.16...@aws-amplify/ui-react@0.2.17) (2020-09-03)
+
+**Note:** Version bump only for package @aws-amplify/ui-react
+
+
+
+
+
+## [0.2.16](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@0.2.15...@aws-amplify/ui-react@0.2.16) (2020-09-01)
+
+**Note:** Version bump only for package @aws-amplify/ui-react
+
+
+
+
+
 ## [0.2.15](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@0.2.14...@aws-amplify/ui-react@0.2.15) (2020-08-19)
 
 **Note:** Version bump only for package @aws-amplify/ui-react

diff --git a/packages/amplify-ui-react/package.json b/packages/amplify-ui-react/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@aws-amplify/ui-react",
 	"sideEffects": false,
-	"version": "0.2.15",
+	"version": "0.2.17",
 	"description": "React specific wrapper for @aws-amplify/ui-components",
 	"publishConfig": {
 		"access": "public"
@@ -32,7 +32,7 @@
 		"typescript": "^3.3.4000"
 	},
 	"dependencies": {
-		"@aws-amplify/ui-components": "^0.6.2"
+		"@aws-amplify/ui-components": "^0.8.0"
 	},
 	"peerDependencies": {
 		"react": "^16.7.0",

diff --git a/packages/amplify-ui-storybook/CHANGELOG.md b/packages/amplify-ui-storybook/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.17](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@0.2.16...@aws-amplify/ui-storybook@0.2.17) (2020-09-03)
+
+**Note:** Version bump only for package @aws-amplify/ui-storybook
+
+
+
+
+
+## [0.2.16](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@0.2.15...@aws-amplify/ui-storybook@0.2.16) (2020-09-01)
+
+**Note:** Version bump only for package @aws-amplify/ui-storybook
+
+
+
+
+
 ## [0.2.15](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@0.2.14...@aws-amplify/ui-storybook@0.2.15) (2020-08-19)
 
 **Note:** Version bump only for package @aws-amplify/ui-storybook

diff --git a/packages/amplify-ui-storybook/package.json b/packages/amplify-ui-storybook/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@aws-amplify/ui-storybook",
-  "version": "0.2.15",
+  "version": "0.2.17",
   "private": true,
   "dependencies": {
-    "@aws-amplify/ui-react": "^0.2.15",
+    "@aws-amplify/ui-react": "^0.2.17",
     "@storybook/addon-knobs": "^5.3.13",
     "@storybook/theming": "^5.3.14",
     "@types/jest": "^24.0.0",
     "@types/node": "^12.0.0",
     "@types/react": "^16.9.0",
     "@types/react-dom": "^16.9.0",
-    "aws-amplify": "^3.0.24",
+    "aws-amplify": "^3.1.0",
     "react": "^16.12.0",
     "react-app-polyfill": "^1.0.6",
     "react-dom": "^16.12.0",

diff --git a/packages/amplify-ui-vue/CHANGELOG.md b/packages/amplify-ui-vue/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.16](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@0.2.15...@aws-amplify/ui-vue@0.2.16) (2020-09-03)
+
+**Note:** Version bump only for package @aws-amplify/ui-vue
+
+
+
+
+
+## [0.2.15](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@0.2.14...@aws-amplify/ui-vue@0.2.15) (2020-09-01)
+
+**Note:** Version bump only for package @aws-amplify/ui-vue
+
+
+
+
+
 ## [0.2.14](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@0.2.13...@aws-amplify/ui-vue@0.2.14) (2020-08-19)
 
 **Note:** Version bump only for package @aws-amplify/ui-vue

diff --git a/packages/amplify-ui-vue/package.json b/packages/amplify-ui-vue/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@aws-amplify/ui-vue",
 	"sideEffects": true,
-	"version": "0.2.14",
+	"version": "0.2.16",
 	"description": "Vue specific wrapper for @aws-amplify/ui-components",
 	"publishConfig": {
 		"access": "public"
@@ -17,7 +17,7 @@
 		"url": "https://github.com/aws-amplify/amplify-js.git"
 	},
 	"dependencies": {
-		"@aws-amplify/ui-components": "^0.6.2"
+		"@aws-amplify/ui-components": "^0.8.0"
 	},
 	"scripts": {
 		"build": "npm run clean && npm run compile",