Merge branch 'main' into amplify-ui-react/bug/fix-cant-resolve-fs-web…

…pack-windows
aws-amplify · Dec 2, 2020 · 3b79a98 · 3b79a98
2 parents d0708a2 + 84b4a88
commit 3b79a98
Show file tree

Hide file tree

Showing 81 changed files with 2,307 additions and 385 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -677,6 +677,7 @@ datastore_auth_scenarios: &datastore_auth_scenarios
       public-auth-default,
       public-auth-iam,
       owner-custom-claim-default,
+      owner-custom-field-default,
     ]
 
 workflows:

diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ If you can't migrate to [aws-sdk-js-v3](https://github.com/aws/aws-sdk-js-v3) or
 - [**Analytics**](https://docs.amplify.aws/lib/analytics/getting-started/q/platform/js): Easily collect analytics data for your app. Analytics data includes user sessions and other custom events that you want to track in your app.
 - [**REST API**](https://docs.amplify.aws/lib/restapi/getting-started/q/platform/js): Provides a simple solution when making HTTP requests. It provides an automatic, lightweight signing process which complies with AWS Signature Version 4.
 - [**GraphQL API**](https://docs.amplify.aws/lib/graphqlapi/getting-started/q/platform/js): Interact with your GraphQL server or AWS AppSync API with an easy-to-use & configured GraphQL client.
+- [**DataStore**](https://docs.amplify.aws/lib/datastore/getting-started/q/platform/js): A programming model for leveraging shared and distributed data without writing additional code for offline and online scenarios, which makes working with distributed, cross-user data just as simple as working with local-only data.
 - [**Storage**](https://docs.amplify.aws/lib/storage/getting-started/q/platform/js): Provides a simple mechanism for managing user content for your app in public, protected or private storage buckets.
 - [**Push Notifications**](https://docs.amplify.aws/lib/push-notifications/getting-started/q/platform/js): Allows you to integrate push notifications in your app with Amazon Pinpoint targeting and campaign management support.
 - [**Interactions**](https://docs.amplify.aws/lib/interactions/getting-started/q/platform/js#interactions-with-aws): Create conversational bots powered by deep learning technologies.

diff --git a/package.json b/package.json
@@ -93,6 +93,7 @@
 	},
 	"resolutions": {
 		"@types/babel__traverse": "7.0.8",
+		"@types/react": "16.9.10",
 		"terser": "4.6.7",
 		"npm-packlist": "1.1.12"
 	},

diff --git a/packages/amazon-cognito-identity-js/CHANGELOG.md b/packages/amazon-cognito-identity-js/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.5.5](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@4.5.4...amazon-cognito-identity-js@4.5.5) (2020-11-20)
+
+**Note:** Version bump only for package amazon-cognito-identity-js
+
+
+
+
+
 ## [4.5.4](https://github.com/aws-amplify/amplify-js/compare/amazon-cognito-identity-js@4.5.3...amazon-cognito-identity-js@4.5.4) (2020-11-13)
 
 

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.5.4",
+  "version": "4.5.5",
   "author": {
     "name": "Amazon Web Services",
     "email": "aws@amazon.com",

diff --git a/packages/amplify-ui-angular/CHANGELOG.md b/packages/amplify-ui-angular/CHANGELOG.md
@@ -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.
 
+## [0.4.14](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@0.4.13...@aws-amplify/ui-angular@0.4.14) (2020-11-30)
+
+**Note:** Version bump only for package @aws-amplify/ui-angular
+
+
+
+
+
+## [0.4.13](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@0.4.12...@aws-amplify/ui-angular@0.4.13) (2020-11-23)
+
+**Note:** Version bump only for package @aws-amplify/ui-angular
+
+
+
+
+
+## [0.4.12](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@0.4.11...@aws-amplify/ui-angular@0.4.12) (2020-11-20)
+
+**Note:** Version bump only for package @aws-amplify/ui-angular
+
+
+
+
+
 ## [0.4.11](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-angular@0.4.10...@aws-amplify/ui-angular@0.4.11) (2020-11-13)
 
 **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.4.11",
+	"version": "0.4.14",
 	"description": "Angular specific wrapper for @aws-amplify/ui-components",
 	"publishConfig": {
 		"access": "public"
@@ -31,7 +31,7 @@
 		"dist/"
 	],
 	"dependencies": {
-		"@aws-amplify/ui-components": "0.9.3"
+		"@aws-amplify/ui-components": "0.9.6"
 	},
 	"devDependencies": {
 		"@angular/compiler-cli": "^7.2.1",

diff --git a/packages/amplify-ui-components/CHANGELOG.md b/packages/amplify-ui-components/CHANGELOG.md
@@ -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.
 
+## [0.9.6](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@0.9.5...@aws-amplify/ui-components@0.9.6) (2020-11-30)
+
+**Note:** Version bump only for package @aws-amplify/ui-components
+
+
+
+
+
+## [0.9.5](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@0.9.4...@aws-amplify/ui-components@0.9.5) (2020-11-23)
+
+**Note:** Version bump only for package @aws-amplify/ui-components
+
+
+
+
+
+## [0.9.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@0.9.3...@aws-amplify/ui-components@0.9.4) (2020-11-20)
+
+**Note:** Version bump only for package @aws-amplify/ui-components
+
+
+
+
+
 ## [0.9.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-components@0.9.2...@aws-amplify/ui-components@0.9.3) (2020-11-13)
 
 **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.9.3",
+  "version": "0.9.6",
   "description": "Core Amplify UI Component Library",
   "module": "dist/index.mjs",
   "main": "dist/index.js",
@@ -35,11 +35,11 @@
     "clean": "rimraf dist .stencil"
   },
   "dependencies": {
-    "@aws-amplify/auth": "3.4.11",
-    "@aws-amplify/core": "3.8.3",
-    "@aws-amplify/interactions": "3.3.11",
-    "@aws-amplify/storage": "3.3.11",
-    "@aws-amplify/xr": "2.2.11",
+    "@aws-amplify/auth": "3.4.14",
+    "@aws-amplify/core": "3.8.6",
+    "@aws-amplify/interactions": "3.3.14",
+    "@aws-amplify/storage": "3.3.14",
+    "@aws-amplify/xr": "2.2.14",
     "qrcode": "^1.4.4",
     "uuid": "^8.2.0"
   },

diff --git a/packages/amplify-ui-components/stencil.config.ts b/packages/amplify-ui-components/stencil.config.ts
@@ -24,7 +24,7 @@ export const config: Config = {
     }),
     nodePolyfills(),
     sass({
-      injectGlobalPaths: [['src/global/breakpoint.scss', '*']],
+      injectGlobalPaths: ['src/global/breakpoint.scss'],
     }),
   ],
   nodeResolve: {

diff --git a/packages/amplify-ui-react/CHANGELOG.md b/packages/amplify-ui-react/CHANGELOG.md
@@ -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.
 
+## [0.2.31](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@0.2.30...@aws-amplify/ui-react@0.2.31) (2020-11-30)
+
+**Note:** Version bump only for package @aws-amplify/ui-react
+
+
+
+
+
+## [0.2.30](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@0.2.29...@aws-amplify/ui-react@0.2.30) (2020-11-23)
+
+**Note:** Version bump only for package @aws-amplify/ui-react
+
+
+
+
+
+## [0.2.29](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@0.2.28...@aws-amplify/ui-react@0.2.29) (2020-11-20)
+
+**Note:** Version bump only for package @aws-amplify/ui-react
+
+
+
+
+
 ## [0.2.28](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-react@0.2.27...@aws-amplify/ui-react@0.2.28) (2020-11-13)
 
 **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.28",
+	"version": "0.2.31",
 	"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.9.3"
+		"@aws-amplify/ui-components": "0.9.6"
 	},
 	"peerDependencies": {
 		"react": "^16.7.0",

diff --git a/packages/amplify-ui-storybook/CHANGELOG.md b/packages/amplify-ui-storybook/CHANGELOG.md
@@ -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.
 
+## [0.2.31](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@0.2.30...@aws-amplify/ui-storybook@0.2.31) (2020-11-30)
+
+**Note:** Version bump only for package @aws-amplify/ui-storybook
+
+
+
+
+
+## [0.2.30](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@0.2.29...@aws-amplify/ui-storybook@0.2.30) (2020-11-23)
+
+**Note:** Version bump only for package @aws-amplify/ui-storybook
+
+
+
+
+
+## [0.2.29](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@0.2.28...@aws-amplify/ui-storybook@0.2.29) (2020-11-20)
+
+**Note:** Version bump only for package @aws-amplify/ui-storybook
+
+
+
+
+
 ## [0.2.28](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-storybook@0.2.27...@aws-amplify/ui-storybook@0.2.28) (2020-11-13)
 
 **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.28",
+	"version": "0.2.31",
 	"private": true,
 	"dependencies": {
-		"@aws-amplify/ui-react": "0.2.28",
+		"@aws-amplify/ui-react": "0.2.31",
 		"@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.3.8",
+		"aws-amplify": "3.3.11",
 		"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,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.30](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@0.2.29...@aws-amplify/ui-vue@0.2.30) (2020-11-30)
+
+**Note:** Version bump only for package @aws-amplify/ui-vue
+
+
+
+
+
+## [0.2.29](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@0.2.28...@aws-amplify/ui-vue@0.2.29) (2020-11-23)
+
+**Note:** Version bump only for package @aws-amplify/ui-vue
+
+
+
+
+
+## [0.2.28](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@0.2.27...@aws-amplify/ui-vue@0.2.28) (2020-11-20)
+
+**Note:** Version bump only for package @aws-amplify/ui-vue
+
+
+
+
+
 ## [0.2.27](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/ui-vue@0.2.26...@aws-amplify/ui-vue@0.2.27) (2020-11-13)
 
 **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.27",
+	"version": "0.2.30",
 	"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.9.3"
+		"@aws-amplify/ui-components": "0.9.6"
 	},
 	"scripts": {
 		"build": "npm run clean && npm run compile",

diff --git a/packages/analytics/CHANGELOG.md b/packages/analytics/CHANGELOG.md
@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@4.0.1...@aws-amplify/analytics@4.0.2) (2020-11-30)
+
+
+### Bug Fixes
+
+* **@aws-amplify/analytics:** send events when autoSessionRecord is disabled ([#7308](https://github.com/aws-amplify/amplify-js/issues/7308)) ([039aa95](https://github.com/aws-amplify/amplify-js/commit/039aa95f9a3e791f09d7566bd7baecf68c7c8cb6))
+
+
+
+
+
+## [4.0.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@4.0.0...@aws-amplify/analytics@4.0.1) (2020-11-23)
+
+**Note:** Version bump only for package @aws-amplify/analytics
+
+
+
+
+
+# [4.0.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@3.3.11...@aws-amplify/analytics@4.0.0) (2020-11-20)
+
+
+* fix(@aws-amplify/analytics)!: do not attempt to delete unused endpoints (#7245) ([d11009a](https://github.com/aws-amplify/amplify-js/commit/d11009a8f6c7fc7245eeb397eba39f468935ac16)), closes [#7245](https://github.com/aws-amplify/amplify-js/issues/7245)
+
+
+### BREAKING CHANGES
+
+* Analytics will no longer attempt to automatically delete old endpoints on updateEndpoint
+
+
+
+
+
 ## [3.3.11](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@3.3.10...@aws-amplify/analytics@3.3.11) (2020-11-13)
 
 **Note:** Version bump only for package @aws-amplify/analytics

diff --git a/packages/analytics/__tests__/Providers/AWSPinpointProvider-unit-test.ts b/packages/analytics/__tests__/Providers/AWSPinpointProvider-unit-test.ts
@@ -749,33 +749,17 @@ describe('AnalyticsProvider test', () => {
 					// Reject with error the first time we execute updateEndpoint
 					.mockImplementationOnce(async params => {
 						throw mockExceededMaxError;
-					})
-					// Succeed on the second attempt (i.e. after we go through _retryEndpointUpdate)
-					.mockImplementationOnce(async params => {
-						return 'data';
 					});
 
 				jest
 					.spyOn(Credentials, 'get')
 					.mockImplementationOnce(() => Promise.resolve(credentials));
 
-				jest
-					.spyOn(AnalyticsProvider.prototype, '_removeUnusedEndpoints')
-					.mockImplementationOnce(() => ({
-						promise: jest.fn().mockResolvedValue(true),
-					}));
-
-				const spyonRetryEndpointUpdate = jest.spyOn(
-					AnalyticsProvider.prototype,
-					'_retryEndpointUpdate'
-				);
-
 				const params = { event: { name: '_update_endpoint', immediate: true } };
 
 				await analytics.record(params, { resolve, reject });
 
-				expect(spyonUpdateEndpoint).toHaveBeenCalledTimes(2); // 1 failed + 1 successful call
-				expect(spyonRetryEndpointUpdate).toHaveBeenCalled();
+				expect(spyonUpdateEndpoint).toHaveBeenCalledTimes(1);
 
 				spyonUpdateEndpoint.mockRestore();
 			});