fix typings

Co-authored-by: Jiachi Liu <[email protected]>

Author: Netail

packages/next/errors.json

@@ -778,5 +778,6 @@
   "777": "Invariant: failed to find source route %s for prerender %s",
   "778": "`prerenderAndAbortInSequentialTasksWithStages` should not be called in edge runtime.",
   "779": "Route %s used \"searchParams\" inside \"use cache\". Accessing dynamic request data inside a cache scope is not supported. If you need some search params inside a cached function await \"searchParams\" outside of the cached function and pass only the required search params as arguments to the cached function. See more info here: https://nextjs.org/docs/messages/next-request-in-use-cache",
-  "780": "Invariant: failed to find parent dynamic route for notFound route %s"
+  "780": "Invariant: failed to find parent dynamic route for notFound route %s",
+  "781": "No webpack compiler"
 }

packages/next/src/build/compiler.ts

@@ -54,6 +54,10 @@ export function runCompiler(
   return new Promise((resolve, reject) => {
     const compiler = getWebpackBundler()(config)
 
+    if (!compiler) {
+      throw new Error('No webpack compiler')
+    }
+
     // Ensure we use the previous inputFileSystem
     if (inputFileSystem) {
       compiler.inputFileSystem = inputFileSystem

packages/next/src/build/webpack-config.ts

@@ -1120,8 +1120,8 @@ export default async function getBaseWebpackConfig(
           chunks: 'all' as const,
           name: 'framework',
           // Ensures the framework chunk is not created for App Router.
-          layer: isWebpackDefaultLayer,
-          test(module: any) {
+          layer: isWebpackDefaultLayer as (layer: string | null) => boolean,
+          test(module: webpack.Module) {
             const resource = module.nameForCondition?.()
             return resource
               ? topLevelFrameworkPaths.some((pkgPath) =>
@@ -1136,32 +1136,25 @@ export default async function getBaseWebpackConfig(
         }
 
         const libCacheGroup = {
-          test(module: {
-            type: string
-            size: Function
-            nameForCondition: Function
-          }): boolean {
+          test(module: webpack.Module): boolean {
             return (
               !module.type?.startsWith('css') &&
               module.size() > 160000 &&
               /node_modules[/\\]/.test(module.nameForCondition() || '')
             )
           },
-          name(module: {
-            layer: string | null | undefined
-            type: string
-            libIdent?: Function
-            updateHash: (hash: crypto.Hash) => void
-          }): string {
+          name(module: webpack.Module): string {
             const hash = crypto.createHash('sha1')
             if (isModuleCSS(module)) {
+              // @ts-expect-error - updateHash is missing in typings
               module.updateHash(hash)
             } else {
               if (!module.libIdent) {
                 throw new Error(
                   `Encountered unknown module type: ${module.type}. Please open an issue.`
                 )
               }
+              // @ts-ignore
               hash.update(module.libIdent({ context: dir }))
             }
 

packages/next/src/build/webpack/loaders/next-flight-loader/index.ts

@@ -166,7 +166,9 @@ ${JSON.stringify(ref)},
 
       return this.callback(null, esmSource, {
         version: 3,
+        file: originalSourceURL,
         sources: [originalSourceURL],
+        names: [],
         // minimal, parseable mappings
         mappings: 'AAAA',
         sourcesContent: [esmSource],
@@ -200,6 +202,8 @@ module.exports = createProxy(${stringifiedResourceKey})
       return this.callback(null, cjsSource, {
         version: 3,
         sources: [originalSourceURL],
+        names: [],
+        file: originalSourceURL,
         // minimal, parseable mappings
         mappings: 'AAAA',
         sourcesContent: [cjsSource],

packages/next/src/build/webpack/plugins/css-minimizer-plugin.ts

@@ -48,6 +48,7 @@ export class CssMinimizerPlugin {
       .process(input, postcssOptions)
       .then((res) => {
         if (res.map) {
+          // @ts-expect-error of type 'RawSourceMap' version is not compatible, it's a small typing bug
           return new sources.SourceMapSource(res.css, file, res.map.toJSON())
         } else {
           return new sources.RawSource(res.css)

packages/next/src/build/webpack/plugins/eval-source-map-dev-tool-plugin.ts

@@ -44,9 +44,7 @@ export interface EvalSourceMapDevToolPluginOptions
 // https://github.com/webpack/webpack/blob/e237b580e2bda705c5ab39973f786f7c5a7026bc/lib/EvalSourceMapDevToolPlugin.js#L37
 export default class EvalSourceMapDevToolPlugin {
   sourceMapComment: string
-  moduleFilenameTemplate: NonNullable<
-    EvalSourceMapDevToolPluginOptions['moduleFilenameTemplate']
-  >
+  moduleFilenameTemplate: string | ((context?: any) => string)
   namespace: NonNullable<EvalSourceMapDevToolPluginOptions['namespace']>
   options: EvalSourceMapDevToolPluginOptions
   shouldIgnorePath: (modulePath: string) => boolean
@@ -67,9 +65,10 @@ export default class EvalSourceMapDevToolPlugin {
       options.append && typeof options.append !== 'function'
         ? options.append
         : '//# sourceURL=[module]\n//# sourceMappingURL=[url]'
-    this.moduleFilenameTemplate =
-      options.moduleFilenameTemplate ||
-      'webpack://[namespace]/[resource-path]?[hash]'
+    this.moduleFilenameTemplate = (options.moduleFilenameTemplate ||
+      'webpack://[namespace]/[resource-path]?[hash]') as
+      | string
+      | ((context?: any) => string)
     this.namespace = options.namespace || ''
     this.options = options
 

packages/next/src/build/webpack/plugins/minify-webpack-plugin/src/index.ts

@@ -191,7 +191,7 @@ export class MinifyPlugin {
                 try {
                   minifiedOutput = await getWorker().minify({
                     input,
-                    inputSourceMap,
+                    inputSourceMap: inputSourceMap as Object,
                   })
                 } catch (error) {
                   compilation.errors.push(buildError(error, name))
@@ -205,7 +205,8 @@ export class MinifyPlugin {
                       name,
                       minifiedOutput.map,
                       input,
-                      inputSourceMap,
+                      // SourceMapSource excepts undefined, not null
+                      inputSourceMap || undefined,
                       true
                     )
                   : new RawSource(minifiedOutput.code)

packages/next/src/build/webpack/plugins/wellknown-errors-plugin/index.ts

@@ -1,4 +1,4 @@
-import type { webpack } from 'next/dist/compiled/webpack/webpack'
+import type { webpack, WebpackError } from 'next/dist/compiled/webpack/webpack'
 
 import { getModuleBuildError } from './webpackModuleError'
 
@@ -12,7 +12,7 @@ export class WellKnownErrorsPlugin {
             compilation.warnings.map(async (warn, i) => {
               if (
                 warn.name === 'ModuleDependencyWarning' &&
-                warn.module?.context?.includes('node_modules')
+                (warn as WebpackError).module?.context?.includes('node_modules')
               ) {
                 compilation.warnings.splice(i, 1)
               }

packages/next/src/bundles/webpack/packages/HotModuleReplacement.runtime.js

@@ -8,7 +8,6 @@
 
 var $interceptModuleExecution$ = undefined;
 var $moduleCache$ = undefined;
-// eslint-disable-next-line no-unused-vars
 var $hmrModuleData$ = undefined;
 /** @type {() => Promise}  */
 var $hmrDownloadManifest$ = undefined;

packages/next/src/bundles/webpack/packages/JavascriptHotModuleReplacement.runtime.js

@@ -117,7 +117,6 @@ module.exports = function () {
 		for (var moduleId in currentUpdate) {
 			if ($hasOwnProperty$(currentUpdate, moduleId)) {
 				var newModuleFactory = currentUpdate[moduleId];
-				/** @type {TODO} */
 				var result = newModuleFactory
 					? getAffectedModuleEffects(moduleId)
 					: {