chore: enable eslint and remove tslint for react-native packages (#13079

) * chore: enable eslint and remove tslint for packages: 1. packages/react-native 2. packages/rtn-push-notification 3. packages/rtn-web-browser * chore(react-native): run yarn lint:fix * chore(react-native): manual fix of linter reported errors * chore(rtn-push-notification): run yarn lint:fix * chore(rtn-web-browser): run yarn lint:fix
aws-amplify · Mar 19, 2024 · 0e0c496 · 0e0c496
1 parent 22d042d
commit 0e0c496
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 183 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -53,9 +53,9 @@ module.exports = {
 		'packages/notifications',
 		// 'packages/predictions',
 		// 'packages/pubsub',
-		'packages/react-native',
-		'packages/rtn-push-notification',
-		'packages/rtn-web-browser',
+		// 'packages/react-native',
+		// 'packages/rtn-push-notification',
+		// 'packages/rtn-web-browser',
 		// 'packages/storage',
 	],
 	rules: {

diff --git a/packages/react-native/example/src/App.tsx b/packages/react-native/example/src/App.tsx
@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import * as React from 'react';
-
-import { StyleSheet, View, Text, Platform } from 'react-native';
+import { Platform, StyleSheet, Text, View } from 'react-native';
 import { computeModPow, computeS } from '@aws-amplify/react-native';
 
 const computeModPowPayload = {
@@ -31,10 +30,10 @@ export default function App() {
 
 	React.useEffect(() => {
 		async function calc() {
-			const computeModPowResult = await computeModPow(computeModPowPayload);
-			setComputeModPowResult(computeModPowResult);
-			const computeSResult = await computeS(computeSPayload);
-			setComputeSResult(computeSResult);
+			const modPowResult = await computeModPow(computeModPowPayload);
+			setComputeModPowResult(modPowResult);
+			const sResult = await computeS(computeSPayload);
+			setComputeSResult(sResult);
 		}
 		calc();
 	}, []);

diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -19,7 +19,8 @@
 		"build": "npm run clean && npm run build:esm-cjs",
 		"clean": "rimraf lib-esm lib dist",
 		"format": "echo \"Not implemented\"",
-		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
+		"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
+		"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 88.21"
 	},
 	"dependencies": {

diff --git a/packages/react-native/src/nativeModule.ts b/packages/react-native/src/nativeModule.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NativeModules, Platform } from 'react-native';
+
 import { RTNCore } from './types';
 
 const LINKING_ERROR =

diff --git a/packages/react-native/tslint.json b/packages/react-native/tslint.json
diff --git a/packages/rtn-push-notification/package.json b/packages/rtn-push-notification/package.json
@@ -19,7 +19,8 @@
 		"build": "npm run clean && npm run build:esm-cjs",
 		"clean": "rimraf lib-esm lib dist",
 		"format": "echo \"Not implemented\"",
-		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
+		"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
+		"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 99"
 	},
 	"devDependencies": {

diff --git a/packages/rtn-push-notification/src/apis/addMessageEventListener.ts b/packages/rtn-push-notification/src/apis/addMessageEventListener.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { EmitterSubscription } from 'react-native';
+
 import { nativeEventEmitter } from '../nativeModule';
 import { NativeMessage, PushNotificationMessage } from '../types';
 import { normalizeNativeMessage } from '../utils';

diff --git a/packages/rtn-push-notification/src/apis/addTokenEventListener.ts b/packages/rtn-push-notification/src/apis/addTokenEventListener.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { EmitterSubscription } from 'react-native';
+
 import { nativeEventEmitter } from '../nativeModule';
 import { TokenPayload } from '../types';
 

diff --git a/packages/rtn-push-notification/src/apis/registerHeadlessTask.ts b/packages/rtn-push-notification/src/apis/registerHeadlessTask.ts
@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AppRegistry } from 'react-native';
-import { getConstants } from './getConstants';
+
 import { NativeMessage, PushNotificationMessage } from '../types';
 import { normalizeNativeMessage } from '../utils';
 
+import { getConstants } from './getConstants';
+
 export const registerHeadlessTask = (
 	task: (message: PushNotificationMessage | null) => Promise<void>,
 ): void => {

diff --git a/packages/rtn-push-notification/src/index.ts b/packages/rtn-push-notification/src/index.ts
@@ -13,6 +13,7 @@ import {
 	requestPermissions,
 	setBadgeCount,
 } from './apis';
+
 export {
 	PushNotificationMessage,
 	PushNotificationPermissionStatus,

diff --git a/packages/rtn-push-notification/src/nativeModule.ts b/packages/rtn-push-notification/src/nativeModule.ts
@@ -1,7 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { NativeModules, NativeEventEmitter } from 'react-native';
+import { NativeEventEmitter, NativeModules } from 'react-native';
+
 import { LINKING_ERROR } from './constants';
 import { PushNotificationNativeModule } from './types';
 

diff --git a/packages/rtn-push-notification/src/types/native.ts b/packages/rtn-push-notification/src/types/native.ts
@@ -2,11 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NativeModule } from 'react-native';
+
 import { PushNotificationMessage, PushNotificationPermissions } from './module';
 
 export interface PushNotificationNativeModule extends NativeModule {
-	completeNotification?: (completionHandlerId: string) => void;
-	getConstants: () => {
+	completeNotification?(completionHandlerId: string): void;
+	getConstants(): {
 		NativeEvent: {
 			BACKGROUND_MESSAGE_RECEIVED?: string;
 			FOREGROUND_MESSAGE_RECEIVED: string;
@@ -16,19 +17,19 @@ export interface PushNotificationNativeModule extends NativeModule {
 		};
 		NativeHeadlessTaskKey?: string;
 	};
-	getLaunchNotification: () => Promise<NativeMessage | null>;
-	getBadgeCount?: () => Promise<number>;
-	setBadgeCount?: (count: number) => void;
-	getPermissionStatus: () => Promise<NativePermissionStatus>;
-	requestPermissions: (
+	getLaunchNotification(): Promise<NativeMessage | null>;
+	getBadgeCount?(): Promise<number>;
+	setBadgeCount?(count: number): void;
+	getPermissionStatus(): Promise<NativePermissionStatus>;
+	requestPermissions(
 		permissions: PushNotificationPermissions,
-	) => Promise<boolean>;
+	): Promise<boolean>;
 }
 
-export type NativeAction = {
+export interface NativeAction {
 	deeplink?: string;
 	url?: string;
-};
+}
 
 export type NativeMessage = (ApnsMessage | FcmMessage) & {
 	token?: never;
@@ -48,7 +49,7 @@ export interface NormalizedValues {
 }
 
 // iOS
-export type ApnsMessage = {
+export interface ApnsMessage {
 	aps: {
 		alert?: {
 			body?: string;
@@ -62,12 +63,12 @@ export type ApnsMessage = {
 	};
 	rawData?: never;
 	completionHandlerId?: string;
-};
+}
 
 export type IosPermissionStatus = 'NotDetermined' | 'Authorized' | 'Denied';
 
 // Android
-export type FcmMessage = {
+export interface FcmMessage {
 	action?: NativeAction;
 	aps?: never;
 	body?: string;
@@ -79,14 +80,14 @@ export type FcmMessage = {
 	senderId?: string;
 	sendTime?: number;
 	completionHandlerId?: never;
-};
+}
 
 export type AndroidPermissionStatus =
 	| 'ShouldRequest'
 	| 'ShouldExplainThenRequest'
 	| 'Granted'
 	| 'Denied';
 
-export type TokenPayload = {
+export interface TokenPayload {
 	token: string;
-};
+}
diff --git a/packages/rtn-push-notification/src/utils/normalizeNativeMessage.ts b/packages/rtn-push-notification/src/utils/normalizeNativeMessage.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import isEmpty from 'lodash/isEmpty.js';
+
 import {
 	ApnsMessage,
 	FcmMessage,
@@ -26,6 +27,7 @@ export const normalizeNativeMessage = (
 		return null;
 	}
 	const { body, imageUrl, title, action, options, data } = normalized;
+
 	return {
 		body,
 		data,
@@ -42,13 +44,15 @@ const normalizeApnsMessage = (apnsMessage: ApnsMessage): NormalizedValues => {
 	const action = getApnsAction(data?.pinpoint) ?? {};
 	const imageUrl = data?.['media-url'];
 	const options = getApnsOptions(apnsMessage);
+
 	return { body, imageUrl, title, action, options, data };
 };
 
 const normalizeFcmMessage = (fcmMessage: FcmMessage): NormalizedValues => {
 	const { body, imageUrl, rawData: data, title } = fcmMessage;
 	const action = getFcmAction(fcmMessage.action) ?? {};
 	const options = getFcmOptions(fcmMessage);
+
 	return { body, imageUrl, title, action, options, data };
 };
 
@@ -76,6 +80,7 @@ const getApnsOptions = ({
 }: ApnsMessage): Pick<PushNotificationMessage, 'apnsOptions'> => {
 	const { subtitle } = aps.alert ?? {};
 	const apnsOptions = { ...(subtitle && { subtitle }) };
+
 	return { ...(!isEmpty(apnsOptions) && { apnsOptions }) };
 };
 
@@ -91,6 +96,7 @@ const getFcmOptions = ({
 		senderId,
 		sendTime: new Date(sendTime),
 	};
+
 	return { ...(!isEmpty(fcmOptions) && { fcmOptions }) };
 };
 

diff --git a/packages/rtn-push-notification/tslint.json b/packages/rtn-push-notification/tslint.json
diff --git a/packages/rtn-web-browser/package.json b/packages/rtn-web-browser/package.json
@@ -19,7 +19,8 @@
 		"build": "npm run clean && npm run build:esm-cjs",
 		"clean": "rimraf dist lib lib-esm",
 		"format": "echo \"Not implemented\"",
-		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
+		"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
+		"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 88.21"
 	},
 	"devDependencies": {

diff --git a/packages/rtn-web-browser/src/apis/openAuthSessionAsync.ts b/packages/rtn-web-browser/src/apis/openAuthSessionAsync.ts
@@ -7,6 +7,7 @@ import {
 	NativeEventSubscription,
 	Platform,
 } from 'react-native';
+
 import { nativeModule } from '../nativeModule';
 
 let appStateListener: NativeEventSubscription | undefined;
@@ -31,12 +32,13 @@ export const openAuthSessionAsync = async (
 const openAuthSessionIOS = async (
 	url: string,
 	redirectUrls: string[],
-	prefersEphemeralSession: boolean = false,
+	prefersEphemeralSession = false,
 ) => {
 	const redirectUrl = redirectUrls.find(
 		// take the first non-web url as the deeplink
 		item => !item.startsWith('https://') && !item.startsWith('http://'),
 	);
+
 	return nativeModule.openAuthSessionAsync(
 		url,
 		redirectUrl,
@@ -56,6 +58,7 @@ const openAuthSessionAndroid = async (url: string, redirectUrls: string[]) => {
 			// open chrome tab
 			nativeModule.openAuthSessionAsync(url),
 		]);
+
 		return redirectUrl;
 	} finally {
 		appStateListener?.remove();

diff --git a/packages/rtn-web-browser/src/nativeModule.ts b/packages/rtn-web-browser/src/nativeModule.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NativeModules } from 'react-native';
+
 import { LINKING_ERROR } from './constants';
 import { WebBrowserNativeModule } from './types';