From 0f13518f8d9d1995df9508b86b9f5af88f7d6127 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 6 Aug 2024 14:26:21 +0200 Subject: [PATCH 1/2] chore(lint): Allow `ts-ignore` in Node integration tests --- dev-packages/node-integration-tests/.eslintrc.js | 8 ++++++++ .../suites/tracing/meta-tags/test.ts | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-packages/node-integration-tests/.eslintrc.js b/dev-packages/node-integration-tests/.eslintrc.js index df04aa267446..4f9c2bc1696e 100644 --- a/dev-packages/node-integration-tests/.eslintrc.js +++ b/dev-packages/node-integration-tests/.eslintrc.js @@ -20,6 +20,14 @@ module.exports = { }, rules: { '@typescript-eslint/typedef': 'off', + // Explicitly allow ts-ignore with description for Node integration tests + // Reason: We run these tests on TS3.8 which doesn't support `@ts-expect-error` + '@typescript-eslint/ban-ts-comment': [ + 'error', + { + 'ts-ignore': 'allow-with-description', + }, + ], }, }, ], diff --git a/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts b/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts index 22bef9d2b1b9..c9c2afa1e78b 100644 --- a/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts @@ -16,8 +16,7 @@ describe('getTraceMetaTags', () => { baggage: 'sentry-environment=production', }); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error - response is defined, types just don't reflect it const html = response?.response as unknown as string; expect(html).toMatch(//); From 645990b3f5cd2c51581e0b4f90e57e7d1d353a84 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 6 Aug 2024 16:41:04 +0200 Subject: [PATCH 2/2] fix eslint rule --- dev-packages/node-integration-tests/.eslintrc.js | 1 + .../node-integration-tests/suites/tracing/meta-tags/test.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-packages/node-integration-tests/.eslintrc.js b/dev-packages/node-integration-tests/.eslintrc.js index 4f9c2bc1696e..51b7dfbb7ed3 100644 --- a/dev-packages/node-integration-tests/.eslintrc.js +++ b/dev-packages/node-integration-tests/.eslintrc.js @@ -26,6 +26,7 @@ module.exports = { 'error', { 'ts-ignore': 'allow-with-description', + 'ts-expect-error': true, }, ], }, diff --git a/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts b/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts index c9c2afa1e78b..c42269dd8504 100644 --- a/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts @@ -16,7 +16,7 @@ describe('getTraceMetaTags', () => { baggage: 'sentry-environment=production', }); - // @ts-expect-error - response is defined, types just don't reflect it + // @ts-ignore - response is defined, types just don't reflect it const html = response?.response as unknown as string; expect(html).toMatch(//);