perf: fix directory watchers to not invoke them unnecessary

TypeStrong · Jun 10, 2020 · 9041f53 · 9041f53
1 parent d1a0f18
commit 9041f53
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/hooks/tapAfterCompileToGetIssues.ts b/src/hooks/tapAfterCompileToGetIssues.ts
@@ -1,4 +1,5 @@
 import webpack from 'webpack';
+import path from 'path';
 import { ForkTsCheckerWebpackPluginConfiguration } from '../ForkTsCheckerWebpackPluginConfiguration';
 import { ForkTsCheckerWebpackPluginState } from '../ForkTsCheckerWebpackPluginState';
 import { getForkTsCheckerWebpackPluginHooks } from './pluginHooks';
@@ -35,7 +36,7 @@ function tapAfterCompileToGetIssues(
     if (configuration.issue.scope === 'webpack') {
       // exclude issues that are related to files outside webpack compilation
       issues = issues.filter(
-        (issue) => !issue.file || compilation.fileDependencies.has(issue.file)
+        (issue) => !issue.file || compilation.fileDependencies.has(path.normalize(issue.file))
       );
     }
 

diff --git a/src/hooks/tapDoneToAsyncGetIssues.ts b/src/hooks/tapDoneToAsyncGetIssues.ts
@@ -1,4 +1,6 @@
 import webpack from 'webpack';
+import chalk from 'chalk';
+import path from 'path';
 import { ForkTsCheckerWebpackPluginConfiguration } from '../ForkTsCheckerWebpackPluginConfiguration';
 import { ForkTsCheckerWebpackPluginState } from '../ForkTsCheckerWebpackPluginState';
 import { getForkTsCheckerWebpackPluginHooks } from './pluginHooks';
@@ -7,7 +9,6 @@ import { Issue } from '../issue';
 import { IssueWebpackError } from '../issue/IssueWebpackError';
 import isPending from '../utils/async/isPending';
 import wait from '../utils/async/wait';
-import chalk from 'chalk';
 
 function tapDoneToAsyncGetIssues(
   compiler: webpack.Compiler,
@@ -53,7 +54,7 @@ function tapDoneToAsyncGetIssues(
     if (configuration.issue.scope === 'webpack') {
       // exclude issues that are related to files outside webpack compilation
       issues = issues.filter(
-        (issue) => !issue.file || stats.compilation.fileDependencies.has(issue.file)
+        (issue) => !issue.file || stats.compilation.fileDependencies.has(path.normalize(issue.file))
       );
     }
 

diff --git a/src/typescript-reporter/reporter/ControlledTypeScriptSystem.ts b/src/typescript-reporter/reporter/ControlledTypeScriptSystem.ts
@@ -215,7 +215,7 @@ function createControlledTypeScriptSystem(
     invokeFileChanged(path: string) {
       const normalizedPath = realFileSystem.normalizePath(path);
 
-      if (deletedFiles.get(normalizedPath) || !fileWatchersMap.has(path)) {
+      if (deletedFiles.get(normalizedPath) || !fileWatchersMap.has(normalizedPath)) {
         invokeFileWatchers(path, ts.FileWatcherEventKind.Created);
         invokeDirectoryWatchers(normalizedPath);