Pass excludePaths to multiGlob helper

zzarcon · Feb 22, 2016 · 06478c1 · 06478c1
1 parent c11a106
commit 06478c1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/service-worker.js b/lib/service-worker.js
@@ -47,8 +47,9 @@ BroccoliServiceWorker.prototype.write = function(readTree, destDir) {
   var fallback = this.fallback;
   var precacheURLs = this.precacheURLs;
   var serviceWorkerFile = this.serviceWorkerFile;
+  var excludePaths = this.excludePaths;
   var serviceWorkerTree = funnel(this.inTree, {
-    exclude: this.excludePaths
+    exclude: excludePaths
   });
   var swIncludeFiles = this.swIncludeFiles;
   var swIncludeTree = this.swIncludeTree;
@@ -65,7 +66,7 @@ BroccoliServiceWorker.prototype.write = function(readTree, destDir) {
       }
       lines.push("var urlsToPrefetch = [");
       lines.push("    '/',");
-      getFilesRecursively(srcDir, [ "**/*" ]).forEach(function (file, idx, array) {
+      getFilesRecursively(srcDir, [ "**/*" ], excludePaths).forEach(function (file, idx, array) {
         lines.push(createArrayLine('    '+JSON.stringify(file), idx, array.length));
       });
       lines.push("];");
@@ -166,9 +167,9 @@ function escapeRegExp(string){
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
-function getFilesRecursively(dir, globPatterns) {
+function getFilesRecursively(dir, globPatterns, excludePaths) {
   try {
-    return helpers.multiGlob(globPatterns, { cwd: dir }).filter(function(file){
+    return helpers.multiGlob(globPatterns, { cwd: dir, ignore: excludePaths }).filter(function(file){
       var srcFile = path.join(dir, file);
       var stat = fs.lstatSync(srcFile);
       return (stat.isFile()  || stat.isSymbolicLink());