feat: allow ./ in the file pattern

develar · develar · commit 1152f2b7b0aa · 2017-01-30T08:18:59.000+01:00
Use path.posix.normalize
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,323 @@
 To see changes for current major release, please use [GiHub releases](https://github.com/electron-userland/electron-builder/releases).
 
 
+<a name=""></a>
+# [](https://github.com/electron-userland/electron-builder/compare/v12.0.3...v) (2017-01-29)
+
+
+
+<a name="12.0.3"></a>
+## [12.0.3](https://github.com/electron-userland/electron-builder/compare/v12.0.2...v12.0.3) (2017-01-29)
+
+
+### Features
+
+* **nsis:** Pass --update flag to uninstaller when auto updating an application ([505a63d](https://github.com/electron-userland/electron-builder/commit/505a63d)), closes [#1162](https://github.com/electron-userland/electron-builder/issues/1162)
+
+
+
+<a name="12.0.2"></a>
+## [12.0.2](https://github.com/electron-userland/electron-builder/compare/v12.0.1...v12.0.2) (2017-01-29)
+
+
+### Bug Fixes
+
+* **deployment:** warn "A release is already published" instead of error ([5d64693](https://github.com/electron-userland/electron-builder/commit/5d64693)), closes [#1183](https://github.com/electron-userland/electron-builder/issues/1183)
+* **nsis:** add `+` as safe symbol for product name ([e7e2a82](https://github.com/electron-userland/electron-builder/commit/e7e2a82))
+* deepAssign error without config ([5d72c10](https://github.com/electron-userland/electron-builder/commit/5d72c10)), closes [#1177](https://github.com/electron-userland/electron-builder/issues/1177)
+
+
+### Features
+
+* **electron-updater:** add requestHeaders option ([dd1320d](https://github.com/electron-userland/electron-builder/commit/dd1320d)), closes [#1175](https://github.com/electron-userland/electron-builder/issues/1175)
+
+
+
+<a name="12.0.1"></a>
+## [12.0.1](https://github.com/electron-userland/electron-builder/compare/v12.0.0...v12.0.1) (2017-01-27)
+
+
+### Bug Fixes
+
+* **deployment:** Error on CI build when GH_TOKEN not set for external PRs ([ee32575](https://github.com/electron-userland/electron-builder/commit/ee32575)), closes [#1178](https://github.com/electron-userland/electron-builder/issues/1178)
+
+
+
+<a name="12.0.0"></a>
+# [12.0.0](https://github.com/electron-userland/electron-builder/compare/v11.7.0...v12.0.0) (2017-01-26)
+
+
+### Features
+
+* **nsis:** use productName rather than name for install path if matches /^[-_0-9a-zA-Z ]+$/ ([2539cfb](https://github.com/electron-userland/electron-builder/commit/2539cfb)), closes [#1100](https://github.com/electron-userland/electron-builder/issues/1100) [#767](https://github.com/electron-userland/electron-builder/issues/767) [#1104](https://github.com/electron-userland/electron-builder/issues/1104)
+
+
+### BREAKING CHANGES
+
+* nsis: installation path change
+
+
+
+<a name="11.7.0"></a>
+# [11.7.0](https://github.com/electron-userland/electron-builder/compare/v11.6.1...v11.7.0) (2017-01-26)
+
+
+### Features
+
+* **nsis:** Show welcome and finish page duing uninstall (#1173) ([aa43344](https://github.com/electron-userland/electron-builder/commit/aa43344))
+
+
+
+<a name="11.6.1"></a>
+## [11.6.1](https://github.com/electron-userland/electron-builder/compare/v11.6.0...v11.6.1) (2017-01-25)
+
+
+### Bug Fixes
+
+* Error during signing when running as Windows SYSTEM user ([688111e](https://github.com/electron-userland/electron-builder/commit/688111e)), closes [#1164](https://github.com/electron-userland/electron-builder/issues/1164)
+
+
+
+<a name="11.6.0"></a>
+# [11.6.0](https://github.com/electron-userland/electron-builder/compare/v11.5.2...v11.6.0) (2017-01-25)
+
+
+### Features
+
+* **electron-updater:** cannot use updater without administrator privileges ([7c2973d](https://github.com/electron-userland/electron-builder/commit/7c2973d)), closes [#1133](https://github.com/electron-userland/electron-builder/issues/1133)
+
+
+
+<a name="11.5.2"></a>
+## [11.5.2](https://github.com/electron-userland/electron-builder/compare/v11.5.1...v11.5.2) (2017-01-24)
+
+
+### Bug Fixes
+
+* **deployment:** another fix for "only first artifact is uploaded to GitHub" ([93b4d59](https://github.com/electron-userland/electron-builder/commit/93b4d59)), closes [#1133](https://github.com/electron-userland/electron-builder/issues/1133)
+* **nsis:** Must be error if file association is set, but perMachine not ([96c8ed9](https://github.com/electron-userland/electron-builder/commit/96c8ed9)), closes [#772](https://github.com/electron-userland/electron-builder/issues/772)
+
+
+
+<a name="11.5.1"></a>
+## [11.5.1](https://github.com/electron-userland/electron-builder/compare/v11.5.0...v11.5.1) (2017-01-21)
+
+
+### Bug Fixes
+
+* Arch & pacman use i686 instead of i386 and pkg.tar.xz (#1148) ([5fe94ee](https://github.com/electron-userland/electron-builder/commit/5fe94ee))
+
+
+### Features
+
+* **deployment:** Only first artifact is uploaded to GitHub ([e3ab55b](https://github.com/electron-userland/electron-builder/commit/e3ab55b)), closes [#1133](https://github.com/electron-userland/electron-builder/issues/1133)
+* **electron-updater:** NSIS autoUpdater.setFeedURL throws error ([eb6a453](https://github.com/electron-userland/electron-builder/commit/eb6a453)), closes [#1105](https://github.com/electron-userland/electron-builder/issues/1105)
+
+
+
+<a name="11.5.0"></a>
+# [11.5.0](https://github.com/electron-userland/electron-builder/compare/v11.4.4...v11.5.0) (2017-01-18)
+
+
+### Bug Fixes
+
+* make file association name optional ([248855c](https://github.com/electron-userland/electron-builder/commit/248855c)), closes [#1069](https://github.com/electron-userland/electron-builder/issues/1069)
+
+
+### Features
+
+* **electron-updater:** Port support for downloads, Protocol support for generic backend ([8d883f1](https://github.com/electron-userland/electron-builder/commit/8d883f1))
+
+
+
+<a name="11.4.4"></a>
+## [11.4.4](https://github.com/electron-userland/electron-builder/compare/v11.4.3...v11.4.4) (2017-01-17)
+
+
+### Bug Fixes
+
+* **publish:** resolve any publish configuration — not only string ([98c2c8e](https://github.com/electron-userland/electron-builder/commit/98c2c8e))
+
+
+
+<a name="11.4.3"></a>
+## [11.4.3](https://github.com/electron-userland/electron-builder/compare/v11.4.1...v11.4.3) (2017-01-16)
+
+
+### Bug Fixes
+
+* generate latest-mac.json for github in the github directory ([8670d5a](https://github.com/electron-userland/electron-builder/commit/8670d5a))
+* **snap:** interface 'platform' doesn't exist ([ade922c](https://github.com/electron-userland/electron-builder/commit/ade922c)), closes [#1123](https://github.com/electron-userland/electron-builder/issues/1123)
+
+
+
+<a name="11.4.1"></a>
+## [11.4.1](https://github.com/electron-userland/electron-builder/compare/v11.4.0...v11.4.1) (2017-01-16)
+
+
+### Bug Fixes
+
+* **AppImage:** include libappindicator1 in AppImage ([df7d316](https://github.com/electron-userland/electron-builder/commit/df7d316)), closes [#1082](https://github.com/electron-userland/electron-builder/issues/1082)
+
+
+
+<a name="11.4.0"></a>
+# [11.4.0](https://github.com/electron-userland/electron-builder/compare/v11.3.0...v11.4.0) (2017-01-15)
+
+
+### Bug Fixes
+
+* **squirrel.windows:** Crash after autoupdate downloads nuget package ([d10ba78](https://github.com/electron-userland/electron-builder/commit/d10ba78)), closes [#1101](https://github.com/electron-userland/electron-builder/issues/1101)
+
+
+### Features
+
+* **electron-updater:** Electron Auto Updater MacOS support ([067d5c7](https://github.com/electron-userland/electron-builder/commit/067d5c7))
+* Separate build config from package.json ([ecfdc65](https://github.com/electron-userland/electron-builder/commit/ecfdc65)), closes [#1109](https://github.com/electron-userland/electron-builder/issues/1109)
+
+
+
+<a name="11.3.0"></a>
+# [11.3.0](https://github.com/electron-userland/electron-builder/compare/v11.2.5...v11.3.0) (2017-01-14)
+
+
+### Bug Fixes
+
+* **docker:** add missing libcurl3 for osslsigncode (#1116) ([f0a553a](https://github.com/electron-userland/electron-builder/commit/f0a553a))
+* **electron-updater:** Add better error handling for github releases (#1114) ([9dc5bc9](https://github.com/electron-userland/electron-builder/commit/9dc5bc9)), closes [#1112](https://github.com/electron-userland/electron-builder/issues/1112)
+
+
+
+<a name="11.2.5"></a>
+## [11.2.5](https://github.com/electron-userland/electron-builder/compare/v11.2.4...v11.2.5) (2017-01-12)
+
+
+### Bug Fixes
+
+* **codeSign:** signing with "Mac Developer" failed #1103 ([88682e8](https://github.com/electron-userland/electron-builder/commit/88682e8))
+
+
+
+<a name="11.2.4"></a>
+## [11.2.4](https://github.com/electron-userland/electron-builder/compare/v11.2.1...v11.2.4) (2017-01-11)
+
+
+
+<a name="11.2.1"></a>
+## [11.2.1](https://github.com/electron-userland/electron-builder/compare/v11.2.0...v11.2.1) (2017-01-09)
+
+
+### Bug Fixes
+
+* do not fail if cannot rebuild optional dep ([f67b7d2](https://github.com/electron-userland/electron-builder/commit/f67b7d2)), closes [#1075](https://github.com/electron-userland/electron-builder/issues/1075)
+
+
+
+<a name="11.2.0"></a>
+# [11.2.0](https://github.com/electron-userland/electron-builder/compare/v11.1.1...v11.2.0) (2017-01-08)
+
+
+### Bug Fixes
+
+* **electron-auto-updater:** uncaught SHA2 checksum mismatch exception ([cb87588](https://github.com/electron-userland/electron-builder/commit/cb87588))
+
+
+### Features
+
+* linked dirs outside of projects (e.g. linked modules) ([2364a1c](https://github.com/electron-userland/electron-builder/commit/2364a1c)), closes [#675](https://github.com/electron-userland/electron-builder/issues/675)
+
+
+
+<a name="11.1.1"></a>
+## [11.1.1](https://github.com/electron-userland/electron-builder/compare/v1.1.1...v11.1.1) (2017-01-06)
+
+
+### Bug Fixes
+
+* to preserve compatibility with old electron-auto-updater (< 0.10.0), we upload file with path specific for GitHub ([c06f3f4](https://github.com/electron-userland/electron-builder/commit/c06f3f4))
+
+
+
+<a name="11.1.0"></a>
+# [11.1.0](https://github.com/electron-userland/electron-builder/compare/v11.0.0...v11.1.0) (2017-01-05)
+
+
+### Features
+
+* **nsis:** Change installation directory when not using 'oneClick' with NSIS ([06b0103](https://github.com/electron-userland/electron-builder/commit/06b0103)), closes [#596](https://github.com/electron-userland/electron-builder/issues/596)
+
+
+
+<a name="11.0.0"></a>
+# [11.0.0](https://github.com/electron-userland/electron-builder/compare/v10.17.2...v11.0.0) (2017-01-05)
+
+
+### Bug Fixes
+
+* **electron-builder-http:** electron-auto-updater request can download so fast that the first few chunks arrive before ensureDirPromise has finished for configurePipes to run ([cb85790](https://github.com/electron-userland/electron-builder/commit/cb85790)), closes [#1081](https://github.com/electron-userland/electron-builder/issues/1081)
+* electron-builder not generating "latest.yml" file ([0f1fc4d](https://github.com/electron-userland/electron-builder/commit/0f1fc4d)), closes [#925](https://github.com/electron-userland/electron-builder/issues/925)
+
+
+### Code Refactoring
+
+* extract electron-builder-squirrel-windows ([6256432](https://github.com/electron-userland/electron-builder/commit/6256432))
+
+
+### Features
+
+* add beforeBuild callback (#1085) ([35a8cdf](https://github.com/electron-userland/electron-builder/commit/35a8cdf)), closes [#982](https://github.com/electron-userland/electron-builder/issues/982)
+
+
+### BREAKING CHANGES
+
+* To use Squirrel.Windows please install `electron-builder-squirrel-windows` dependency.
+
+
+
+<a name="10.17.2"></a>
+## [10.17.2](https://github.com/electron-userland/electron-builder/compare/v10.17.0...v10.17.2) (2017-01-04)
+
+
+### Bug Fixes
+
+* Unhandled rejection SyntaxError: Unexpected token ... ([0c81bf7](https://github.com/electron-userland/electron-builder/commit/0c81bf7)), closes [#1076](https://github.com/electron-userland/electron-builder/issues/1076)
+* use transformer to notify about progress ([7fa56bc](https://github.com/electron-userland/electron-builder/commit/7fa56bc)), closes [#1077](https://github.com/electron-userland/electron-builder/issues/1077)
+* **dmg:** Can't locate Mac/Finder/DSStore.pm in [@INC](https://github.com/INC) ([8d0e230](https://github.com/electron-userland/electron-builder/commit/8d0e230)), closes [#1079](https://github.com/electron-userland/electron-builder/issues/1079)
+
+
+
+<a name="10.17.0"></a>
+# [10.17.0](https://github.com/electron-userland/electron-builder/compare/v10.16.0...v10.17.0) (2017-01-03)
+
+
+### Bug Fixes
+
+* asarUnpack unpacks parent directory when file is specified ([82f16d1](https://github.com/electron-userland/electron-builder/commit/82f16d1)), closes [#1071](https://github.com/electron-userland/electron-builder/issues/1071)
+
+
+### Features
+
+* **linux:** use ${macro} syntax for linux templates ([fe137fc](https://github.com/electron-userland/electron-builder/commit/fe137fc))
+
+
+
+<a name="10.16.0"></a>
+# [10.16.0](https://github.com/electron-userland/electron-builder/compare/v10.15.2...v10.16.0) (2017-01-02)
+
+
+### Features
+
+* **nsis:** allow submenu in start menu in programfiles ([e3faaf1](https://github.com/electron-userland/electron-builder/commit/e3faaf1)), closes [#1063](https://github.com/electron-userland/electron-builder/issues/1063)
+
+
+
 <a name="10.15.2"></a>
-# [0.15.2](https://github.com/electron-userland/electron-builder/compare/v10.15.1...v0.0.0-semantic-release) (2016-12-31)
+## [10.15.2](https://github.com/electron-userland/electron-builder/compare/v10.15.1...v10.15.2) (2016-12-31)
 
 
 ### Bug Fixes
 
-* **dmg:** Unable to build with custom path ([89f7f6a](https://github.com/electron-userland/electron-builder/commit/89f7f6a)), closes [#847](https://github.com/electron-userland/electron-builder/issues/847) [#1054](https://github.com/electron-userland/electron-builder/issues/1054)
+* **dmg:** Unable to build with custom path ([3bf8c93](https://github.com/electron-userland/electron-builder/commit/3bf8c93)), closes [#847](https://github.com/electron-userland/electron-builder/issues/847) [#1054](https://github.com/electron-userland/electron-builder/issues/1054)
 * **docker:** Docker - wine - bad exe format for rcedit.exe ([920c230](https://github.com/electron-userland/electron-builder/commit/920c230))
 * **electron-auto-updater:** Checking for updates from github was failing ([3401630](https://github.com/electron-userland/electron-builder/commit/3401630)), closes [#1038](https://github.com/electron-userland/electron-builder/issues/1038)
 
@@ -2937,4 +3247,4 @@ Auto-update — please see https://github.com/electron-userland/electron-builder
 
 ### Features
 
-* use read-package-json as a correct fix of Linux maintainer .deb package field ([3fba451](https://github.com/electron-userland/electron-builder/commit/3fba451))
+* use read-package-json as a correct fix of Linux maintainer .deb package field ([3fba451](https://github.com/electron-userland/electron-builder/commit/3fba451))
diff --git a/packages/electron-builder/src/fileMatcher.ts b/packages/electron-builder/src/fileMatcher.ts
@@ -24,11 +24,11 @@ export class FileMatcher {
   constructor(from: string, to: string, private options: FileMatchOptions, patterns?: Array<string> | string | n) {
     this.from = this.expandPattern(from)
     this.to = this.expandPattern(to)
-    this.patterns = asArray(patterns)
+    this.patterns = asArray(patterns).map(it => path.posix.normalize(it))
   }
 
   addPattern(pattern: string) {
-    this.patterns.push(pattern)
+    this.patterns.push(path.posix.normalize((pattern)))
   }
 
   addAllPattern() {
diff --git a/packages/electron-builder/src/platformPackager.ts b/packages/electron-builder/src/platformPackager.ts
@@ -306,9 +306,9 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>
         patterns = [patterns]
       }
 
-      for (let i = 0; i < patterns.length; i++) {
-        const pattern = patterns[i]
+      for (const pattern of patterns) {
         if (typeof pattern === "string") {
+          // use normalize to transform ./foo to foo
           defaultMatcher.addPattern(pattern)
         }
         else if (allowAdvancedMatching) {
@@ -326,7 +326,7 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>
     addPatterns(platformSpecificPatterns)
 
     if (!defaultMatcher.isEmpty()) {
-      // Default matcher should be first in the array
+      // default matcher should be first in the array
       fileMatchers.unshift(defaultMatcher)
     }
 
diff --git a/test/src/filesTest.ts b/test/src/filesTest.ts
@@ -44,6 +44,7 @@ test.ifNotCiWin("extraResources", async () => {
         extraResources: [
           "foo",
           "bar/hello.txt",
+          "./dir-relative/f.txt",
           "bar/${arch}.txt",
           "${os}/${arch}.txt",
         ],
@@ -61,6 +62,7 @@ test.ifNotCiWin("extraResources", async () => {
         return BluebirdPromise.all([
           outputFile(path.join(projectDir, "foo/nameWithoutDot"), "nameWithoutDot"),
           outputFile(path.join(projectDir, "bar/hello.txt"), "data"),
+          outputFile(path.join(projectDir, "dir-relative/f.txt"), "data"),
           outputFile(path.join(projectDir, `bar/${process.arch}.txt`), "data"),
           outputFile(path.join(projectDir, `${osName}/${process.arch}.txt`), "data"),
           outputFile(path.join(projectDir, "platformSpecificR"), "platformSpecificR"),
@@ -78,6 +80,7 @@ test.ifNotCiWin("extraResources", async () => {
           assertThat(path.join(resourcesDir, "foo")).isDirectory(),
           assertThat(path.join(resourcesDir, "foo", "nameWithoutDot")).isFile(),
           assertThat(path.join(resourcesDir, "bar", "hello.txt")).isFile(),
+          assertThat(path.join(resourcesDir, "dir-relative", "f.txt")).isFile(),
           assertThat(path.join(resourcesDir, "bar", `${process.arch}.txt`)).isFile(),
           assertThat(path.join(resourcesDir, osName, `${process.arch}.txt`)).isFile(),
           assertThat(path.join(resourcesDir, "platformSpecificR")).isFile(),
@@ -86,6 +89,7 @@ test.ifNotCiWin("extraResources", async () => {
       },
       expectedContents: platform === Platform.WINDOWS ? pathSorter(expectedWinContents.concat(
         winDirPrefix + "bar/hello.txt",
+        winDirPrefix + "dir-relative/f.txt",
         winDirPrefix + "bar/x64.txt",
         winDirPrefix + "foo/nameWithoutDot",
         winDirPrefix + "platformSpecificR",
diff --git a/test/src/helpers/packTester.ts b/test/src/helpers/packTester.ts

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ export class FileMatcher {`
`24`	`24`	`constructor(from: string, to: string, private options: FileMatchOptions, patterns?: Array<string> \| string \| n) {`
`25`	`25`	`this.from = this.expandPattern(from)`
`26`	`26`	`this.to = this.expandPattern(to)`
`27`		`- this.patterns = asArray(patterns)`
	`27`	`+ this.patterns = asArray(patterns).map(it => path.posix.normalize(it))`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`addPattern(pattern: string) {`
`31`		`- this.patterns.push(pattern)`
	`31`	`+ this.patterns.push(path.posix.normalize((pattern)))`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`addAllPattern() {`
Original file line number	Diff line number	Diff line change
`@@ -306,9 +306,9 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>`
`306`	`306`	`patterns = [patterns]`
`307`	`307`	`}`
`308`	`308`
`309`		`- for (let i = 0; i < patterns.length; i++) {`
`310`		`- const pattern = patterns[i]`
	`309`	`+ for (const pattern of patterns) {`
`311`	`310`	`if (typeof pattern === "string") {`
	`311`	`+ // use normalize to transform ./foo to foo`
`312`	`312`	`defaultMatcher.addPattern(pattern)`
`313`	`313`	`}`
`314`	`314`	`else if (allowAdvancedMatching) {`
`@@ -326,7 +326,7 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>`
`326`	`326`	`addPatterns(platformSpecificPatterns)`
`327`	`327`
`328`	`328`	`if (!defaultMatcher.isEmpty()) {`
`329`		`- // Default matcher should be first in the array`
	`329`	`+ // default matcher should be first in the array`
`330`	`330`	`fileMatchers.unshift(defaultMatcher)`
`331`	`331`	`}`
`332`	`332`