Skip to content

Commit f069cb0

Browse files
committed
don't do include merging
1 parent c6ff13d commit f069cb0

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

packages/nextjs/src/config/index.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import includeAllNextjsProps from './nextConfigToWebpackPluginConfig';
1+
// import includeAllNextjsProps from './nextConfigToWebpackPluginConfig';
22
import { ExportedNextConfig, NextConfigFunction, NextConfigObject, SentryWebpackPluginOptions } from './types';
33
import { constructWebpackConfigFunction } from './webpack';
44

@@ -18,21 +18,23 @@ export function withSentryConfig(
1818
if (typeof userNextConfig === 'function') {
1919
return function(phase: string, defaults: { defaultConfig: NextConfigObject }): NextConfigObject {
2020
const materializedUserNextConfig = userNextConfig(phase, defaults);
21-
const sentryWebpackPluginOptionsWithSources = includeAllNextjsProps(
22-
materializedUserNextConfig,
23-
userSentryWebpackPluginOptions,
24-
);
21+
// const sentryWebpackPluginOptionsWithSources = includeAllNextjsProps(
22+
// materializedUserNextConfig,
23+
// userSentryWebpackPluginOptions,
24+
// );
2525
return {
2626
...materializedUserNextConfig,
27-
webpack: constructWebpackConfigFunction(materializedUserNextConfig, sentryWebpackPluginOptionsWithSources),
27+
webpack: constructWebpackConfigFunction(materializedUserNextConfig, userSentryWebpackPluginOptions),
28+
// webpack: constructWebpackConfigFunction(materializedUserNextConfig, sentryWebpackPluginOptionsWithSources),
2829
};
2930
};
3031
}
3132

32-
const webpackPluginOptionsWithSources = includeAllNextjsProps(userNextConfig, userSentryWebpackPluginOptions);
33+
// const webpackPluginOptionsWithSources = includeAllNextjsProps(userNextConfig, userSentryWebpackPluginOptions);
3334
// Otherwise, we can just merge their config with ours and return an object.
3435
return {
3536
...userNextConfig,
36-
webpack: constructWebpackConfigFunction(userNextConfig, webpackPluginOptionsWithSources),
37+
webpack: constructWebpackConfigFunction(userNextConfig, userSentryWebpackPluginOptions),
38+
// webpack: constructWebpackConfigFunction(userNextConfig, webpackPluginOptionsWithSources),
3739
};
3840
}

0 commit comments

Comments
 (0)