fix(aws-amplify): Amplify.register is called per-instance, not per-import

packages/analytics/src/Analytics.ts

@@ -15,6 +15,7 @@ import {
 	Amplify,
 	ConsoleLogger as Logger,
 	Hub,
+	browserOrNode,
 	Parser,
 } from '@aws-amplify/core';
 import { AWSPinpointProvider } from './Providers/AWSPinpointProvider';
@@ -75,6 +76,11 @@ export class AnalyticsClass {
 		Hub.listen('auth', listener);
 		Hub.listen('storage', listener);
 		Hub.listen('analytics', listener);
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
 	}
 
 	public getModuleName() {
@@ -401,4 +407,3 @@ const sendEvents = () => {
 };
 
 export const Analytics = new AnalyticsClass();
-Amplify.register(Analytics);

packages/api-graphql/src/GraphQLAPI.ts

@@ -18,6 +18,7 @@ import { parse } from 'graphql/language/parser';
 import Observable from 'zen-observable-ts';
 import {
 	Amplify,
+	browserOrNode,
 	ConsoleLogger as Logger,
 	Constants,
 	Credentials,
@@ -57,6 +58,12 @@ export class GraphQLAPIClass {
 	 */
 	constructor(options) {
 		this._options = options;
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
+
 		logger.debug('API Options', this._options);
 	}
 
@@ -378,4 +385,3 @@ export class GraphQLAPIClass {
 }
 
 export const GraphQLAPI = new GraphQLAPIClass(null);
-Amplify.register(GraphQLAPI);

packages/api-rest/src/RestAPI.ts

@@ -13,6 +13,7 @@
 import { RestClient } from './RestClient';
 import {
 	Amplify,
+	browserOrNode,
 	ConsoleLogger as Logger,
 	Credentials,
 } from '@aws-amplify/core';
@@ -38,6 +39,12 @@ export class RestAPIClass {
 	 */
 	constructor(options) {
 		this._options = options;
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
+
 		logger.debug('API Options', this._options);
 	}
 
@@ -336,4 +343,3 @@ export class RestAPIClass {
 }
 
 export const RestAPI = new RestAPIClass(null);
-Amplify.register(RestAPI);

packages/api/src/API.ts

@@ -20,6 +20,7 @@ import {
 } from '@aws-amplify/api-graphql';
 import {
 	Amplify,
+	browserOrNode,
 	ConsoleLogger as Logger,
 	Credentials,
 } from '@aws-amplify/core';
@@ -52,6 +53,12 @@ export class APIClass {
 		this._options = options;
 		this._restApi = new RestAPIClass(options);
 		this._graphqlApi = new GraphQLAPIClass(options);
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
+
 		logger.debug('API Options', this._options);
 	}
 
@@ -196,4 +203,3 @@ export class APIClass {
 }
 
 export const API = new APIClass(null);
-Amplify.register(API);

packages/auth/src/Auth.ts

@@ -120,6 +120,11 @@ export class AuthClass {
 					break;
 			}
 		});
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (JS.browserOrNode().isBrowser) {
+			Amplify.register(this);
+		}
 	}
 
 	public getModuleName() {
@@ -2085,5 +2090,3 @@ export class AuthClass {
 }
 
 export const Auth = new AuthClass(null);
-
-Amplify.register(Auth);

packages/core/src/Credentials.ts

@@ -1,6 +1,6 @@
 import { ConsoleLogger as Logger } from './Logger';
 import { StorageHelper } from './StorageHelper';
-import { makeQuerablePromise } from './JS';
+import { makeQuerablePromise, browserOrNode } from './JS';
 import { FacebookOAuth, GoogleOAuth } from './OAuthHelper';
 import { jitteredExponentialRetry } from './Util';
 import { ICredentials } from './types';
@@ -40,6 +40,11 @@ export class CredentialsClass {
 		this.configure(config);
 		this._refreshHandlers['google'] = GoogleOAuth.refreshGoogleToken;
 		this._refreshHandlers['facebook'] = FacebookOAuth.refreshFacebookToken;
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
 	}
 
 	public getModuleName() {
@@ -546,8 +551,6 @@ export class CredentialsClass {
 
 export const Credentials = new CredentialsClass(null);
 
-Amplify.register(Credentials);
-
 /**
  * @deprecated use named import
  */

packages/datastore/src/datastore/datastore.ts

@@ -1,4 +1,10 @@
-import { Amplify, ConsoleLogger as Logger, Hub, JS } from '@aws-amplify/core';
+import {
+	Amplify,
+	browserOrNode,
+	ConsoleLogger as Logger,
+	Hub,
+	JS,
+} from '@aws-amplify/core';
 import { Draft, immerable, produce, setAutoFreeze } from 'immer';
 import { v4 as uuid4 } from 'uuid';
 import Observable, { ZenObservable } from 'zen-observable-ts';
@@ -524,6 +530,13 @@ class DataStore {
 	private sync: SyncEngine;
 	private syncPageSize: number;
 
+	constructor() {
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
+	}
+
 	getModuleName() {
 		return 'DataStore';
 	}
@@ -1047,6 +1060,5 @@ class DataStore {
 }
 
 const instance = new DataStore();
-Amplify.register(instance);
 
 export { DataStore as DataStoreClass, initSchema, instance as DataStore };

packages/interactions/src/Interactions.ts

@@ -17,7 +17,11 @@ import {
 	InteractionsMessage,
 	InteractionsResponse,
 } from './types';
-import { Amplify, ConsoleLogger as Logger } from '@aws-amplify/core';
+import {
+	Amplify,
+	browserOrNode,
+	ConsoleLogger as Logger,
+} from '@aws-amplify/core';
 import { AWSLexProvider } from './Providers';
 const logger = new Logger('Interactions');
 
@@ -35,6 +39,11 @@ export class InteractionsClass {
 		this._options = options;
 		logger.debug('Interactions Options', this._options);
 		this._pluggables = {};
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
 	}
 
 	public getModuleName() {
@@ -147,4 +156,3 @@ export class InteractionsClass {
 }
 
 export const Interactions = new InteractionsClass(null);
-Amplify.register(Interactions);

packages/predictions/src/Predictions.ts

@@ -22,7 +22,11 @@ import {
 	AbstractInterpretPredictionsProvider,
 	AbstractPredictionsProvider,
 } from './types/Providers';
-import { Amplify, ConsoleLogger as Logger } from '@aws-amplify/core';
+import {
+	Amplify,
+	browserOrNode,
+	ConsoleLogger as Logger,
+} from '@aws-amplify/core';
 
 const logger = new Logger('Predictions');
 
@@ -42,6 +46,11 @@ export class PredictionsClass {
 		this._convertPluggables = [];
 		this._identifyPluggables = [];
 		this._interpretPluggables = [];
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
 	}
 
 	public getModuleName() {
@@ -246,4 +255,3 @@ export class PredictionsClass {
 }
 
 export const Predictions = new PredictionsClass({});
-Amplify.register(Predictions);

packages/pubsub/src/PubSub.ts

@@ -73,6 +73,11 @@ export class PubSubClass {
 		logger.debug('PubSub Options', this._options);
 		this._pluggables = [];
 		this.subscribe = this.subscribe.bind(this);
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
 	}
 
 	public getModuleName() {
@@ -183,4 +188,3 @@ export class PubSubClass {
 }
 
 export const PubSub = new PubSubClass(null);
-Amplify.register(PubSub);

packages/pushnotification/__tests__/PushNotification-test.ts

@@ -1,3 +1,14 @@
+jest.mock('@aws-amplify/core', () => ({
+	__esModule: true,
+	...jest.requireActual('@aws-amplify/core'),
+	browserOrNode() {
+		return {
+			isBrowser: true,
+			isNode: false,
+		};
+	},
+}));
+
 import { DeviceEventEmitter, Platform, NativeModules } from 'react-native';
 import Amplify from 'aws-amplify';
 import PushNotificationIOS from '@react-native-community/push-notification-ios';
@@ -73,12 +84,12 @@ describe('PushNotification:', () => {
 			// Spy should be at 0 (it was already called on import)
 			expect(registerSpy).toHaveBeenCalledTimes(0);
 
-			// Global Amplify should keep original instance, not new instances
+			// Global Amplify will always reference last registered instance
 			const NewPushNotification = new PushNotification(null);
-			expect(Amplify.Pushnotification).not.toEqual(NewPushNotification);
+			expect(Amplify.Pushnotification).toEqual(NewPushNotification);
 
-			// Amplify.register should not have been called for the new instance
-			expect(registerSpy).toHaveBeenCalledTimes(0);
+			// Amplify.register should be called for the new instance
+			expect(registerSpy).toHaveBeenCalledTimes(1);
 			registerSpy.mockClear();
 		});
 	});

packages/pushnotification/src/PushNotification.ts

@@ -19,7 +19,12 @@ import {
 	AppState,
 } from 'react-native';
 import PushNotificationIOS from '@react-native-community/push-notification-ios';
-import { Amplify, ConsoleLogger as Logger, JS } from '@aws-amplify/core';
+import {
+	Amplify,
+	browserOrNode,
+	ConsoleLogger as Logger,
+	isEmpty,
+} from '@aws-amplify/core';
 
 const logger = new Logger('Notification');
 
@@ -56,14 +61,19 @@ export default class PushNotification {
 		this._iosInitialized = false;
 
 		this._notificationOpenedHandlers = [];
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
 	}
 
 	getModuleName() {
 		return 'Pushnotification';
 	}
 
 	configure(config) {
-		if (JS.isEmpty(config)) return this._config;
+		if (isEmpty(config)) return this._config;
 		let conf = config ? config.PushNotification || config : {};
 
 		if (config['aws_mobile_analytics_app_id']) {

packages/pushnotification/src/index.ts

@@ -10,11 +10,9 @@
  * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-import { Amplify } from '@aws-amplify/core';
 import NotificationClass from './PushNotification';
 
 const _instance = new NotificationClass(null);
 const PushNotification = _instance;
-Amplify.register(PushNotification);
 
 export default PushNotification;

packages/storage/src/Storage.ts

@@ -11,7 +11,12 @@
  * and limitations under the License.
  */
 
-import { ConsoleLogger as Logger, Parser } from '@aws-amplify/core';
+import {
+	Amplify,
+	browserOrNode,
+	ConsoleLogger as Logger,
+	Parser,
+} from '@aws-amplify/core';
 import { AWSS3Provider } from './providers';
 import { StorageProvider } from './types';
 
@@ -46,6 +51,11 @@ export class Storage {
 		this.put = this.put.bind(this);
 		this.remove = this.remove.bind(this);
 		this.list = this.list.bind(this);
+
+		// Register module each time on the client, but not on the server to prevent memory leaks
+		if (!browserOrNode().isNode) {
+			Amplify.register(this);
+		}
 	}
 
 	public getModuleName() {

packages/storage/src/index.ts

@@ -13,7 +13,7 @@
 
 import { Storage as StorageClass } from './Storage';
 
-import { Amplify, ConsoleLogger as Logger } from '@aws-amplify/core';
+import { ConsoleLogger as Logger } from '@aws-amplify/core';
 
 const logger = new Logger('Storage');
 
@@ -48,7 +48,6 @@ const getInstance = () => {
 };
 
 export const Storage: StorageClass = getInstance();
-Amplify.register(Storage);
 
 /**
  * @deprecated use named import