Merge eb8e139 into 8d3379a

Author: iamVP7

src/cmd/build.js

@@ -52,7 +52,7 @@ function defaultPackageCreator(
 
 export default function build(
     {sourceDir, artifactsDir, asNeeded=false}: Object,
-    {manifestData, fileFilter=new FileFilter(),
+    {manifestData, fileFilter=new FileFilter({filePathsToIgnore: [path.resolve(artifactsDir)]}),
      onSourceChange=defaultSourceWatcher,
      packageCreator=defaultPackageCreator}
     : Object = {}): Promise {
@@ -95,14 +95,16 @@ export function safeFileName(name: string): string {
  */
 export class FileFilter {
   filesToIgnore: Array<string>;
-
-  constructor({filesToIgnore}: Object = {}) {
+  filePathsToIgnore : Array<String>;
+  constructor({filesToIgnore,filePathsToIgnore}: Object = {}) {
     this.filesToIgnore = filesToIgnore || [
       '**/*.xpi',
       '**/*.zip',
       '**/.*', // any hidden file
-      '**/node_modules',
+      '**/node_modules',  
     ];
+    
+    this.filePathsToIgnore = filePathsToIgnore;
   }
 
   /*
@@ -118,6 +120,13 @@ export class FileFilter {
         return false;
       }
     }
+    for (const filePath of this.filePathsToIgnore) {
+      if (filePath === path){
+        log.debug(`FileFilter: ignoring file ${path}`);
+        return false; 
+      }
+    }
     return true;
-  }
+  }    
+  
 }

src/watcher.js

@@ -33,7 +33,7 @@ export default function onSourceChange(
 export function proxyFileChanges(
     {artifactsDir, onChange, filePath, shouldWatchFile}: Object) {
   if (!shouldWatchFile) {
-    const fileFilter = new FileFilter();
+    const fileFilter = new FileFilter({filePathsToIgnore: [path.resolve(artifactsDir)]});
     shouldWatchFile = (...args) => fileFilter.wantFile(...args);
   }
   if (filePath.indexOf(artifactsDir) === 0 || !shouldWatchFile(filePath)) {