Merge branch 'master' into smartUnpack

beyondkmp · web-flow · commit 98830beabb6e · 2024-11-11T11:16:28.000+08:00
diff --git a/.changeset/fair-penguins-build.md b/.changeset/fair-penguins-build.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+chore(deps): update electron/asar to 3.2.17
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -19,12 +19,14 @@
   "changesets": [
     "dull-eyes-check",
     "early-penguins-share",
+    "fair-penguins-build",
     "fluffy-wolves-smile",
     "fresh-camels-smash",
     "gold-parents-complain",
     "khaki-schools-provide",
     "lucky-tigers-do",
     "many-shoes-look",
+    "mighty-forks-pump",
     "nasty-mangos-yawn",
     "new-zoos-repair",
     "ninety-candles-laugh",
@@ -36,7 +38,9 @@
     "smooth-camels-decide",
     "sour-points-refuse",
     "stupid-buses-compete",
+    "stupid-ducks-join",
     "sweet-masks-sparkle",
+    "tame-buckets-drum",
     "tiny-cobras-walk",
     "tricky-files-speak",
     "two-rice-wash",
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# [](https://github.com/electron-userland/electron-builder/compare/v26.0.0-alpha.5...v) (2024-11-07)
+
+
+### Bug Fixes
+
+* docker build script unable to build node 18 image ([#8665](https://github.com/electron-userland/electron-builder/issues/8665)) ([fb26f6a](https://github.com/electron-userland/electron-builder/commit/fb26f6ae32503df46523f5e986ce40f3e3f8dfff))
+* use FileCopier for copying files and queue creation of symlinks ([#8663](https://github.com/electron-userland/electron-builder/issues/8663)) ([866b0ca](https://github.com/electron-userland/electron-builder/commit/866b0caa2859ccff90ec8654f82263569cd2465d))
+
+
+### Features
+
+* add AppArmor profile to FPM targets to pair with `afterInstall` and `afterRemove` template scripts ([#8636](https://github.com/electron-userland/electron-builder/issues/8636)) ([88cc0b0](https://github.com/electron-userland/electron-builder/commit/88cc0b06dba22139721fd1e04f6a1cf2d447edbd))
+
+
+
 # [](https://github.com/electron-userland/electron-builder/compare/v26.0.0-alpha.4...v) (2024-11-01)
 
 
diff --git a/packages/app-builder-lib/CHANGELOG.md b/packages/app-builder-lib/CHANGELOG.md
@@ -1,5 +1,21 @@
 # app-builder-lib
 
+## 26.0.0-alpha.6
+
+### Minor Changes
+
+- [#8636](https://github.com/electron-userland/electron-builder/pull/8636) [`88cc0b06`](https://github.com/electron-userland/electron-builder/commit/88cc0b06dba22139721fd1e04f6a1cf2d447edbd) Thanks [@mmaietta](https://github.com/mmaietta)! - feat: add support for AppArmor with template profile and configuration property
+
+### Patch Changes
+
+- [#8671](https://github.com/electron-userland/electron-builder/pull/8671) [`a4505a37`](https://github.com/electron-userland/electron-builder/commit/a4505a3785c17fc1aaaeaa91ba2653787219d74a) Thanks [@beyondkmp](https://github.com/beyondkmp)! - chore(deps): update electron/asar to 3.2.17
+
+- [`a1ee0419`](https://github.com/electron-userland/electron-builder/commit/a1ee04191f12920585fea8fa648cd0c4b0ed0558) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: use FileCopier for copying files and queue creation of symlinks
+
+- Updated dependencies []:
+  - dmg-builder@26.0.0-alpha.6
+  - electron-builder-squirrel-windows@26.0.0-alpha.6
+
 ## 26.0.0-alpha.5
 
 ### 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": "26.0.0-alpha.5",
+  "version": "26.0.0-alpha.6",
   "main": "out/index.js",
   "files": [
     "out",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@develar/schema-utils": "~2.6.5",
     "@electron/fuses": "^1.8.0",
-    "@electron/asar": "3.2.13",
+    "@electron/asar": "3.2.17",
     "@electron/notarize": "2.5.0",
     "@electron/osx-sign": "1.3.1",
     "@electron/rebuild": "3.7.0",
diff --git a/packages/app-builder-lib/src/version.ts b/packages/app-builder-lib/src/version.ts
@@ -1 +1 @@
-export const PACKAGE_VERSION = "26.0.0-alpha.5"
+export const PACKAGE_VERSION = "26.0.0-alpha.6"
diff --git a/packages/dmg-builder/CHANGELOG.md b/packages/dmg-builder/CHANGELOG.md
@@ -1,5 +1,12 @@
 # dmg-builder
 
+## 26.0.0-alpha.6
+
+### Patch Changes
+
+- Updated dependencies [[`a4505a37`](https://github.com/electron-userland/electron-builder/commit/a4505a3785c17fc1aaaeaa91ba2653787219d74a), [`88cc0b06`](https://github.com/electron-userland/electron-builder/commit/88cc0b06dba22139721fd1e04f6a1cf2d447edbd), [`a1ee0419`](https://github.com/electron-userland/electron-builder/commit/a1ee04191f12920585fea8fa648cd0c4b0ed0558)]:
+  - app-builder-lib@26.0.0-alpha.6
+
 ## 26.0.0-alpha.5
 
 ### Patch Changes
diff --git a/packages/dmg-builder/package.json b/packages/dmg-builder/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dmg-builder",
-	"version": "26.0.0-alpha.5",
+	"version": "26.0.0-alpha.6",
 	"main": "out/dmgUtil.js",
 	"author": "Vladimir Krivosheev",
 	"license": "MIT",
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
 
+## 26.0.0-alpha.6
+
+### Patch Changes
+
+- Updated dependencies [[`a4505a37`](https://github.com/electron-userland/electron-builder/commit/a4505a3785c17fc1aaaeaa91ba2653787219d74a), [`88cc0b06`](https://github.com/electron-userland/electron-builder/commit/88cc0b06dba22139721fd1e04f6a1cf2d447edbd), [`a1ee0419`](https://github.com/electron-userland/electron-builder/commit/a1ee04191f12920585fea8fa648cd0c4b0ed0558)]:
+  - app-builder-lib@26.0.0-alpha.6
+
 ## 26.0.0-alpha.5
 
 ### 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": "26.0.0-alpha.5",
+  "version": "26.0.0-alpha.6",
   "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
 
+## 26.0.0-alpha.6
+
+### Patch Changes
+
+- Updated dependencies [[`a4505a37`](https://github.com/electron-userland/electron-builder/commit/a4505a3785c17fc1aaaeaa91ba2653787219d74a), [`88cc0b06`](https://github.com/electron-userland/electron-builder/commit/88cc0b06dba22139721fd1e04f6a1cf2d447edbd), [`a1ee0419`](https://github.com/electron-userland/electron-builder/commit/a1ee04191f12920585fea8fa648cd0c4b0ed0558)]:
+  - app-builder-lib@26.0.0-alpha.6
+  - dmg-builder@26.0.0-alpha.6
+
 ## 26.0.0-alpha.5
 
 ### 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": "26.0.0-alpha.5",
+  "version": "26.0.0-alpha.6",
   "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
 
+## 26.0.0-alpha.6
+
+### Patch Changes
+
+- Updated dependencies [[`a4505a37`](https://github.com/electron-userland/electron-builder/commit/a4505a3785c17fc1aaaeaa91ba2653787219d74a), [`88cc0b06`](https://github.com/electron-userland/electron-builder/commit/88cc0b06dba22139721fd1e04f6a1cf2d447edbd), [`a1ee0419`](https://github.com/electron-userland/electron-builder/commit/a1ee04191f12920585fea8fa648cd0c4b0ed0558)]:
+  - app-builder-lib@26.0.0-alpha.6
+
 ## 26.0.0-alpha.5
 
 ### 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": "26.0.0-alpha.5",
+  "version": "26.0.0-alpha.6",
   "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
 
+## 26.0.0-alpha.6
+
+### Patch Changes
+
+- Updated dependencies [[`a4505a37`](https://github.com/electron-userland/electron-builder/commit/a4505a3785c17fc1aaaeaa91ba2653787219d74a), [`88cc0b06`](https://github.com/electron-userland/electron-builder/commit/88cc0b06dba22139721fd1e04f6a1cf2d447edbd), [`a1ee0419`](https://github.com/electron-userland/electron-builder/commit/a1ee04191f12920585fea8fa648cd0c4b0ed0558)]:
+  - app-builder-lib@26.0.0-alpha.6
+
 ## 26.0.0-alpha.5
 
 ### 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": "26.0.0-alpha.5",
+  "version": "26.0.0-alpha.6",
   "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
 
+## 26.0.0-alpha.6
+
+### Patch Changes
+
+- Updated dependencies [[`a4505a37`](https://github.com/electron-userland/electron-builder/commit/a4505a3785c17fc1aaaeaa91ba2653787219d74a), [`88cc0b06`](https://github.com/electron-userland/electron-builder/commit/88cc0b06dba22139721fd1e04f6a1cf2d447edbd), [`a1ee0419`](https://github.com/electron-userland/electron-builder/commit/a1ee04191f12920585fea8fa648cd0c4b0ed0558)]:
+  - app-builder-lib@26.0.0-alpha.6
+
 ## 26.0.0-alpha.5
 
 ### 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": "26.0.0-alpha.5",
+  "version": "26.0.0-alpha.6",
   "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
 
+## 26.0.0-alpha.6
+
+### Patch Changes
+
+- Updated dependencies [[`a4505a37`](https://github.com/electron-userland/electron-builder/commit/a4505a3785c17fc1aaaeaa91ba2653787219d74a), [`88cc0b06`](https://github.com/electron-userland/electron-builder/commit/88cc0b06dba22139721fd1e04f6a1cf2d447edbd), [`a1ee0419`](https://github.com/electron-userland/electron-builder/commit/a1ee04191f12920585fea8fa648cd0c4b0ed0558)]:
+  - app-builder-lib@26.0.0-alpha.6
+
 ## 26.0.0-alpha.5
 
 ### 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": "26.0.0-alpha.5",
+  "version": "26.0.0-alpha.6",
   "main": "main.js",
   "author": "Vladimir Krivosheev",
   "license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/snapshots/BuildTest.js.snap b/test/snapshots/BuildTest.js.snap
@@ -5219,10 +5219,8 @@ exports[`win smart unpack 2`] = `
               "files": {
                 "package.json": {
                   "size": "<size>",
-                  "unpacked": true,
                 },
               },
-              "unpacked": true,
             },
           },
         },
@@ -5423,14 +5421,6 @@ exports[`win smart unpack 3`] = `
   "app.asar.unpacked/node_modules/edge-cs/lib/edge-cs.js",
   "app.asar.unpacked/node_modules/edge-cs/lib/bootstrap/Dummy.cs",
   "app.asar.unpacked/node_modules/edge-cs/lib/bootstrap/project.json",
-  {
-    "content": "{
-  "name": "@electron-builder/test-smart-unpack-empty",
-  "version": "1.0.0"
-}
-",
-    "name": "app.asar.unpacked/node_modules/@electron-builder/test-smart-unpack-empty/package.json",
-  },
   "app.asar.unpacked/node_modules/@electron-builder/test-smart-unpack/foo.dll",
   {
     "content": "{

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export const PACKAGE_VERSION = "26.0.0-alpha.5"`
	`1`	`+export const PACKAGE_VERSION = "26.0.0-alpha.6"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "dmg-builder",`
`3`		`- "version": "26.0.0-alpha.5",`
	`3`	`+ "version": "26.0.0-alpha.6",`
`4`	`4`	`"main": "out/dmgUtil.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-builder-squirrel-windows",`
`3`		`- "version": "26.0.0-alpha.5",`
	`3`	`+ "version": "26.0.0-alpha.6",`
`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": "26.0.0-alpha.5",`
	`4`	`+ "version": "26.0.0-alpha.6",`
`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": "26.0.0-alpha.5",`
	`3`	`+ "version": "26.0.0-alpha.6",`
`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": "26.0.0-alpha.5",`
	`3`	`+ "version": "26.0.0-alpha.6",`
`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": "26.0.0-alpha.5",`
	`3`	`+ "version": "26.0.0-alpha.6",`
`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": "26.0.0-alpha.5",`
	`3`	`+ "version": "26.0.0-alpha.6",`
`4`	`4`	`"main": "main.js",`
`5`	`5`	`"author": "Vladimir Krivosheev",`
`6`	`6`	`"license": "MIT",`