build: update webpack types

Author: clydin

package.json

@@ -80,9 +80,9 @@
     "@types/request": "^2.47.1",
     "@types/semver": "^5.5.0",
     "@types/source-map": "0.5.2",
-    "@types/webpack": "^4.4.0",
-    "@types/webpack-dev-server": "^2.9.4",
-    "@types/webpack-sources": "^0.1.4",
+    "@types/webpack": "^4.4.11",
+    "@types/webpack-dev-server": "^3.1.0",
+    "@types/webpack-sources": "^0.1.5",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
@@ -107,8 +107,6 @@
     "tslint-sonarts": "^1.7.0"
   },
   "resolutions": {
-    "@types/webpack": "4.4.0",
-    "@types/webpack-dev-server": "2.9.4",
     "rxjs": "~6.2.0"
   }
 }

packages/angular_devkit/build_angular/src/dev-server/index.ts

@@ -210,7 +210,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
         index: `${servePath}/${path.basename(browserOptions.index)}`,
         disableDotRule: true,
         htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-      },
+      } as WebpackDevServer.HistoryApiFallbackConfig,
       stats: false,
       compress: browserOptions.optimization,
       watchOptions: {

packages/angular_devkit/build_angular/src/utils/webpack-file-system-host-adapter.ts

@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { FileDoesNotExistException, JsonObject, normalize, virtualFs } from '@angular-devkit/core';
-import { Callback, InputFileSystem } from '@ngtools/webpack/src/webpack';
+import { Callback } from '@ngtools/webpack/src/webpack';
 import { Stats } from 'fs';
 import { Observable, of } from 'rxjs';
 import { map, mergeMap, switchMap } from 'rxjs/operators';
 
 
-export class WebpackFileSystemHostAdapter implements InputFileSystem {
+export class WebpackFileSystemHostAdapter {
   protected _syncHost: virtualFs.SyncDelegateHost<Stats> | null = null;
 
   constructor(protected _host: virtualFs.Host<Stats>) {}

packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts

@@ -49,7 +49,7 @@ export class WebpackDevServerBuilder implements Builder<WebpackDevServerBuilderS
       devServerConfig.port = devServerConfig.port || 8080;
 
       if (devServerConfig.stats) {
-        webpackConfig.stats = devServerConfig.stats;
+        webpackConfig.stats = devServerConfig.stats as webpack.Stats.ToStringOptionsObject;
       }
       // Disable stats reporting by the devserver, we have our own logger.
       devServerConfig.stats = false;

packages/ngtools/webpack/src/angular_compiler_plugin.ts

@@ -52,7 +52,6 @@ import {
 } from './virtual_file_system_decorator';
 import {
   Callback,
-  InputFileSystem,
   NodeWatchFileSystemInterface,
   NormalModuleFactoryRequest,
 } from './webpack';
@@ -583,7 +582,6 @@ export class AngularCompilerPlugin {
     compiler.hooks.environment.tap('angular-compiler', () => {
       // The webpack types currently do not include these
       const compilerWithFileSystems = compiler as Compiler & {
-        inputFileSystem: InputFileSystem,
         watchFileSystem: NodeWatchFileSystemInterface,
       };
 

packages/ngtools/webpack/src/virtual_file_system_decorator.ts

@@ -7,12 +7,14 @@
  */
 import { Path, getSystemPath, normalize } from '@angular-devkit/core';
 import { Stats } from 'fs';
+import { InputFileSystem } from 'webpack';
 import { WebpackCompilerHost } from './compiler_host';
-import { Callback, InputFileSystem, NodeWatchFileSystemInterface } from './webpack';
+import { Callback, NodeWatchFileSystemInterface } from './webpack';
 
 export const NodeWatchFileSystem: NodeWatchFileSystemInterface = require(
   'webpack/lib/node/NodeWatchFileSystem');
 
+// NOTE: @types/webpack InputFileSystem is missing some methods
 export class VirtualFileSystemDecorator implements InputFileSystem {
   constructor(
     private _inputFileSystem: InputFileSystem,
@@ -39,33 +41,37 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
     return this._webpackCompilerHost.getNgFactoryPaths();
   }
 
-  stat(path: string, callback: Callback<Stats>): void {
+  stat(path: string, callback: (err: Error, stats: Stats) => void): void {
     const result = this._statSync(path);
     if (result) {
-      callback(null, result);
+      // tslint:disable-next-line:no-any
+      callback(null as any, result);
     } else {
       this._inputFileSystem.stat(path, callback);
     }
   }
 
   readdir(path: string, callback: Callback<string[]>): void {
-    this._inputFileSystem.readdir(path, callback);
+    // tslint:disable-next-line:no-any
+    (this._inputFileSystem as any).readdir(path, callback);
   }
 
-  readFile(path: string, callback: Callback<Buffer>): void {
+  readFile(path: string, callback: (err: Error, contents: Buffer) => void): void {
     const result = this._readFileSync(path);
     if (result) {
-      callback(null, result);
+      // tslint:disable-next-line:no-any
+      callback(null as any, result);
     } else {
       this._inputFileSystem.readFile(path, callback);
     }
   }
 
   readJson(path: string, callback: Callback<{}>): void {
-    this._inputFileSystem.readJson(path, callback);
+    // tslint:disable-next-line:no-any
+    (this._inputFileSystem as any).readJson(path, callback);
   }
 
-  readlink(path: string, callback: Callback<string>): void {
+  readlink(path: string, callback: (err: Error, linkString: string) => void): void {
     this._inputFileSystem.readlink(path, callback);
   }
 
@@ -76,7 +82,8 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
   }
 
   readdirSync(path: string): string[] {
-    return this._inputFileSystem.readdirSync(path);
+    // tslint:disable-next-line:no-any
+    return (this._inputFileSystem as any).readdirSync(path);
   }
 
   readFileSync(path: string): Buffer {
@@ -86,7 +93,8 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
   }
 
   readJsonSync(path: string): string {
-    return this._inputFileSystem.readJsonSync(path);
+    // tslint:disable-next-line:no-any
+    return (this._inputFileSystem as any).readJsonSync(path);
   }
 
   readlinkSync(path: string): string {
@@ -100,7 +108,8 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
       changes.forEach((fileName: string) => this._webpackCompilerHost.invalidate(fileName));
     }
     if (this._inputFileSystem.purge) {
-      this._inputFileSystem.purge(changes);
+      // tslint:disable-next-line:no-any
+      (this._inputFileSystem as any).purge(changes);
     }
   }
 }

packages/ngtools/webpack/src/webpack-input-host.ts

@@ -9,7 +9,7 @@ import { Path, PathFragment, fragment, getSystemPath, virtualFs } from '@angular
 import { Stats } from 'fs';
 import { Observable, throwError } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { InputFileSystem } from './webpack';
+import { InputFileSystem } from 'webpack';
 
 // Host is used instead of ReadonlyHost due to most decorators only supporting Hosts
 export class WebpackInputHost implements virtualFs.Host<Stats> {
@@ -51,7 +51,8 @@ export class WebpackInputHost implements virtualFs.Host<Stats> {
       // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
       // fixed.
       try {
-        const names = this.inputFileSystem.readdirSync(getSystemPath(path));
+        // tslint:disable-next-line:no-any
+        const names: string[] = (this.inputFileSystem as any).readdirSync(getSystemPath(path));
         obs.next(names.map(name => fragment(name)));
         obs.complete();
       } catch (err) {

packages/ngtools/webpack/src/webpack.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Stats } from 'fs';
+import { InputFileSystem } from 'webpack';
 
 // Declarations for (some) Webpack types. Only what's needed.
 
@@ -21,21 +21,6 @@ export interface NormalModuleFactoryRequest {
   typescriptPathMapped?: boolean;
 }
 
-export interface InputFileSystem {
-  stat(path: string, callback: Callback<Stats>): void;
-  readdir(path: string, callback: Callback<string[]>): void;
-  readFile(path: string, callback: Callback<Buffer>): void;
-  readJson(path: string, callback: Callback): void;
-  readlink(path: string, callback: Callback<string>): void;
-  statSync(path: string): Stats;
-  readdirSync(path: string): string[];
-  readFileSync(path: string): Buffer;
-  // tslint:disable-next-line:no-any
-  readJsonSync(path: string): any;
-  readlinkSync(path: string): string;
-  purge(changes?: string[] | string): void;
-}
-
 export interface NodeWatchFileSystemInterface {
   inputFileSystem: InputFileSystem;
   new(inputFileSystem: InputFileSystem): NodeWatchFileSystemInterface;