meta(changelog): Update changelog for 9.6.1

.github/workflows/build.yml

@@ -274,6 +274,9 @@ jobs:
         uses: ./.github/actions/restore-cache
         with:
           dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check for duplicate dependencies in lockfile
+        # Run `yarn dedupe-deps:fix` locally to resolve any duplicates.
+        run: yarn dedupe-deps:check
       - name: Lint source files
         run: yarn lint:lerna
       - name: Lint for ES compatibility

.github/workflows/canary.yml

@@ -108,6 +108,12 @@ jobs:
           - test-application: 'react-router-6'
             build-command: 'test:build-canary'
             label: 'react-router-6 (canary)'
+          - test-application: 'nuxt-3'
+            build-command: 'test:build-canary'
+            label: 'nuxt-3 (canary)'
+          - test-application: 'nuxt-4'
+            build-command: 'test:build-canary'
+            label: 'nuxt-4 (canary)'
 
     steps:
       - name: Check out current commit

CHANGELOG.md

@@ -10,6 +10,14 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.6.1
+
+- feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com./getsentry/sentry-javascript/pull/15714))
+- feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 ([#15711](https://github.com./getsentry/sentry-javascript/pull/15711))
+- fix(nextjs): Re-patch router if it is overridden by Next.js ([#15721](https://github.com./getsentry/sentry-javascript/pull/15721))
+- fix(nuxt): Add Nitro Rollup plugin to inject Sentry server config ([#15710](https://github.com./getsentry/sentry-javascript/pull/15710))
+- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com./getsentry/sentry-javascript/pull/15651))
+
 ## 9.6.0
 
 ### Important Changes

dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

@@ -13,7 +13,7 @@
     "@sentry/node": "latest || *"
   },
   "devDependencies": {
-    "rollup": "^4.24.2",
+    "rollup": "^4.35.0",
     "vitest": "^0.34.6",
     "@sentry/rollup-plugin": "2.22.6"
   },

dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json

@@ -21,8 +21,10 @@
     "@playwright/test": "~1.50.0",
     "@sentry-internal/test-utils": "link:../../../test-utils"
   },
-  "overrides": {
-    "nitropack": "~2.9.7",
-    "ofetch": "^1.4.0"
+  "pnpm": {
+    "overrides": {
+      "nitropack": "~2.9.7",
+      "ofetch": "^1.4.0"
+    }
   }
 }

dev-packages/e2e-tests/test-applications/nuxt-3/package.json

@@ -12,6 +12,7 @@
     "clean": "npx nuxi cleanup",
     "test": "playwright test",
     "test:build": "pnpm install && pnpm build",
+    "test:build-canary": "pnpm add nuxt@npm:nuxt-nightly@3x && pnpm add nitropack@npm:nitropack-nightly@latest && pnpm install --force && pnpm build",
     "test:assert": "pnpm test"
   },
   "dependencies": {
@@ -21,5 +22,13 @@
   "devDependencies": {
     "@playwright/test": "~1.50.0",
     "@sentry-internal/test-utils": "link:../../../test-utils"
+  },
+  "sentryTest": {
+    "optionalVariants": [
+      {
+        "build-command": "test:build-canary",
+        "label": "nuxt-3 (canary)"
+      }
+    ]
   }
 }

dev-packages/e2e-tests/test-applications/nuxt-4/package.json

@@ -12,6 +12,7 @@
     "clean": "npx nuxi cleanup",
     "test": "playwright test",
     "test:build": "pnpm install && pnpm build",
+    "test:build-canary": "pnpm add nuxt@npm:nuxt-nightly@latest && pnpm add nitropack@npm:nitropack-nightly@latest && pnpm install --force && pnpm build",
     "test:assert": "pnpm test"
   },
   "dependencies": {
@@ -25,5 +26,13 @@
   },
   "overrides": {
     "@vercel/nft": "0.27.4"
+  },
+  "sentryTest": {
+    "optionalVariants": [
+      {
+        "build-command": "test:build-canary",
+        "label": "nuxt-4 (canary)"
+      }
+    ]
   }
 }

package.json

@@ -29,6 +29,8 @@
     "lint:lerna": "lerna run lint",
     "lint:prettier": "prettier \"**/*.{md,css,yml,yaml}\" \"packages/**/**.{ts,js,mjs,cjs,mts,cts,jsx,tsx,astro,vue}\" --check",
     "lint:es-compatibility": "es-check es2020 ./packages/*/build/{bundles,npm/cjs,cjs}/*.js && es-check es2020 ./packages/*/build/{npm/esm,esm}/*.js --module",
+    "dedupe-deps:check": "yarn-deduplicate yarn.lock --list --fail",
+    "dedupe-deps:fix": "yarn-deduplicate yarn.lock",
     "postpublish": "lerna run --stream --concurrency 1 postpublish",
     "test": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests}\" test",
     "test:unit": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests}\" test:unit",
@@ -126,7 +128,7 @@
     "npm-run-all2": "^6.2.0",
     "prettier": "^3.1.1",
     "rimraf": "^5.0.10",
-    "rollup": "^4.24.2",
+    "rollup": "^4.35.0",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-license": "^3.3.1",
     "size-limit": "~11.1.6",
@@ -135,7 +137,8 @@
     "ts-node": "10.9.1",
     "typescript": "~5.0.0",
     "vitest": "^2.1.8",
-    "yalc": "^1.0.0-pre.53"
+    "yalc": "^1.0.0-pre.53",
+    "yarn-deduplicate": "6.0.2"
   },
   "//_resolutions_comment": [
     "Because new versions of strip-ansi, string-width, and wrap-ansi are ESM only packages,",

packages/browser-utils/test/instrument/history.test.ts

@@ -1,13 +1,12 @@
-import { describe, expect, it, vi } from 'vitest';
+import { describe, expect, it, vi, afterEach } from 'vitest';
 import { WINDOW } from '../../src/types';
-import { afterEach } from 'node:test';
 
 import { instrumentHistory } from './../../src/instrument/history';
+import * as instrumentHandlersModule from '@sentry/core';
 
 describe('instrumentHistory', () => {
   const originalHistory = WINDOW.history;
   WINDOW.addEventListener = vi.fn();
-
   afterEach(() => {
     // @ts-expect-error - this is fine for testing
     WINDOW.history = originalHistory;
@@ -55,4 +54,66 @@ describe('instrumentHistory', () => {
       pushState: expect.any(Function), // patched function
     });
   });
+
+  it('does not trigger handlers when the URLs are the same', () => {
+    const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
+    const pushStateMock = vi.fn();
+
+    // @ts-expect-error - this is fine for testing
+    WINDOW.history = {
+      pushState: pushStateMock,
+      replaceState: () => {},
+    };
+
+    instrumentHistory();
+
+    // First call with URL1 to set lastHref
+    WINDOW.history.pushState({}, '', 'https://example.com/page1');
+    expect(pushStateMock).toHaveBeenCalledTimes(1);
+
+    // Reset mocks to check next call
+    pushStateMock.mockClear();
+    vi.mocked(triggerHandlerSpy).mockClear();
+
+    // Call with the same URL
+    WINDOW.history.pushState({}, '', 'https://example.com/page1');
+
+    expect(pushStateMock).toHaveBeenCalledTimes(1);
+    expect(triggerHandlerSpy).not.toHaveBeenCalled();
+  });
+
+  it('triggers handlers when the URLs are different', () => {
+    const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
+    // Setup a mock for history.pushState
+    const pushStateMock = vi.fn();
+
+    // @ts-expect-error - this is fine for testing
+    WINDOW.history = {
+      pushState: pushStateMock,
+      replaceState: () => {},
+    };
+
+    // Run the instrumentation
+    instrumentHistory();
+
+    // First call with URL1 to set lastHref
+    WINDOW.history.pushState({}, '', 'https://example.com/page1');
+    expect(pushStateMock).toHaveBeenCalledTimes(1);
+
+    // Reset mocks to check next call
+    pushStateMock.mockClear();
+    vi.mocked(triggerHandlerSpy).mockClear();
+
+    // Call with a different URL
+    WINDOW.history.pushState({}, '', 'https://example.com/page2');
+
+    // Original function should be called
+    expect(pushStateMock).toHaveBeenCalledTimes(1);
+
+    // triggerHandlers should be called with from and to data
+    expect(triggerHandlerSpy).toHaveBeenCalledWith('history', {
+      from: 'https://example.com/page1',
+      to: 'https://example.com/page2',
+    });
+  });
 });

packages/core/src/types-hoist/envelope.ts

@@ -5,7 +5,7 @@ import type { LegacyCSPReport } from './csp';
 import type { DsnComponents } from './dsn';
 import type { Event } from './event';
 import type { FeedbackEvent, UserFeedback } from './feedback';
-import type { Log } from './log';
+import type { SerializedOtelLog } from './log';
 import type { Profile, ProfileChunk } from './profiling';
 import type { ReplayEvent, ReplayRecordingData } from './replay';
 import type { SdkInfo } from './sdkinfo';
@@ -87,7 +87,7 @@ type CheckInItemHeaders = { type: 'check_in' };
 type ProfileItemHeaders = { type: 'profile' };
 type ProfileChunkItemHeaders = { type: 'profile_chunk' };
 type SpanItemHeaders = { type: 'span' };
-type LogItemHeaders = { type: 'otel_log' };
+type OtelLogItemHeaders = { type: 'otel_log' };
 type RawSecurityHeaders = { type: 'raw_security'; sentry_release?: string; sentry_environment?: string };
 
 export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
@@ -104,7 +104,7 @@ export type FeedbackItem = BaseEnvelopeItem<FeedbackItemHeaders, FeedbackEvent>;
 export type ProfileItem = BaseEnvelopeItem<ProfileItemHeaders, Profile>;
 export type ProfileChunkItem = BaseEnvelopeItem<ProfileChunkItemHeaders, ProfileChunk>;
 export type SpanItem = BaseEnvelopeItem<SpanItemHeaders, Partial<SpanJSON>>;
-export type LogItem = BaseEnvelopeItem<LogItemHeaders, Log>;
+export type OtelLogItem = BaseEnvelopeItem<OtelLogItemHeaders, SerializedOtelLog>;
 export type RawSecurityItem = BaseEnvelopeItem<RawSecurityHeaders, LegacyCSPReport>;
 
 export type EventEnvelopeHeaders = { event_id: string; sent_at: string; trace?: Partial<DynamicSamplingContext> };
@@ -113,7 +113,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
 type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
 type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
 type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
-type LogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
+type OtelLogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
 
 export type EventEnvelope = BaseEnvelope<
   EventEnvelopeHeaders,
@@ -126,7 +126,7 @@ export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
 export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
 export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
 export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
-export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogItem>;
+export type OtelLogEnvelope = BaseEnvelope<OtelLogEnvelopeHeaders, OtelLogItem>;
 
 export type Envelope =
   | EventEnvelope
@@ -137,6 +137,6 @@ export type Envelope =
   | CheckInEnvelope
   | SpanEnvelope
   | RawSecurityEnvelope
-  | LogEnvelope;
+  | OtelLogEnvelope;
 
 export type EnvelopeItem = Envelope[1][number];

packages/core/src/types-hoist/index.ts

@@ -110,7 +110,7 @@ export type {
   TraceFlag,
 } from './span';
 export type { SpanStatus } from './spanStatus';
-export type { Log, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
+export type { SerializedOtelLog, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
 export type { TimedEvent } from './timedEvent';
 export type { StackFrame } from './stackframe';
 export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';

packages/core/src/types-hoist/log.ts

@@ -5,7 +5,9 @@ export type LogAttributeValueType =
       stringValue: string;
     }
   | {
-      intValue: number;
+      // integers must be represented as a string
+      // because JSON cannot differentiate between integers and floats
+      intValue: string;
     }
   | {
       boolValue: boolean;
@@ -19,7 +21,7 @@ export type LogAttribute = {
   value: LogAttributeValueType;
 };
 
-export interface Log {
+export interface SerializedOtelLog {
   /**
    * The severity level of the log.
    *

packages/nextjs/package.json

@@ -88,7 +88,7 @@
     "@sentry/webpack-plugin": "3.2.2",
     "chalk": "3.0.0",
     "resolve": "1.22.8",
-    "rollup": "4.34.9",
+    "rollup": "4.35.0",
     "stacktrace-parser": "^0.1.10"
   },
   "devDependencies": {