Make type checking compatible with webpack 5 (#15158)

Co-authored-by: Joe Haddad <[email protected]>
vercel · Jul 15, 2020 · 14babe5 · 14babe5
1 parent fc082b9
commit 14babe5
Show file tree

Hide file tree

Showing 14 changed files with 254 additions and 258 deletions.
diff --git a/packages/next/build/webpack/config/blocks/css/index.ts b/packages/next/build/webpack/config/blocks/css/index.ts
@@ -280,6 +280,7 @@ export const css = curry(async function css(
     // Extract CSS as CSS file(s) in the client-side production bundle.
     fns.push(
       plugin(
+        // @ts-ignore webpack 5 compat
         new MiniCssExtractPlugin({
           filename: 'static/css/[contenthash].css',
           chunkFilename: 'static/css/[contenthash].css',

diff --git a/packages/next/build/webpack/plugins/build-manifest-plugin.ts b/packages/next/build/webpack/plugins/build-manifest-plugin.ts
@@ -59,7 +59,7 @@ export default class BuildManifestPlugin {
   apply(compiler: Compiler) {
     compiler.hooks.emit.tapAsync(
       'NextJsBuildManifest',
-      (compilation, callback) => {
+      (compilation: any, callback: any) => {
         const chunks: CompilationType.Chunk[] = compilation.chunks
         const assetMap: BuildManifest = {
           polyfillFiles: [],

diff --git a/packages/next/build/webpack/plugins/css-minimizer-plugin.ts b/packages/next/build/webpack/plugins/css-minimizer-plugin.ts
@@ -21,10 +21,10 @@ export class CssMinimizerPlugin {
   }
 
   apply(compiler: webpack.Compiler) {
-    compiler.hooks.compilation.tap('CssMinimizerPlugin', (compilation) => {
+    compiler.hooks.compilation.tap('CssMinimizerPlugin', (compilation: any) => {
       compilation.hooks.optimizeChunkAssets.tapPromise(
         'CssMinimizerPlugin',
-        (chunks) =>
+        (chunks: webpack.compilation.Chunk[]) =>
           Promise.all(
             chunks
               .reduce(

diff --git a/packages/next/build/webpack/plugins/next-drop-client-page-plugin.ts b/packages/next/build/webpack/plugins/next-drop-client-page-plugin.ts
@@ -22,7 +22,7 @@ export class DropClientPage implements Plugin {
   apply(compiler: Compiler) {
     compiler.hooks.compilation.tap(
       PLUGIN_NAME,
-      (compilation, { normalModuleFactory }) => {
+      (compilation: any, { normalModuleFactory }: any) => {
         // Recursively look up the issuer till it ends up at the root
         function findEntryModule(mod: any): CompilationType.Module | null {
           const queue = new Set([mod])

diff --git a/packages/next/build/webpack/plugins/next-esm-plugin.ts b/packages/next/build/webpack/plugins/next-esm-plugin.ts
@@ -80,12 +80,9 @@ export class NextEsmPlugin implements Plugin {
   }
 
   apply(compiler: Compiler) {
-    compiler.hooks.make.tapAsync(
-      PLUGIN_NAME,
-      (compilation: CompilationType.Compilation, callback) => {
-        this.runBuild(compiler, compilation).then(callback)
-      }
-    )
+    compiler.hooks.make.tapAsync(PLUGIN_NAME, (compilation, callback) => {
+      this.runBuild(compiler, compilation).then(callback)
+    })
   }
 
   getLoaders(rules: RuleSetRule[], predicate: (loader: string) => boolean) {

diff --git a/packages/next/build/webpack/plugins/webpack-conformance-plugin/index.ts b/packages/next/build/webpack/plugins/webpack-conformance-plugin/index.ts
@@ -112,7 +112,7 @@ export default class WebpackConformancePlugin {
     for (const type of JS_TYPES) {
       factory.hooks.parser
         .for('javascript/' + type)
-        .tap(this.constructor.name, (parser) => {
+        .tap(this.constructor.name, (parser: any) => {
           parser.hooks.program.tap(this.constructor.name, (ast: any) => {
             const visitors: VisitorMap = {}
             const that = this

diff --git a/packages/next/compiled/terser-webpack-plugin/cjs.js b/packages/next/compiled/terser-webpack-plugin/cjs.js
diff --git a/packages/next/compiled/terser/bundle.min.js b/packages/next/compiled/terser/bundle.min.js
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -137,10 +137,8 @@
     "@types/fresh": "0.5.0",
     "@types/json5": "0.0.30",
     "@types/jsonwebtoken": "8.3.7",
-    "@types/loader-utils": "1.1.3",
     "@types/lodash.curry": "4.1.6",
     "@types/lru-cache": "5.1.0",
-    "@types/mini-css-extract-plugin": "0.8.0",
     "@types/nanoid": "2.0.0",
     "@types/node-fetch": "2.3.4",
     "@types/path-to-regexp": "1.7.0",
@@ -150,9 +148,7 @@
     "@types/resolve": "0.0.8",
     "@types/send": "0.14.4",
     "@types/styled-jsx": "2.2.8",
-    "@types/terser-webpack-plugin": "2.2.0",
     "@types/text-table": "0.2.1",
-    "@types/webpack-hot-middleware": "2.16.5",
     "@types/webpack-sources": "0.1.5",
     "@zeit/ncc": "0.22.0",
     "amphtml-validator": "1.0.31",

diff --git a/packages/next/server/on-demand-entry-handler.ts b/packages/next/server/on-demand-entry-handler.ts
@@ -296,6 +296,7 @@ class Invalidator {
     // Work around a bug in webpack, calling `invalidate` on Watching.js
     // doesn't trigger the invalid call used to keep track of the `.done` hook on multiCompiler
     for (const compiler of this.multiCompiler.compilers) {
+      // @ts-ignore TODO: Check if this is still needed with webpack 5
       compiler.hooks.invalid.call()
     }
     this.watcher.invalidate()

diff --git a/packages/next/types/misc.d.ts b/packages/next/types/misc.d.ts
@@ -207,10 +207,7 @@ declare module 'next/dist/compiled/unistore' {
   export = m
 }
 
-declare module 'next/dist/compiled/terser-webpack-plugin' {
-  import m from 'terser-webpack-plugin'
-  export = m
-}
+declare module 'next/dist/compiled/terser-webpack-plugin'
 declare module 'next/dist/compiled/comment-json' {
   import m from 'comment-json'
   export = m