Fix typing issue with withSentryConfig and NextConfig

Author: timfish

.gitignore

@@ -1,6 +1,7 @@
 # dependencies
 node_modules/
 packages/*/package-lock.json
+packages/**/test/**/yarn.lock
 package-lock.json
 
 # build and test

packages/nextjs/package.json

@@ -66,7 +66,8 @@
     "test": "run-s test:unit",
     "test:all": "run-s test:unit test:integration",
     "test:unit": "jest",
-    "test:integration": "test/run-integration-tests.sh",
+    "test:integration": "test/run-integration-tests.sh && yarn test:types",
+    "test:types": "cd test/types/ && yarn && tsc",
     "test:watch": "jest --watch",
     "vercel:branch": "source vercel/set-up-branch-for-test-app-use.sh",
     "vercel:project": "source vercel/make-project-use-current-branch.sh"

packages/nextjs/src/config/types.ts

@@ -23,7 +23,7 @@ export type NextConfigFunctionWithSentry = (
 
 export type NextConfigObject = {
   // Custom webpack options
-  webpack?: WebpackConfigFunction;
+  webpack?: WebpackConfigFunction | null;
   // Whether to build serverless functions for all pages, not just API routes. Removed in nextjs 12+.
   target?: 'server' | 'experimental-serverless-trace';
   // The output directory for the built app (defaults to ".next")
@@ -93,8 +93,13 @@ export type BuildContext = {
   isServer: boolean;
   buildId: string;
   dir: string;
-  config: NextConfigObject;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  config: any;
   webpack: { version: string };
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  defaultLoaders: { babel: any };
+  totalPages: number;
+  nextRuntime?: 'nodejs' | 'edge';
 };
 
 /**

packages/nextjs/src/config/webpack.ts

@@ -401,7 +401,9 @@ export function getWebpackPluginOptions(
   userPluginOptions: Partial<SentryWebpackPluginOptions>,
   userSentryOptions: UserSentryOptions,
 ): SentryWebpackPluginOptions {
-  const { buildId, isServer, webpack, config: userNextConfig, dev: isDev, dir: projectDir } = buildContext;
+  const { buildId, isServer, webpack, config, dev: isDev, dir: projectDir } = buildContext;
+  const userNextConfig = config as NextConfigObject;
+
   const distDir = userNextConfig.distDir ?? '.next'; // `.next` is the default directory
 
   const isWebpack5 = webpack.version.startsWith('5');

packages/nextjs/test/types/next.config.ts

@@ -0,0 +1,17 @@
+import { withSentryConfig } from '../../src/config';
+import { NextConfig } from 'next';
+
+const config: NextConfig = {
+  hideSourceMaps: true,
+  webpack: config => ({
+    ...config,
+    module: {
+      ...config.module,
+      rules: [...config.module.rules],
+    },
+  }),
+};
+
+module.exports = withSentryConfig(config, {
+  validate: true,
+});

packages/nextjs/test/types/package.json

@@ -0,0 +1,6 @@
+{
+  "description": "This is only used to install the nextjs v12 package so we can test against those types",
+  "dependencies": {
+    "next": "12.3.1"
+  }
+}

packages/nextjs/test/types/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.json",
+  "include": [
+    "./**/*"
+  ]
+}