Merge branch 'master' into addon-test-support

Author: mike-north

lib/incremental-typescript-compiler/typescript-output-plugin.js

@@ -30,7 +30,7 @@ module.exports = class TypescriptOutput extends Plugin {
         for (let relativeSrc of Object.keys(this.paths)) {
           let src = `${this.compiler.outDir()}/${relativeSrc}`;
           let dest = `${this.outputPath}/${this.paths[relativeSrc]}`;
-          if (fs.existsSync(src)) {
+          if (fs.existsSync(src) && !fs.existsSync(dest)) {
             let dir = path.dirname(dest);
             if (dir !== '.') {
               fs.mkdirsSync(dir);

lib/utilities/compile.js

@@ -69,7 +69,7 @@ function diagnosticCallback(callback) {
 }
 
 function buildWatchHooks(project, ts, callbacks) {
-  let ignorePatterns = ['\\..*?', 'dist', 'tmp', 'node_modules'];
+  let ignorePatterns = ['\\..*?', 'dist', 'tmp'];
 
   return Object.assign({}, ts.sys, {
     watchFile: null,
@@ -80,7 +80,7 @@ function buildWatchHooks(project, ts, callbacks) {
       }
 
       let dir = getCanonicalCapitalization(path.resolve(rawDir));
-      let ignored = buildIgnoreRegex(dir, ignorePatterns);
+      let ignored = buildIgnoreDefs(dir, ignorePatterns);
       let watcher = chokidar.watch(dir, { ignored, ignoreInitial: true });
       debug(`watching directory %s %o`, dir, { ignored });
 
@@ -105,10 +105,13 @@ function buildWatchHooks(project, ts, callbacks) {
   });
 }
 
-function buildIgnoreRegex(rootDir, patterns) {
+function buildIgnoreDefs(rootDir, patterns) {
   let base = escapeRegex(rootDir);
   let sep = `[/\\\\]`;
-  return new RegExp(`^${base}${sep}(${patterns.join('|')})${sep}`, 'i');
+  return [
+    '**/node_modules/**',
+    new RegExp(`^${base}${sep}(${patterns.join('|')})${sep}`, 'i')
+  ];
 }
 
 // On case-insensitive file systems, tsc will normalize paths to be all lowercase,