fix types

Author: lobsterkatie

packages/nextjs/src/config/index.ts

@@ -12,7 +12,7 @@ import { constructWebpackConfigFunction } from './webpack';
 export function withSentryConfig(
   userNextConfig: ExportedNextConfig = {},
   userSentryWebpackPluginOptions: Partial<SentryWebpackPluginOptions> = {},
-): NextConfigFunction | NextConfigObject {
+): NextConfigFunction | Partial<NextConfigObject> {
   // If the user has passed us a function, we need to return a function, so that we have access to `phase` and
   // `defaults` in order to pass them along to the user's function
   if (typeof userNextConfig === 'function') {

packages/nextjs/src/config/types.ts

@@ -8,15 +8,15 @@ export type SentryWebpackPlugin = WebpackPluginInstance & { options: SentryWebpa
  * Overall Nextjs config
  */
 
-export type ExportedNextConfig = NextConfigObject | NextConfigFunction;
+export type ExportedNextConfig = Partial<NextConfigObject> | NextConfigFunction;
 
 export type NextConfigObject = {
   // custom webpack options
-  webpack?: WebpackConfigFunction;
+  webpack: WebpackConfigFunction;
   // whether to build serverless functions for all pages, not just API routes
-  target?: 'server' | 'experimental-serverless-trace';
+  target: 'server' | 'experimental-serverless-trace';
   // the output directory for the built app (defaults to ".next")
-  distDir?: string;
+  distDir: string;
   sentry?: {
     disableServerWebpackPlugin?: boolean;
     disableClientWebpackPlugin?: boolean;
@@ -26,10 +26,7 @@ export type NextConfigObject = {
   [key: string]: unknown;
 };
 
-export type NextConfigFunction = (
-  phase: string,
-  defaults: { defaultConfig: { [key: string]: unknown } },
-) => NextConfigObject;
+export type NextConfigFunction = (phase: string, defaults: { defaultConfig: NextConfigObject }) => NextConfigObject;
 
 /**
  * Webpack config
@@ -59,7 +56,7 @@ export type BuildContext = {
   isServer: boolean;
   buildId: string;
   dir: string;
-  config: Partial<NextConfigObject>;
+  config: NextConfigObject;
   webpack: { version: string };
 };
 

packages/nextjs/src/config/webpack.ts

@@ -45,7 +45,7 @@ export { SentryWebpackPlugin };
  * @returns The function to set as the nextjs config's `webpack` value
  */
 export function constructWebpackConfigFunction(
-  userNextConfig: NextConfigObject = {},
+  userNextConfig: Partial<NextConfigObject> = {},
   userSentryWebpackPluginOptions: Partial<SentryWebpackPluginOptions> = {},
 ): WebpackConfigFunction {
   // Will be called by nextjs and passed its default webpack configuration and context data about the build (whether