chore: Sync ui-components/main with main

.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: |
@@ -412,6 +412,45 @@ jobs:
           sample_name: multi-user-translation
           spec: multiuser-translation
 
+  integ_react_interactions:
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/react/interactions/chatbot-component
+    steps:
+      - prepare_test_env
+      - integ_test_js:
+          test_name: 'React Interactions'
+          framework: react
+          category: interactions
+          sample_name: chatbot-component
+          spec: chatbot-component
+
+  integ_vue_interactions:
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/vue/interactions/chatbot-component
+    steps:
+      - prepare_test_env
+      - integ_test_js:
+          test_name: 'Vue Interactions'
+          framework: vue
+          category: interactions
+          sample_name: chatbot-component
+          spec: chatbot-component
+
+  integ_angular_interactions:
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/angular/interactions/chatbot-component
+    steps:
+      - prepare_test_env
+      - integ_test_js:
+          test_name: 'Angular Interactions'
+          framework: angular
+          category: interactions
+          sample_name: chatbot-component
+          spec: chatbot-component
+
   integ_react_datastore:
     executor: js-test-executor
     <<: *test_env_vars
@@ -618,7 +657,7 @@ releasable_branches: &releasable_branches
     only:
       - release
       - main
-      - ui-components/master
+      - ui-components/main
       - 1.0-stable
 
 workflows:
@@ -658,6 +697,24 @@ workflows:
             - build
           filters:
             <<: *releasable_branches
+      - integ_react_interactions:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
+      - integ_vue_interactions:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
+      - integ_angular_interactions:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
       - integ_react_datastore:
           requires:
             - integ_setup

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",
@@ -23,6 +24,7 @@
 		"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:ui-components/main": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=ui-preview --preid=ui-preview --exact",
 		"publish:verdaccio": "lerna publish --no-push --canary minor --dist-tag=unstable --preid=unstable --exact --force-publish --yes"
 	},
 	"husky": {
@@ -31,8 +33,13 @@
 		}
 	},
 	"workspaces": {
-  		"packages": ["packages/*"],
-  		"nohoist": ["**/@types/react-native", "**/@types/react-native/**"]
+		"packages": [
+			"packages/*"
+		],
+		"nohoist": [
+			"**/@types/react-native",
+			"**/@types/react-native/**"
+		]
 	},
 	"repository": {
 		"type": "git",

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

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": {

packages/amazon-cognito-identity-js/src/Client.js

@@ -1,3 +1,5 @@
+import 'isomorphic-unfetch';
+
 import UserAgent from './UserAgent';
 
 class CognitoError extends Error {

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;

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

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",

packages/amplify-ui-angular/src/amplify-module.ts

@@ -7,6 +7,7 @@ import {
 	AmplifyAuthenticator,
 	AmplifyAuthFields,
 	AmplifyButton,
+	AmplifyChatbot,
 	AmplifyCheckbox,
 	AmplifyCodeField,
 	AmplifyConfirmSignIn,
@@ -65,6 +66,7 @@ const DECLARATIONS = [
 	AmplifyAuthenticator,
 	AmplifyAuthFields,
 	AmplifyButton,
+	AmplifyChatbot,
 	AmplifyCheckbox,
 	AmplifyCodeField,
 	AmplifyConfirmSignIn,

packages/amplify-ui-angular/tsconfig.json

@@ -8,6 +8,7 @@
 		"fullTemplateTypeCheck": false
 	},
 	"compilerOptions": {
+		"skipLibCheck": true,
 		"alwaysStrict": true,
 		"strict": true,
 		"allowSyntheticDefaultImports": true,

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

packages/amplify-ui-components/Readme.md

@@ -351,6 +351,7 @@ Theming for the UI components can be achieved by using [CSS Variables](https://d
 | `--amplify-light-grey`         | #c4c4c4              |
 | `--amplify-white`              | #ffffff              |
 | `--amplify-red`                | #dd3f5b              |
+| `--amplify-blue`               | #099ac8              |
 
 ## Amplify Authenticator `usernameAlias`
 

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",