Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions packages/nextjs/src/config/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import includeAllNextjsProps from './nextConfigToWebpackPluginConfig';
import { ExportedNextConfig, NextConfigFunction, NextConfigObject, SentryWebpackPluginOptions } from './types';
import { constructWebpackConfigFunction } from './webpack';

Expand All @@ -18,21 +17,16 @@ export function withSentryConfig(
if (typeof userNextConfig === 'function') {
return function(phase: string, defaults: { defaultConfig: NextConfigObject }): NextConfigObject {
const materializedUserNextConfig = userNextConfig(phase, defaults);
const sentryWebpackPluginOptionsWithSources = includeAllNextjsProps(
materializedUserNextConfig,
userSentryWebpackPluginOptions,
);
return {
...materializedUserNextConfig,
webpack: constructWebpackConfigFunction(materializedUserNextConfig, sentryWebpackPluginOptionsWithSources),
webpack: constructWebpackConfigFunction(materializedUserNextConfig, userSentryWebpackPluginOptions),
};
};
}

const webpackPluginOptionsWithSources = includeAllNextjsProps(userNextConfig, userSentryWebpackPluginOptions);
// Otherwise, we can just merge their config with ours and return an object.
return {
...userNextConfig,
webpack: constructWebpackConfigFunction(userNextConfig, webpackPluginOptionsWithSources),
webpack: constructWebpackConfigFunction(userNextConfig, userSentryWebpackPluginOptions),
};
}
125 changes: 0 additions & 125 deletions packages/nextjs/src/config/nextConfigToWebpackPluginConfig.ts

This file was deleted.

117 changes: 0 additions & 117 deletions packages/nextjs/test/config/nextConfigToWebpackPluginConfig.test.ts

This file was deleted.