Merge branch 'main' into manoj-update-detox-version

aws-amplify · May 10, 2024 · 9bbefc9 · 9bbefc9
2 parents e9f15b1 + 57a77b5
commit 9bbefc9
Show file tree

Hide file tree

Showing 19 changed files with 76 additions and 220 deletions.
diff --git a/package.json b/package.json
@@ -118,8 +118,6 @@
 		"terser-webpack-plugin": "^5.3.6",
 		"ts-jest": "^29.1.1",
 		"ts-loader": "^9.4.3",
-		"tslint": "^5.7.0",
-		"tslint-config-airbnb": "^5.8.0",
 		"typedoc": "0.25.8",
 		"typedoc-plugin-extras": "^3.0.0",
 		"typedoc-plugin-missing-exports": "^2.2.0",

diff --git a/packages/api-graphql/__tests__/fixtures/with-types/API.ts b/packages/api-graphql/__tests__/fixtures/with-types/API.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 //  This file was automatically generated and should not be edited.
 

diff --git a/packages/api-graphql/__tests__/fixtures/with-types/mutations.ts b/packages/api-graphql/__tests__/fixtures/with-types/mutations.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 // this is an auto generated file. This will be overwritten
 

diff --git a/packages/api-graphql/__tests__/fixtures/with-types/queries.ts b/packages/api-graphql/__tests__/fixtures/with-types/queries.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 // this is an auto generated file. This will be overwritten
 

diff --git a/packages/api-graphql/__tests__/fixtures/with-types/subscriptions.ts b/packages/api-graphql/__tests__/fixtures/with-types/subscriptions.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 // this is an auto generated file. This will be overwritten
 

diff --git a/packages/api-graphql/__tests__/fixtures/without-types/API.ts b/packages/api-graphql/__tests__/fixtures/without-types/API.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 //  This file was automatically generated and should not be edited.
 

diff --git a/packages/api-graphql/__tests__/fixtures/without-types/mutations.ts b/packages/api-graphql/__tests__/fixtures/without-types/mutations.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 // this is an auto generated file. This will be overwritten
 

diff --git a/packages/api-graphql/__tests__/fixtures/without-types/queries.ts b/packages/api-graphql/__tests__/fixtures/without-types/queries.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 // this is an auto generated file. This will be overwritten
 

diff --git a/packages/api-graphql/__tests__/fixtures/without-types/subscriptions.ts b/packages/api-graphql/__tests__/fixtures/without-types/subscriptions.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 // this is an auto generated file. This will be overwritten
 

diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json
@@ -15,7 +15,7 @@
 	},
 	"scripts": {
 		"test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
-		"test:watch": "tslint 'src/**/*.ts' && jest -w 1 --watch",
+		"test:watch": "jest -w 1 --watch",
 		"build-with-test": "npm test && npm build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",

diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json
@@ -12,7 +12,7 @@
 	},
 	"scripts": {
 		"test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
-		"test:watch": "tslint 'src/**/*.ts' && jest -w 1 --watch",
+		"test:watch": "jest -w 1 --watch",
 		"build-with-test": "npm test && npm build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",

diff --git a/packages/datastore-storage-adapter/.npmignore b/packages/datastore-storage-adapter/.npmignore
@@ -8,6 +8,5 @@ node_modules/**
 *.log
 tsconfig.json
 tsfmt.json
-tslint.json
 typeDoc.js
-webpack.config.js
+webpack.config.js
diff --git a/packages/datastore/.npmignore b/packages/datastore/.npmignore
@@ -8,6 +8,5 @@ node_modules/**
 *.log
 tsconfig.json
 tsfmt.json
-tslint.json
 typeDoc.js
-webpack.config.js
+webpack.config.js
diff --git a/packages/datastore/__tests__/DataStore/sanityCheck.test.ts b/packages/datastore/__tests__/DataStore/sanityCheck.test.ts
@@ -196,7 +196,6 @@ describe('DataStore sanity testing checks', () => {
 							await DataStore.start();
 						});
 
-						// tslint:disable-next-line: max-line-length
 						test(`starting after unawaited clear results in a DX-friendly error (${connectedState}, ${environment})`, async () => {
 							({ DataStore, Post } = getDataStore({ online, isNode }));
 							await DataStore.start();
@@ -210,7 +209,6 @@ describe('DataStore sanity testing checks', () => {
 							await clearing;
 						});
 
-						// tslint:disable-next-line: max-line-length
 						test(`starting after unawaited stop results in a DX-friendly error (${connectedState}, ${environment})`, async () => {
 							({ DataStore, Post } = getDataStore({ online, isNode }));
 							await DataStore.start();

diff --git a/packages/notifications/package.json b/packages/notifications/package.json
@@ -12,7 +12,7 @@
 	},
 	"scripts": {
 		"test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
-		"test:watch": "tslint 'src/**/*.ts' && jest -w 1 --watch",
+		"test:watch": "jest -w 1 --watch",
 		"build-with-test": "npm run clean && npm run build",
 		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
 		"build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",

diff --git a/packages/predictions/__tests__/providers/AWSAIIdentifyPredictionsProvider.test.ts b/packages/predictions/__tests__/providers/AWSAIIdentifyPredictionsProvider.test.ts
@@ -291,7 +291,6 @@ mockGetUrl.mockImplementation(({ key, options }) => {
 		);
 	} else {
 		const identityId = options?.targetIdentityId || 'identityId';
-		// tslint:disable-next-line: max-line-length
 		url = new URL(
 			`https://bucket-name.s3.us-west-2.amazonaws.com/${level}/${identityId}/key.png?X-Amz-Algorithm=AWS4-HMAC-SHA256`,
 		);

diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -11,7 +11,7 @@
 		"access": "public"
 	},
 	"scripts": {
-		"test": "tslint 'src/**/*.ts'",
+		"test": "echo 'no-op'",
 		"test:android": "./android/gradlew test -p ./android",
 		"build-with-test": "npm run clean && npm test && tsc",
 		"build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",

diff --git a/packages/rtn-web-browser/package.json b/packages/rtn-web-browser/package.json
@@ -11,7 +11,7 @@
 		"access": "public"
 	},
 	"scripts": {
-		"test": "tslint 'src/**/*.ts'",
+		"test": "echo 'no-op'",
 		"test:android": "./android/gradlew test -p ./android",
 		"build-with-test": "npm run clean && npm test && tsc",
 		"build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",