internal: remove usage of hand crafted webpack typings

package.json

@@ -61,6 +61,7 @@
     "@types/micromatch": "^3.1.0",
     "@types/node": "^10.0.0",
     "@types/semver": "^5.4.0",
+    "@types/webpack": "^4.4.27",
     "babel": "^6.0.0",
     "babel-core": "^6.0.0",
     "babel-loader": "^7.0.0",

src/after-compile.ts

@@ -1,12 +1,12 @@
 import * as path from 'path';
+import * as webpack from 'webpack';
 
 import * as constants from './constants';
 import { getEmitOutput } from './instances';
 import {
   TSFile,
   TSFiles,
   TSInstance,
-  WebpackCompilation,
   WebpackError,
   WebpackModule
 } from './interfaces';
@@ -16,14 +16,24 @@ import {
   isUsingProjectReferences
 } from './utils';
 
+interface PatchedCompiler extends webpack.Compiler {
+  isChild(): boolean;
+  context: string;
+  outputPath: string;
+}
+
+interface PatchedWebpackCompilation extends webpack.compilation.Compilation {
+  compiler: PatchedCompiler;
+}
+
 export function makeAfterCompile(
   instance: TSInstance,
   configFilePath: string | undefined
 ) {
   let getCompilerOptionDiagnostics = true;
   let checkAllFilesForErrors = true;
 
-  return (compilation: WebpackCompilation, callback: () => void) => {
+  return (compilation: PatchedWebpackCompilation, callback: () => void) => {
     // Don't add errors for child compilations
     if (compilation.compiler.isChild()) {
       callback();
@@ -76,7 +86,7 @@ export function makeAfterCompile(
  */
 function provideCompilerOptionDiagnosticErrorsToWebpack(
   getCompilerOptionDiagnostics: boolean,
-  compilation: WebpackCompilation,
+  compilation: PatchedWebpackCompilation,
   instance: TSInstance,
   configFilePath: string | undefined
 ) {
@@ -103,7 +113,7 @@ function provideCompilerOptionDiagnosticErrorsToWebpack(
  * this is used for quick-lookup when trying to find modules
  * based on filepath
  */
-function determineModules(compilation: WebpackCompilation) {
+function determineModules(compilation: PatchedWebpackCompilation) {
   // TODO: Convert to reduce
   const modules = new Map<string, WebpackModule[]>();
   compilation.modules.forEach(module => {
@@ -163,7 +173,7 @@ function determineFilesToCheckForErrors(
 function provideErrorsToWebpack(
   filesToCheckForErrors: TSFiles,
   filesWithErrors: TSFiles,
-  compilation: WebpackCompilation,
+  compilation: PatchedWebpackCompilation,
   modules: Map<string, WebpackModule[]>,
   instance: TSInstance
 ) {
@@ -255,7 +265,7 @@ function provideErrorsToWebpack(
 function provideDeclarationFilesToWebpack(
   filesToCheckForErrors: TSFiles,
   instance: TSInstance,
-  compilation: WebpackCompilation
+  compilation: PatchedWebpackCompilation
 ) {
   for (const filePath of filesToCheckForErrors.keys()) {
     if (filePath.match(constants.tsTsxRegex) === null) {

src/compilerSetup.ts

@@ -1,7 +1,6 @@
 import * as semver from 'semver';
 import * as typescript from 'typescript';
 
-import * as constants from './constants';
 import { LoaderOptions } from './interfaces';
 import * as logger from './logger';
 
@@ -66,9 +65,9 @@ export function getCompilerOptions(
   if (
     compilerOptions.module === undefined &&
     (compilerOptions.target !== undefined &&
-      compilerOptions.target < constants.ScriptTargetES2015)
+      compilerOptions.target < typescript.ScriptTarget.ES2015)
   ) {
-    compilerOptions.module = constants.ModuleKindCommonJs;
+    compilerOptions.module = typescript.ModuleKind.CommonJS;
   }
 
   return compilerOptions;

src/config.ts

@@ -1,7 +1,9 @@
 import { Chalk } from 'chalk';
 import * as path from 'path';
 import * as typescript from 'typescript';
-import { LoaderOptions, Webpack, WebpackError } from './interfaces';
+import * as webpack from 'webpack';
+
+import { LoaderOptions, WebpackError } from './interfaces';
 import * as logger from './logger';
 import { formatErrors } from './utils';
 
@@ -13,7 +15,7 @@ interface ConfigFile {
 export function getConfigFile(
   compiler: typeof typescript,
   colors: Chalk,
-  loader: Webpack,
+  loader: webpack.loader.LoaderContext,
   loaderOptions: LoaderOptions,
   compilerCompatible: boolean,
   log: logger.Logger,

src/constants.ts

@@ -7,10 +7,6 @@ export const LineFeed = '\n';
 export const CarriageReturnLineFeedCode = 0;
 export const LineFeedCode = 1;
 
-export const ScriptTargetES2015 = 2;
-
-export const ModuleKindCommonJs = 1;
-
 export const extensionRegex = /\.[^.]+$/;
 export const tsxRegex = /\.tsx$/i;
 export const tsTsxRegex = /\.ts(x?)$/i;

src/index.ts

@@ -1,18 +1,16 @@
 import * as loaderUtils from 'loader-utils';
 import * as path from 'path';
 import * as typescript from 'typescript';
+import * as webpack from 'webpack';
 
 import * as constants from './constants';
 import { getEmitOutput, getTypeScriptInstance } from './instances';
 import {
-  AsyncCallback,
-  Compiler,
   LoaderOptions,
   LoaderOptionsCache,
   LogLevel,
   TSFile,
-  TSInstance,
-  Webpack
+  TSInstance
 } from './interfaces';
 import {
   appendSuffixesIfMatch,
@@ -23,16 +21,16 @@ import {
   validateSourceMapOncePerProject
 } from './utils';
 
-const webpackInstances: Compiler[] = [];
+const webpackInstances: webpack.Compiler[] = [];
 const loaderOptionsCache: LoaderOptionsCache = {};
 
 /**
  * The entry point for ts-loader
  */
-function loader(this: Webpack, contents: string) {
+function loader(this: webpack.loader.LoaderContext, contents: string) {
   // tslint:disable-next-line:no-unused-expression strict-boolean-expressions
   this.cacheable && this.cacheable();
-  const callback = this.async();
+  const callback = this.async() as webpack.loader.loaderCallback;
   const options = getLoaderOptions(this);
   const instanceOrError = getTypeScriptInstance(options, this);
 
@@ -51,9 +49,9 @@ function loader(this: Webpack, contents: string) {
 }
 
 function successLoader(
-  loaderContext: Webpack,
+  loaderContext: webpack.loader.LoaderContext,
   contents: string,
-  callback: AsyncCallback,
+  callback: webpack.loader.loaderCallback,
   options: LoaderOptions,
   instance: TSInstance
 ) {
@@ -157,10 +155,10 @@ function makeSourceMapAndFinish(
   outputText: string | undefined,
   filePath: string,
   contents: string,
-  loaderContext: Webpack,
+  loaderContext: webpack.loader.LoaderContext,
   options: LoaderOptions,
   fileVersion: number,
-  callback: AsyncCallback
+  callback: webpack.loader.loaderCallback
 ) {
   if (outputText === null || outputText === undefined) {
     const additionalGuidance =
@@ -198,7 +196,7 @@ function makeSourceMapAndFinish(
  * either retrieves loader options from the cache
  * or creates them, adds them to the cache and returns
  */
-function getLoaderOptions(loaderContext: Webpack) {
+function getLoaderOptions(loaderContext: webpack.loader.LoaderContext) {
   // differentiate the TypeScript instance based on the webpack instance
   let webpackIndex = webpackInstances.indexOf(loaderContext._compiler);
   if (webpackIndex === -1) {
@@ -390,7 +388,7 @@ function getEmit(
   rawFilePath: string,
   filePath: string,
   instance: TSInstance,
-  loaderContext: Webpack
+  loaderContext: webpack.loader.LoaderContext
 ) {
   const outputFiles = getEmitOutput(instance, filePath);
 
@@ -460,7 +458,7 @@ function getTranspilationEmit(
   fileName: string,
   contents: string,
   instance: TSInstance,
-  loaderContext: Webpack
+  loaderContext: webpack.loader.LoaderContext
 ) {
   const {
     outputText,
@@ -495,7 +493,7 @@ function makeSourceMap(
   outputText: string,
   filePath: string,
   contents: string,
-  loaderContext: Webpack
+  loaderContext: webpack.loader.LoaderContext
 ) {
   if (sourceMapText === undefined) {
     return { output: outputText, sourceMap: undefined };

src/instances.ts

@@ -2,6 +2,7 @@ import chalk, { Chalk } from 'chalk';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as typescript from 'typescript';
+import * as webpack from 'webpack';
 
 import { makeAfterCompile } from './after-compile';
 import { getCompiler, getCompilerOptions } from './compilerSetup';
@@ -13,7 +14,6 @@ import {
   TSFiles,
   TSInstance,
   TSInstances,
-  Webpack,
   WebpackError
 } from './interfaces';
 import * as logger from './logger';
@@ -29,6 +29,9 @@ import { makeWatchRun } from './watch-run';
 
 const instances = {} as TSInstances;
 
+// TODO: workaround for issues with webpack typings
+type PatchedHookCallback = any;
+
 /**
  * The loader is executed once for each file seen by webpack. However, we need to keep
  * a persistent instance of TypeScript that contains all of the files in the program
@@ -38,7 +41,7 @@ const instances = {} as TSInstances;
  */
 export function getTypeScriptInstance(
   loaderOptions: LoaderOptions,
-  loader: Webpack
+  loader: webpack.loader.LoaderContext
 ): { instance?: TSInstance; error?: WebpackError } {
   if (instances.hasOwnProperty(loaderOptions.instance)) {
     const instance = instances[loaderOptions.instance];
@@ -67,7 +70,7 @@ export function getTypeScriptInstance(
 
 function successfulTypeScriptInstance(
   loaderOptions: LoaderOptions,
-  loader: Webpack,
+  loader: webpack.loader.LoaderContext,
   log: logger.Logger,
   colors: Chalk,
   compiler: typeof typescript,
@@ -307,10 +310,10 @@ function successfulTypeScriptInstance(
     );
   }
 
-  loader._compiler.hooks.afterCompile.tapAsync(
-    'ts-loader',
-    makeAfterCompile(instance, configFilePath)
-  );
+  loader._compiler.hooks.afterCompile.tapAsync('ts-loader', makeAfterCompile(
+    instance,
+    configFilePath
+  ) as PatchedHookCallback);
   loader._compiler.hooks.watchRun.tapAsync('ts-loader', makeWatchRun(instance));
 
   return { instance };