Skip to content

Commit ba23ef7

Browse files
committed
fix ci fails
1 parent 5fa214b commit ba23ef7

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

packages/nuxt/src/runtime/plugins/sentry.server.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ export default (nitroApp => {
1919
// h3 v2 (Nuxt 5): response headers are on event.res.headers
2020
const isPreRenderedPage =
2121
Object.keys(nodeResHeadersH3v1).includes('x-nitro-prerender') ||
22-
// oxlint-disable-next-line typescript/no-explicit-any
22+
// fix × typescript-eslint(no-unsafe-member-access): Unsafe member access .res on an `any` value.
23+
// oxlint-disable-next-line typescript/no-explicit-any,typescript-oxlint/no-unsafe-member-access
2324
!!(event as any).res?.headers?.has?.('x-nitro-prerender');
2425

25-
const isSWRCachedPage = event?.context?.cache?.options.swr as boolean | undefined;
26+
// oxlint-disable-next-line typescript-oxlint/no-unsafe-member-access
27+
const isSWRCachedPage = event?.context?.cache?.options?.swr as boolean | undefined;
2628

2729
if (!isPreRenderedPage && !isSWRCachedPage) {
2830
addSentryTracingMetaTags(html.head);

packages/nuxt/test/vite/databaseConfig.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('addDatabaseInstrumentation', () => {
3434
const nitroConfig: NitroConfig = {};
3535
const moduleOptions: SentryNuxtModuleOptions = { debug: true };
3636

37-
addDatabaseInstrumentation(nitroConfig, moduleOptions);
37+
addDatabaseInstrumentation(nitroConfig, false, moduleOptions);
3838

3939
expect(consoleLogSpy).toHaveBeenCalledWith(
4040
'[Sentry] [Nitro Database Plugin]: No database configuration found. Skipping database instrumentation.',
@@ -45,15 +45,15 @@ describe('addDatabaseInstrumentation', () => {
4545
const nitroConfig: NitroConfig = {};
4646
const moduleOptions: SentryNuxtModuleOptions = { debug: false };
4747

48-
addDatabaseInstrumentation(nitroConfig, moduleOptions);
48+
addDatabaseInstrumentation(nitroConfig, false, moduleOptions);
4949

5050
expect(consoleLogSpy).not.toHaveBeenCalled();
5151
});
5252

5353
it('should not log debug message when moduleOptions is undefined', () => {
5454
const nitroConfig: NitroConfig = {};
5555

56-
addDatabaseInstrumentation(nitroConfig, undefined);
56+
addDatabaseInstrumentation(nitroConfig, false, undefined);
5757

5858
expect(consoleLogSpy).not.toHaveBeenCalled();
5959
});
@@ -62,7 +62,7 @@ describe('addDatabaseInstrumentation', () => {
6262
const nitroConfig: NitroConfig = {};
6363
const moduleOptions: SentryNuxtModuleOptions = {};
6464

65-
addDatabaseInstrumentation(nitroConfig, moduleOptions);
65+
addDatabaseInstrumentation(nitroConfig, false, moduleOptions);
6666

6767
expect(consoleLogSpy).not.toHaveBeenCalled();
6868
});
@@ -71,7 +71,7 @@ describe('addDatabaseInstrumentation', () => {
7171
const nitroConfig: NitroConfig = { experimental: { database: false } };
7272
const moduleOptions: SentryNuxtModuleOptions = { debug: true };
7373

74-
addDatabaseInstrumentation(nitroConfig, moduleOptions);
74+
addDatabaseInstrumentation(nitroConfig, false, moduleOptions);
7575

7676
expect(consoleLogSpy).toHaveBeenCalledWith(
7777
'[Sentry] [Nitro Database Plugin]: No database configuration found. Skipping database instrumentation.',

0 commit comments

Comments
 (0)