Merge branch 'electron-userland:master' into master

erikrz · web-flow · commit 874ee4e82375 · 2021-09-10T17:38:09.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# [](https://github.com/electron-userland/electron-builder/compare/v22.13.1...v) (2021-09-10)
+
+
+### Bug Fixes
+
+* (mac) Fix intel mac upgrade flow when both x64 and arm64 published ([#6212](https://github.com/electron-userland/electron-builder/issues/6212)) ([0c21cd6](https://github.com/electron-userland/electron-builder/commit/0c21cd69663a7eebe0687eaba9eea851cc2fea9e))
+* Add support for nested file extensions (such as `.dmg.blockmap`) to Keygen publisher ([#6234](https://github.com/electron-userland/electron-builder/issues/6234)) ([369f1fa](https://github.com/electron-userland/electron-builder/commit/369f1fa793c28d8743e19ef07ce6eb091c191fb0)), closes [#6229](https://github.com/electron-userland/electron-builder/issues/6229)
+* **deploy:** Removing schema generation since it doesn't compile during release ([7e28c11](https://github.com/electron-userland/electron-builder/commit/7e28c11ec894c9ce7664a2ea3bfdb3e96f09d983))
+* **deploy:** Update package.json script name ([e22fc16](https://github.com/electron-userland/electron-builder/commit/e22fc16cd196ab0f3cc7b2f9bdaae237e64121a8))
+* dmg-license optional dependency ([#6244](https://github.com/electron-userland/electron-builder/issues/6244)) ([8ccb2da](https://github.com/electron-userland/electron-builder/commit/8ccb2da5d4c641b971f6a7403d3b2e3a3b844a05))
+* dmg-license-dependency ([#6248](https://github.com/electron-userland/electron-builder/issues/6248)) ([f359035](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693))
+
+
+### Features
+
+* adding Bitbucket publisher and autoupdater ([#6228](https://github.com/electron-userland/electron-builder/issues/6228)) ([a945321](https://github.com/electron-userland/electron-builder/commit/a94532164709a545c0f6551fdc336dbc5377bda8))
+
+
+
 # [](https://github.com/electron-userland/electron-builder/compare/v22.13.1...v) (2021-09-09)
 
 
diff --git a/netlify-docs.sh b/netlify-docs.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 pip3 install pipenv
 pipenv install
+echo "Installing pnpm"
+npx pnpm install --store=./node_modules/.pnpm-store
+echo "Building site docs"
 mkdocs build
diff --git a/netlify.toml b/netlify.toml
@@ -4,3 +4,6 @@
 [Build]
   Publish = ""
   Functions = ""
+
+[build.environment]
+  NPM_FLAGS = "--version"
diff --git a/package.json b/package.json
@@ -37,6 +37,9 @@
   "repository": "https://github.com/electron-userland/electron-builder",
   "///": "All dependencies for all packages (hoisted)",
   "////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
+  "dependencies": {
+    "dmg-license": "1.0.9"
+  },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "7.15.0",
     "@changesets/changelog-github": "0.4.1",
diff --git a/packages/app-builder-lib/CHANGELOG.md b/packages/app-builder-lib/CHANGELOG.md
@@ -1,5 +1,11 @@
 # app-builder-lib
 
+## 22.14.2
+
+### Patch Changes
+
+- [#6248](https://github.com/electron-userland/electron-builder/pull/6248) [`f3590355`](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: dmg-license as an optional dependency while still enabling docs site to build properly
+
 ## 22.14.1
 
 ### Patch Changes
diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "app-builder-lib",
   "description": "electron-builder lib",
-  "version": "22.14.1",
+  "version": "22.14.2",
   "main": "out/index.js",
   "files": [
     "out",
@@ -101,8 +101,9 @@
     "@types/is-ci": "3.0.0",
     "@types/js-yaml": "4.0.3",
     "@types/semver": "7.3.8",
+    "dmg-builder": "workspace:*",
     "electron-builder-squirrel-windows": "workspace:*"
   },
-  "//": "electron-builder-squirrel-windows added as dev dep for tests (as otherwise `require` doesn't work using Yarn 2)",
+  "//": "electron-builder-squirrel-windows and dmg-builder added as dev dep for tests (as otherwise `require` doesn't work using Yarn 2)",
   "typings": "./out/index.d.ts"
 }
diff --git a/packages/app-builder-lib/src/version.ts b/packages/app-builder-lib/src/version.ts
@@ -1 +1 @@
-export const PACKAGE_VERSION = "22.14.1"
+export const PACKAGE_VERSION = "22.14.2"
diff --git a/packages/dmg-builder/CHANGELOG.md b/packages/dmg-builder/CHANGELOG.md
@@ -1,5 +1,14 @@
 # dmg-builder
 
+## 22.14.2
+
+### Patch Changes
+
+- [#6248](https://github.com/electron-userland/electron-builder/pull/6248) [`f3590355`](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: dmg-license as an optional dependency while still enabling docs site to build properly
+
+- Updated dependencies [[`f3590355`](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693)]:
+  - app-builder-lib@22.14.2
+
 ## 22.14.1
 
 ### Patch Changes
diff --git a/packages/dmg-builder/package.json b/packages/dmg-builder/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dmg-builder",
-	"version": "22.14.1",
+	"version": "22.14.2",
 	"main": "out/dmgUtil.js",
 	"author": "Vladimir Krivosheev",
 	"license": "MIT",
@@ -20,11 +20,13 @@
 		"app-builder-lib": "workspace:*",
 		"builder-util": "workspace:*",
 		"builder-util-runtime": "workspace:*",
-		"dmg-license": "^1.0.9",
 		"fs-extra": "^10.0.0",
 		"iconv-lite": "^0.6.2",
 		"js-yaml": "^4.1.0"
 	},
+	"optionalDependencies": {
+		"dmg-license": "^1.0.9"
+	},
 	"devDependencies": {
 		"@types/fs-extra": "9.0.12",
 		"@types/js-yaml": "4.0.3",
diff --git a/packages/electron-builder-squirrel-windows/CHANGELOG.md b/packages/electron-builder-squirrel-windows/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-builder-squirrel-windows
 
+## 22.14.2
+
+### Patch Changes
+
+- Updated dependencies [[`f3590355`](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693)]:
+  - app-builder-lib@22.14.2
+
 ## 22.14.1
 
 ### Patch Changes
diff --git a/packages/electron-builder-squirrel-windows/package.json b/packages/electron-builder-squirrel-windows/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-builder-squirrel-windows",
-  "version": "22.14.1",
+  "version": "22.14.2",
   "main": "out/SquirrelWindowsTarget.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",
diff --git a/packages/electron-builder/CHANGELOG.md b/packages/electron-builder/CHANGELOG.md
@@ -1,5 +1,13 @@
 # electron-builder
 
+## 22.14.2
+
+### Patch Changes
+
+- Updated dependencies [[`f3590355`](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693)]:
+  - app-builder-lib@22.14.2
+  - dmg-builder@22.14.2
+
 ## 22.14.1
 
 ### Patch Changes
diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json
@@ -1,7 +1,7 @@
 {
   "name": "electron-builder",
   "description": "A complete solution to package and build a ready for distribution Electron app for MacOS, Windows and Linux with “auto update” support out of the box",
-  "version": "22.14.1",
+  "version": "22.14.2",
   "main": "out/index.js",
   "files": [
     "out"
diff --git a/packages/electron-forge-maker-appimage/CHANGELOG.md b/packages/electron-forge-maker-appimage/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-forge-maker-appimage
 
+## 22.14.2
+
+### Patch Changes
+
+- Updated dependencies [[`f3590355`](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693)]:
+  - app-builder-lib@22.14.2
+
 ## 22.14.1
 
 ### Patch Changes
diff --git a/packages/electron-forge-maker-appimage/package.json b/packages/electron-forge-maker-appimage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-forge-maker-appimage",
-  "version": "22.14.1",
+  "version": "22.14.2",
   "main": "main.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",
diff --git a/packages/electron-forge-maker-nsis-web/CHANGELOG.md b/packages/electron-forge-maker-nsis-web/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-forge-maker-nsis-web
 
+## 22.14.2
+
+### Patch Changes
+
+- Updated dependencies [[`f3590355`](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693)]:
+  - app-builder-lib@22.14.2
+
 ## 22.14.1
 
 ### Patch Changes
diff --git a/packages/electron-forge-maker-nsis-web/package.json b/packages/electron-forge-maker-nsis-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-forge-maker-nsis-web",
-  "version": "22.14.1",
+  "version": "22.14.2",
   "main": "main.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",
diff --git a/packages/electron-forge-maker-nsis/CHANGELOG.md b/packages/electron-forge-maker-nsis/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-forge-maker-nsis
 
+## 22.14.2
+
+### Patch Changes
+
+- Updated dependencies [[`f3590355`](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693)]:
+  - app-builder-lib@22.14.2
+
 ## 22.14.1
 
 ### Patch Changes
diff --git a/packages/electron-forge-maker-nsis/package.json b/packages/electron-forge-maker-nsis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-forge-maker-nsis",
-  "version": "22.14.1",
+  "version": "22.14.2",
   "main": "main.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",
diff --git a/packages/electron-forge-maker-snap/CHANGELOG.md b/packages/electron-forge-maker-snap/CHANGELOG.md
@@ -1,5 +1,12 @@
 # electron-forge-maker-snap
 
+## 22.14.2
+
+### Patch Changes
+
+- Updated dependencies [[`f3590355`](https://github.com/electron-userland/electron-builder/commit/f3590355c61dab05a6c92c5951aae8e59503d693)]:
+  - app-builder-lib@22.14.2
+
 ## 22.14.1
 
 ### Patch Changes
diff --git a/packages/electron-forge-maker-snap/package.json b/packages/electron-forge-maker-snap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-forge-maker-snap",
-  "version": "22.14.1",
+  "version": "22.14.2",
   "main": "main.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export const PACKAGE_VERSION = "22.14.1"`
	`1`	`+export const PACKAGE_VERSION = "22.14.2"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "electron-builder-squirrel-windows",`
`3`		`- "version": "22.14.1",`
	`3`	`+ "version": "22.14.2",`
`4`	`4`	`"main": "out/SquirrelWindowsTarget.js",`
`5`	`5`	`"author": "Vladimir Krivosheev",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "electron-builder",`
`3`	`3`	`"description": "A complete solution to package and build a ready for distribution Electron app for MacOS, Windows and Linux with “auto update” support out of the box",`
`4`		`- "version": "22.14.1",`
	`4`	`+ "version": "22.14.2",`
`5`	`5`	`"main": "out/index.js",`
`6`	`6`	`"files": [`
`7`	`7`	`"out"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "electron-forge-maker-appimage",`
`3`		`- "version": "22.14.1",`
	`3`	`+ "version": "22.14.2",`
`4`	`4`	`"main": "main.js",`
`5`	`5`	`"author": "Vladimir Krivosheev",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "electron-forge-maker-nsis-web",`
`3`		`- "version": "22.14.1",`
	`3`	`+ "version": "22.14.2",`
`4`	`4`	`"main": "main.js",`
`5`	`5`	`"author": "Vladimir Krivosheev",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "electron-forge-maker-nsis",`
`3`		`- "version": "22.14.1",`
	`3`	`+ "version": "22.14.2",`
`4`	`4`	`"main": "main.js",`
`5`	`5`	`"author": "Vladimir Krivosheev",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "electron-forge-maker-snap",`
`3`		`- "version": "22.14.1",`
	`3`	`+ "version": "22.14.2",`
`4`	`4`	`"main": "main.js",`
`5`	`5`	`"author": "Vladimir Krivosheev",`
`6`	`6`	`"license": "MIT",`