chore: Upgrade Prettier (aws-amplify#13017)

sushpatg · Feb 15, 2024 · 1fdbb12 · 1fdbb12
1 parent b735feb
commit 1fdbb12
Show file tree

Hide file tree

Showing 488 changed files with 4,033 additions and 4,005 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yaml b/.github/ISSUE_TEMPLATE/1.bug_report.yaml
@@ -96,9 +96,9 @@ body:
         Which major version of `aws-amplify` are you using?
       multiple: false
       options:
-      - v6
-      - v5
-      - Older than v5
+        - v6
+        - v5
+        - Older than v5
     validations:
       required: true
   - type: dropdown
@@ -126,10 +126,10 @@ body:
         How have you deployed the backend resources?
       multiple: false
       options:
-      - Amplify CLI
-      - Amplify Gen 2 (Preview)
-      - CDK
-      - Other
+        - Amplify CLI
+        - Amplify Gen 2 (Preview)
+        - CDK
+        - Other
   - type: textarea
     attributes:
       label: Environment information

diff --git a/jest.config.js b/jest.config.js
@@ -1,11 +1,7 @@
 /** @type {import('jest').Config} */
 module.exports = {
 	workerIdleMemoryLimit: '512MB',
-	coveragePathIgnorePatterns: [
-		'/node_modules/',
-		'dist',
-		'__tests__',
-	],
+	coveragePathIgnorePatterns: ['/node_modules/', 'dist', '__tests__'],
 	setupFiles: ['../../jest.setup.js'],
 	testEnvironment: 'jsdom',
 	testRegex: '/__tests__/.*\\.(test|spec)\\.[jt]sx?$',

diff --git a/package.json b/package.json
@@ -110,7 +110,7 @@
 		"lerna": "^7.4.2",
 		"license-check-and-add": "^4.0.5",
 		"mkdirp": "^3.0.1",
-		"prettier": "^3.1.0",
+		"prettier": "^3.2.5",
 		"rimraf": "^2.6.2",
 		"rollup": "^4.9.6",
 		"size-limit": "^8.1.0",

diff --git a/packages/adapter-nextjs/__tests__/createServerRunner.test.ts b/packages/adapter-nextjs/__tests__/createServerRunner.test.ts
@@ -24,7 +24,7 @@ jest.mock(
 	'../src/utils/createCookieStorageAdapterFromNextServerContext',
 	() => ({
 		createCookieStorageAdapterFromNextServerContext: jest.fn(),
-	})
+	}),
 );
 
 describe('createServerRunner', () => {
@@ -92,7 +92,7 @@ describe('createServerRunner', () => {
 				expect(mockRunWithAmplifyServerContextCore).toHaveBeenCalledWith(
 					mockAmplifyConfig,
 					{},
-					operation
+					operation,
 				);
 			});
 		});
@@ -106,11 +106,11 @@ describe('createServerRunner', () => {
 					const operation = jest.fn();
 					runWithAmplifyServerContext({ operation, nextServerContext: null });
 					expect(
-						mockCreateAWSCredentialsAndIdentityIdProvider
+						mockCreateAWSCredentialsAndIdentityIdProvider,
 					).toHaveBeenCalledWith(mockAmplifyConfig.Auth, sharedInMemoryStorage);
 					expect(mockCreateUserPoolsTokenProvider).toHaveBeenCalledWith(
 						mockAmplifyConfig.Auth,
-						sharedInMemoryStorage
+						sharedInMemoryStorage,
 					);
 				});
 			});
@@ -124,7 +124,7 @@ describe('createServerRunner', () => {
 						remove: jest.fn(),
 					};
 					mockCreateKeyValueStorageFromCookieStorageAdapter.mockReturnValueOnce(
-						mockCookieStorageAdapter
+						mockCookieStorageAdapter,
 					);
 					const mockNextServerContext = {
 						req: {
@@ -145,14 +145,14 @@ describe('createServerRunner', () => {
 							mockNextServerContext as unknown as NextServer.Context,
 					});
 					expect(
-						mockCreateAWSCredentialsAndIdentityIdProvider
+						mockCreateAWSCredentialsAndIdentityIdProvider,
 					).toHaveBeenCalledWith(
 						mockAmplifyConfig.Auth,
-						mockCookieStorageAdapter
+						mockCookieStorageAdapter,
 					);
 					expect(mockCreateUserPoolsTokenProvider).toHaveBeenCalledWith(
 						mockAmplifyConfig.Auth,
-						mockCookieStorageAdapter
+						mockCookieStorageAdapter,
 					);
 				});
 			});

diff --git a/...es/adapter-nextjs/__tests__/utils/createCookieStorageAdapterFromNextServerContext.test.ts b/...es/adapter-nextjs/__tests__/utils/createCookieStorageAdapterFromNextServerContext.test.ts
@@ -49,7 +49,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 				({
 					get: mockGetFunc,
 					getAll: mockGetAllFunc,
-				}) as any
+				}) as any,
 		);
 
 		jest.spyOn(response, 'cookies', 'get').mockImplementation(() => ({
@@ -75,7 +75,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 		it('gets cookie by calling `get` method of the underlying cookie store with a encoded cookie name', () => {
 			result.get(mockKeyWithEncoding);
 			expect(mockGetFunc).toHaveBeenCalledWith(
-				encodeURIComponent(mockKeyWithEncoding)
+				encodeURIComponent(mockKeyWithEncoding),
 			);
 		});
 
@@ -89,7 +89,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			expect(mockSetFunc).toHaveBeenCalledWith(
 				mockKey,
 				mockValue,
-				undefined /* didn't specify the options param in the call */
+				undefined /* didn't specify the options param in the call */,
 			);
 		});
 
@@ -98,7 +98,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			expect(mockSetFunc).toHaveBeenCalledWith(
 				encodeURIComponent(mockKeyWithEncoding),
 				mockValue,
-				{ sameSite: 'lax' }
+				{ sameSite: 'lax' },
 			);
 		});
 
@@ -110,7 +110,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 		it('deletes cookie by calling  the `delete` method of the underlying cookie store with a encoded cookie name', () => {
 			result.delete(mockKeyWithEncoding);
 			expect(mockDeleteFunc).toHaveBeenCalledWith(
-				encodeURIComponent(mockKeyWithEncoding)
+				encodeURIComponent(mockKeyWithEncoding),
 			);
 		});
 	});
@@ -124,13 +124,13 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 				({
 					get: mockGetFunc,
 					getAll: mockGetAllFunc,
-				}) as any
+				}) as any,
 		);
 		jest.spyOn(response, 'headers', 'get').mockImplementation(
 			() =>
 				({
 					append: mockAppend,
-				}) as any
+				}) as any,
 		);
 
 		const mockContext = {
@@ -156,7 +156,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 		it('gets cookie by calling `get` method of the underlying cookie store with a encoded cookie name', () => {
 			result.get(mockKeyWithEncoding);
 			expect(mockGetFunc).toHaveBeenCalledWith(
-				encodeURIComponent(mockKeyWithEncoding)
+				encodeURIComponent(mockKeyWithEncoding),
 			);
 		});
 
@@ -173,7 +173,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 					mockSerializeOptions.domain
 				};Expires=${mockSerializeOptions.expires.toUTCString()};HttpOnly;SameSite=${
 					mockSerializeOptions.sameSite
-				};Secure`
+				};Secure`,
 			);
 		});
 
@@ -185,15 +185,15 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 					mockSerializeOptions.domain
 				};Expires=${mockSerializeOptions.expires.toUTCString()};HttpOnly;SameSite=${
 					mockSerializeOptions.sameSite
-				};Secure`
+				};Secure`,
 			);
 		});
 
 		it('sets cookie by calling the `set` method of the underlying cookie store without options', () => {
 			result.set(mockKey, mockValue, undefined);
 			expect(mockAppend).toHaveBeenCalledWith(
 				'Set-Cookie',
-				`${mockKey}=${mockValue};`
+				`${mockKey}=${mockValue};`,
 			);
 		});
 
@@ -205,15 +205,15 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			});
 			expect(mockAppend).toHaveBeenCalledWith(
 				'Set-Cookie',
-				`${mockKey}=${mockValue};`
+				`${mockKey}=${mockValue};`,
 			);
 		});
 
 		it('deletes cookie by calling  the `delete` method of the underlying cookie store', () => {
 			result.delete(mockKey);
 			expect(mockAppend).toHaveBeenCalledWith(
 				'Set-Cookie',
-				`${mockKey}=;Expires=${DATE_IN_THE_PAST.toUTCString()}`
+				`${mockKey}=;Expires=${DATE_IN_THE_PAST.toUTCString()}`,
 			);
 		});
 
@@ -222,8 +222,8 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			expect(mockAppend).toHaveBeenCalledWith(
 				'Set-Cookie',
 				`${encodeURIComponent(
-					mockKeyWithEncoding
-				)}=;Expires=${DATE_IN_THE_PAST.toUTCString()}`
+					mockKeyWithEncoding,
+				)}=;Expires=${DATE_IN_THE_PAST.toUTCString()}`,
 			);
 		});
 	});
@@ -241,7 +241,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 		it('gets cookie by calling `get` method of the underlying cookie store with a encoded cookie name', () => {
 			result.get(mockKeyWithEncoding);
 			expect(mockNextCookiesFuncReturn.get).toHaveBeenCalledWith(
-				encodeURIComponent(mockKeyWithEncoding)
+				encodeURIComponent(mockKeyWithEncoding),
 			);
 		});
 
@@ -255,7 +255,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			expect(mockNextCookiesFuncReturn.set).toHaveBeenCalledWith(
 				mockKey,
 				mockValue,
-				undefined
+				undefined,
 			);
 		});
 
@@ -264,7 +264,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			expect(mockNextCookiesFuncReturn.set).toHaveBeenCalledWith(
 				encodeURIComponent(mockKeyWithEncoding),
 				mockValue,
-				undefined
+				undefined,
 			);
 		});
 
@@ -276,7 +276,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 		it('deletes cookie by calling  the `delete` method of the underlying cookie store with a encoded cookie name', () => {
 			result.delete(mockKeyWithEncoding);
 			expect(mockNextCookiesFuncReturn.delete).toHaveBeenCalledWith(
-				encodeURIComponent(mockKeyWithEncoding)
+				encodeURIComponent(mockKeyWithEncoding),
 			);
 		});
 	});
@@ -318,21 +318,21 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			});
 			expect(setHeaderSpy).toHaveBeenCalledWith(
 				'Set-Cookie',
-				'key4=value4;HttpOnly'
+				'key4=value4;HttpOnly',
 			);
 
 			result.delete('key3');
 			expect(setHeaderSpy).toHaveBeenCalledWith(
 				'Set-Cookie',
-				`key3=;Expires=${DATE_IN_THE_PAST.toUTCString()}`
+				`key3=;Expires=${DATE_IN_THE_PAST.toUTCString()}`,
 			);
 		});
 
 		it('operates with the underlying cookie store with encoded cookie names', () => {
 			// these the auth keys generated by Amplify
 			const encodedCookieName1 = encodeURIComponent('[email protected]');
 			const encodedCookieName2 = encodeURIComponent(
-				'[email protected]'
+				'[email protected]',
 			);
 
 			const mockCookies = {
@@ -375,18 +375,18 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			});
 
 			const encodedCookieName = encodeURIComponent(
-				'[email protected]'
+				'[email protected]',
 			);
 			result.set(encodeURIComponent('[email protected]'), 'value5');
 			expect(setHeaderSpy).toHaveBeenCalledWith(
 				'Set-Cookie',
-				`${encodeURIComponent(encodedCookieName)}=value5;`
+				`${encodeURIComponent(encodedCookieName)}=value5;`,
 			);
 
 			result.delete('key3');
 			expect(setHeaderSpy).toHaveBeenCalledWith(
 				'Set-Cookie',
-				`key3=;Expires=${DATE_IN_THE_PAST.toUTCString()}`
+				`key3=;Expires=${DATE_IN_THE_PAST.toUTCString()}`,
 			);
 		});
 	});
@@ -396,7 +396,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 			createCookieStorageAdapterFromNextServerContext({
 				request: undefined,
 				response: new ServerResponse({} as any),
-			} as any)
+			} as any),
 		).toThrow();
 	});
 });
diff --git a/packages/adapter-nextjs/src/utils/createCookieStorageAdapterFromNextServerContext.ts b/packages/adapter-nextjs/src/utils/createCookieStorageAdapterFromNextServerContext.ts
@@ -164,7 +164,7 @@ const createCookieStorageAdapterFromGetServerSidePropsContext = (
 				? {
 						name,
 						value,
-				  }
+					}
 				: undefined;
 		},
 		getAll() {

diff --git a/packages/adapter-nextjs/src/utils/createRunWithAmplifyServerContext.ts b/packages/adapter-nextjs/src/utils/createRunWithAmplifyServerContext.ts
@@ -34,7 +34,7 @@ export const createRunWithAmplifyServerContext = ({
 								createCookieStorageAdapterFromNextServerContext(
 									nextServerContext,
 								),
-						  );
+							);
 				const credentialsProvider = createAWSCredentialsAndIdentityIdProvider(
 					resourcesConfig.Auth,
 					keyValueStorage,

diff --git a/packages/analytics/__tests__/providers/kinesis-firehose/apis/flushEvents.test.ts b/packages/analytics/__tests__/providers/kinesis-firehose/apis/flushEvents.test.ts
@@ -26,7 +26,7 @@ describe('Analytics Kinesis Firehose API: flushEvents', () => {
 	beforeEach(() => {
 		mockResolveConfig.mockReturnValue(mockKinesisConfig);
 		mockResolveCredentials.mockReturnValue(
-			Promise.resolve(mockCredentialConfig)
+			Promise.resolve(mockCredentialConfig),
 		);
 		mockGetEventBuffer.mockImplementation(() => ({
 			flushAll: mockFlushAll,
@@ -50,7 +50,7 @@ describe('Analytics Kinesis Firehose API: flushEvents', () => {
 			expect.objectContaining({
 				...mockKinesisConfig,
 				...mockCredentialConfig,
-			})
+			}),
 		);
 		expect(mockFlushAll).toHaveBeenCalledTimes(1);
 	});
@@ -62,7 +62,7 @@ describe('Analytics Kinesis Firehose API: flushEvents', () => {
 		await new Promise(process.nextTick);
 		expect(loggerWarnSpy).toHaveBeenCalledWith(
 			expect.any(String),
-			expect.any(Error)
+			expect.any(Error),
 		);
 	});
 });
diff --git a/packages/analytics/__tests__/providers/kinesis-firehose/apis/record.test.ts b/packages/analytics/__tests__/providers/kinesis-firehose/apis/record.test.ts
@@ -35,7 +35,7 @@ describe('Analytics KinesisFirehose API: record', () => {
 		mockIsAnalyticsEnabled.mockReturnValue(true);
 		mockResolveConfig.mockReturnValue(mockKinesisConfig);
 		mockResolveCredentials.mockReturnValue(
-			Promise.resolve(mockCredentialConfig)
+			Promise.resolve(mockCredentialConfig),
 		);
 		mockGetEventBuffer.mockImplementation(() => ({
 			append: mockAppend,
@@ -60,7 +60,7 @@ describe('Analytics KinesisFirehose API: record', () => {
 				streamName: mockRecordInput.streamName,
 				event: mockRecordInput.data,
 				retryCount: 0,
-			})
+			}),
 		);
 	});
 
@@ -72,7 +72,7 @@ describe('Analytics KinesisFirehose API: record', () => {
 		await new Promise(process.nextTick);
 		expect(loggerWarnSpy).toHaveBeenCalledWith(
 			expect.any(String),
-			expect.any(Error)
+			expect.any(Error),
 		);
 	});
-Original file line number
+Diff line change
@@ Expand Up @@
     				? {
     						name,
     						value,
-    				  }
+    					}
     				: undefined;
     		},
     		getAll() {
@@ Expand Down @@