feat(nextjs): Do not strip origin information from different origin stack frames#15418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lforst merged 15 commits into from
Feb 24, 2025
Merged

feat(nextjs): Do not strip origin information from different origin stack frames #15418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2732514
feat(nextjs): Do not strip origin information from different origin s…
Feb 14, 2025
b6a6818
fix tests?
Feb 14, 2025
f0496d9
.
Feb 14, 2025
e47084a
comments and stuff
Feb 14, 2025
c38281a
add experimental flag
chargome Feb 19, 2025
ad052c3
trigger ci
chargome Feb 19, 2025
e7e7428
debug: remove nextjs from size limit
chargome Feb 19, 2025
7dfc195
add next to size check
chargome Feb 19, 2025
9b9f884
debug: check if window causes ci failure
chargome Feb 21, 2025
9941dab
guard window access
chargome Feb 21, 2025
497b019
sorry for all the notifications luca
chargome Feb 21, 2025
15497db
try without global obj
chargome Feb 21, 2025
27f8c9c
...
chargome Feb 21, 2025
87c3f9c
madonna mia
chargome Feb 21, 2025
818cf78
triste
chargome Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .size-limit.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ module.exports = [
import: createImport('init'),
ignore: ['next/router', 'next/constants'],
gzip: true,
limit: '40 KB',
limit: '41 KB',
},
// SvelteKit SDK (ESM)
{
Expand Down
86 changes: 70 additions & 16 deletions packages/nextjs/src/client/clientNormalizationIntegration.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,30 +2,84 @@ import { rewriteFramesIntegration } from '@sentry/browser';
import { defineIntegration } from '@sentry/core';

export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
({ assetPrefixPath }: { assetPrefixPath: string }) => {
({
assetPrefix,
basePath,
rewriteFramesAssetPrefixPath,
experimentalThirdPartyOriginStackFrames,
}: {
assetPrefix?: string;
basePath?: string;
rewriteFramesAssetPrefixPath: string;
experimentalThirdPartyOriginStackFrames: boolean;
}) => {
const rewriteFramesInstance = rewriteFramesIntegration({
// Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
iteratee: frame => {
try {
const { origin } = new URL(frame.filename as string);
frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
} catch (err) {
// Filename wasn't a properly formed URL, so there's nothing we can do
if (experimentalThirdPartyOriginStackFrames) {
// Not sure why but access to global WINDOW from @sentry/Browser causes hideous ci errors
// eslint-disable-next-line no-restricted-globals
const windowOrigin = typeof window !== 'undefined' && window.location ? window.location.origin : '';
// A filename starting with the local origin and not ending with JS is most likely JS in HTML which we do not want to rewrite
if (frame.filename?.startsWith(windowOrigin) && !frame.filename.endsWith('.js')) {
return frame;
}

if (assetPrefix) {
// If the user defined an asset prefix, we need to strip it so that we can match it with uploaded sourcemaps.
// assetPrefix always takes priority over basePath.
if (frame.filename?.startsWith(assetPrefix)) {
frame.filename = frame.filename.replace(assetPrefix, 'app://');
}
} else if (basePath) {
// If the user defined a base path, we need to strip it to match with uploaded sourcemaps.
// We should only do this for same-origin filenames though, so that third party assets are not rewritten.
try {
const { origin: frameOrigin } = new URL(frame.filename as string);
if (frameOrigin === windowOrigin) {
frame.filename = frame.filename?.replace(frameOrigin, 'app://').replace(basePath, '');
}
} catch (err) {
// Filename wasn't a properly formed URL, so there's nothing we can do
}
}
} else {
try {
const { origin } = new URL(frame.filename as string);
frame.filename = frame.filename?.replace(origin, 'app://').replace(rewriteFramesAssetPrefixPath, '');
Comment on lines +48 to +49

@s1gr1ds1gr1dFeb 24, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L: That's a minor code-style comment - I would move this logic (which is shorter) upward to improve readability.

} catch (err) {
// Filename wasn't a properly formed URL, so there's nothing we can do
}
}

// We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
// The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
if (frame.filename?.startsWith('app:///_next')) {
frame.filename = decodeURI(frame.filename);
}
if (experimentalThirdPartyOriginStackFrames) {
if (frame.filename?.includes('/_next')) {
frame.filename = decodeURI(frame.filename);
}

if (
frame.filename?.match(
/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
)
) {
// We don't care about these frames. It's Next.js internal code.
frame.in_app = false;
}
} else {
if (frame.filename?.startsWith('app:///_next')) {
frame.filename = decodeURI(frame.filename);
}

if (
frame.filename?.match(
/^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
)
) {
// We don't care about these frames. It's Next.js internal code.
frame.in_app = false;
if (
frame.filename?.match(
/^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
)
) {
// We don't care about these frames. It's Next.js internal code.
frame.in_app = false;
}
}

return frame;
Expand Down
21 changes: 18 additions & 3 deletions packages/nextjs/src/client/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,9 @@ export { browserTracingIntegration } from './browserTracingIntegration';

const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
_sentryRewriteFramesAssetPrefixPath: string;
_sentryAssetPrefix?: string;
_sentryBasePath?: string;
_experimentalThirdPartyOriginStackFrames?: string;
};

// Treeshakable guard to remove all code related to tracing
Expand DownExpand Up@@ -67,13 +70,25 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
customDefaultIntegrations.push(browserTracingIntegration());
}

// This value is injected at build time, based on the output directory specified in the build config. Though a default
// These values are injected at build time, based on the output directory specified in the build config. Though a default
// is set there, we set it here as well, just in case something has gone wrong with the injection.
const assetPrefixPath =
const rewriteFramesAssetPrefixPath =
process.env._sentryRewriteFramesAssetPrefixPath ||
globalWithInjectedValues._sentryRewriteFramesAssetPrefixPath ||
'';
customDefaultIntegrations.push(nextjsClientStackFrameNormalizationIntegration({ assetPrefixPath }));
const assetPrefix = process.env._sentryAssetPrefix || globalWithInjectedValues._sentryAssetPrefix;
const basePath = process.env._sentryBasePath || globalWithInjectedValues._sentryBasePath;
const experimentalThirdPartyOriginStackFrames =
process.env._experimentalThirdPartyOriginStackFrames === 'true' ||
globalWithInjectedValues._experimentalThirdPartyOriginStackFrames === 'true';
customDefaultIntegrations.push(
nextjsClientStackFrameNormalizationIntegration({
assetPrefix,
basePath,
rewriteFramesAssetPrefixPath,
experimentalThirdPartyOriginStackFrames,
}),
);

return customDefaultIntegrations;
}
Expand Down
9 changes: 9 additions & 0 deletions packages/nextjs/src/config/types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -439,6 +439,15 @@ export type SentryBuildOptions = {
* Defaults to `false`.
*/
automaticVercelMonitors?: boolean;

/**
* Contains a set of experimental flags that might change in future releases. These flags enable
* features that are still in development and may be modified, renamed, or removed without notice.
* Use with caution in production environments.
*/
_experimental?: Partial<{
thirdPartyOriginStackFrames: boolean;
}>;
};

export type NextConfigFunction = (
Expand Down
4 changes: 4 additions & 0 deletions packages/nextjs/src/config/webpack.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -624,6 +624,10 @@ function addValueInjectionLoader(
_sentryRewriteFramesAssetPrefixPath: assetPrefix
? new URL(assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '')
: '',
_sentryAssetPrefix: userNextConfig.assetPrefix,
_sentryExperimentalThirdPartyOriginStackFrames: userSentryOptions._experimental?.thirdPartyOriginStackFrames
? 'true'
: undefined,
};

if (buildContext.isServer) {
Expand Down
16 changes: 16 additions & 0 deletions packages/nextjs/src/config/withSentryConfig.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
: '',
};

if (userNextConfig.assetPrefix) {
buildTimeVariables._assetsPrefix = userNextConfig.assetPrefix;
}

if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
}

if (rewritesTunnelPath) {
buildTimeVariables._sentryRewritesTunnelPath = rewritesTunnelPath;
}
Expand All@@ -276,6 +284,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
buildTimeVariables._sentryBasePath = basePath;
}

if (userNextConfig.assetPrefix) {
buildTimeVariables._sentryAssetPrefix = userNextConfig.assetPrefix;
}

if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
}

if (typeof userNextConfig.env === 'object') {
userNextConfig.env = { ...buildTimeVariables, ...userNextConfig.env };
} else if (userNextConfig.env === undefined) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(nextjs): Do not strip origin information from different origin stack frames#15418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 15 commits into

from

Feb 24, 2025
 Merged


feat(nextjs): Do not strip origin information from different origin stack frames
#15418
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
2732514

feat(nextjs): Do not strip origin information from different origin s…

Feb 14, 2025
b6a6818

fix tests?

Feb 14, 2025
f0496d9

.

Feb 14, 2025
e47084a

comments and stuff

Feb 14, 2025
c38281a

add experimental flag


chargome Feb 19, 2025
ad052c3

trigger ci


chargome Feb 19, 2025
e7e7428

debug: remove nextjs from size limit


chargome Feb 19, 2025
7dfc195

add next to size check


chargome Feb 19, 2025
9b9f884

debug: check if window causes ci failure


chargome Feb 21, 2025
9941dab

guard window access


chargome Feb 21, 2025
497b019

sorry for all the notifications luca


chargome Feb 21, 2025
15497db

try without global obj


chargome Feb 21, 2025
27f8c9c

...


chargome Feb 21, 2025
87c3f9c

madonna mia


chargome Feb 21, 2025
818cf78

triste


chargome Feb 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ module.exports = [
 import: createImport('init'),
 ignore: ['next/router', 'next/constants'],
 gzip: true,
 limit: '40 KB',
 limit: '41 KB',
 },
 // SvelteKit SDK (ESM)
 {
Expand Down

86 changes: 70 additions & 16 deletions
packages/nextjs/src/client/clientNormalizationIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,30 +2,84 @@ import { rewriteFramesIntegration } from '@sentry/browser';
import { defineIntegration } from '@sentry/core';

export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
 ({ assetPrefixPath }: { assetPrefixPath: string }) => {
 ({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }: {
 assetPrefix?: string;
 basePath?: string;
 rewriteFramesAssetPrefixPath: string;
 experimentalThirdPartyOriginStackFrames: boolean;
 }) => {
 const rewriteFramesInstance = rewriteFramesIntegration({
 // Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
 iteratee: frame => {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 if (experimentalThirdPartyOriginStackFrames) {
 // Not sure why but access to global WINDOW from @sentry/Browser causes hideous ci errors
 // eslint-disable-next-line no-restricted-globals
 const windowOrigin = typeof window !== 'undefined' && window.location ? window.location.origin : '';
 // A filename starting with the local origin and not ending with JS is most likely JS in HTML which we do not want to rewrite
 if (frame.filename?.startsWith(windowOrigin) && !frame.filename.endsWith('.js')) {
 return frame;
 }

 if (assetPrefix) {
 // If the user defined an asset prefix, we need to strip it so that we can match it with uploaded sourcemaps.
 // assetPrefix always takes priority over basePath.
 if (frame.filename?.startsWith(assetPrefix)) {
 frame.filename = frame.filename.replace(assetPrefix, 'app://');
 }
 } else if (basePath) {
 // If the user defined a base path, we need to strip it to match with uploaded sourcemaps.
 // We should only do this for same-origin filenames though, so that third party assets are not rewritten.
 try {
 const { origin: frameOrigin } = new URL(frame.filename as string);
 if (frameOrigin === windowOrigin) {
 frame.filename = frame.filename?.replace(frameOrigin, 'app://').replace(basePath, '');
 }
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }
 } else {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(rewriteFramesAssetPrefixPath, '');

Comment on lines

+48
 to 
+49

@s1gr1ds1gr1dFeb 24, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L: That's a minor code-style comment - I would move this logic (which is shorter) upward to improve readability.
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }

 // We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
 // The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }
 if (experimentalThirdPartyOriginStackFrames) {
 if (frame.filename?.includes('/_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 } else {
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 }

 return frame;
Expand Down

21 changes: 18 additions & 3 deletions
packages/nextjs/src/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,9 @@ export { browserTracingIntegration } from './browserTracingIntegration';

const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
 _sentryRewriteFramesAssetPrefixPath: string;
 _sentryAssetPrefix?: string;
 _sentryBasePath?: string;
 _experimentalThirdPartyOriginStackFrames?: string;
};

// Treeshakable guard to remove all code related to tracing
Expand DownExpand Up@@ -67,13 +70,25 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
 customDefaultIntegrations.push(browserTracingIntegration());
 }

 // This value is injected at build time, based on the output directory specified in the build config. Though a default
 // These values are injected at build time, based on the output directory specified in the build config. Though a default
 // is set there, we set it here as well, just in case something has gone wrong with the injection.
 const assetPrefixPath =
 const rewriteFramesAssetPrefixPath =
 process.env._sentryRewriteFramesAssetPrefixPath ||
 globalWithInjectedValues._sentryRewriteFramesAssetPrefixPath ||
 '';
 customDefaultIntegrations.push(nextjsClientStackFrameNormalizationIntegration({ assetPrefixPath }));
 const assetPrefix = process.env._sentryAssetPrefix || globalWithInjectedValues._sentryAssetPrefix;
 const basePath = process.env._sentryBasePath || globalWithInjectedValues._sentryBasePath;
 const experimentalThirdPartyOriginStackFrames =
 process.env._experimentalThirdPartyOriginStackFrames === 'true' ||
 globalWithInjectedValues._experimentalThirdPartyOriginStackFrames === 'true';
 customDefaultIntegrations.push(
 nextjsClientStackFrameNormalizationIntegration({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }),
 );

 return customDefaultIntegrations;
}
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/config/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -439,6 +439,15 @@ export type SentryBuildOptions = {
 * Defaults to `false`.
 */
 automaticVercelMonitors?: boolean;

 /**
 * Contains a set of experimental flags that might change in future releases. These flags enable
 * features that are still in development and may be modified, renamed, or removed without notice.
 * Use with caution in production environments.
 */
 _experimental?: Partial<{
 thirdPartyOriginStackFrames: boolean;
 }>;
};

export type NextConfigFunction = (
Expand Down

4 changes: 4 additions & 0 deletions
packages/nextjs/src/config/webpack.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -624,6 +624,10 @@ function addValueInjectionLoader(
 _sentryRewriteFramesAssetPrefixPath: assetPrefix
 ? new URL(assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '')
 : '',
 _sentryAssetPrefix: userNextConfig.assetPrefix,
 _sentryExperimentalThirdPartyOriginStackFrames: userSentryOptions._experimental?.thirdPartyOriginStackFrames
 ? 'true'
 : undefined,
 };

 if (buildContext.isServer) {
Expand Down

16 changes: 16 additions & 0 deletions
packages/nextjs/src/config/withSentryConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 : '',
 };

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._assetsPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (rewritesTunnelPath) {
 buildTimeVariables._sentryRewritesTunnelPath = rewritesTunnelPath;
 }
Expand All@@ -276,6 +284,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 buildTimeVariables._sentryBasePath = basePath;
 }

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._sentryAssetPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (typeof userNextConfig.env === 'object') {
 userNextConfig.env = { ...buildTimeVariables, ...userNextConfig.env };
 } else if (userNextConfig.env === undefined) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(nextjs): Do not strip origin information from different origin stack frames#15418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 15 commits into

from

Feb 24, 2025
 Merged


feat(nextjs): Do not strip origin information from different origin stack frames
#15418
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
2732514

feat(nextjs): Do not strip origin information from different origin s…

Feb 14, 2025
b6a6818

fix tests?

Feb 14, 2025
f0496d9

.

Feb 14, 2025
e47084a

comments and stuff

Feb 14, 2025
c38281a

add experimental flag


chargome Feb 19, 2025
ad052c3

trigger ci


chargome Feb 19, 2025
e7e7428

debug: remove nextjs from size limit


chargome Feb 19, 2025
7dfc195

add next to size check


chargome Feb 19, 2025
9b9f884

debug: check if window causes ci failure


chargome Feb 21, 2025
9941dab

guard window access


chargome Feb 21, 2025
497b019

sorry for all the notifications luca


chargome Feb 21, 2025
15497db

try without global obj


chargome Feb 21, 2025
27f8c9c

...


chargome Feb 21, 2025
87c3f9c

madonna mia


chargome Feb 21, 2025
818cf78

triste


chargome Feb 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ module.exports = [
 import: createImport('init'),
 ignore: ['next/router', 'next/constants'],
 gzip: true,
 limit: '40 KB',
 limit: '41 KB',
 },
 // SvelteKit SDK (ESM)
 {
Expand Down

86 changes: 70 additions & 16 deletions
packages/nextjs/src/client/clientNormalizationIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,30 +2,84 @@ import { rewriteFramesIntegration } from '@sentry/browser';
import { defineIntegration } from '@sentry/core';

export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
 ({ assetPrefixPath }: { assetPrefixPath: string }) => {
 ({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }: {
 assetPrefix?: string;
 basePath?: string;
 rewriteFramesAssetPrefixPath: string;
 experimentalThirdPartyOriginStackFrames: boolean;
 }) => {
 const rewriteFramesInstance = rewriteFramesIntegration({
 // Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
 iteratee: frame => {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 if (experimentalThirdPartyOriginStackFrames) {
 // Not sure why but access to global WINDOW from @sentry/Browser causes hideous ci errors
 // eslint-disable-next-line no-restricted-globals
 const windowOrigin = typeof window !== 'undefined' && window.location ? window.location.origin : '';
 // A filename starting with the local origin and not ending with JS is most likely JS in HTML which we do not want to rewrite
 if (frame.filename?.startsWith(windowOrigin) && !frame.filename.endsWith('.js')) {
 return frame;
 }

 if (assetPrefix) {
 // If the user defined an asset prefix, we need to strip it so that we can match it with uploaded sourcemaps.
 // assetPrefix always takes priority over basePath.
 if (frame.filename?.startsWith(assetPrefix)) {
 frame.filename = frame.filename.replace(assetPrefix, 'app://');
 }
 } else if (basePath) {
 // If the user defined a base path, we need to strip it to match with uploaded sourcemaps.
 // We should only do this for same-origin filenames though, so that third party assets are not rewritten.
 try {
 const { origin: frameOrigin } = new URL(frame.filename as string);
 if (frameOrigin === windowOrigin) {
 frame.filename = frame.filename?.replace(frameOrigin, 'app://').replace(basePath, '');
 }
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }
 } else {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(rewriteFramesAssetPrefixPath, '');

Comment on lines

+48
 to 
+49

@s1gr1ds1gr1dFeb 24, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L: That's a minor code-style comment - I would move this logic (which is shorter) upward to improve readability.
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }

 // We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
 // The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }
 if (experimentalThirdPartyOriginStackFrames) {
 if (frame.filename?.includes('/_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 } else {
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 }

 return frame;
Expand Down

21 changes: 18 additions & 3 deletions
packages/nextjs/src/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,9 @@ export { browserTracingIntegration } from './browserTracingIntegration';

const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
 _sentryRewriteFramesAssetPrefixPath: string;
 _sentryAssetPrefix?: string;
 _sentryBasePath?: string;
 _experimentalThirdPartyOriginStackFrames?: string;
};

// Treeshakable guard to remove all code related to tracing
Expand DownExpand Up@@ -67,13 +70,25 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
 customDefaultIntegrations.push(browserTracingIntegration());
 }

 // This value is injected at build time, based on the output directory specified in the build config. Though a default
 // These values are injected at build time, based on the output directory specified in the build config. Though a default
 // is set there, we set it here as well, just in case something has gone wrong with the injection.
 const assetPrefixPath =
 const rewriteFramesAssetPrefixPath =
 process.env._sentryRewriteFramesAssetPrefixPath ||
 globalWithInjectedValues._sentryRewriteFramesAssetPrefixPath ||
 '';
 customDefaultIntegrations.push(nextjsClientStackFrameNormalizationIntegration({ assetPrefixPath }));
 const assetPrefix = process.env._sentryAssetPrefix || globalWithInjectedValues._sentryAssetPrefix;
 const basePath = process.env._sentryBasePath || globalWithInjectedValues._sentryBasePath;
 const experimentalThirdPartyOriginStackFrames =
 process.env._experimentalThirdPartyOriginStackFrames === 'true' ||
 globalWithInjectedValues._experimentalThirdPartyOriginStackFrames === 'true';
 customDefaultIntegrations.push(
 nextjsClientStackFrameNormalizationIntegration({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }),
 );

 return customDefaultIntegrations;
}
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/config/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -439,6 +439,15 @@ export type SentryBuildOptions = {
 * Defaults to `false`.
 */
 automaticVercelMonitors?: boolean;

 /**
 * Contains a set of experimental flags that might change in future releases. These flags enable
 * features that are still in development and may be modified, renamed, or removed without notice.
 * Use with caution in production environments.
 */
 _experimental?: Partial<{
 thirdPartyOriginStackFrames: boolean;
 }>;
};

export type NextConfigFunction = (
Expand Down

4 changes: 4 additions & 0 deletions
packages/nextjs/src/config/webpack.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -624,6 +624,10 @@ function addValueInjectionLoader(
 _sentryRewriteFramesAssetPrefixPath: assetPrefix
 ? new URL(assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '')
 : '',
 _sentryAssetPrefix: userNextConfig.assetPrefix,
 _sentryExperimentalThirdPartyOriginStackFrames: userSentryOptions._experimental?.thirdPartyOriginStackFrames
 ? 'true'
 : undefined,
 };

 if (buildContext.isServer) {
Expand Down

16 changes: 16 additions & 0 deletions
packages/nextjs/src/config/withSentryConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 : '',
 };

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._assetsPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (rewritesTunnelPath) {
 buildTimeVariables._sentryRewritesTunnelPath = rewritesTunnelPath;
 }
Expand All@@ -276,6 +284,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 buildTimeVariables._sentryBasePath = basePath;
 }

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._sentryAssetPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (typeof userNextConfig.env === 'object') {
 userNextConfig.env = { ...buildTimeVariables, ...userNextConfig.env };
 } else if (userNextConfig.env === undefined) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(nextjs): Do not strip origin information from different origin stack frames#15418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 15 commits into

from

Feb 24, 2025
 Merged


feat(nextjs): Do not strip origin information from different origin stack frames
#15418
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
2732514

feat(nextjs): Do not strip origin information from different origin s…

Feb 14, 2025
b6a6818

fix tests?

Feb 14, 2025
f0496d9

.

Feb 14, 2025
e47084a

comments and stuff

Feb 14, 2025
c38281a

add experimental flag


chargome Feb 19, 2025
ad052c3

trigger ci


chargome Feb 19, 2025
e7e7428

debug: remove nextjs from size limit


chargome Feb 19, 2025
7dfc195

add next to size check


chargome Feb 19, 2025
9b9f884

debug: check if window causes ci failure


chargome Feb 21, 2025
9941dab

guard window access


chargome Feb 21, 2025
497b019

sorry for all the notifications luca


chargome Feb 21, 2025
15497db

try without global obj


chargome Feb 21, 2025
27f8c9c

...


chargome Feb 21, 2025
87c3f9c

madonna mia


chargome Feb 21, 2025
818cf78

triste


chargome Feb 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ module.exports = [
 import: createImport('init'),
 ignore: ['next/router', 'next/constants'],
 gzip: true,
 limit: '40 KB',
 limit: '41 KB',
 },
 // SvelteKit SDK (ESM)
 {
Expand Down

86 changes: 70 additions & 16 deletions
packages/nextjs/src/client/clientNormalizationIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,30 +2,84 @@ import { rewriteFramesIntegration } from '@sentry/browser';
import { defineIntegration } from '@sentry/core';

export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
 ({ assetPrefixPath }: { assetPrefixPath: string }) => {
 ({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }: {
 assetPrefix?: string;
 basePath?: string;
 rewriteFramesAssetPrefixPath: string;
 experimentalThirdPartyOriginStackFrames: boolean;
 }) => {
 const rewriteFramesInstance = rewriteFramesIntegration({
 // Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
 iteratee: frame => {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 if (experimentalThirdPartyOriginStackFrames) {
 // Not sure why but access to global WINDOW from @sentry/Browser causes hideous ci errors
 // eslint-disable-next-line no-restricted-globals
 const windowOrigin = typeof window !== 'undefined' && window.location ? window.location.origin : '';
 // A filename starting with the local origin and not ending with JS is most likely JS in HTML which we do not want to rewrite
 if (frame.filename?.startsWith(windowOrigin) && !frame.filename.endsWith('.js')) {
 return frame;
 }

 if (assetPrefix) {
 // If the user defined an asset prefix, we need to strip it so that we can match it with uploaded sourcemaps.
 // assetPrefix always takes priority over basePath.
 if (frame.filename?.startsWith(assetPrefix)) {
 frame.filename = frame.filename.replace(assetPrefix, 'app://');
 }
 } else if (basePath) {
 // If the user defined a base path, we need to strip it to match with uploaded sourcemaps.
 // We should only do this for same-origin filenames though, so that third party assets are not rewritten.
 try {
 const { origin: frameOrigin } = new URL(frame.filename as string);
 if (frameOrigin === windowOrigin) {
 frame.filename = frame.filename?.replace(frameOrigin, 'app://').replace(basePath, '');
 }
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }
 } else {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(rewriteFramesAssetPrefixPath, '');

Comment on lines

+48
 to 
+49

@s1gr1ds1gr1dFeb 24, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L: That's a minor code-style comment - I would move this logic (which is shorter) upward to improve readability.
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }

 // We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
 // The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }
 if (experimentalThirdPartyOriginStackFrames) {
 if (frame.filename?.includes('/_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 } else {
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 }

 return frame;
Expand Down

21 changes: 18 additions & 3 deletions
packages/nextjs/src/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,9 @@ export { browserTracingIntegration } from './browserTracingIntegration';

const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
 _sentryRewriteFramesAssetPrefixPath: string;
 _sentryAssetPrefix?: string;
 _sentryBasePath?: string;
 _experimentalThirdPartyOriginStackFrames?: string;
};

// Treeshakable guard to remove all code related to tracing
Expand DownExpand Up@@ -67,13 +70,25 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
 customDefaultIntegrations.push(browserTracingIntegration());
 }

 // This value is injected at build time, based on the output directory specified in the build config. Though a default
 // These values are injected at build time, based on the output directory specified in the build config. Though a default
 // is set there, we set it here as well, just in case something has gone wrong with the injection.
 const assetPrefixPath =
 const rewriteFramesAssetPrefixPath =
 process.env._sentryRewriteFramesAssetPrefixPath ||
 globalWithInjectedValues._sentryRewriteFramesAssetPrefixPath ||
 '';
 customDefaultIntegrations.push(nextjsClientStackFrameNormalizationIntegration({ assetPrefixPath }));
 const assetPrefix = process.env._sentryAssetPrefix || globalWithInjectedValues._sentryAssetPrefix;
 const basePath = process.env._sentryBasePath || globalWithInjectedValues._sentryBasePath;
 const experimentalThirdPartyOriginStackFrames =
 process.env._experimentalThirdPartyOriginStackFrames === 'true' ||
 globalWithInjectedValues._experimentalThirdPartyOriginStackFrames === 'true';
 customDefaultIntegrations.push(
 nextjsClientStackFrameNormalizationIntegration({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }),
 );

 return customDefaultIntegrations;
}
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/config/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -439,6 +439,15 @@ export type SentryBuildOptions = {
 * Defaults to `false`.
 */
 automaticVercelMonitors?: boolean;

 /**
 * Contains a set of experimental flags that might change in future releases. These flags enable
 * features that are still in development and may be modified, renamed, or removed without notice.
 * Use with caution in production environments.
 */
 _experimental?: Partial<{
 thirdPartyOriginStackFrames: boolean;
 }>;
};

export type NextConfigFunction = (
Expand Down

4 changes: 4 additions & 0 deletions
packages/nextjs/src/config/webpack.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -624,6 +624,10 @@ function addValueInjectionLoader(
 _sentryRewriteFramesAssetPrefixPath: assetPrefix
 ? new URL(assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '')
 : '',
 _sentryAssetPrefix: userNextConfig.assetPrefix,
 _sentryExperimentalThirdPartyOriginStackFrames: userSentryOptions._experimental?.thirdPartyOriginStackFrames
 ? 'true'
 : undefined,
 };

 if (buildContext.isServer) {
Expand Down

16 changes: 16 additions & 0 deletions
packages/nextjs/src/config/withSentryConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 : '',
 };

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._assetsPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (rewritesTunnelPath) {
 buildTimeVariables._sentryRewritesTunnelPath = rewritesTunnelPath;
 }
Expand All@@ -276,6 +284,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 buildTimeVariables._sentryBasePath = basePath;
 }

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._sentryAssetPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (typeof userNextConfig.env === 'object') {
 userNextConfig.env = { ...buildTimeVariables, ...userNextConfig.env };
 } else if (userNextConfig.env === undefined) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(nextjs): Do not strip origin information from different origin stack frames#15418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 15 commits into

from

Feb 24, 2025
 Merged


feat(nextjs): Do not strip origin information from different origin stack frames
#15418
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
2732514

feat(nextjs): Do not strip origin information from different origin s…

Feb 14, 2025
b6a6818

fix tests?

Feb 14, 2025
f0496d9

.

Feb 14, 2025
e47084a

comments and stuff

Feb 14, 2025
c38281a

add experimental flag


chargome Feb 19, 2025
ad052c3

trigger ci


chargome Feb 19, 2025
e7e7428

debug: remove nextjs from size limit


chargome Feb 19, 2025
7dfc195

add next to size check


chargome Feb 19, 2025
9b9f884

debug: check if window causes ci failure


chargome Feb 21, 2025
9941dab

guard window access


chargome Feb 21, 2025
497b019

sorry for all the notifications luca


chargome Feb 21, 2025
15497db

try without global obj


chargome Feb 21, 2025
27f8c9c

...


chargome Feb 21, 2025
87c3f9c

madonna mia


chargome Feb 21, 2025
818cf78

triste


chargome Feb 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ module.exports = [
 import: createImport('init'),
 ignore: ['next/router', 'next/constants'],
 gzip: true,
 limit: '40 KB',
 limit: '41 KB',
 },
 // SvelteKit SDK (ESM)
 {
Expand Down

86 changes: 70 additions & 16 deletions
packages/nextjs/src/client/clientNormalizationIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,30 +2,84 @@ import { rewriteFramesIntegration } from '@sentry/browser';
import { defineIntegration } from '@sentry/core';

export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
 ({ assetPrefixPath }: { assetPrefixPath: string }) => {
 ({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }: {
 assetPrefix?: string;
 basePath?: string;
 rewriteFramesAssetPrefixPath: string;
 experimentalThirdPartyOriginStackFrames: boolean;
 }) => {
 const rewriteFramesInstance = rewriteFramesIntegration({
 // Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
 iteratee: frame => {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 if (experimentalThirdPartyOriginStackFrames) {
 // Not sure why but access to global WINDOW from @sentry/Browser causes hideous ci errors
 // eslint-disable-next-line no-restricted-globals
 const windowOrigin = typeof window !== 'undefined' && window.location ? window.location.origin : '';
 // A filename starting with the local origin and not ending with JS is most likely JS in HTML which we do not want to rewrite
 if (frame.filename?.startsWith(windowOrigin) && !frame.filename.endsWith('.js')) {
 return frame;
 }

 if (assetPrefix) {
 // If the user defined an asset prefix, we need to strip it so that we can match it with uploaded sourcemaps.
 // assetPrefix always takes priority over basePath.
 if (frame.filename?.startsWith(assetPrefix)) {
 frame.filename = frame.filename.replace(assetPrefix, 'app://');
 }
 } else if (basePath) {
 // If the user defined a base path, we need to strip it to match with uploaded sourcemaps.
 // We should only do this for same-origin filenames though, so that third party assets are not rewritten.
 try {
 const { origin: frameOrigin } = new URL(frame.filename as string);
 if (frameOrigin === windowOrigin) {
 frame.filename = frame.filename?.replace(frameOrigin, 'app://').replace(basePath, '');
 }
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }
 } else {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(rewriteFramesAssetPrefixPath, '');

Comment on lines

+48
 to 
+49

@s1gr1ds1gr1dFeb 24, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L: That's a minor code-style comment - I would move this logic (which is shorter) upward to improve readability.
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }

 // We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
 // The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }
 if (experimentalThirdPartyOriginStackFrames) {
 if (frame.filename?.includes('/_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 } else {
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 }

 return frame;
Expand Down

21 changes: 18 additions & 3 deletions
packages/nextjs/src/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,9 @@ export { browserTracingIntegration } from './browserTracingIntegration';

const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
 _sentryRewriteFramesAssetPrefixPath: string;
 _sentryAssetPrefix?: string;
 _sentryBasePath?: string;
 _experimentalThirdPartyOriginStackFrames?: string;
};

// Treeshakable guard to remove all code related to tracing
Expand DownExpand Up@@ -67,13 +70,25 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
 customDefaultIntegrations.push(browserTracingIntegration());
 }

 // This value is injected at build time, based on the output directory specified in the build config. Though a default
 // These values are injected at build time, based on the output directory specified in the build config. Though a default
 // is set there, we set it here as well, just in case something has gone wrong with the injection.
 const assetPrefixPath =
 const rewriteFramesAssetPrefixPath =
 process.env._sentryRewriteFramesAssetPrefixPath ||
 globalWithInjectedValues._sentryRewriteFramesAssetPrefixPath ||
 '';
 customDefaultIntegrations.push(nextjsClientStackFrameNormalizationIntegration({ assetPrefixPath }));
 const assetPrefix = process.env._sentryAssetPrefix || globalWithInjectedValues._sentryAssetPrefix;
 const basePath = process.env._sentryBasePath || globalWithInjectedValues._sentryBasePath;
 const experimentalThirdPartyOriginStackFrames =
 process.env._experimentalThirdPartyOriginStackFrames === 'true' ||
 globalWithInjectedValues._experimentalThirdPartyOriginStackFrames === 'true';
 customDefaultIntegrations.push(
 nextjsClientStackFrameNormalizationIntegration({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }),
 );

 return customDefaultIntegrations;
}
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/config/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -439,6 +439,15 @@ export type SentryBuildOptions = {
 * Defaults to `false`.
 */
 automaticVercelMonitors?: boolean;

 /**
 * Contains a set of experimental flags that might change in future releases. These flags enable
 * features that are still in development and may be modified, renamed, or removed without notice.
 * Use with caution in production environments.
 */
 _experimental?: Partial<{
 thirdPartyOriginStackFrames: boolean;
 }>;
};

export type NextConfigFunction = (
Expand Down

4 changes: 4 additions & 0 deletions
packages/nextjs/src/config/webpack.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -624,6 +624,10 @@ function addValueInjectionLoader(
 _sentryRewriteFramesAssetPrefixPath: assetPrefix
 ? new URL(assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '')
 : '',
 _sentryAssetPrefix: userNextConfig.assetPrefix,
 _sentryExperimentalThirdPartyOriginStackFrames: userSentryOptions._experimental?.thirdPartyOriginStackFrames
 ? 'true'
 : undefined,
 };

 if (buildContext.isServer) {
Expand Down

16 changes: 16 additions & 0 deletions
packages/nextjs/src/config/withSentryConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 : '',
 };

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._assetsPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (rewritesTunnelPath) {
 buildTimeVariables._sentryRewritesTunnelPath = rewritesTunnelPath;
 }
Expand All@@ -276,6 +284,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 buildTimeVariables._sentryBasePath = basePath;
 }

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._sentryAssetPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (typeof userNextConfig.env === 'object') {
 userNextConfig.env = { ...buildTimeVariables, ...userNextConfig.env };
 } else if (userNextConfig.env === undefined) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(nextjs): Do not strip origin information from different origin stack frames#15418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 15 commits into

from

Feb 24, 2025
 Merged


feat(nextjs): Do not strip origin information from different origin stack frames
#15418
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
2732514

feat(nextjs): Do not strip origin information from different origin s…

Feb 14, 2025
b6a6818

fix tests?

Feb 14, 2025
f0496d9

.

Feb 14, 2025
e47084a

comments and stuff

Feb 14, 2025
c38281a

add experimental flag


chargome Feb 19, 2025
ad052c3

trigger ci


chargome Feb 19, 2025
e7e7428

debug: remove nextjs from size limit


chargome Feb 19, 2025
7dfc195

add next to size check


chargome Feb 19, 2025
9b9f884

debug: check if window causes ci failure


chargome Feb 21, 2025
9941dab

guard window access


chargome Feb 21, 2025
497b019

sorry for all the notifications luca


chargome Feb 21, 2025
15497db

try without global obj


chargome Feb 21, 2025
27f8c9c

...


chargome Feb 21, 2025
87c3f9c

madonna mia


chargome Feb 21, 2025
818cf78

triste


chargome Feb 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ module.exports = [
 import: createImport('init'),
 ignore: ['next/router', 'next/constants'],
 gzip: true,
 limit: '40 KB',
 limit: '41 KB',
 },
 // SvelteKit SDK (ESM)
 {
Expand Down

86 changes: 70 additions & 16 deletions
packages/nextjs/src/client/clientNormalizationIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,30 +2,84 @@ import { rewriteFramesIntegration } from '@sentry/browser';
import { defineIntegration } from '@sentry/core';

export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
 ({ assetPrefixPath }: { assetPrefixPath: string }) => {
 ({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }: {
 assetPrefix?: string;
 basePath?: string;
 rewriteFramesAssetPrefixPath: string;
 experimentalThirdPartyOriginStackFrames: boolean;
 }) => {
 const rewriteFramesInstance = rewriteFramesIntegration({
 // Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
 iteratee: frame => {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 if (experimentalThirdPartyOriginStackFrames) {
 // Not sure why but access to global WINDOW from @sentry/Browser causes hideous ci errors
 // eslint-disable-next-line no-restricted-globals
 const windowOrigin = typeof window !== 'undefined' && window.location ? window.location.origin : '';
 // A filename starting with the local origin and not ending with JS is most likely JS in HTML which we do not want to rewrite
 if (frame.filename?.startsWith(windowOrigin) && !frame.filename.endsWith('.js')) {
 return frame;
 }

 if (assetPrefix) {
 // If the user defined an asset prefix, we need to strip it so that we can match it with uploaded sourcemaps.
 // assetPrefix always takes priority over basePath.
 if (frame.filename?.startsWith(assetPrefix)) {
 frame.filename = frame.filename.replace(assetPrefix, 'app://');
 }
 } else if (basePath) {
 // If the user defined a base path, we need to strip it to match with uploaded sourcemaps.
 // We should only do this for same-origin filenames though, so that third party assets are not rewritten.
 try {
 const { origin: frameOrigin } = new URL(frame.filename as string);
 if (frameOrigin === windowOrigin) {
 frame.filename = frame.filename?.replace(frameOrigin, 'app://').replace(basePath, '');
 }
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }
 } else {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(rewriteFramesAssetPrefixPath, '');

Comment on lines

+48
 to 
+49

@s1gr1ds1gr1dFeb 24, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L: That's a minor code-style comment - I would move this logic (which is shorter) upward to improve readability.
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }

 // We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
 // The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }
 if (experimentalThirdPartyOriginStackFrames) {
 if (frame.filename?.includes('/_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 } else {
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 }

 return frame;
Expand Down

21 changes: 18 additions & 3 deletions
packages/nextjs/src/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,9 @@ export { browserTracingIntegration } from './browserTracingIntegration';

const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
 _sentryRewriteFramesAssetPrefixPath: string;
 _sentryAssetPrefix?: string;
 _sentryBasePath?: string;
 _experimentalThirdPartyOriginStackFrames?: string;
};

// Treeshakable guard to remove all code related to tracing
Expand DownExpand Up@@ -67,13 +70,25 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
 customDefaultIntegrations.push(browserTracingIntegration());
 }

 // This value is injected at build time, based on the output directory specified in the build config. Though a default
 // These values are injected at build time, based on the output directory specified in the build config. Though a default
 // is set there, we set it here as well, just in case something has gone wrong with the injection.
 const assetPrefixPath =
 const rewriteFramesAssetPrefixPath =
 process.env._sentryRewriteFramesAssetPrefixPath ||
 globalWithInjectedValues._sentryRewriteFramesAssetPrefixPath ||
 '';
 customDefaultIntegrations.push(nextjsClientStackFrameNormalizationIntegration({ assetPrefixPath }));
 const assetPrefix = process.env._sentryAssetPrefix || globalWithInjectedValues._sentryAssetPrefix;
 const basePath = process.env._sentryBasePath || globalWithInjectedValues._sentryBasePath;
 const experimentalThirdPartyOriginStackFrames =
 process.env._experimentalThirdPartyOriginStackFrames === 'true' ||
 globalWithInjectedValues._experimentalThirdPartyOriginStackFrames === 'true';
 customDefaultIntegrations.push(
 nextjsClientStackFrameNormalizationIntegration({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }),
 );

 return customDefaultIntegrations;
}
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/config/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -439,6 +439,15 @@ export type SentryBuildOptions = {
 * Defaults to `false`.
 */
 automaticVercelMonitors?: boolean;

 /**
 * Contains a set of experimental flags that might change in future releases. These flags enable
 * features that are still in development and may be modified, renamed, or removed without notice.
 * Use with caution in production environments.
 */
 _experimental?: Partial<{
 thirdPartyOriginStackFrames: boolean;
 }>;
};

export type NextConfigFunction = (
Expand Down

4 changes: 4 additions & 0 deletions
packages/nextjs/src/config/webpack.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -624,6 +624,10 @@ function addValueInjectionLoader(
 _sentryRewriteFramesAssetPrefixPath: assetPrefix
 ? new URL(assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '')
 : '',
 _sentryAssetPrefix: userNextConfig.assetPrefix,
 _sentryExperimentalThirdPartyOriginStackFrames: userSentryOptions._experimental?.thirdPartyOriginStackFrames
 ? 'true'
 : undefined,
 };

 if (buildContext.isServer) {
Expand Down

16 changes: 16 additions & 0 deletions
packages/nextjs/src/config/withSentryConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 : '',
 };

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._assetsPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (rewritesTunnelPath) {
 buildTimeVariables._sentryRewritesTunnelPath = rewritesTunnelPath;
 }
Expand All@@ -276,6 +284,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 buildTimeVariables._sentryBasePath = basePath;
 }

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._sentryAssetPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (typeof userNextConfig.env === 'object') {
 userNextConfig.env = { ...buildTimeVariables, ...userNextConfig.env };
 } else if (userNextConfig.env === undefined) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(nextjs): Do not strip origin information from different origin stack frames#15418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 15 commits into

from

Feb 24, 2025
 Merged


feat(nextjs): Do not strip origin information from different origin stack frames
#15418
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
2732514

feat(nextjs): Do not strip origin information from different origin s…

Feb 14, 2025
b6a6818

fix tests?

Feb 14, 2025
f0496d9

.

Feb 14, 2025
e47084a

comments and stuff

Feb 14, 2025
c38281a

add experimental flag


chargome Feb 19, 2025
ad052c3

trigger ci


chargome Feb 19, 2025
e7e7428

debug: remove nextjs from size limit


chargome Feb 19, 2025
7dfc195

add next to size check


chargome Feb 19, 2025
9b9f884

debug: check if window causes ci failure


chargome Feb 21, 2025
9941dab

guard window access


chargome Feb 21, 2025
497b019

sorry for all the notifications luca


chargome Feb 21, 2025
15497db

try without global obj


chargome Feb 21, 2025
27f8c9c

...


chargome Feb 21, 2025
87c3f9c

madonna mia


chargome Feb 21, 2025
818cf78

triste


chargome Feb 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ module.exports = [
 import: createImport('init'),
 ignore: ['next/router', 'next/constants'],
 gzip: true,
 limit: '40 KB',
 limit: '41 KB',
 },
 // SvelteKit SDK (ESM)
 {
Expand Down

86 changes: 70 additions & 16 deletions
packages/nextjs/src/client/clientNormalizationIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,30 +2,84 @@ import { rewriteFramesIntegration } from '@sentry/browser';
import { defineIntegration } from '@sentry/core';

export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
 ({ assetPrefixPath }: { assetPrefixPath: string }) => {
 ({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }: {
 assetPrefix?: string;
 basePath?: string;
 rewriteFramesAssetPrefixPath: string;
 experimentalThirdPartyOriginStackFrames: boolean;
 }) => {
 const rewriteFramesInstance = rewriteFramesIntegration({
 // Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
 iteratee: frame => {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 if (experimentalThirdPartyOriginStackFrames) {
 // Not sure why but access to global WINDOW from @sentry/Browser causes hideous ci errors
 // eslint-disable-next-line no-restricted-globals
 const windowOrigin = typeof window !== 'undefined' && window.location ? window.location.origin : '';
 // A filename starting with the local origin and not ending with JS is most likely JS in HTML which we do not want to rewrite
 if (frame.filename?.startsWith(windowOrigin) && !frame.filename.endsWith('.js')) {
 return frame;
 }

 if (assetPrefix) {
 // If the user defined an asset prefix, we need to strip it so that we can match it with uploaded sourcemaps.
 // assetPrefix always takes priority over basePath.
 if (frame.filename?.startsWith(assetPrefix)) {
 frame.filename = frame.filename.replace(assetPrefix, 'app://');
 }
 } else if (basePath) {
 // If the user defined a base path, we need to strip it to match with uploaded sourcemaps.
 // We should only do this for same-origin filenames though, so that third party assets are not rewritten.
 try {
 const { origin: frameOrigin } = new URL(frame.filename as string);
 if (frameOrigin === windowOrigin) {
 frame.filename = frame.filename?.replace(frameOrigin, 'app://').replace(basePath, '');
 }
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }
 } else {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(rewriteFramesAssetPrefixPath, '');

Comment on lines

+48
 to 
+49

@s1gr1ds1gr1dFeb 24, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L: That's a minor code-style comment - I would move this logic (which is shorter) upward to improve readability.
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }

 // We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
 // The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }
 if (experimentalThirdPartyOriginStackFrames) {
 if (frame.filename?.includes('/_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 } else {
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 }

 return frame;
Expand Down

21 changes: 18 additions & 3 deletions
packages/nextjs/src/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,9 @@ export { browserTracingIntegration } from './browserTracingIntegration';

const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
 _sentryRewriteFramesAssetPrefixPath: string;
 _sentryAssetPrefix?: string;
 _sentryBasePath?: string;
 _experimentalThirdPartyOriginStackFrames?: string;
};

// Treeshakable guard to remove all code related to tracing
Expand DownExpand Up@@ -67,13 +70,25 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
 customDefaultIntegrations.push(browserTracingIntegration());
 }

 // This value is injected at build time, based on the output directory specified in the build config. Though a default
 // These values are injected at build time, based on the output directory specified in the build config. Though a default
 // is set there, we set it here as well, just in case something has gone wrong with the injection.
 const assetPrefixPath =
 const rewriteFramesAssetPrefixPath =
 process.env._sentryRewriteFramesAssetPrefixPath ||
 globalWithInjectedValues._sentryRewriteFramesAssetPrefixPath ||
 '';
 customDefaultIntegrations.push(nextjsClientStackFrameNormalizationIntegration({ assetPrefixPath }));
 const assetPrefix = process.env._sentryAssetPrefix || globalWithInjectedValues._sentryAssetPrefix;
 const basePath = process.env._sentryBasePath || globalWithInjectedValues._sentryBasePath;
 const experimentalThirdPartyOriginStackFrames =
 process.env._experimentalThirdPartyOriginStackFrames === 'true' ||
 globalWithInjectedValues._experimentalThirdPartyOriginStackFrames === 'true';
 customDefaultIntegrations.push(
 nextjsClientStackFrameNormalizationIntegration({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }),
 );

 return customDefaultIntegrations;
}
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/config/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -439,6 +439,15 @@ export type SentryBuildOptions = {
 * Defaults to `false`.
 */
 automaticVercelMonitors?: boolean;

 /**
 * Contains a set of experimental flags that might change in future releases. These flags enable
 * features that are still in development and may be modified, renamed, or removed without notice.
 * Use with caution in production environments.
 */
 _experimental?: Partial<{
 thirdPartyOriginStackFrames: boolean;
 }>;
};

export type NextConfigFunction = (
Expand Down

4 changes: 4 additions & 0 deletions
packages/nextjs/src/config/webpack.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -624,6 +624,10 @@ function addValueInjectionLoader(
 _sentryRewriteFramesAssetPrefixPath: assetPrefix
 ? new URL(assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '')
 : '',
 _sentryAssetPrefix: userNextConfig.assetPrefix,
 _sentryExperimentalThirdPartyOriginStackFrames: userSentryOptions._experimental?.thirdPartyOriginStackFrames
 ? 'true'
 : undefined,
 };

 if (buildContext.isServer) {
Expand Down

16 changes: 16 additions & 0 deletions
packages/nextjs/src/config/withSentryConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 : '',
 };

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._assetsPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (rewritesTunnelPath) {
 buildTimeVariables._sentryRewritesTunnelPath = rewritesTunnelPath;
 }
Expand All@@ -276,6 +284,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 buildTimeVariables._sentryBasePath = basePath;
 }

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._sentryAssetPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (typeof userNextConfig.env === 'object') {
 userNextConfig.env = { ...buildTimeVariables, ...userNextConfig.env };
 } else if (userNextConfig.env === undefined) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(nextjs): Do not strip origin information from different origin stack frames#15418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lforst
merged 15 commits into

from

Feb 24, 2025
 Merged


feat(nextjs): Do not strip origin information from different origin stack frames
#15418
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
2732514

feat(nextjs): Do not strip origin information from different origin s…

Feb 14, 2025
b6a6818

fix tests?

Feb 14, 2025
f0496d9

.

Feb 14, 2025
e47084a

comments and stuff

Feb 14, 2025
c38281a

add experimental flag


chargome Feb 19, 2025
ad052c3

trigger ci


chargome Feb 19, 2025
e7e7428

debug: remove nextjs from size limit


chargome Feb 19, 2025
7dfc195

add next to size check


chargome Feb 19, 2025
9b9f884

debug: check if window causes ci failure


chargome Feb 21, 2025
9941dab

guard window access


chargome Feb 21, 2025
497b019

sorry for all the notifications luca


chargome Feb 21, 2025
15497db

try without global obj


chargome Feb 21, 2025
27f8c9c

...


chargome Feb 21, 2025
87c3f9c

madonna mia


chargome Feb 21, 2025
818cf78

triste


chargome Feb 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ module.exports = [
 import: createImport('init'),
 ignore: ['next/router', 'next/constants'],
 gzip: true,
 limit: '40 KB',
 limit: '41 KB',
 },
 // SvelteKit SDK (ESM)
 {
Expand Down

86 changes: 70 additions & 16 deletions
packages/nextjs/src/client/clientNormalizationIntegration.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,30 +2,84 @@ import { rewriteFramesIntegration } from '@sentry/browser';
import { defineIntegration } from '@sentry/core';

export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
 ({ assetPrefixPath }: { assetPrefixPath: string }) => {
 ({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }: {
 assetPrefix?: string;
 basePath?: string;
 rewriteFramesAssetPrefixPath: string;
 experimentalThirdPartyOriginStackFrames: boolean;
 }) => {
 const rewriteFramesInstance = rewriteFramesIntegration({
 // Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
 iteratee: frame => {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 if (experimentalThirdPartyOriginStackFrames) {
 // Not sure why but access to global WINDOW from @sentry/Browser causes hideous ci errors
 // eslint-disable-next-line no-restricted-globals
 const windowOrigin = typeof window !== 'undefined' && window.location ? window.location.origin : '';
 // A filename starting with the local origin and not ending with JS is most likely JS in HTML which we do not want to rewrite
 if (frame.filename?.startsWith(windowOrigin) && !frame.filename.endsWith('.js')) {
 return frame;
 }

 if (assetPrefix) {
 // If the user defined an asset prefix, we need to strip it so that we can match it with uploaded sourcemaps.
 // assetPrefix always takes priority over basePath.
 if (frame.filename?.startsWith(assetPrefix)) {
 frame.filename = frame.filename.replace(assetPrefix, 'app://');
 }
 } else if (basePath) {
 // If the user defined a base path, we need to strip it to match with uploaded sourcemaps.
 // We should only do this for same-origin filenames though, so that third party assets are not rewritten.
 try {
 const { origin: frameOrigin } = new URL(frame.filename as string);
 if (frameOrigin === windowOrigin) {
 frame.filename = frame.filename?.replace(frameOrigin, 'app://').replace(basePath, '');
 }
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }
 } else {
 try {
 const { origin } = new URL(frame.filename as string);
 frame.filename = frame.filename?.replace(origin, 'app://').replace(rewriteFramesAssetPrefixPath, '');

Comment on lines

+48
 to 
+49

@s1gr1ds1gr1dFeb 24, 2025

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L: That's a minor code-style comment - I would move this logic (which is shorter) upward to improve readability.
 } catch (err) {
 // Filename wasn't a properly formed URL, so there's nothing we can do
 }
 }

 // We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
 // The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }
 if (experimentalThirdPartyOriginStackFrames) {
 if (frame.filename?.includes('/_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 } else {
 if (frame.filename?.startsWith('app:///_next')) {
 frame.filename = decodeURI(frame.filename);
 }

 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 if (
 frame.filename?.match(
 /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
 )
 ) {
 // We don't care about these frames. It's Next.js internal code.
 frame.in_app = false;
 }
 }

 return frame;
Expand Down

21 changes: 18 additions & 3 deletions
packages/nextjs/src/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,9 @@ export { browserTracingIntegration } from './browserTracingIntegration';

const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
 _sentryRewriteFramesAssetPrefixPath: string;
 _sentryAssetPrefix?: string;
 _sentryBasePath?: string;
 _experimentalThirdPartyOriginStackFrames?: string;
};

// Treeshakable guard to remove all code related to tracing
Expand DownExpand Up@@ -67,13 +70,25 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
 customDefaultIntegrations.push(browserTracingIntegration());
 }

 // This value is injected at build time, based on the output directory specified in the build config. Though a default
 // These values are injected at build time, based on the output directory specified in the build config. Though a default
 // is set there, we set it here as well, just in case something has gone wrong with the injection.
 const assetPrefixPath =
 const rewriteFramesAssetPrefixPath =
 process.env._sentryRewriteFramesAssetPrefixPath ||
 globalWithInjectedValues._sentryRewriteFramesAssetPrefixPath ||
 '';
 customDefaultIntegrations.push(nextjsClientStackFrameNormalizationIntegration({ assetPrefixPath }));
 const assetPrefix = process.env._sentryAssetPrefix || globalWithInjectedValues._sentryAssetPrefix;
 const basePath = process.env._sentryBasePath || globalWithInjectedValues._sentryBasePath;
 const experimentalThirdPartyOriginStackFrames =
 process.env._experimentalThirdPartyOriginStackFrames === 'true' ||
 globalWithInjectedValues._experimentalThirdPartyOriginStackFrames === 'true';
 customDefaultIntegrations.push(
 nextjsClientStackFrameNormalizationIntegration({
 assetPrefix,
 basePath,
 rewriteFramesAssetPrefixPath,
 experimentalThirdPartyOriginStackFrames,
 }),
 );

 return customDefaultIntegrations;
}
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/config/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -439,6 +439,15 @@ export type SentryBuildOptions = {
 * Defaults to `false`.
 */
 automaticVercelMonitors?: boolean;

 /**
 * Contains a set of experimental flags that might change in future releases. These flags enable
 * features that are still in development and may be modified, renamed, or removed without notice.
 * Use with caution in production environments.
 */
 _experimental?: Partial<{
 thirdPartyOriginStackFrames: boolean;
 }>;
};

export type NextConfigFunction = (
Expand Down

4 changes: 4 additions & 0 deletions
packages/nextjs/src/config/webpack.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -624,6 +624,10 @@ function addValueInjectionLoader(
 _sentryRewriteFramesAssetPrefixPath: assetPrefix
 ? new URL(assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '')
 : '',
 _sentryAssetPrefix: userNextConfig.assetPrefix,
 _sentryExperimentalThirdPartyOriginStackFrames: userSentryOptions._experimental?.thirdPartyOriginStackFrames
 ? 'true'
 : undefined,
 };

 if (buildContext.isServer) {
Expand Down

16 changes: 16 additions & 0 deletions
packages/nextjs/src/config/withSentryConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,6 +268,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 : '',
 };

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._assetsPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (rewritesTunnelPath) {
 buildTimeVariables._sentryRewritesTunnelPath = rewritesTunnelPath;
 }
Expand All@@ -276,6 +284,14 @@ function setUpBuildTimeVariables(userNextConfig: NextConfigObject, userSentryOpt
 buildTimeVariables._sentryBasePath = basePath;
 }

 if (userNextConfig.assetPrefix) {
 buildTimeVariables._sentryAssetPrefix = userNextConfig.assetPrefix;
 }

 if (userSentryOptions._experimental?.thirdPartyOriginStackFrames) {
 buildTimeVariables._experimentalThirdPartyOriginStackFrames = 'true';
 }

 if (typeof userNextConfig.env === 'object') {
 userNextConfig.env = { ...buildTimeVariables, ...userNextConfig.env };
 } else if (userNextConfig.env === undefined) {
Expand Down