Merge branch 'master' into differentially

Author: beyondkmp

.changeset/blue-icons-push.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+refactor: update package manager detection and improve type handling

.changeset/poor-planes-nail.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix(deps): update dependency @electron/universal to v2.0.2

.changeset/purple-tigers-guess.md

@@ -0,0 +1,5 @@
+---
+"electron-updater": patch
+---
+
+fix: update regex for multipart content-type parsing in multipleRange

.changeset/shaggy-teachers-relax.md

@@ -0,0 +1,5 @@
+---
+"electron-updater": patch
+---
+
+fix: allow forceDevUpdateConfig also on Linux

.changeset/three-foxes-confess.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+refactor: improve resource directory handling for macOS

.changeset/yellow-icons-dream.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix(deps): update dependency @electron/osx-sign to v1.3.3

.github/actions/pretest/action.yml

@@ -23,7 +23,7 @@ runs:
     - name: Setup python
       uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
       with:
-        python-version: '3.11'
+        python-version: '3.13'
 
     - name: Setup node
       uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4

.github/workflows/docker-build.yml

@@ -34,7 +34,7 @@ jobs:
           docker save -o ${{ runner.temp }}/electron-builder-all-${{ env.NODE_TAG }}.tar electronuserland/builder
 
       - name: Bundle all images
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: electron-builder-all-${{ env.NODE_TAG }}
           path: ${{ runner.temp }}/electron-builder-all-${{ env.NODE_TAG }}.tar

packages/app-builder-lib/package.json

@@ -50,9 +50,9 @@
     "@electron/asar": "3.4.1",
     "@electron/fuses": "^1.8.0",
     "@electron/notarize": "2.5.0",
-    "@electron/osx-sign": "1.3.1",
+    "@electron/osx-sign": "1.3.3",
     "@electron/rebuild": "3.7.2",
-    "@electron/universal": "2.0.1",
+    "@electron/universal": "2.0.3",
     "@malept/flatpak-bundler": "^0.4.0",
     "@types/fs-extra": "9.0.13",
     "async-exit-hook": "^2.0.1",

packages/app-builder-lib/src/electron/ElectronFramework.ts

@@ -97,27 +97,29 @@ async function removeUnusedLanguagesIfNeeded(options: BeforeCopyExtraFilesOption
     return
   }
 
-  const { dir, langFileExt } = getLocalesConfig(options)
+  const { dirs, langFileExt } = getLocalesConfig(options)
   // noinspection SpellCheckingInspection
-  await asyncPool(MAX_FILE_REQUESTS, await readdir(dir), async file => {
-    if (!file.endsWith(langFileExt)) {
-      return
-    }
+  const deletedFiles = async (dir: string) => {
+    await asyncPool(MAX_FILE_REQUESTS, await readdir(dir), async file => {
+      if (path.extname(file) !== langFileExt) {
+        return
+      }
 
-    const language = file.substring(0, file.length - langFileExt.length)
-    if (!wantedLanguages.includes(language)) {
-      return fs.rm(path.join(dir, file), { recursive: true, force: true })
-    }
-    return
-  })
+      const language = path.basename(file, langFileExt)
+      if (!wantedLanguages.includes(language)) {
+        return fs.rm(path.join(dir, file), { recursive: true, force: true })
+      }
+      return
+    })
+  }
+  await Promise.all(dirs.map(deletedFiles))
 
   function getLocalesConfig(options: BeforeCopyExtraFilesOptions) {
     const { appOutDir, packager } = options
     if (packager.platform === Platform.MAC) {
-      return { dir: packager.getResourcesDir(appOutDir), langFileExt: ".lproj" }
-    } else {
-      return { dir: path.join(packager.getResourcesDir(appOutDir), "..", "locales"), langFileExt: ".pak" }
+      return { dirs: [packager.getResourcesDir(appOutDir), packager.getMacOsElectronFrameworkResourcesDir(appOutDir)], langFileExt: ".lproj" }
     }
+    return { dirs: [path.join(packager.getResourcesDir(appOutDir), "..", "locales")], langFileExt: ".pak" }
   }
 }