fix: Update Auth to import JS using named export (aws-amplify#10033)

Imports specific functions instead of the whole JS module to improve bundle size
stocaaro · Jun 29, 2022 · 11b537c · 11b537c
1 parent fb1f02c
commit 11b537c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/packages/auth/__tests__/hosted-ui.test.ts b/packages/auth/__tests__/hosted-ui.test.ts
@@ -157,7 +157,8 @@ jest.mock('amazon-cognito-identity-js/lib/CognitoUser', () => {
 	return CognitoUser;
 });
 
-import { Hub, Credentials, StorageHelper, JS } from '@aws-amplify/core';
+import * as AmplifyCore from '@aws-amplify/core';
+const { Hub, Credentials, StorageHelper } = AmplifyCore;
 
 const authOptionsWithOAuth: AuthOptions = {
 	userPoolId: 'awsUserPoolsId',
@@ -263,7 +264,7 @@ describe('Hosted UI tests', () => {
 			};
 		});
 
-		jest.spyOn(JS, 'browserOrNode').mockImplementation(() => ({
+		jest.spyOn(AmplifyCore, 'browserOrNode').mockImplementation(() => ({
 			isBrowser: true,
 			isNode: false,
 		}));
@@ -317,7 +318,7 @@ describe('Hosted UI tests', () => {
 			};
 		});
 
-		jest.spyOn(JS, 'browserOrNode').mockImplementation(() => ({
+		jest.spyOn(AmplifyCore, 'browserOrNode').mockImplementation(() => ({
 			isBrowser: false,
 			isNode: true,
 		}));
@@ -371,7 +372,7 @@ describe('Hosted UI tests', () => {
 			};
 		});
 
-		jest.spyOn(JS, 'browserOrNode').mockImplementation(() => ({
+		jest.spyOn(AmplifyCore, 'browserOrNode').mockImplementation(() => ({
 			isBrowser: false,
 			isNode: true,
 		}));
@@ -417,7 +418,7 @@ describe('Hosted UI tests', () => {
 			};
 		});
 
-		jest.spyOn(JS, 'browserOrNode').mockImplementation(() => ({
+		jest.spyOn(AmplifyCore, 'browserOrNode').mockImplementation(() => ({
 			isBrowser: true,
 			isNode: false,
 		}));

diff --git a/packages/auth/src/Auth.ts b/packages/auth/src/Auth.ts
@@ -41,7 +41,7 @@ import {
 	StorageHelper,
 	ICredentials,
 	Parser,
-	JS,
+	browserOrNode,
 	UniversalStorage,
 	urlSafeDecode,
 } from '@aws-amplify/core';
@@ -1905,7 +1905,7 @@ export class AuthClass {
 		resolve: () => void,
 		reject: (reason?: any) => void
 	) {
-		const { isBrowser } = JS.browserOrNode();
+		const { isBrowser } = browserOrNode();
 
 		if (isBrowser) {
 			this.oAuthSignOutRedirectOrReject(reject);
@@ -2273,7 +2273,7 @@ export class AuthClass {
 			);
 
 			const currentUrl =
-				URL || (JS.browserOrNode().isBrowser ? window.location.href : '');
+				URL || (browserOrNode().isBrowser ? window.location.href : '');
 
 			const hasCodeOrError = !!(parse(currentUrl).query || '')
 				.split('&')

diff --git a/packages/auth/src/urlListener.ts b/packages/auth/src/urlListener.ts
@@ -10,14 +10,14 @@
  * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-import { JS } from '@aws-amplify/core';
+import { browserOrNode } from '@aws-amplify/core';
 
 export default callback => {
-	if (JS.browserOrNode().isBrowser && window.location) {
+	if (browserOrNode().isBrowser && window.location) {
 		const url = window.location.href;
 
 		callback({ url });
-	} else if (JS.browserOrNode().isNode) {
+	} else if (browserOrNode().isNode) {
 		// continue building on ssr
 		() => {}; // noop
 	} else {