Update electron-builder to 23.0.8
This commit is contained in:
Fedor Indutny
GitHub
parent
1d26424f22
commit
c8842d94ec
5 changed files with 157 additions and 192 deletions
|
|
@ -1,107 +0,0 @@
|
|||
diff --git a/node_modules/app-builder-lib/out/asar/asar.d.ts b/node_modules/app-builder-lib/out/asar/asar.d.ts
|
||||
index be27052..97db603 100644
|
||||
--- a/node_modules/app-builder-lib/out/asar/asar.d.ts
|
||||
+++ b/node_modules/app-builder-lib/out/asar/asar.d.ts
|
||||
@@ -1,3 +1,3 @@
|
||||
-export declare function readAsarHeader(archive: string): Promise<ReadAsarHeader>;
|
||||
-export declare function readAsar(archive: string): Promise<AsarFilesystem>;
|
||||
+export declare function readAsarHeader(archive: string): Promise<unknown>;
|
||||
+export declare function readAsar(archive: string): Promise<unknown>;
|
||||
export declare function readAsarJson(archive: string, file: string): Promise<any>;
|
||||
diff --git a/node_modules/app-builder-lib/out/asar/integrity.d.ts b/node_modules/app-builder-lib/out/asar/integrity.d.ts
|
||||
index 01da9f4..094c175 100644
|
||||
--- a/node_modules/app-builder-lib/out/asar/integrity.d.ts
|
||||
+++ b/node_modules/app-builder-lib/out/asar/integrity.d.ts
|
||||
@@ -1,5 +1,4 @@
|
||||
/// <reference types="node" />
|
||||
-import { NodeIntegrity } from "./asar";
|
||||
export interface AsarIntegrityOptions {
|
||||
readonly resourcesPath: string;
|
||||
readonly resourcesRelativePath: string;
|
||||
@@ -12,5 +11,5 @@ export interface AsarIntegrity {
|
||||
[key: string]: HeaderHash;
|
||||
}
|
||||
export declare function computeData({ resourcesPath, resourcesRelativePath }: AsarIntegrityOptions): Promise<AsarIntegrity>;
|
||||
-export declare function hashFile(file: string, blockSize?: number): Promise<NodeIntegrity>;
|
||||
-export declare function hashFileContents(contents: Buffer | string, blockSize?: number): NodeIntegrity;
|
||||
+export declare function hashFile(file: string, blockSize?: number): Promise<unknown>;
|
||||
+export declare function hashFileContents(contents: Buffer | string, blockSize?: number): unknown;
|
||||
diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
||||
index ffcc8bd..bafab0e 100644
|
||||
--- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
||||
+++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
||||
@@ -88,7 +88,7 @@ class LinuxTargetHelper {
|
||||
// https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables
|
||||
const execCodes = ["%f", "%u", "%F", "%U"];
|
||||
if (executableArgs == null || executableArgs.findIndex(arg => execCodes.includes(arg)) === -1) {
|
||||
- exec += " %U";
|
||||
+ exec += " --no-sandbox %U";
|
||||
}
|
||||
}
|
||||
const desktopMeta = {
|
||||
diff --git a/node_modules/app-builder-lib/templates/linux/after-install.tpl b/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
||||
index 1536059..555f8f5 100644
|
||||
--- a/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
||||
+++ b/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
||||
@@ -3,8 +3,5 @@
|
||||
# Link to the binary
|
||||
ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}'
|
||||
|
||||
-# SUID chrome-sandbox for Electron 5+
|
||||
-chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox' || true
|
||||
-
|
||||
update-mime-database /usr/share/mime || true
|
||||
update-desktop-database /usr/share/applications || true
|
||||
diff --git a/node_modules/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh b/node_modules/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
|
||||
index cc77993..ac36618 100644
|
||||
--- a/node_modules/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
|
||||
+++ b/node_modules/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
|
||||
@@ -40,7 +40,7 @@
|
||||
${nsProcess::FindProcess} "${_FILE}" ${_ERR}
|
||||
!else
|
||||
# find process owned by current user
|
||||
- nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" | find "${_FILE}"`
|
||||
+ nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" | %SYSTEMROOT%\System32\find.exe "${_FILE}"`
|
||||
Pop ${_ERR}
|
||||
!endif
|
||||
!macroend
|
||||
diff --git a/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh b/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh
|
||||
index d96a655..f5470bf 100644
|
||||
--- a/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh
|
||||
+++ b/node_modules/app-builder-lib/templates/nsis/include/extractAppPackage.nsh
|
||||
@@ -113,13 +113,21 @@
|
||||
# Try copying a few times before asking for a user action.
|
||||
Goto RetryExtract7za
|
||||
${else}
|
||||
- MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "$(appCannotBeClosed)" /SD IDCANCEL IDRETRY RetryExtract7za
|
||||
+ MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "$(appCannotBeClosed)" /SD IDRETRY IDCANCEL AbortExtract7za
|
||||
${endIf}
|
||||
|
||||
# As an absolutely last resort after a few automatic attempts and user
|
||||
# intervention - we will just overwrite everything with `Nsis7z::Extract`
|
||||
# even though it is not atomic and will ignore errors.
|
||||
+
|
||||
+ # Clear the temporary folder first to make sure we don't use twice as
|
||||
+ # much disk space.
|
||||
+ RMDir /r "$PLUGINSDIR\7z-out"
|
||||
+
|
||||
Nsis7z::Extract "${FILE}"
|
||||
+ Goto DoneExtract7za
|
||||
+
|
||||
+ AbortExtract7za:
|
||||
Quit
|
||||
|
||||
RetryExtract7za:
|
||||
diff --git a/node_modules/app-builder-lib/templates/nsis/messages.yml b/node_modules/app-builder-lib/templates/nsis/messages.yml
|
||||
index 6527c99..695444c 100644
|
||||
--- a/node_modules/app-builder-lib/templates/nsis/messages.yml
|
||||
+++ b/node_modules/app-builder-lib/templates/nsis/messages.yml
|
||||
@@ -45,7 +45,7 @@ x64WinRequired:
|
||||
es: Windows de 64 bits es requerido
|
||||
da: 64-bit Windows er påkrævet
|
||||
appRunning:
|
||||
- en: "${PRODUCT_NAME} is running.\nClick OK to close it."
|
||||
+ en: "${PRODUCT_NAME} is running.\nClick OK to close it.\nIf it doesn't close, try closing it manually."
|
||||
de: "${PRODUCT_NAME} ist geöffnet. \nKlicken Sie zum Schliessen auf «OK»."
|
||||
it: "${PRODUCT_NAME} è in esecuzione. \nPremi OK per chiudere."
|
||||
fr: "${PRODUCT_NAME} est en cours d’utilisation. \nCliquez sur «OK» pour fermer ce programme."
|
||||
39
patches/app-builder-lib+23.0.8.patch
Normal file
39
patches/app-builder-lib+23.0.8.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
||||
index ffcc8bd..bafab0e 100644
|
||||
--- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
||||
+++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
|
||||
@@ -88,7 +88,7 @@ class LinuxTargetHelper {
|
||||
// https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables
|
||||
const execCodes = ["%f", "%u", "%F", "%U"];
|
||||
if (executableArgs == null || executableArgs.findIndex(arg => execCodes.includes(arg)) === -1) {
|
||||
- exec += " %U";
|
||||
+ exec += " --no-sandbox %U";
|
||||
}
|
||||
}
|
||||
const desktopMeta = {
|
||||
diff --git a/node_modules/app-builder-lib/templates/linux/after-install.tpl b/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
||||
index 1536059..555f8f5 100644
|
||||
--- a/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
||||
+++ b/node_modules/app-builder-lib/templates/linux/after-install.tpl
|
||||
@@ -3,8 +3,5 @@
|
||||
# Link to the binary
|
||||
ln -sf '/opt/${sanitizedProductName}/${executable}' '/usr/bin/${executable}'
|
||||
|
||||
-# SUID chrome-sandbox for Electron 5+
|
||||
-chmod 4755 '/opt/${sanitizedProductName}/chrome-sandbox' || true
|
||||
-
|
||||
update-mime-database /usr/share/mime || true
|
||||
update-desktop-database /usr/share/applications || true
|
||||
diff --git a/node_modules/app-builder-lib/templates/nsis/messages.yml b/node_modules/app-builder-lib/templates/nsis/messages.yml
|
||||
index 6527c99..695444c 100644
|
||||
--- a/node_modules/app-builder-lib/templates/nsis/messages.yml
|
||||
+++ b/node_modules/app-builder-lib/templates/nsis/messages.yml
|
||||
@@ -45,7 +45,7 @@ x64WinRequired:
|
||||
es: Windows de 64 bits es requerido
|
||||
da: 64-bit Windows er påkrævet
|
||||
appRunning:
|
||||
- en: "${PRODUCT_NAME} is running.\nClick OK to close it."
|
||||
+ en: "${PRODUCT_NAME} is running.\nClick OK to close it.\nIf it doesn't close, try closing it manually."
|
||||
de: "${PRODUCT_NAME} ist geöffnet. \nKlicken Sie zum Schliessen auf «OK»."
|
||||
it: "${PRODUCT_NAME} è in esecuzione. \nPremi OK per chiudere."
|
||||
fr: "${PRODUCT_NAME} est en cours d’utilisation. \nCliquez sur «OK» pour fermer ce programme."
|
||||
Loading…
Add table
Add a link
Reference in a new issue