Merge branch 'main' into main

aws-amplify · Dec 2, 2020 · 0237962 · 0237962
2 parents 997d110 + 4d0a2e3
commit 0237962
Show file tree

Hide file tree

Showing 67 changed files with 849 additions and 167 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/packages/amplify-ui-angular/CHANGELOG.md b/packages/amplify-ui-angular/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.
 
+## [0.4.14](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (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/[email protected]...@aws-amplify/[email protected]) (2020-11-23)
 
 **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.13",
+	"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.5"
+		"@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,14 @@
 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/[email protected]...@aws-amplify/[email protected]) (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/[email protected]...@aws-amplify/[email protected]) (2020-11-23)
 
 **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.5",
+  "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.13",
-    "@aws-amplify/core": "3.8.5",
-    "@aws-amplify/interactions": "3.3.13",
-    "@aws-amplify/storage": "3.3.13",
-    "@aws-amplify/xr": "2.2.13",
+    "@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,14 @@
 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/[email protected]...@aws-amplify/[email protected]) (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/[email protected]...@aws-amplify/[email protected]) (2020-11-23)
 
 **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.30",
+	"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.5"
+		"@aws-amplify/ui-components": "0.9.6"
 	},
 	"peerDependencies": {
 		"react": "^16.7.0",

diff --git a/packages/amplify-ui-react/webpack.config.js b/packages/amplify-ui-react/webpack.config.js
@@ -50,4 +50,7 @@ module.exports = {
 			},
 		],
 	},
+	node: {
+		fs: 'empty',
+	},
 };
diff --git a/packages/amplify-ui-storybook/CHANGELOG.md b/packages/amplify-ui-storybook/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.
 
+## [0.2.31](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (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/[email protected]...@aws-amplify/[email protected]) (2020-11-23)
 
 **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.30",
+	"version": "0.2.31",
 	"private": true,
 	"dependencies": {
-		"@aws-amplify/ui-react": "0.2.30",
+		"@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.10",
+		"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,14 @@
 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/[email protected]...@aws-amplify/[email protected]) (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/[email protected]...@aws-amplify/[email protected]) (2020-11-23)
 
 **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.29",
+	"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.5"
+		"@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,17 @@
 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/[email protected]...@aws-amplify/[email protected]) (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/[email protected]...@aws-amplify/[email protected]) (2020-11-23)
 
 **Note:** Version bump only for package @aws-amplify/analytics

diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/analytics",
-	"version": "4.0.1",
+	"version": "4.0.2",
 	"description": "Analytics category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -43,8 +43,8 @@
 	},
 	"homepage": "https://aws-amplify.github.io/",
 	"dependencies": {
-		"@aws-amplify/cache": "3.1.38",
-		"@aws-amplify/core": "3.8.5",
+		"@aws-amplify/cache": "3.1.39",
+		"@aws-amplify/core": "3.8.6",
 		"@aws-sdk/client-firehose": "1.0.0-rc.4",
 		"@aws-sdk/client-kinesis": "1.0.0-rc.4",
 		"@aws-sdk/client-personalize-events": "1.0.0-rc.4",

diff --git a/packages/analytics/src/Analytics.ts b/packages/analytics/src/Analytics.ts
@@ -99,6 +99,11 @@ export class AnalyticsClass {
 			this._disabled = true;
 		}
 
+		// turn on the autoSessionRecord if not specified
+		if (this._config['autoSessionRecord'] === undefined) {
+			this._config['autoSessionRecord'] = true;
+		}
+
 		this._pluggables.forEach(pluggable => {
 			// for backward compatibility
 			const providerConfig =
@@ -109,6 +114,7 @@ export class AnalyticsClass {
 
 			pluggable.configure({
 				disabled: this._config['disabled'],
+				autoSessionRecord: this._config['autoSessionRecord'],
 				...providerConfig,
 			});
 		});
@@ -117,11 +123,6 @@ export class AnalyticsClass {
 			this.addPluggable(new AWSPinpointProvider());
 		}
 
-		// turn on the autoSessionRecord if not specified
-		if (this._config['autoSessionRecord'] === undefined) {
-			this._config['autoSessionRecord'] = true;
-		}
-
 		dispatchAnalyticsEvent(
 			'configured',
 			null,

diff --git a/packages/analytics/src/Providers/AWSPinpointProvider.ts b/packages/analytics/src/Providers/AWSPinpointProvider.ts
@@ -119,6 +119,10 @@ export class AWSPinpointProvider implements AnalyticsProvider {
 		const conf = config || {};
 		this._config = Object.assign({}, this._config, conf);
 
+		// If autoSessionRecord is enabled, we need to wait for the endpoint to be
+		// updated before sending any events. See `sendEvents` in `Analytics.ts`
+		this._endpointGenerating = !!config['autoSessionRecord'];
+
 		if (this._config.appId && !this._config.disabled) {
 			if (!this._config.endpointId) {
 				const cacheKey = this.getProviderName() + '_' + this._config.appId;

diff --git a/packages/analytics/src/types/Provider.ts b/packages/analytics/src/types/Provider.ts
@@ -17,7 +17,7 @@ export interface PromiseHandlers {
 }
 
 export interface AnalyticsProvider {
-	// you need to implement those  methods
+	// you need to implement those methods
 
 	// configure your provider
 	configure(config: object): object;

diff --git a/packages/api-graphql/CHANGELOG.md b/packages/api-graphql/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.
 
+## [1.2.14](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-11-30)
+
+**Note:** Version bump only for package @aws-amplify/api-graphql
+
+
+
+
+
 ## [1.2.13](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-11-23)
 
 **Note:** Version bump only for package @aws-amplify/api-graphql

diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/api-graphql",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "description": "Api-graphql category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -44,11 +44,11 @@
     "@types/zen-observable": "^0.8.0"
   },
   "dependencies": {
-    "@aws-amplify/api-rest": "1.2.13",
-    "@aws-amplify/auth": "3.4.13",
-    "@aws-amplify/cache": "3.1.38",
-    "@aws-amplify/core": "3.8.5",
-    "@aws-amplify/pubsub": "3.2.11",
+    "@aws-amplify/api-rest": "1.2.14",
+    "@aws-amplify/auth": "3.4.14",
+    "@aws-amplify/cache": "3.1.39",
+    "@aws-amplify/core": "3.8.6",
+    "@aws-amplify/pubsub": "3.2.12",
     "graphql": "14.0.0",
     "uuid": "^3.2.1",
     "zen-observable-ts": "0.8.19"

diff --git a/packages/api-rest/CHANGELOG.md b/packages/api-rest/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.
 
+## [1.2.14](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-11-30)
+
+**Note:** Version bump only for package @aws-amplify/api-rest
+
+
+
+
+
 ## [1.2.13](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2020-11-23)
 
 

diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/api-rest",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "description": "Api-rest category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -41,7 +41,7 @@
   },
   "homepage": "https://aws-amplify.github.io/",
   "dependencies": {
-    "@aws-amplify/core": "3.8.5",
+    "@aws-amplify/core": "3.8.6",
     "axios": "0.19.0"
   },
   "jest": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,4 +50,7 @@ module.exports = { @@
     			},
     		],
     	},
+    	node: {
+    		fs: 'empty',
+    	},
     };