Skip to content

Commit bdb4885

Browse files
committed
fix: rename debug logging here already so we don't have to later
1 parent eb17e0a commit bdb4885

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

packages/nextjs/src/config/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export type SentryBuildWebpackOptions = {
111111
/**
112112
* Tree shakes Sentry SDK logger statements from the bundle. Note that this doesn't affect Sentry Logs.
113113
*/
114-
debugLogs?: boolean;
114+
debugLogging?: boolean;
115115
};
116116

117117
/**
@@ -535,7 +535,7 @@ export type SentryBuildOptions = {
535535
/**
536536
* Tree shakes Sentry SDK logger statements from the bundle.
537537
*
538-
* @deprecated Use `webpack.treeshake.debugLogs` instead.
538+
* @deprecated Use `webpack.treeshake.debugLogging` instead.
539539
*/
540540
disableLogger?: boolean;
541541

packages/nextjs/src/config/webpack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ export function constructWebpackConfigFunction({
431431
}
432432
}
433433

434-
if (userSentryOptions.webpack?.treeshake?.debugLogs) {
434+
if (userSentryOptions.webpack?.treeshake?.debugLogging) {
435435
newConfig.plugins = newConfig.plugins || [];
436436
newConfig.plugins.push(
437437
new buildContext.webpack.DefinePlugin({

packages/nextjs/src/config/withSentryConfig.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ function migrateDeprecatedWebpackOptions(userSentryOptions: SentryBuildOptions):
162162
deprecatedMessage('disableSentryWebpackConfig', 'webpack.disableSentryConfig'),
163163
);
164164

165-
// Handle treeshake.debugLogs specially since it's nested
165+
// Handle treeshake.debugLogging specially since it's nested
166166
if (userSentryOptions.disableLogger !== undefined) {
167167
webpack.treeshake = webpack.treeshake || {};
168-
webpack.treeshake.debugLogs = withDeprecatedFallback(
169-
webpack.treeshake.debugLogs,
168+
webpack.treeshake.debugLogging = withDeprecatedFallback(
169+
webpack.treeshake.debugLogging,
170170
userSentryOptions.disableLogger,
171-
deprecatedMessage('disableLogger', 'webpack.treeshake.debugLogs'),
171+
deprecatedMessage('disableLogger', 'webpack.treeshake.debugLogging'),
172172
);
173173
}
174174

packages/nextjs/test/config/withSentryConfig.test.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,14 @@ describe('withSentryConfig', () => {
334334
expect(finalConfig.webpack).toBe(originalWebpackFunction);
335335
});
336336

337-
it('merges webpack.treeshake.debugLogs with deprecated disableLogger', () => {
337+
it('merges webpack.treeshake.debugLogging with deprecated disableLogger', () => {
338338
delete process.env.TURBOPACK;
339339

340-
// New webpack.treeshake.debugLogs should map to disableLogger internally
340+
// New webpack.treeshake.debugLogging should map to disableLogger internally
341341
const sentryOptionsNew = {
342342
webpack: {
343343
treeshake: {
344-
debugLogs: true,
344+
debugLogging: true,
345345
},
346346
},
347347
};
@@ -385,7 +385,9 @@ describe('withSentryConfig', () => {
385385
expect(consoleWarnSpy).toHaveBeenCalledWith(
386386
expect.stringContaining('[@sentry/nextjs] DEPRECATION WARNING: disableLogger is deprecated'),
387387
);
388-
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Use webpack.treeshake.debugLogs instead'));
388+
expect(consoleWarnSpy).toHaveBeenCalledWith(
389+
expect.stringContaining('Use webpack.treeshake.debugLogging instead'),
390+
);
389391
});
390392

391393
it('does not warn when using new webpack path', () => {
@@ -394,7 +396,7 @@ describe('withSentryConfig', () => {
394396
const sentryOptions = {
395397
webpack: {
396398
treeshake: {
397-
debugLogs: true,
399+
debugLogging: true,
398400
},
399401
},
400402
};
@@ -411,7 +413,7 @@ describe('withSentryConfig', () => {
411413
disableLogger: true, // deprecated
412414
webpack: {
413415
treeshake: {
414-
debugLogs: false, // new path takes precedence
416+
debugLogging: false, // new path takes precedence
415417
},
416418
},
417419
};

0 commit comments

Comments
 (0)