Next major version/merge in app

.circleci/config.yml

@@ -1219,6 +1219,7 @@ releasable_branches: &releasable_branches
       - ui-components/main
       - 1.0-stable
       - geo/main
+      - in-app-messaging/main
       - next-major-version/5
 
 test_browsers: &test_browsers

package.json

@@ -28,7 +28,8 @@
 		"publish:1.0-stable": "lerna publish --conventional-commits --yes --dist-tag=stable-1.0 --message 'chore(release): Publish [ci skip]' --no-verify-access",
 		"publish:ui-components/main": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=ui-preview --preid=ui-preview --exact --no-verify-access",
 		"publish:verdaccio": "lerna publish --no-push --canary minor --dist-tag=unstable --preid=unstable --exact --force-publish --yes --no-verify-access",
-		"publish:geo/main": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=geo --preid=geo --exact --no-verify-access"
+		"publish:geo/main": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=geo --preid=geo --exact --no-verify-access",
+		"publish:in-app-messaging/main": "lerna publish --canary --force-publish \"*\" --yes --dist-tag=in-app-messaging --preid=in-app-messaging --exact --no-verify-access"
 	},
 	"husky": {
 		"hooks": {

packages/analytics/__tests__/Analytics.test.ts

@@ -1,34 +1,25 @@
+/*
+ * Copyright 2017-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+ * the License. A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
 jest.mock('../src/vendor/dom-utils', () => {
 	return {
 		delegate: jest.fn(),
 	};
 });
 
-import {
-	ClientDevice,
-	Parser,
-	ConsoleLogger as Logger,
-	Credentials,
-} from '@aws-amplify/core';
-import { AnalyticsOptions, EventAttributes, EventMetrics } from '../src/types';
+import { ClientDevice, Parser, Hub } from '@aws-amplify/core';
 import { AnalyticsClass as Analytics } from '../src/Analytics';
 import AWSAnalyticsProvider from '../src/Providers/AWSPinpointProvider';
 
-const options: AnalyticsOptions = {
-	appId: 'appId',
-	platform: 'platform',
-	clientId: 'clientId',
-	region: 'region',
-};
-
-const credentials = {
-	accessKeyId: 'accessKeyId',
-	sessionToken: 'sessionToken',
-	secretAccessKey: 'secretAccessKey',
-	identityId: 'identityId',
-	authenticated: true,
-};
-
 jest.useFakeTimers();
 
 const record_spyon = jest
@@ -37,7 +28,12 @@ const record_spyon = jest
 		return handlers.resolve();
 	});
 
+const hubSpy = jest.spyOn(Hub, 'dispatch');
+
 describe('Analytics test', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
 	describe('configure test', () => {
 		test('happy case with default parser', () => {
 			const analytics = new Analytics();
@@ -83,6 +79,16 @@ describe('Analytics test', () => {
 			analytics.configure({ mock: 'value' });
 
 			await analytics.startSession();
+			expect(hubSpy).toBeCalledWith(
+				'analytics',
+				{
+					event: 'record',
+					data: { name: '_session.start' },
+					message: 'Recording Analytics session start event',
+				},
+				'Analytics',
+				expect.anything()
+			);
 			expect(record_spyon).toBeCalled();
 		});
 	});
@@ -95,6 +101,16 @@ describe('Analytics test', () => {
 			analytics.configure({ mock: 'value' });
 
 			await analytics.stopSession();
+			expect(hubSpy).toBeCalledWith(
+				'analytics',
+				{
+					event: 'record',
+					data: { name: '_session.stop' },
+					message: 'Recording Analytics session stop event',
+				},
+				'Analytics',
+				expect.anything()
+			);
 			expect(record_spyon).toBeCalled();
 		});
 	});
@@ -105,16 +121,23 @@ describe('Analytics test', () => {
 			const provider = new AWSAnalyticsProvider();
 			analytics.addPluggable(provider);
 			analytics.configure({ mock: 'value' });
-
-			await analytics.record({
+			const event = {
 				name: 'event',
-				attributes: {
-					key: 'value',
-				},
-				metrics: {
-					metric: 123,
+				attributes: { key: 'value' },
+				metrics: { metric: 123 },
+			};
+
+			await analytics.record(event);
+			expect(hubSpy).toBeCalledWith(
+				'analytics',
+				{
+					event: 'record',
+					data: event,
+					message: 'Recording Analytics event',
 				},
-			});
+				'Analytics',
+				expect.anything()
+			);
 			expect(record_spyon).toBeCalled();
 		});
 	});

packages/analytics/src/Analytics.ts

@@ -217,7 +217,15 @@ export class AnalyticsClass {
 	 * @return - A promise which resolves if buffer doesn't overflow
 	 */
 	public async startSession(provider?: string) {
-		const params = { event: { name: '_session.start' }, provider };
+		const event = { name: '_session.start' };
+		const params = { event, provider };
+
+		dispatchAnalyticsEvent(
+			'record',
+			event,
+			'Recording Analytics session start event'
+		);
+
 		return this._sendEvent(params);
 	}
 
@@ -227,7 +235,15 @@ export class AnalyticsClass {
 	 * @return - A promise which resolves if buffer doesn't overflow
 	 */
 	public async stopSession(provider?: string) {
-		const params = { event: { name: '_session.stop' }, provider };
+		const event = { name: '_session.stop' };
+		const params = { event, provider };
+
+		dispatchAnalyticsEvent(
+			'record',
+			event,
+			'Recording Analytics session stop event'
+		);
+
 		return this._sendEvent(params);
 	}
 
@@ -276,6 +292,9 @@ export class AnalyticsClass {
 		} else {
 			params = { event, provider: providerOrAttributes };
 		}
+
+		dispatchAnalyticsEvent('record', params.event, 'Recording Analytics event');
+
 		return this._sendEvent(params);
 	}
 

packages/aws-amplify-angular/rollup.config.js

@@ -34,6 +34,7 @@ export default {
 		'aws-amplify',
 		'@ionic/angular',
 		'@aws-amplify/core',
+		'@aws-amplify/cache',
 	],
 	plugins: [
 		nodeResolve({ preferBuiltins: false, modulesOnly: true }),

packages/aws-amplify/__tests__/exports-test.ts

@@ -25,6 +25,7 @@ describe('aws-amplify', () => {
 			  "PubSub",
 			  "Cache",
 			  "Interactions",
+			  "Notifications",
 			  "a",
 			  "button",
 			  "signInButton",

packages/aws-amplify/package.json

@@ -42,6 +42,7 @@
     "@aws-amplify/datastore": "3.12.12",
     "@aws-amplify/geo": "1.3.18",
     "@aws-amplify/interactions": "4.1.3",
+    "@aws-amplify/notifications": "1.0.0",
     "@aws-amplify/predictions": "4.0.55",
     "@aws-amplify/pubsub": "4.5.5",
     "@aws-amplify/storage": "4.5.8",

packages/aws-amplify/src/index.ts

@@ -44,6 +44,7 @@ export {
 export { PubSub } from '@aws-amplify/pubsub';
 export { BrowserStorageCache as Cache } from '@aws-amplify/cache';
 export { Interactions } from '@aws-amplify/interactions';
+export { Notifications } from '@aws-amplify/notifications';
 export * from '@aws-amplify/ui';
 export { XR } from '@aws-amplify/xr';
 export { Predictions } from '@aws-amplify/predictions';

packages/core/src/Amplify.ts

@@ -27,6 +27,7 @@ export class AmplifyClass {
 	Predictions = null;
 	DataStore = null;
 	Geo = null;
+	Notifications = null;
 
 	Logger = LoggerClass;
 	ServiceWorker = null;

packages/core/src/types/types.ts

@@ -9,6 +9,9 @@ export interface AmplifyConfig {
 	Storage?: object;
 	Cache?: object;
 	Geo?: object;
+	Notifications?: {
+		InAppMessaging?: object;
+	};
 	ssr?: boolean;
 }
 

packages/notifications/.npmignore

@@ -0,0 +1,10 @@
+__mocks__/**
+__tests__/**
+Authenticator_Architecture.png
+docs/**
+jsDoc.config.json
+node_modules/**
+README.md
+.vscode/**
+.DS_Store
+*.log