diff --git a/backend/package.json b/backend/package.json index a6d65ea692ed..e511719a0290 100644 --- a/backend/package.json +++ b/backend/package.json @@ -81,8 +81,8 @@ "@vitest/coverage-v8": "4.1.5", "concurrently": "8.2.2", "openapi3-ts": "2.0.2", - "oxlint": "1.74.0", - "oxlint-tsgolint": "0.24.0", + "oxlint": "1.75.0", + "oxlint-tsgolint": "7.0.2001", "readline-sync": "1.4.10", "supertest": "7.1.4", "testcontainers": "11.11.0", diff --git a/backend/scripts/openapi.ts b/backend/scripts/openapi.ts index e64c24e11e6c..505c47472350 100644 --- a/backend/scripts/openapi.ts +++ b/backend/scripts/openapi.ts @@ -196,7 +196,7 @@ function addAuth( function getRequiredPermissions( metadata: EndpointMetadata | undefined, ): PermissionId[] | undefined { - if (metadata === undefined || metadata.requirePermission === undefined) { + if (metadata?.requirePermission === undefined) { return undefined; } @@ -210,7 +210,7 @@ function addTags( operation: OperationObject, metadata: EndpointMetadata | undefined, ): void { - if (metadata === undefined || metadata.openApiTags === undefined) return; + if (metadata?.openApiTags === undefined) return; operation.tags = Array.isArray(metadata.openApiTags) ? metadata.openApiTags : [metadata.openApiTags]; @@ -220,7 +220,7 @@ function addRateLimit( operation: OperationObject, metadata: EndpointMetadata | undefined, ): void { - if (metadata === undefined || metadata.rateLimit === undefined) return; + if (metadata?.rateLimit === undefined) return; // oxlint-disable-next-line no-unsafe-assignment const okResponse = operation.responses["200"]; if (okResponse === undefined) return; @@ -280,7 +280,7 @@ function addRequiredConfiguration( operation: OperationObject, metadata: EndpointMetadata | undefined, ): void { - if (metadata === undefined || metadata.requireConfiguration === undefined) { + if (metadata?.requireConfiguration === undefined) { return; } diff --git a/backend/src/middlewares/configuration.ts b/backend/src/middlewares/configuration.ts index c14badbc5a4c..97e70923d67e 100644 --- a/backend/src/middlewares/configuration.ts +++ b/backend/src/middlewares/configuration.ts @@ -80,7 +80,7 @@ function getValue( function getRequireConfigurations( metadata: EndpointMetadata | undefined, ): RequireConfiguration[] | undefined { - if (metadata === undefined || metadata.requireConfiguration === undefined) { + if (metadata?.requireConfiguration === undefined) { return undefined; } diff --git a/backend/src/middlewares/permission.ts b/backend/src/middlewares/permission.ts index 9eb8f7f17dd7..0396c63970ae 100644 --- a/backend/src/middlewares/permission.ts +++ b/backend/src/middlewares/permission.ts @@ -135,7 +135,7 @@ export function verifyPermissions< function getRequiredPermissionIds( metadata: EndpointMetadata | undefined, ): PermissionId[] | undefined { - if (metadata === undefined || metadata.requirePermission === undefined) { + if (metadata?.requirePermission === undefined) { return undefined; } diff --git a/backend/src/middlewares/rate-limit.ts b/backend/src/middlewares/rate-limit.ts index 948c7b27d311..a894c2adf63d 100644 --- a/backend/src/middlewares/rate-limit.ts +++ b/backend/src/middlewares/rate-limit.ts @@ -66,7 +66,7 @@ function initialiseLimiters(): Record { const convert = (options: RateLimitOptions): RateLimitRequestHandler => { return rateLimit({ windowMs: convertWindowToMs(options.window), - max: options.max * REQUEST_MULTIPLIER, + limit: options.max * REQUEST_MULTIPLIER, handler: customHandler, keyGenerator: getKeyWithUid, }); @@ -140,7 +140,7 @@ export function rateLimitRequest< // Root Rate Limit export const rootRateLimiter = rateLimit({ windowMs: 60 * 1000 * 60, - max: 1000 * REQUEST_MULTIPLIER, + limit: 1000 * REQUEST_MULTIPLIER, keyGenerator: getKey, handler: (_req, _res, _next, _options): void => { throw new MonkeyError( @@ -206,7 +206,7 @@ export async function incrementBadAuth( export const webhookLimit = rateLimit({ windowMs: 1000, - max: 1 * REQUEST_MULTIPLIER, + limit: 1 * REQUEST_MULTIPLIER, keyGenerator: getKeyWithUid, handler: customHandler, }); diff --git a/frontend/package.json b/frontend/package.json index 5bd35e09a577..9fcd96d2c4d3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -109,8 +109,8 @@ "madge": "8.0.0", "magic-string": "0.30.17", "normalize.css": "8.0.1", - "oxlint": "1.74.0", - "oxlint-tsgolint": "0.24.0", + "oxlint": "1.75.0", + "oxlint-tsgolint": "7.0.2001", "postcss": "8.5.15", "sass": "1.70.0", "solid-devtools": "0.34.5", diff --git a/frontend/src/html/pages/test.html b/frontend/src/html/pages/test.html index 419d735b4582..c8b4f83c6c4c 100644 --- a/frontend/src/html/pages/test.html +++ b/frontend/src/html/pages/test.html @@ -21,7 +21,7 @@ - +