fix: Use of extraResources prevents node_modules from being included in asar

develar · develar · commit 0fbad33a93b1 · 2017-05-05T11:44:49.000+02:00
Close #867
diff --git a/packages/electron-builder/src/fileMatcher.ts b/packages/electron-builder/src/fileMatcher.ts
@@ -1,6 +1,6 @@
 import BluebirdPromise from "bluebird-lst"
 import { FilePattern, PlatformSpecificBuildOptions } from "electron-builder-core"
-import { asArray } from "electron-builder-util"
+import { asArray, debug } from "electron-builder-util"
 import { copyDir, copyFile, Filter, statOrNull } from "electron-builder-util/out/fs"
 import { warn } from "electron-builder-util/out/log"
 import { mkdirs } from "fs-extra-p"
@@ -80,6 +80,10 @@ export class FileMatcher {
     this.computeParsedPatterns(parsedPatterns)
     return createFilter(this.from, parsedPatterns, ignoreFiles, rawFilter, excludePatterns)
   }
+
+  toString() {
+    return `from: ${this.from}, to: ${this.to}, patterns: ${this.patterns.join(", ")}`
+  }
 }
 
 export function createFileMatcher(info: BuildInfo, appDir: string, resourcesPath: string, macroExpander: (pattern: string) => string, platformSpecificBuildOptions: PlatformSpecificBuildOptions, buildResourceDir: string) {
@@ -190,6 +194,9 @@ export function copyFiles(patterns: Array<FileMatcher> | null): Promise<any> {
     if (pattern.isEmpty() || pattern.containsOnlyIgnore()) {
       pattern.addAllPattern()
     }
+    if (debug.enabled) {
+      debug(`Copying files using pattern: ${pattern}`)
+    }
     return await copyDir(pattern.from, pattern.to, pattern.createFilter())
   })
 }
diff --git a/packages/electron-builder/src/util/filter.ts b/packages/electron-builder/src/util/filter.ts
@@ -1,7 +1,7 @@
+import { Filter } from "electron-builder-util/out/fs"
 import { Stats } from "fs-extra-p"
 import { Minimatch } from "minimatch"
 import * as path from "path"
-import { Filter } from "electron-builder-util/out/fs"
 
 export function hasMagic(pattern: Minimatch) {
   const set = pattern.set
@@ -38,7 +38,8 @@ export function createFilter(src: string, patterns: Array<Minimatch>, ignoreFile
       relative = relative.replace(/\\/g, "/")
     }
 
-    return minimatchAll(relative, patterns, stat) && (excludePatterns == null || !minimatchAll(relative, excludePatterns, stat))
+    // https://github.com/electron-userland/electron-builder/issues/867
+    return minimatchAll(relative, patterns, stat) && (excludePatterns == null || stat.isDirectory() || !minimatchAll(relative, excludePatterns, stat))
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
	`1`	`+import { Filter } from "electron-builder-util/out/fs"`
`1`	`2`	`import { Stats } from "fs-extra-p"`
`2`	`3`	`import { Minimatch } from "minimatch"`
`3`	`4`	`import * as path from "path"`
`4`		`-import { Filter } from "electron-builder-util/out/fs"`
`5`	`5`
`6`	`6`	`export function hasMagic(pattern: Minimatch) {`
`7`	`7`	`const set = pattern.set`
`@@ -38,7 +38,8 @@ export function createFilter(src: string, patterns: Array<Minimatch>, ignoreFile`
`38`	`38`	`relative = relative.replace(/\\/g, "/")`
`39`	`39`	`}`
`40`	`40`
`41`		`- return minimatchAll(relative, patterns, stat) && (excludePatterns == null \|\| !minimatchAll(relative, excludePatterns, stat))`
	`41`	`+ // https://github.com/electron-userland/electron-builder/issues/867`
	`42`	`+ return minimatchAll(relative, patterns, stat) && (excludePatterns == null \|\| stat.isDirectory() \|\| !minimatchAll(relative, excludePatterns, stat))`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`