diff --git a/.npmrc b/.npmrc index 1fe1dfa49db..680fc44933f 100644 --- a/.npmrc +++ b/.npmrc @@ -3,5 +3,5 @@ save-exact=true # This applies to all npm scripts in this repository. node-options=--max-old-space-size=8192 -# Enable hoisting to support packages with undeclared peer dependencies +# Hoist dependencies for compatibility with electron-builder and phantom dependencies shamefully-hoist=true diff --git a/package.json b/package.json index 03fdcbf982e..9a036f16cd1 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "cross-env": "10.1.0", "css-loader": "7.1.2", "electron": "37.7.0", - "electron-builder": "26.0.12", + "electron-builder": "26.0.13", "electron-log": "5.4.3", "electron-reload": "2.0.0-alpha.1", "electron-store": "8.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c4c2ea0806..caaa9cd3234 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -364,8 +364,8 @@ importers: specifier: 37.7.0 version: 37.7.0 electron-builder: - specifier: 26.0.12 - version: 26.0.12(electron-builder-squirrel-windows@26.0.12) + specifier: 26.0.13 + version: 26.0.13(electron-builder-squirrel-windows@26.0.12) electron-log: specifier: 5.4.3 version: 5.4.3 @@ -1842,6 +1842,11 @@ packages: engines: {node: '>=12.13.0'} hasBin: true + '@electron/rebuild@3.7.2': + resolution: {integrity: sha512-19/KbIR/DAxbsCkiaGMXIdPnMCJLkcf8AvGnduJtWBs/CBwiAjY1apCqOLVxrXg+rtXFCngbXhBanWjxLUt1Mg==} + engines: {node: '>=12.13.0'} + hasBin: true + '@electron/rebuild@4.0.1': resolution: {integrity: sha512-iMGXb6Ib7H/Q3v+BKZJoETgF9g6KMNZVbsO4b7Dmpgb5qTFqyFTzqW9F3TOSHdybv2vKYKzSS9OiZL+dcJb+1Q==} engines: {node: '>=22.12.0'} @@ -4997,6 +5002,13 @@ packages: dmg-builder: 26.0.12 electron-builder-squirrel-windows: 26.0.12 + app-builder-lib@26.0.13: + resolution: {integrity: sha512-Iov4wX9dHRiI1rxRFk7k3X4QtltsTXN+8Kge7B5DO+pTjKxSNhJ1S+wjJAQM5VatxGxwX7HnxmHLt5PRI5AYSw==} + engines: {node: '>=14.0.0'} + peerDependencies: + dmg-builder: 26.0.13 + electron-builder-squirrel-windows: 26.0.13 + append-field@1.0.0: resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==} @@ -5371,6 +5383,9 @@ packages: builder-util@26.0.11: resolution: {integrity: sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==} + builder-util@26.0.13: + resolution: {integrity: sha512-6b64uHzywaL2KAG+rVcqk/Prta1m3I2Jo1d4d2CrApb6EeSk2V384tmSL0EniH+P8jaNbMp6qhg7cIALw32zRA==} + bundle-name@4.1.0: resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==} engines: {node: '>=18'} @@ -6222,8 +6237,8 @@ packages: dlv@1.1.3: resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} - dmg-builder@26.0.12: - resolution: {integrity: sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==} + dmg-builder@26.0.13: + resolution: {integrity: sha512-OBa6xbQwFAm6gbbClkuGrxnOLbrPauv3yaugnGtIHsn7BvFSmMhZzhmcJQMrAGzDW2M3n/RmG/5mgOYUagqoeg==} dmg-license@1.0.11: resolution: {integrity: sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==} @@ -6334,8 +6349,8 @@ packages: electron-builder-squirrel-windows@26.0.12: resolution: {integrity: sha512-kpwXM7c/ayRUbYVErQbsZ0nQZX4aLHQrPEG9C4h9vuJCXylwFH8a7Jgi2VpKIObzCXO7LKHiCw4KdioFLFOgqA==} - electron-builder@26.0.12: - resolution: {integrity: sha512-cD1kz5g2sgPTMFHjLxfMjUK5JABq3//J4jPswi93tOPFz6btzXYtK5NrDt717NRbukCUDOrrvmYVOWERlqoiXA==} + electron-builder@26.0.13: + resolution: {integrity: sha512-DbTHV16W03TcGImDXeFulmCGIaFIh4nyXTLm5CE3ml47R54AaAlEWI+Jj1/kMsK2rproHw3eoR4l/3P7hlJ0fA==} engines: {node: '>=14.0.0'} hasBin: true @@ -6346,6 +6361,9 @@ packages: electron-publish@26.0.11: resolution: {integrity: sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A==} + electron-publish@26.0.13: + resolution: {integrity: sha512-O5hfHSwli5cegQ4JS3Dp0dZcheex6UCRE/qYyRQvhB6DhSwojiwTnAGEuQCJXc8K8Zxz2lku5Du3VwYHf8d5Lw==} + electron-reload@2.0.0-alpha.1: resolution: {integrity: sha512-hTde7gv0TEqxbxlB3pj2CwoyCQ9sdiQrcP8GkpzhosxyVeYM3mZbMEVKCZK3L0fED7Mz5A9IWmK7zEvi4H3P1g==} @@ -14636,6 +14654,26 @@ snapshots: - bluebird - supports-color + '@electron/rebuild@3.7.2': + dependencies: + '@electron/node-gyp': https://codeload.github.com/electron/node-gyp/tar.gz/06b29aafb7708acef8b3669835c8a7857ebc92d2 + '@malept/cross-spawn-promise': 2.0.0 + chalk: 4.1.2 + debug: 4.4.3 + detect-libc: 2.1.2 + fs-extra: 10.1.0 + got: 11.8.6 + node-abi: 3.85.0 + node-api-version: 0.2.1 + ora: 5.4.1 + read-binary-file-arch: 1.0.6 + semver: 7.7.3 + tar: 6.2.1 + yargs: 17.7.2 + transitivePeerDependencies: + - bluebird + - supports-color + '@electron/rebuild@4.0.1': dependencies: '@malept/cross-spawn-promise': 2.0.0 @@ -14657,7 +14695,7 @@ snapshots: '@electron/universal@2.0.1': dependencies: - '@electron/asar': 3.2.18 + '@electron/asar': 3.4.1 '@malept/cross-spawn-promise': 2.0.0 debug: 4.4.3 dir-compare: 4.2.0 @@ -17939,7 +17977,7 @@ snapshots: app-builder-bin@5.0.0-alpha.12: {} - app-builder-lib@26.0.12(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12): + app-builder-lib@26.0.12(dmg-builder@26.0.13)(electron-builder-squirrel-windows@26.0.12): dependencies: '@develar/schema-utils': 2.6.5 '@electron/asar': 3.2.18 @@ -17956,11 +17994,11 @@ snapshots: chromium-pickle-js: 0.2.0 config-file-ts: 0.2.8-rc1 debug: 4.4.3 - dmg-builder: 26.0.12(electron-builder-squirrel-windows@26.0.12) + dmg-builder: 26.0.13(electron-builder-squirrel-windows@26.0.12) dotenv: 16.6.1 dotenv-expand: 11.0.7 ejs: 3.1.10 - electron-builder-squirrel-windows: 26.0.12(dmg-builder@26.0.12) + electron-builder-squirrel-windows: 26.0.12(dmg-builder@26.0.13) electron-publish: 26.0.11 fs-extra: 10.1.0 hosted-git-info: 4.1.0 @@ -17980,6 +18018,47 @@ snapshots: - bluebird - supports-color + app-builder-lib@26.0.13(dmg-builder@26.0.13)(electron-builder-squirrel-windows@26.0.12): + dependencies: + '@develar/schema-utils': 2.6.5 + '@electron/asar': 3.2.18 + '@electron/fuses': 1.8.0 + '@electron/notarize': 2.5.0 + '@electron/osx-sign': 1.3.1 + '@electron/rebuild': 3.7.2 + '@electron/universal': 2.0.1 + '@malept/flatpak-bundler': 0.4.0 + '@types/fs-extra': 9.0.13 + async-exit-hook: 2.0.1 + builder-util: 26.0.13 + builder-util-runtime: 9.3.2 + chromium-pickle-js: 0.2.0 + config-file-ts: 0.2.8-rc1 + debug: 4.4.3 + dmg-builder: 26.0.13(electron-builder-squirrel-windows@26.0.12) + dotenv: 16.6.1 + dotenv-expand: 11.0.7 + ejs: 3.1.10 + electron-builder-squirrel-windows: 26.0.12(dmg-builder@26.0.13) + electron-publish: 26.0.13 + fs-extra: 10.1.0 + hosted-git-info: 4.1.0 + is-ci: 3.0.1 + isbinaryfile: 5.0.7 + js-yaml: 4.1.1 + json5: 2.2.3 + lazy-val: 1.0.5 + minimatch: 10.1.1 + plist: 3.1.0 + resedit: 1.7.2 + semver: 7.7.3 + tar: 6.2.1 + temp-file: 3.4.0 + tiny-async-pool: 1.3.0 + transitivePeerDependencies: + - bluebird + - supports-color + append-field@1.0.0: {} append-transform@2.0.0: @@ -18545,6 +18624,28 @@ snapshots: transitivePeerDependencies: - supports-color + builder-util@26.0.13: + dependencies: + 7zip-bin: 5.2.0 + '@types/debug': 4.1.12 + app-builder-bin: 5.0.0-alpha.12 + builder-util-runtime: 9.3.2 + chalk: 4.1.2 + cross-spawn: 7.0.6 + debug: 4.4.3 + fs-extra: 10.1.0 + http-proxy-agent: 7.0.2 + https-proxy-agent: 7.0.6 + is-ci: 3.0.1 + js-yaml: 4.1.1 + sanitize-filename: 1.6.3 + source-map-support: 0.5.21 + stat-mode: 1.0.0 + temp-file: 3.4.0 + tiny-async-pool: 1.3.0 + transitivePeerDependencies: + - supports-color + bundle-name@4.1.0: dependencies: run-applescript: 7.1.0 @@ -19437,11 +19538,11 @@ snapshots: dlv@1.1.3: {} - dmg-builder@26.0.12(electron-builder-squirrel-windows@26.0.12): + dmg-builder@26.0.13(electron-builder-squirrel-windows@26.0.12): dependencies: - app-builder-lib: 26.0.12(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12) - builder-util: 26.0.11 - builder-util-runtime: 9.3.1 + app-builder-lib: 26.0.13(dmg-builder@26.0.13)(electron-builder-squirrel-windows@26.0.12) + builder-util: 26.0.13 + builder-util-runtime: 9.3.2 fs-extra: 10.1.0 iconv-lite: 0.6.3 js-yaml: 4.1.1 @@ -19573,9 +19674,9 @@ snapshots: dependencies: jake: 10.9.4 - electron-builder-squirrel-windows@26.0.12(dmg-builder@26.0.12): + electron-builder-squirrel-windows@26.0.12(dmg-builder@26.0.13): dependencies: - app-builder-lib: 26.0.12(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12) + app-builder-lib: 26.0.12(dmg-builder@26.0.13)(electron-builder-squirrel-windows@26.0.12) builder-util: 26.0.11 electron-winstaller: 5.4.0 transitivePeerDependencies: @@ -19583,13 +19684,13 @@ snapshots: - dmg-builder - supports-color - electron-builder@26.0.12(electron-builder-squirrel-windows@26.0.12): + electron-builder@26.0.13(electron-builder-squirrel-windows@26.0.12): dependencies: - app-builder-lib: 26.0.12(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12) - builder-util: 26.0.11 - builder-util-runtime: 9.3.1 + app-builder-lib: 26.0.13(dmg-builder@26.0.13)(electron-builder-squirrel-windows@26.0.12) + builder-util: 26.0.13 + builder-util-runtime: 9.3.2 chalk: 4.1.2 - dmg-builder: 26.0.12(electron-builder-squirrel-windows@26.0.12) + dmg-builder: 26.0.13(electron-builder-squirrel-windows@26.0.12) fs-extra: 10.1.0 is-ci: 3.0.1 lazy-val: 1.0.5 @@ -19615,6 +19716,19 @@ snapshots: transitivePeerDependencies: - supports-color + electron-publish@26.0.13: + dependencies: + '@types/fs-extra': 9.0.13 + builder-util: 26.0.13 + builder-util-runtime: 9.3.2 + chalk: 4.1.2 + form-data: 4.0.4 + fs-extra: 10.1.0 + lazy-val: 1.0.5 + mime: 2.6.0 + transitivePeerDependencies: + - supports-color + electron-reload@2.0.0-alpha.1: dependencies: chokidar: 3.6.0