ignore artifacts directory when building XPI

src/cmd/build.js

@@ -57,6 +57,12 @@ export default function build(
      packageCreator=defaultPackageCreator}
     : Object = {}): Promise {
 
+  if (!fileFilter) {
+    fileFilter = new FileFilter({
+      filePathsToIgnore: [path.resolve(artifactsDir)],
+    });
+  }
+
   const rebuildAsNeeded = asNeeded; // alias for `build --as-needed`
   log.info(`Building web extension from ${sourceDir}`);
 
@@ -94,15 +100,16 @@ export function safeFileName(name: string): string {
  * Allows or ignores files when creating a ZIP archive.
  */
 export class FileFilter {
-  filesToIgnore: Array<string>;
-
-  constructor({filesToIgnore}: Object = {}) {
-    this.filesToIgnore = filesToIgnore || [
+  filePatternsToIgnore: Array<string>;
+  filePathsToIgnore : Array<String>;
+  constructor({filePatternsToIgnore, filePathsToIgnore}: Object = {}) {
+    this.filePatternsToIgnore = filePatternsToIgnore || [
       '**/*.xpi',
       '**/*.zip',
       '**/.*', // any hidden file
       '**/node_modules',
     ];
+    this.filePathsToIgnore = filePathsToIgnore || []	;
   }
 
   /*
@@ -112,12 +119,18 @@ export class FileFilter {
    * file in the folder that is being archived.
    */
   wantFile(path: string): boolean {
-    for (const test of this.filesToIgnore) {
+    for (const test of this.filePatternsToIgnore) {
       if (minimatch(path, test)) {
         log.debug(`FileFilter: ignoring file ${path}`);
         return false;
       }
     }
+    for (const filePath of this.filePathsToIgnore) {
+      if (filePath === path){
+        log.debug(`FileFilter: ignoring file path ${path}`);
+        return false;
+      }
+    }
     return true;
   }
 }

tests/test-cmd/test.build.js

@@ -83,7 +83,7 @@ describe('build', () => {
   it('asks FileFilter what files to include in the ZIP', () => {
     let zipFile = new ZipFile();
     let fileFilter = new FileFilter({
-      filesToIgnore: ['**/background-script.js'],
+      filePatternsToIgnore: ['**/background-script.js'],
     });
 
     return withTempDir(
@@ -217,7 +217,7 @@ describe('build', () => {
 
     it('allows you to override the defaults', () => {
       const filter = new FileFilter({
-        filesToIgnore: ['manifest.json'],
+        filePatternsToIgnore: ['manifest.json'],
       });
       assert.equal(filter.wantFile('some.xpi'), true);
       assert.equal(filter.wantFile('manifest.json'), false);
@@ -227,6 +227,15 @@ describe('build', () => {
       assert.equal(defaultFilter.wantFile('path/to/node_modules'), false);
     });
 
+    it('ignores an array of absolute file paths', () => withTempDir(
+      (tmpDir) => {
+        const filter = new FileFilter({
+          filePathsToIgnore: [path.join(tmpDir.path(), 'artifacts')],
+        });
+        assert.equal(filter.wantFile(path.join(tmpDir.path(), 'artifacts')),
+          false);
+      }
+    ));
   });
 
 });