Skip to content

Commit 4d541d9

Browse files
authored
Chore: Unpin eslint dependencies (#14305)
* unpin eslint * running auto-fix * missed update of node 20 in canaray
1 parent bbbfe2e commit 4d541d9

File tree

15 files changed

+106
-175
lines changed

15 files changed

+106
-175
lines changed

.github/actions/node-and-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ inputs:
77
runs:
88
using: 'composite'
99
steps:
10-
- name: Setup Node.js 18
10+
- name: Setup Node.js 20
1111
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
1212
with:
1313
node-version: 20

.github/workflows/callable-canary-e2e-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ jobs:
5858
# Minimal depth 2 so we can checkout the commit before possible merge commit.
5959
fetch-depth: 2
6060
path: amplify-js
61-
- name: Setup Node.js 18
62-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
61+
- name: Setup Node.js 20
62+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
6363
with:
64-
node-version: 18
64+
node-version: 20
6565
env:
6666
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
6767

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@
9292
"@types/lodash": "4.14.182",
9393
"@types/node": "^8.9.5",
9494
"@types/puppeteer": "1.3.0",
95-
"@typescript-eslint/eslint-plugin": "8.8.1",
96-
"@typescript-eslint/parser": "8.8.1",
95+
"@typescript-eslint/eslint-plugin": "^8.8.1",
96+
"@typescript-eslint/parser": "^8.8.1",
9797
"babel-loader": "^8.3.0",
98-
"eslint": "9.12.0",
98+
"eslint": "^9.12.0",
9999
"eslint-config-prettier": "^9.1.0",
100100
"eslint-config-standard": "^17.1.0",
101101
"eslint-import-resolver-typescript": "^3.6.3",

packages/adapter-nextjs/src/auth/utils/getCookieValuesFromNextApiRequest.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import { NextApiRequest } from 'next';
55

66
export const getCookieValuesFromNextApiRequest = <
77
CookieNames extends string[],
8-
R = {
9-
[key in CookieNames[number]]?: string | undefined;
10-
},
8+
R = Partial<Record<CookieNames[number], string | undefined>>,
119
>(
1210
request: NextApiRequest,
1311
cookieNames: CookieNames,

packages/adapter-nextjs/src/auth/utils/getCookieValuesFromRequest.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
export const getCookieValuesFromRequest = <CookieNames extends string[]>(
55
request: Request,
66
cookieNames: CookieNames,
7-
): {
8-
[key in CookieNames[number]]?: string | undefined;
9-
} => {
7+
): Partial<Record<CookieNames[number], string | undefined>> => {
108
const cookieHeader = request.headers.get('Cookie');
119

1210
if (!cookieHeader) {
@@ -27,7 +25,5 @@ export const getCookieValuesFromRequest = <CookieNames extends string[]>(
2725
result[cookieName] = cookieValues[cookieName];
2826
}
2927

30-
return result as {
31-
[key in CookieNames[number]]?: string | undefined;
32-
};
28+
return result as Partial<Record<CookieNames[number], string | undefined>>;
3329
};

packages/auth/src/providers/cognito/tokenProvider/types.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ export type TokenRefresher = ({
2020
username: string;
2121
}) => Promise<CognitoAuthTokens>;
2222

23-
export type AuthKeys<AuthKey extends string> = {
24-
[Key in AuthKey]: string;
25-
};
23+
export type AuthKeys<AuthKey extends string> = Record<AuthKey, string>;
2624

2725
export const AuthTokenStorageKeys = {
2826
accessToken: 'accessToken',

packages/auth/src/types/Auth.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export enum AuthErrorTypes {
2020
OAuthSignInError = 'oauthSignInError',
2121
}
2222

23-
export type AuthErrorMessages = { [key in AuthErrorTypes]: AuthErrorMessage };
23+
export type AuthErrorMessages = Record<AuthErrorTypes, AuthErrorMessage>;
2424

2525
export interface AuthErrorMessage {
2626
message: string;

packages/auth/src/types/models.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,7 @@ export type AuthNextSignInStep<
251251
*/
252252
export type AuthUserAttributes<
253253
UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey,
254-
> = {
255-
[Attribute in UserAttributeKey]?: string;
256-
};
254+
> = Partial<Record<UserAttributeKey, string>>;
257255

258256
/**
259257
* The interface of a user attribute.

packages/auth/src/types/outputs.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,4 @@ export interface AuthUpdateUserAttributeOutput<
4040

4141
export type AuthUpdateUserAttributesOutput<
4242
UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey,
43-
> = {
44-
[authKey in UserAttributeKey]: AuthUpdateUserAttributeOutput<UserAttributeKey>;
45-
};
43+
> = Record<UserAttributeKey, AuthUpdateUserAttributeOutput<UserAttributeKey>>;

packages/core/src/types/errors.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ export interface AmplifyErrorParams<ErrorCode extends string = string> {
1515
underlyingError?: Error | unknown;
1616
}
1717

18-
export type AmplifyErrorMap<ErrorCode extends string = string> = {
19-
[name in ErrorCode]: {
18+
export type AmplifyErrorMap<ErrorCode extends string = string> = Record<
19+
ErrorCode,
20+
{
2021
message: string;
2122
recoverySuggestion?: string;
22-
};
23-
};
23+
}
24+
>;
2425

2526
export interface ServiceError {
2627
name: string;

0 commit comments

Comments
 (0)