Merge commit 'c84843053a8f9e0b6af14c6b2ed33c5f82d495b3' into feat/ele…

…ctron-fuses

# Conflicts:
#	packages/app-builder-lib/package.json
#	pnpm-lock.yaml

.changeset/ninety-candles-laugh.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": minor
+---
+
+feat: migrate to official `electron/asar` packaging

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+      {
+          "type": "node",
+          "request": "launch",
+          "name": "Jest TEST_FILES",
+          "runtimeExecutable": "pnpm",
+          "program": "ci:test",
+          "console": "integratedTerminal",
+          "internalConsoleOptions": "openOnFirstSessionStart",
+          "env": {
+            "TEST_FILES": "BuildTest"
+          }
+      }
+  ]
+}

README.md

@@ -3,8 +3,6 @@ A complete solution to package and build a ready for distribution [Electron](htt
 
 Always looking for community contributions! 👀 Setting up a [dev environment](https://github.com/electron-userland/electron-builder/blob/master/CONTRIBUTING.md) is easy to do 🪩
 
-**We condemn Russia’s military aggression against Ukraine. We stand with the people of Ukraine.**
-
 ## Sponsors
 
 <table>

packages/app-builder-lib/package.json

@@ -48,6 +48,7 @@
   "dependencies": {
     "@develar/schema-utils": "~2.6.5",
     "@electron/fuses": "^1.8.0",
+    "@electron/asar": "^3.2.13",
     "@electron/notarize": "2.5.0",
     "@electron/osx-sign": "1.3.1",
     "@electron/rebuild": "3.7.0",

packages/app-builder-lib/src/asar/asarFileChecker.ts

@@ -1,36 +1,21 @@
-import { statOrNull } from "builder-util"
-import { Node, readAsar } from "./asar"
+import * as asar from "@electron/asar"
+import { FilesystemEntry, FilesystemFileEntry } from "@electron/asar/lib/filesystem"
 
-/** @internal */
-export async function checkFileInArchive(asarFile: string, relativeFile: string, messagePrefix: string) {
+export function checkFileInArchive(asarFile: string, relativeFile: string, messagePrefix: string) {
   function error(text: string) {
     return new Error(`${messagePrefix} "${relativeFile}" in the "${asarFile}" ${text}`)
   }
-
-  let fs
+  let stat: FilesystemEntry
   try {
-    fs = await readAsar(asarFile)
+    stat = asar.statFile(asarFile, relativeFile, false)
   } catch (e: any) {
-    throw error(`is corrupted: ${e}`)
-  }
-
-  let stat: Node | null
-  try {
-    stat = fs.getFile(relativeFile)
-  } catch (_e: any) {
-    const fileStat = await statOrNull(asarFile)
-    if (fileStat == null) {
-      throw error(`does not exist. Seems like a wrong configuration.`)
+    if (e.message.includes("Cannot read properties of undefined (reading 'link')")) {
+      throw error("does not exist. Seems like a wrong configuration.")
     }
-
-    // asar throws error on access to undefined object (info.link)
-    stat = null
-  }
-
-  if (stat == null) {
-    throw error(`does not exist. Seems like a wrong configuration.`)
+    throw error(`is corrupted: ${e}`)
   }
-  if (stat.size === 0) {
+  if ((stat as FilesystemFileEntry).size === 0) {
     throw error(`is corrupted: size 0`)
   }
+  return stat
 }