fix: use external store for files change to not rely on wfs (#546)

Some plugins can wrap WFS which makes storing changed and removed files in WFS unreliable

Author: piotr-oles

src/hooks/getChangedFiles.ts

@@ -13,6 +13,7 @@ function tapAfterEnvironmentToPatchWatching(
       // wrap original watch file system
       (compiler as CompilerWithWatchFileSystem).watchFileSystem = new InclusiveNodeWatchFileSystem(
         watchFileSystem,
+        compiler,
         state
       );
     }

src/hooks/getDeletedFiles.ts

@@ -2,9 +2,7 @@ import webpack from 'webpack';
 import { ForkTsCheckerWebpackPluginConfiguration } from '../ForkTsCheckerWebpackPluginConfiguration';
 import { ForkTsCheckerWebpackPluginState } from '../ForkTsCheckerWebpackPluginState';
 import { getForkTsCheckerWebpackPluginHooks } from './pluginHooks';
-import { getDeletedFiles } from './getDeletedFiles';
-import { Dependencies, FilesChange, ReporterRpcClient } from '../reporter';
-import { getChangedFiles } from './getChangedFiles';
+import { Dependencies, FilesChange, getFilesChange, ReporterRpcClient } from '../reporter';
 import { OperationCanceledError } from '../error/OperationCanceledError';
 import { tapDoneToAsyncGetIssues } from './tapDoneToAsyncGetIssues';
 import { tapAfterCompileToGetIssues } from './tapAfterCompileToGetIssues';
@@ -51,10 +49,7 @@ function tapStartToConnectAndRunReporter(
     let change: FilesChange = {};
 
     if (state.watching) {
-      change = {
-        changedFiles: getChangedFiles(compilation.compiler),
-        deletedFiles: getDeletedFiles(compilation.compiler),
-      };
+      change = getFilesChange(compiler);
 
       configuration.logger.infrastructure.info(
         [

src/hooks/getWatcher.ts

@@ -1,11 +1,26 @@
 import subtract from '../utils/array/substract';
 import unique from '../utils/array/unique';
+import { Compiler } from 'webpack';
 
 interface FilesChange {
   changedFiles?: string[];
   deletedFiles?: string[];
 }
 
+const compilerFilesChangeMap = new WeakMap<Compiler, FilesChange>();
+
+function getFilesChange(compiler: Compiler): FilesChange {
+  return compilerFilesChangeMap.get(compiler) || {};
+}
+
+function updateFilesChange(compiler: Compiler, change: FilesChange): void {
+  compilerFilesChangeMap.set(compiler, aggregateFilesChanges([getFilesChange(compiler), change]));
+}
+
+function clearFilesChange(compiler: Compiler): void {
+  compilerFilesChangeMap.delete(compiler);
+}
+
 /**
  * Computes aggregated files change based on the subsequent files changes.
  *
@@ -31,4 +46,4 @@ function aggregateFilesChanges(changes: FilesChange[]): FilesChange {
   };
 }
 
-export { FilesChange, aggregateFilesChanges };
+export { FilesChange, getFilesChange, updateFilesChange, clearFilesChange, aggregateFilesChanges };

src/hooks/tapAfterEnvironmentToPatchWatching.ts

@@ -2,6 +2,8 @@ import { ForkTsCheckerWebpackPluginState } from '../ForkTsCheckerWebpackPluginSt
 import chokidar, { FSWatcher } from 'chokidar';
 import { extname } from 'path';
 import { Watcher, WatchFileSystem, WatchFileSystemOptions } from './WatchFileSystem';
+import { Compiler } from 'webpack';
+import { clearFilesChange, updateFilesChange } from '../reporter';
 
 const IGNORED_DIRS = ['node_modules', '.git', '.yarn', '.pnp'];
 
@@ -13,17 +15,13 @@ class InclusiveNodeWatchFileSystem implements WatchFileSystem {
   get watcher() {
     return this.watchFileSystem.watcher || this.watchFileSystem.wfs?.watcher;
   }
-
-  readonly changedFiles: Set<string>;
-  readonly removedFiles: Set<string>;
   readonly dirsWatchers: Map<string, FSWatcher | undefined>;
 
   constructor(
     private watchFileSystem: WatchFileSystem,
+    private compiler: Compiler,
     private pluginState: ForkTsCheckerWebpackPluginState
   ) {
-    this.changedFiles = new Set();
-    this.removedFiles = new Set();
     this.dirsWatchers = new Map();
   }
 
@@ -38,8 +36,7 @@ class InclusiveNodeWatchFileSystem implements WatchFileSystem {
     callback?: Function,
     callbackUndelayed?: Function
   ): Watcher {
-    this.changedFiles.clear();
-    this.removedFiles.clear();
+    clearFilesChange(this.compiler);
 
     // use standard watch file system for files and missing
     const standardWatcher = this.watchFileSystem.watch(
@@ -54,14 +51,12 @@ class InclusiveNodeWatchFileSystem implements WatchFileSystem {
 
     this.watcher?.on('change', (file: string) => {
       if (typeof file === 'string' && !isIgnored(file)) {
-        this.changedFiles.add(file);
-        this.removedFiles.delete(file);
+        updateFilesChange(this.compiler, { changedFiles: [file] });
       }
     });
     this.watcher?.on('remove', (file: string) => {
       if (typeof file === 'string' && !isIgnored(file)) {
-        this.removedFiles.add(file);
-        this.changedFiles.delete(file);
+        updateFilesChange(this.compiler, { deletedFiles: [file] });
       }
     });
 
@@ -105,8 +100,7 @@ class InclusiveNodeWatchFileSystem implements WatchFileSystem {
           return;
         }
 
-        this.changedFiles.add(file);
-        this.removedFiles.delete(file);
+        updateFilesChange(this.compiler, { changedFiles: [file] });
 
         const mtime = stats?.mtimeMs || stats?.ctimeMs || 1;
 
@@ -124,8 +118,7 @@ class InclusiveNodeWatchFileSystem implements WatchFileSystem {
           return;
         }
 
-        this.removedFiles.add(file);
-        this.changedFiles.delete(file);
+        updateFilesChange(this.compiler, { deletedFiles: [file] });
 
         this.watcher?._onRemove(dirToWatch, file, 'rename');
       });
@@ -137,8 +130,7 @@ class InclusiveNodeWatchFileSystem implements WatchFileSystem {
     return {
       ...standardWatcher,
       close: () => {
-        this.changedFiles.clear();
-        this.removedFiles.clear();
+        clearFilesChange(this.compiler);
 
         if (standardWatcher) {
           standardWatcher.close();