From 5cfb949dc39df1a5020390d68181112ac1819ba2 Mon Sep 17 00:00:00 2001 From: zeppi Date: Tue, 15 Nov 2022 12:11:42 -0500 Subject: [PATCH 01/14] fix large file uploads --- electron/index.js | 39 +++++++++++++++++++ flow-typed/file-data.js | 10 +++++ package.json | 1 + static/app-strings.json | 1 + ui/component/publishFile/view.jsx | 63 ++++++++++++++++--------------- webpack.base.config.js | 2 +- yarn.lock | 40 +++++++++++++++++++- 7 files changed, 124 insertions(+), 32 deletions(-) create mode 100644 flow-typed/file-data.js diff --git a/electron/index.js b/electron/index.js index da43fdc6c..c7415e247 100644 --- a/electron/index.js +++ b/electron/index.js @@ -24,6 +24,8 @@ const mime = require('mime'); const remote = require('@electron/remote/main'); const os = require('os'); const sudo = require('sudo-prompt'); +const probe = require('ffmpeg-probe'); +const MAX_IPC_SEND_BUFFER_SIZE = 500000000; // large files crash when serialized for ipc message remote.initialize(); const filePath = path.join(process.resourcesPath, 'static', 'upgradeDisabled'); @@ -353,6 +355,43 @@ ipcMain.handle('get-file-from-path', (event, path, readContents = true) => { }); }); +ipcMain.handle('get-file-details-from-path', async (event, path) => { + const isFfMp4 = (ffprobeResults) => { + return ffprobeResults && + ffprobeResults.format && + ffprobeResults.format.format_name && + ffprobeResults.format.format_name.includes('mp4'); + }; + const folders = path.split(/[\\/]/); + const name = folders[folders.length - 1]; + let duration = 0, size = 0, mimeType; + try { + await fs.promises.stat(path); + let ffprobeResults; + try { + ffprobeResults = await probe(path); + duration = ffprobeResults.format.duration; + size = ffprobeResults.format.size; + } catch (e) { + } + let fileReadResult; + if (size < MAX_IPC_SEND_BUFFER_SIZE) { + try { + fileReadResult = await fs.promises.readFile(path); + } catch (e) { + + } + } + // TODO: use mmmagic to inspect file and get mime type + mimeType = isFfMp4(ffprobeResults) ? 'video/mp4' : mime.getType(name); + const fileData = {name, mime: mimeType || undefined, path, duration: duration, size, buffer: fileReadResult }; + return fileData; + } catch (e) { + // no stat + return { error: 'no file' }; + } +}); + ipcMain.on('get-disk-space', async (event) => { try { const { data_dir } = await Lbry.settings_get(); diff --git a/flow-typed/file-data.js b/flow-typed/file-data.js new file mode 100644 index 000000000..5771e9e66 --- /dev/null +++ b/flow-typed/file-data.js @@ -0,0 +1,10 @@ +// @flow + +declare type FileData = { + file?: Blob, + path: string, + duration?: number, + size?: number, + mimeType: string, + error?: string, +} diff --git a/package.json b/package.json index 7af8b08d2..08343ec2c 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "electron-notarize": "^1.0.0", "electron-updater": "^4.2.4", "express": "^4.17.1", + "ffmpeg-probe": "^1.0.6", "humanize-duration": "^3.27.0", "match-sorter": "^6.3.0", "mime": "^3.0.0", diff --git a/static/app-strings.json b/static/app-strings.json index e014df315..d03f05575 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -2321,5 +2321,6 @@ "Autoplay Next is on.": "Autoplay Next is on.", "This will be visible in a few minutes after you submit this form.": "This will be visible in a few minutes after you submit this form.", "Anon --[used in <%anonymous% Reposted>]--": "Anon", + "Your update is now pending. It will take a few minutes to appear for other users.": "Your update is now pending. It will take a few minutes to appear for other users.", "--end--": "--end--" } diff --git a/ui/component/publishFile/view.jsx b/ui/component/publishFile/view.jsx index 50a47b2c5..f1a5f64de 100644 --- a/ui/component/publishFile/view.jsx +++ b/ui/component/publishFile/view.jsx @@ -14,7 +14,7 @@ import I18nMessage from 'component/i18nMessage'; import usePersistedState from 'effects/use-persisted-state'; import * as PUBLISH_MODES from 'constants/publish_types'; import PublishName from 'component/publishName'; - +import path from 'path'; type Props = { uri: ?string, mode: ?string, @@ -99,18 +99,27 @@ function PublishFile(props: Props) { if (!filePath) { return; } - async function readSelectedFile() { + async function readSelectedFileDetails() { // Read the file to get the file's duration (if possible) // and offer transcoding it. - const readFileContents = true; - const result = await ipcRenderer.invoke('get-file-from-path', filePath, readFileContents); - const file = new File([result.buffer], result.name, { - type: result.mime, - }); - const fileWithPath = { file, path: result.path }; - processSelectedFile(fileWithPath); + const result = await ipcRenderer.invoke('get-file-details-from-path', filePath); + let file; + if (result.buffer) { + file = new File([result.buffer], result.name, { + type: result.mime, + }); + } + const fileData: FileData = { + path: result.path, + name: result.name, + mimeType: result.mime || 'application/octet-stream', + size: result.size, + duration: result.duration, + file: file, + }; + processSelectedFile(fileData); } - readSelectedFile(); + readSelectedFileDetails(); }, [filePath]); useEffect(() => { @@ -219,11 +228,11 @@ function PublishFile(props: Props) { } } - function processSelectedFile(fileWithPath: FileWithPath, clearName = true) { + function processSelectedFile(fileData: FileData, clearName = true) { window.URL = window.URL || window.webkitURL; // select file, start to select a new one, then cancel - if (!fileWithPath) { + if (!fileData || fileData.error) { if (isStillEditing || !clearName) { updatePublishForm({ filePath: '' }); } else { @@ -233,8 +242,11 @@ function PublishFile(props: Props) { } // if video, extract duration so we can warn about bitrate if (typeof file !== 'string') - const file = fileWithPath.file; - const contentType = file.type && file.type.split('/'); + const file = fileData.file; + // Check to see if it's a video and if mp4 + const contentType = fileData.mimeType && fileData.mimeType.split('/'); // get this from electron side + const duration = fileData.duration; + const size = fileData.size; const isVideo = contentType && contentType[0] === 'video'; const isMp4 = contentType && contentType[1] === 'mp4'; @@ -243,33 +255,24 @@ function PublishFile(props: Props) { if (contentType && contentType[0] === 'text') { isTextPost = contentType[1] === 'plain' || contentType[1] === 'markdown'; setCurrentFileType(contentType.join('/')); - } else if (file.name) { + } else if (path.parse(fileData.path).ext) { // If user's machine is missing a valid content type registration // for markdown content: text/markdown, file extension will be used instead - const extension = file.name.split('.').pop(); + const extension = path.parse(fileData.path).ext; isTextPost = MARKDOWN_FILE_EXTENSIONS.includes(extension); } if (isVideo) { if (isMp4) { - const video = document.createElement('video'); - video.preload = 'metadata'; - video.onloadedmetadata = () => { - updateFileInfo(video.duration, file.size, isVideo); - window.URL.revokeObjectURL(video.src); - }; - video.onerror = () => { - updateFileInfo(0, file.size, isVideo); - }; - video.src = window.URL.createObjectURL(file); + updateFileInfo(duration || 0, size, isVideo); } else { - updateFileInfo(0, file.size, isVideo); + updateFileInfo(duration || 0, size, isVideo); } } else { - updateFileInfo(0, file.size, isVideo); + updateFileInfo(0, size, isVideo); } - if (isTextPost) { + if (isTextPost && file) { // Create reader const reader = new FileReader(); // Handler for file reader @@ -283,7 +286,7 @@ function PublishFile(props: Props) { // Strip off extension and replace invalid characters if (!isStillEditing) { - const fileWithoutExtension = name || (file.name && file.name.substring(0, file.name.lastIndexOf('.'))) || ''; + const fileWithoutExtension = path.parse(fileData.path).name; updatePublishForm({ name: parseName(fileWithoutExtension) }); } } diff --git a/webpack.base.config.js b/webpack.base.config.js index 2f77ce75e..11cf43cea 100644 --- a/webpack.base.config.js +++ b/webpack.base.config.js @@ -95,7 +95,7 @@ let baseConfig = { }, plugins: [ - new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/), + new webpack.IgnorePlugin({resourceRegExp: /^\.\/locale$/, contextRegExp: /moment$/}), new webpack.EnvironmentPlugin(['NODE_ENV']), new DefinePlugin({ __static: `"${path.join(__dirname, 'static').replace(/\\/g, '\\\\')}"`, diff --git a/yarn.lock b/yarn.lock index d52b88e1c..cf02d2e0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7994,6 +7994,21 @@ __metadata: languageName: node linkType: hard +"execa@npm:^0.10.0": + version: 0.10.0 + resolution: "execa@npm:0.10.0" + dependencies: + cross-spawn: ^6.0.0 + get-stream: ^3.0.0 + is-stream: ^1.1.0 + npm-run-path: ^2.0.0 + p-finally: ^1.0.0 + signal-exit: ^3.0.0 + strip-eof: ^1.0.0 + checksum: da132af2b209e69d79f91751ac6d15ddbb8d9414f9e5f7a53405232679a3dca00fe11eb14e0cd5c2c374a749061410a7717fcc3094f6dd779cf4d259faa58d9a + languageName: node + linkType: hard + "execa@npm:^0.7.0": version: 0.7.0 resolution: "execa@npm:0.7.0" @@ -8308,6 +8323,15 @@ __metadata: languageName: node linkType: hard +"ffmpeg-probe@npm:^1.0.6": + version: 1.0.6 + resolution: "ffmpeg-probe@npm:1.0.6" + dependencies: + execa: ^0.10.0 + checksum: fe649b2ca41bd48b521d7cc5741663d4c608d7bc596033ee9c76d4c3f5e739881a4d421bdcfa3ea60e28301eae7a85b72cd74d6266e661bccf9aea6578fcfe3c + languageName: node + linkType: hard + "figgy-pudding@npm:^3.5.1": version: 3.5.2 resolution: "figgy-pudding@npm:3.5.2" @@ -11450,6 +11474,7 @@ __metadata: eslint-plugin-react-hooks: ^1.6.0 eslint-plugin-standard: ^4.0.1 express: ^4.17.1 + ffmpeg-probe: ^1.0.6 file-loader: ^4.2.0 flow-bin: ^0.97.0 flow-typed: ^3.7.0 @@ -17641,7 +17666,20 @@ __metadata: languageName: node linkType: hard -"terser@npm:^4.1.2, terser@npm:^4.6.12, terser@npm:^4.6.3": +"terser@npm:^4.1.2": + version: 4.8.1 + resolution: "terser@npm:4.8.1" + dependencies: + commander: ^2.20.0 + source-map: ~0.6.1 + source-map-support: ~0.5.12 + bin: + terser: bin/terser + checksum: b342819bf7e82283059aaa3f22bb74deb1862d07573ba5a8947882190ad525fd9b44a15074986be083fd379c58b9a879457a330b66dcdb77b485c44267f9a55a + languageName: node + linkType: hard + +"terser@npm:^4.6.12, terser@npm:^4.6.3": version: 4.8.0 resolution: "terser@npm:4.8.0" dependencies: -- 2.43.4 From 9e552fdacc851320676386538ba3cc9cc4979e35 Mon Sep 17 00:00:00 2001 From: zeppi Date: Wed, 16 Nov 2022 12:10:30 -0500 Subject: [PATCH 02/14] changelog --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d1ffdc0f..c2f133c91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - +## [unreleased] - [2022-11-10] + +### Fixed + - Selecting a large file in publish no longer crashes ([#7736](https://github.com/lbryio/lbry-desktop/pull/7736)) + ## [0.53.7] - [2022-11-10] ### Added @@ -15,7 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Minor layout fixes _community pr!_ ([#7709](https://github.com/lbryio/lbry-desktop/pull/7709)) - Comment section buttons layout ([#7716](https://github.com/lbryio/lbry-desktop/pull/7716)) - ### Changed +### Changed - Removed watchman and its errors ([#7710](https://github.com/lbryio/lbry-desktop/pull/7710)) - Updated lbrynet to [0.112.0](https://github.com/lbryio/lbry-sdk/releases/tag/v0.112.0) -- 2.43.4 From fba0593bb86bfe767330526673fb6716eb0bf79c Mon Sep 17 00:00:00 2001 From: zeppi Date: Wed, 16 Nov 2022 13:07:27 -0500 Subject: [PATCH 03/14] update github action xcode version --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index abf8f9ccd..14d74788a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,7 +38,7 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1 if: startsWith(runner.os, 'mac') with: - xcode-version: '12.4.0' + xcode-version: '13.1.0' - name: Download blockchain headers run: | -- 2.43.4 From 0b505704b409d85065fb2de81e84e63cf858f994 Mon Sep 17 00:00:00 2001 From: zeppi Date: Wed, 16 Nov 2022 22:20:37 -0500 Subject: [PATCH 04/14] update electronbuilder for macos --- package.json | 2 +- yarn.lock | 452 +++++++++++++++------------------------------------ 2 files changed, 133 insertions(+), 321 deletions(-) diff --git a/package.json b/package.json index 08343ec2c..c6a5965ac 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "dotenv-defaults": "^2.0.1", "dotenv-webpack": "^1.8.0", "electron": "17.2.0", - "electron-builder": "^22.10.5", + "electron-builder": "^23.0.2", "electron-devtools-installer": "^3.1.1", "electron-is-dev": "^0.3.0", "electron-webpack": "^2.8.2", diff --git a/yarn.lock b/yarn.lock index cf02d2e0b..4b840cc10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1521,16 +1521,18 @@ __metadata: languageName: node linkType: hard -"@electron/universal@npm:1.0.5": - version: 1.0.5 - resolution: "@electron/universal@npm:1.0.5" +"@electron/universal@npm:1.2.1": + version: 1.2.1 + resolution: "@electron/universal@npm:1.2.1" dependencies: "@malept/cross-spawn-promise": ^1.1.0 - asar: ^3.0.3 + asar: ^3.1.0 debug: ^4.3.1 dir-compare: ^2.4.0 fs-extra: ^9.0.1 - checksum: 64eae3bbbfa422f28dbc1e92d12d954059cec7dac9ecc3ecad2c7895bb6cd10d30e8b3848092bfba8815bc71b60393a42f792751e50b9b5f643d6f1d03826b86 + minimatch: ^3.0.4 + plist: ^3.0.4 + checksum: 9a7d98cf2b8414ff0274384fef1b72b5a545a0feb7ce03163d2e2ee1b13e4f7064dfe7147cdd652708a1314d1b5e68acdd907847a1747866ec8d2d3e757ec1f7 languageName: node linkType: hard @@ -3515,15 +3517,6 @@ __metadata: languageName: node linkType: hard -"ansi-align@npm:^3.0.0": - version: 3.0.1 - resolution: "ansi-align@npm:3.0.1" - dependencies: - string-width: ^4.1.0 - checksum: 6abfa08f2141d231c257162b15292467081fa49a208593e055c866aa0455b57f3a86b5a678c190c618faa79b4c59e254493099cb700dd9cf2293c6be2c8f5d8d - languageName: node - linkType: hard - "ansi-colors@npm:^3.0.0": version: 3.2.4 resolution: "ansi-colors@npm:3.2.4" @@ -3627,43 +3620,44 @@ __metadata: languageName: node linkType: hard -"app-builder-bin@npm:3.7.1": - version: 3.7.1 - resolution: "app-builder-bin@npm:3.7.1" - checksum: aae6152d7e7e6eabe35e5430f8b4733cc713bd3f80fdb861c5b675ebc8951aa26b520821d27c5ee31f05e850cdfd9b923b58064307f1ae583fb4e7434d380209 +"app-builder-bin@npm:4.0.0": + version: 4.0.0 + resolution: "app-builder-bin@npm:4.0.0" + checksum: c3c8fd85c371b7a396c1bb1160ab2e3231ba4309abea5b36a5b366e42511e347c65a33ff50d56f4960b337833d539c263137b0ba131e2fa268c32edeb6c9f683 languageName: node linkType: hard -"app-builder-lib@npm:22.14.13": - version: 22.14.13 - resolution: "app-builder-lib@npm:22.14.13" +"app-builder-lib@npm:23.6.0": + version: 23.6.0 + resolution: "app-builder-lib@npm:23.6.0" dependencies: 7zip-bin: ~5.1.1 "@develar/schema-utils": ~2.6.5 - "@electron/universal": 1.0.5 + "@electron/universal": 1.2.1 "@malept/flatpak-bundler": ^0.4.0 async-exit-hook: ^2.0.1 bluebird-lst: ^1.0.9 - builder-util: 22.14.13 - builder-util-runtime: 8.9.2 + builder-util: 23.6.0 + builder-util-runtime: 9.1.1 chromium-pickle-js: ^0.2.0 - debug: ^4.3.2 - ejs: ^3.1.6 - electron-osx-sign: ^0.5.0 - electron-publish: 22.14.13 + debug: ^4.3.4 + ejs: ^3.1.7 + electron-osx-sign: ^0.6.0 + electron-publish: 23.6.0 form-data: ^4.0.0 - fs-extra: ^10.0.0 - hosted-git-info: ^4.0.2 + fs-extra: ^10.1.0 + hosted-git-info: ^4.1.0 is-ci: ^3.0.0 - isbinaryfile: ^4.0.8 + isbinaryfile: ^4.0.10 js-yaml: ^4.1.0 lazy-val: ^1.0.5 - minimatch: ^3.0.4 + minimatch: ^3.1.2 read-config-file: 6.2.0 sanitize-filename: ^1.6.3 - semver: ^7.3.5 + semver: ^7.3.7 + tar: ^6.1.11 temp-file: ^3.4.0 - checksum: a32a5ef25b3f70ddcd9b6ba0691221b9e66b0b0a4e1c28e9dc90854d7dcd0183445af55132587458963202afe40b1860b705558b990622d9e5953931b0de2572 + checksum: da3cc9f24e127add651197076c5fa2f68bc7979bcd6a441df7f69629e96bf3aca3118d61c63a85d382a824748f8056a7639464f07b1ded09db53ff1c4b3101be languageName: node linkType: hard @@ -3856,9 +3850,9 @@ __metadata: languageName: node linkType: hard -"asar@npm:^3.0.3": - version: 3.1.0 - resolution: "asar@npm:3.1.0" +"asar@npm:^3.1.0": + version: 3.2.0 + resolution: "asar@npm:3.2.0" dependencies: "@types/glob": ^7.1.1 chromium-pickle-js: ^0.2.0 @@ -3870,7 +3864,7 @@ __metadata: optional: true bin: asar: bin/asar.js - checksum: facc80845639fa4f9e1d1aa40b96adbd1e8b6fee0725d287e8c8e30a69b235cd5b7131b7b09ff700da06c919dd0595b373e372c55722808f983fdb71ef0d5399 + checksum: f7d30b45970b053252ac124230bf319459d0728d7f6dedbe2f765cd2a83792d5a716d2c3f2861ceda69372b401f335e1f46460335169eadd0e91a0904a4f5a15 languageName: node linkType: hard @@ -4444,22 +4438,6 @@ __metadata: languageName: node linkType: hard -"boxen@npm:^5.0.0": - version: 5.1.2 - resolution: "boxen@npm:5.1.2" - dependencies: - ansi-align: ^3.0.0 - camelcase: ^6.2.0 - chalk: ^4.1.0 - cli-boxes: ^2.2.1 - string-width: ^4.2.2 - type-fest: ^0.20.2 - widest-line: ^3.1.0 - wrap-ansi: ^7.0.0 - checksum: 82d03e42a72576ff235123f17b7c505372fe05c83f75f61e7d4fa4bcb393897ec95ce766fecb8f26b915f0f7a7227d66e5ec7cef43f5b2bd9d3aeed47ec55877 - languageName: node - linkType: hard - "brace-expansion@npm:^1.1.7": version: 1.1.11 resolution: "brace-expansion@npm:1.1.11" @@ -4699,19 +4677,29 @@ __metadata: languageName: node linkType: hard -"builder-util@npm:22.14.13": - version: 22.14.13 - resolution: "builder-util@npm:22.14.13" +"builder-util-runtime@npm:9.1.1": + version: 9.1.1 + resolution: "builder-util-runtime@npm:9.1.1" + dependencies: + debug: ^4.3.4 + sax: ^1.2.4 + checksum: 3458f9c8accad6e934c841cffa93f5d4b342c22b10b9c1a2eb3fd44ca96ea2c662b1048f9a075da9b8a4fada17206887b7e92ebdca331b1071520916e013e245 + languageName: node + linkType: hard + +"builder-util@npm:23.6.0": + version: 23.6.0 + resolution: "builder-util@npm:23.6.0" dependencies: 7zip-bin: ~5.1.1 "@types/debug": ^4.1.6 "@types/fs-extra": ^9.0.11 - app-builder-bin: 3.7.1 + app-builder-bin: 4.0.0 bluebird-lst: ^1.0.9 - builder-util-runtime: 8.9.2 + builder-util-runtime: 9.1.1 chalk: ^4.1.1 cross-spawn: ^7.0.3 - debug: ^4.3.2 + debug: ^4.3.4 fs-extra: ^10.0.0 http-proxy-agent: ^5.0.0 https-proxy-agent: ^5.0.0 @@ -4720,7 +4708,7 @@ __metadata: source-map-support: ^0.5.19 stat-mode: ^1.0.0 temp-file: ^3.4.0 - checksum: 6d72cc1f0bf7e72debe70049dede2a5eac302fb98b87eb7e60b7feed8631dc66877821367d5e7a87aea881f937a565c25e4e24042b421ef12c1d2afa8b7cc02d + checksum: 138fb9abed01ea2e5ac895e6a6ed75310ca6c89e0050483c81801b052f61b42ae5a042f457088b6e205ec8b4403b1ff3a325955f110255afb4da2310e3cf14ad languageName: node linkType: hard @@ -4966,13 +4954,6 @@ __metadata: languageName: node linkType: hard -"camelcase@npm:^6.2.0": - version: 6.3.0 - resolution: "camelcase@npm:6.3.0" - checksum: 8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d - languageName: node - linkType: hard - "caniuse-api@npm:^3.0.0": version: 3.0.0 resolution: "caniuse-api@npm:3.0.0" @@ -5239,13 +5220,6 @@ __metadata: languageName: node linkType: hard -"cli-boxes@npm:^2.2.1": - version: 2.2.1 - resolution: "cli-boxes@npm:2.2.1" - checksum: be79f8ec23a558b49e01311b39a1ea01243ecee30539c880cf14bf518a12e223ef40c57ead0cb44f509bffdffc5c129c746cd50d863ab879385370112af4f585 - languageName: node - linkType: hard - "cli-cursor@npm:^2.0.0, cli-cursor@npm:^2.1.0": version: 2.1.0 resolution: "cli-cursor@npm:2.1.0" @@ -5315,6 +5289,17 @@ __metadata: languageName: node linkType: hard +"cliui@npm:^8.0.1": + version: 8.0.1 + resolution: "cliui@npm:8.0.1" + dependencies: + string-width: ^4.2.0 + strip-ansi: ^6.0.1 + wrap-ansi: ^7.0.0 + checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56 + languageName: node + linkType: hard + "clone-deep@npm:^4.0.1": version: 4.0.1 resolution: "clone-deep@npm:4.0.1" @@ -5640,20 +5625,6 @@ __metadata: languageName: node linkType: hard -"configstore@npm:^5.0.1": - version: 5.0.1 - resolution: "configstore@npm:5.0.1" - dependencies: - dot-prop: ^5.2.0 - graceful-fs: ^4.1.2 - make-dir: ^3.0.0 - unique-string: ^2.0.0 - write-file-atomic: ^3.0.0 - xdg-basedir: ^4.0.0 - checksum: 60ef65d493b63f96e14b11ba7ec072fdbf3d40110a94fb7199d1c287761bdea5c5244e76b2596325f30c1b652213aa75de96ea20afd4a5f82065e61ea090988e - languageName: node - linkType: hard - "connect-history-api-fallback@npm:^1.6.0": version: 1.6.0 resolution: "connect-history-api-fallback@npm:1.6.0" @@ -6352,7 +6323,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3": +"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -6719,25 +6690,25 @@ __metadata: languageName: node linkType: hard -"dmg-builder@npm:22.14.13": - version: 22.14.13 - resolution: "dmg-builder@npm:22.14.13" +"dmg-builder@npm:23.6.0": + version: 23.6.0 + resolution: "dmg-builder@npm:23.6.0" dependencies: - app-builder-lib: 22.14.13 - builder-util: 22.14.13 - builder-util-runtime: 8.9.2 - dmg-license: ^1.0.9 + app-builder-lib: 23.6.0 + builder-util: 23.6.0 + builder-util-runtime: 9.1.1 + dmg-license: ^1.0.11 fs-extra: ^10.0.0 iconv-lite: ^0.6.2 js-yaml: ^4.1.0 dependenciesMeta: dmg-license: optional: true - checksum: 01be77f99b9309e356e3ae4fbccc294c4f1dcb65b9b21c434807cbaa9d0c22b2338a5b688bba1b277e0110ac33dd1eb126f4267d09382b1fa12d0878162ac648 + checksum: 3e37a4b191cf40c9c7b97d07408c2bf58e7632d78de0dc49a142fb7c68670fd2a7123f31ee8803b3cd100f38feea7b785c28698dfaace508254659d81ecc0b80 languageName: node linkType: hard -"dmg-license@npm:^1.0.9": +"dmg-license@npm:^1.0.11": version: 1.0.11 resolution: "dmg-license@npm:1.0.11" dependencies: @@ -7063,7 +7034,7 @@ __metadata: languageName: node linkType: hard -"ejs@npm:^3.1.5, ejs@npm:^3.1.6": +"ejs@npm:^3.1.5, ejs@npm:^3.1.7": version: 3.1.8 resolution: "ejs@npm:3.1.8" dependencies: @@ -7074,26 +7045,26 @@ __metadata: languageName: node linkType: hard -"electron-builder@npm:^22.10.5": - version: 22.14.13 - resolution: "electron-builder@npm:22.14.13" +"electron-builder@npm:^23.0.2": + version: 23.6.0 + resolution: "electron-builder@npm:23.6.0" dependencies: "@types/yargs": ^17.0.1 - app-builder-lib: 22.14.13 - builder-util: 22.14.13 - builder-util-runtime: 8.9.2 + app-builder-lib: 23.6.0 + builder-util: 23.6.0 + builder-util-runtime: 9.1.1 chalk: ^4.1.1 - dmg-builder: 22.14.13 + dmg-builder: 23.6.0 fs-extra: ^10.0.0 is-ci: ^3.0.0 lazy-val: ^1.0.5 read-config-file: 6.2.0 - update-notifier: ^5.1.0 - yargs: ^17.0.1 + simple-update-notifier: ^1.0.7 + yargs: ^17.5.1 bin: electron-builder: cli.js install-app-deps: install-app-deps.js - checksum: 1c5179ca9c4db3886377f86b6aa00db703180358134fefbf4c32daa54ed2620c47bf5495d0e4ee12bd3694dd7d3553a6561f088d2e5ab571b9e9b2f07ff594f2 + checksum: 227f8fb9c9bb11a11d999f2ade6a5cd1afb720d6ff5053c88b4be62d1265b6268c8f6b4b3b8ad6d0a7261d57ea5acd6619ef301b843865f260b616c474cf8cbd languageName: node linkType: hard @@ -7156,9 +7127,9 @@ __metadata: languageName: node linkType: hard -"electron-osx-sign@npm:^0.5.0": - version: 0.5.0 - resolution: "electron-osx-sign@npm:0.5.0" +"electron-osx-sign@npm:^0.6.0": + version: 0.6.0 + resolution: "electron-osx-sign@npm:0.6.0" dependencies: bluebird: ^3.5.0 compare-version: ^0.1.2 @@ -7169,22 +7140,22 @@ __metadata: bin: electron-osx-flat: bin/electron-osx-flat.js electron-osx-sign: bin/electron-osx-sign.js - checksum: ca1e55d8cb0987b78bfaf197860e73f7e6266cb219f3d6fd32f25665a8393efb284115db9e2246b42f75cdf6163c148060aff8a02960f4f810c6502d6f7d447c + checksum: b688f9efb013670b4226cff7c38101e7b1384ea44e1ab203259995f1eefc019c63aa18e936217a76d33b5a5a452b987ab3d86a56a961294582ce42acbb950de6 languageName: node linkType: hard -"electron-publish@npm:22.14.13": - version: 22.14.13 - resolution: "electron-publish@npm:22.14.13" +"electron-publish@npm:23.6.0": + version: 23.6.0 + resolution: "electron-publish@npm:23.6.0" dependencies: "@types/fs-extra": ^9.0.11 - builder-util: 22.14.13 - builder-util-runtime: 8.9.2 + builder-util: 23.6.0 + builder-util-runtime: 9.1.1 chalk: ^4.1.1 fs-extra: ^10.0.0 lazy-val: ^1.0.5 mime: ^2.5.2 - checksum: 66cf15ad52c9dea67d744eb9080c20d43792a734f4e524b8ffc676e8ce9541a2fe4b11a25e4bd3f48e670160e72edfc7eeb77767e843232f4454075ee91d2475 + checksum: 70473d800f0607b5ffc32473e87004079fe3e5f133242bb498dcff0be89bfaa4ce967860809e12b97ce216b1e907649a8a916b7483daf7a00ea28db3d665878e languageName: node linkType: hard @@ -8745,7 +8716,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^10.0.0": +"fs-extra@npm:^10.0.0, fs-extra@npm:^10.1.0": version: 10.1.0 resolution: "fs-extra@npm:10.1.0" dependencies: @@ -9097,15 +9068,6 @@ __metadata: languageName: node linkType: hard -"global-dirs@npm:^3.0.0": - version: 3.0.0 - resolution: "global-dirs@npm:3.0.0" - dependencies: - ini: 2.0.0 - checksum: 953c17cf14bf6ee0e2100ae82a0d779934eed8a3ec5c94a7a4f37c5b3b592c31ea015fb9a15cf32484de13c79f4a814f3015152f3e1d65976cfbe47c1bfe4a88 - languageName: node - linkType: hard - "global-modules@npm:^1.0.0": version: 1.0.0 resolution: "global-modules@npm:1.0.0" @@ -9430,13 +9392,6 @@ __metadata: languageName: node linkType: hard -"has-yarn@npm:^2.1.0": - version: 2.1.0 - resolution: "has-yarn@npm:2.1.0" - checksum: 5eb1d0bb8518103d7da24532bdbc7124ffc6d367b5d3c10840b508116f2f1bcbcf10fd3ba843ff6e2e991bdf9969fd862d42b2ed58aade88343326c950b7e7f7 - languageName: node - linkType: hard - "has@npm:^1.0.0, has@npm:^1.0.1, has@npm:^1.0.3": version: 1.0.3 resolution: "has@npm:1.0.3" @@ -9597,7 +9552,7 @@ __metadata: languageName: node linkType: hard -"hosted-git-info@npm:^4.0.2": +"hosted-git-info@npm:^4.1.0": version: 4.1.0 resolution: "hosted-git-info@npm:4.1.0" dependencies: @@ -10132,13 +10087,6 @@ __metadata: languageName: node linkType: hard -"ini@npm:2.0.0": - version: 2.0.0 - resolution: "ini@npm:2.0.0" - checksum: e7aadc5fb2e4aefc666d74ee2160c073995a4061556b1b5b4241ecb19ad609243b9cceafe91bae49c219519394bbd31512516cb22a3b1ca6e66d869e0447e84e - languageName: node - linkType: hard - "ini@npm:^1.3.4, ini@npm:^1.3.5, ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" @@ -10374,17 +10322,6 @@ __metadata: languageName: node linkType: hard -"is-ci@npm:^2.0.0": - version: 2.0.0 - resolution: "is-ci@npm:2.0.0" - dependencies: - ci-info: ^2.0.0 - bin: - is-ci: bin.js - checksum: 77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144 - languageName: node - linkType: hard - "is-ci@npm:^3.0.0": version: 3.0.1 resolution: "is-ci@npm:3.0.1" @@ -10595,16 +10532,6 @@ __metadata: languageName: node linkType: hard -"is-installed-globally@npm:^0.4.0": - version: 0.4.0 - resolution: "is-installed-globally@npm:0.4.0" - dependencies: - global-dirs: ^3.0.0 - is-path-inside: ^3.0.2 - checksum: 3359840d5982d22e9b350034237b2cda2a12bac1b48a721912e1ab8e0631dd07d45a2797a120b7b87552759a65ba03e819f1bd63f2d7ab8657ec0b44ee0bf399 - languageName: node - linkType: hard - "is-invalid-path@npm:^0.1.0": version: 0.1.0 resolution: "is-invalid-path@npm:0.1.0" @@ -10642,13 +10569,6 @@ __metadata: languageName: node linkType: hard -"is-npm@npm:^5.0.0": - version: 5.0.0 - resolution: "is-npm@npm:5.0.0" - checksum: 9baff02b0c69a3d3c79b162cb2f9e67fb40ef6d172c16601b2e2471c21e9a4fa1fc9885a308d7bc6f3a3cd2a324c27fa0bf284c133c3349bb22571ab70d041cc - languageName: node - linkType: hard - "is-number-object@npm:^1.0.4": version: 1.0.7 resolution: "is-number-object@npm:1.0.7" @@ -10747,13 +10667,6 @@ __metadata: languageName: node linkType: hard -"is-path-inside@npm:^3.0.2": - version: 3.0.3 - resolution: "is-path-inside@npm:3.0.3" - checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 - languageName: node - linkType: hard - "is-plain-obj@npm:^1.0.0, is-plain-obj@npm:^1.1.0": version: 1.1.0 resolution: "is-plain-obj@npm:1.1.0" @@ -10863,7 +10776,7 @@ __metadata: languageName: node linkType: hard -"is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0": +"is-typedarray@npm:~1.0.0": version: 1.0.0 resolution: "is-typedarray@npm:1.0.0" checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7 @@ -10925,13 +10838,6 @@ __metadata: languageName: node linkType: hard -"is-yarn-global@npm:^0.3.0": - version: 0.3.0 - resolution: "is-yarn-global@npm:0.3.0" - checksum: bca013d65fee2862024c9fbb3ba13720ffca2fe750095174c1c80922fdda16402b5c233f5ac9e265bc12ecb5446e7b7f519a32d9541788f01d4d44e24d2bf481 - languageName: node - linkType: hard - "isarray@npm:0.0.1": version: 0.0.1 resolution: "isarray@npm:0.0.1" @@ -10955,7 +10861,7 @@ __metadata: languageName: node linkType: hard -"isbinaryfile@npm:^4.0.8": +"isbinaryfile@npm:^4.0.10": version: 4.0.10 resolution: "isbinaryfile@npm:4.0.10" checksum: a6b28db7e23ac7a77d3707567cac81356ea18bd602a4f21f424f862a31d0e7ab4f250759c98a559ece35ffe4d99f0d339f1ab884ffa9795172f632ab8f88e686 @@ -11373,15 +11279,6 @@ __metadata: languageName: node linkType: hard -"latest-version@npm:^5.1.0": - version: 5.1.0 - resolution: "latest-version@npm:5.1.0" - dependencies: - package-json: ^6.3.0 - checksum: fbc72b071eb66c40f652441fd783a9cca62f08bf42433651937f078cd9ef94bf728ec7743992777826e4e89305aef24f234b515e6030503a2cbee7fc9bdc2c0f - languageName: node - linkType: hard - "lazy-val@npm:^1.0.4, lazy-val@npm:^1.0.5": version: 1.0.5 resolution: "lazy-val@npm:1.0.5" @@ -11449,7 +11346,7 @@ __metadata: dotenv-defaults: ^2.0.1 dotenv-webpack: ^1.8.0 electron: 17.2.0 - electron-builder: ^22.10.5 + electron-builder: ^23.0.2 electron-devtools-installer: ^3.1.1 electron-dl: ^3.2.0 electron-is-dev: ^0.3.0 @@ -12087,7 +11984,7 @@ __metadata: languageName: node linkType: hard -"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0": +"make-dir@npm:^3.0.2, make-dir@npm:^3.1.0": version: 3.1.0 resolution: "make-dir@npm:3.1.0" dependencies: @@ -13602,18 +13499,6 @@ __metadata: languageName: node linkType: hard -"package-json@npm:^6.3.0": - version: 6.5.0 - resolution: "package-json@npm:6.5.0" - dependencies: - got: ^9.6.0 - registry-auth-token: ^4.0.0 - registry-url: ^5.0.0 - semver: ^6.2.0 - checksum: cc9f890d3667d7610e6184decf543278b87f657d1ace0deb4a9c9155feca738ef88f660c82200763d3348010f4e42e9c7adc91e96ab0f86a770955995b5351e2 - languageName: node - linkType: hard - "pako@npm:~1.0.2, pako@npm:~1.0.5": version: 1.0.11 resolution: "pako@npm:1.0.11" @@ -14704,7 +14589,7 @@ __metadata: languageName: node linkType: hard -"pupa@npm:^2.0.1, pupa@npm:^2.1.1": +"pupa@npm:^2.0.1": version: 2.1.1 resolution: "pupa@npm:2.1.1" dependencies: @@ -14883,7 +14768,7 @@ __metadata: languageName: node linkType: hard -"rc@npm:1.2.8, rc@npm:^1.0.1, rc@npm:^1.1.6, rc@npm:^1.2.8": +"rc@npm:^1.0.1, rc@npm:^1.1.6": version: 1.2.8 resolution: "rc@npm:1.2.8" dependencies: @@ -15623,15 +15508,6 @@ __metadata: languageName: node linkType: hard -"registry-auth-token@npm:^4.0.0": - version: 4.2.2 - resolution: "registry-auth-token@npm:4.2.2" - dependencies: - rc: 1.2.8 - checksum: c5030198546ecfdcbcb0722cbc3e260c4f5f174d8d07bdfedd4620e79bfdf17a2db735aa230d600bd388fce6edd26c0a9ed2eb7e9b4641ec15213a28a806688b - languageName: node - linkType: hard - "registry-url@npm:^3.0.3": version: 3.1.0 resolution: "registry-url@npm:3.1.0" @@ -15641,15 +15517,6 @@ __metadata: languageName: node linkType: hard -"registry-url@npm:^5.0.0": - version: 5.1.0 - resolution: "registry-url@npm:5.1.0" - dependencies: - rc: ^1.2.8 - checksum: bcea86c84a0dbb66467b53187fadebfea79017cddfb4a45cf27530d7275e49082fe9f44301976eb0164c438e395684bcf3dae4819b36ff9d1640d8cc60c73df9 - languageName: node - linkType: hard - "regjsgen@npm:^0.6.0": version: 0.6.0 resolution: "regjsgen@npm:0.6.0" @@ -16370,15 +16237,6 @@ __metadata: languageName: node linkType: hard -"semver-diff@npm:^3.1.1": - version: 3.1.1 - resolution: "semver-diff@npm:3.1.1" - dependencies: - semver: ^6.3.0 - checksum: 8bbe5a5d7add2d5e51b72314a9215cd294d71f41cdc2bf6bd59ee76411f3610b576172896f1d191d0d7294cb9f2f847438d2ee158adacc0c224dca79052812fe - languageName: node - linkType: hard - "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.3.0, semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.6.0, semver@npm:^5.7.1": version: 5.7.1 resolution: "semver@npm:5.7.1" @@ -16388,7 +16246,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.0.0": +"semver@npm:7.0.0, semver@npm:~7.0.0": version: 7.0.0 resolution: "semver@npm:7.0.0" bin: @@ -16415,7 +16273,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.1.3, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5": +"semver@npm:^7.1.3, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5": version: 7.3.7 resolution: "semver@npm:7.3.7" dependencies: @@ -16426,6 +16284,17 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.3.7": + version: 7.3.8 + resolution: "semver@npm:7.3.8" + dependencies: + lru-cache: ^6.0.0 + bin: + semver: bin/semver.js + checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1 + languageName: node + linkType: hard + "send@npm:0.18.0": version: 0.18.0 resolution: "send@npm:0.18.0" @@ -16641,6 +16510,15 @@ __metadata: languageName: node linkType: hard +"simple-update-notifier@npm:^1.0.7": + version: 1.0.7 + resolution: "simple-update-notifier@npm:1.0.7" + dependencies: + semver: ~7.0.0 + checksum: aaadc1f158ad5101b363d1c7aed1f30fc1cac59a760aa31702633e0e6fe423348f07d0e78185aef0aad29130a7b7f0f188c21c7bc7353f897a0ea3682e051a70 + languageName: node + linkType: hard + "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -17159,7 +17037,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": +"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -18061,13 +17939,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.20.2": - version: 0.20.2 - resolution: "type-fest@npm:0.20.2" - checksum: 4fb3272df21ad1c552486f8a2f8e115c09a521ad7a8db3d56d53718d0c907b62c6e9141ba5f584af3f6830d0872c521357e512381f24f7c44acae583ad517d73 - languageName: node - linkType: hard - "type-fest@npm:^0.6.0": version: 0.6.0 resolution: "type-fest@npm:0.6.0" @@ -18085,15 +17956,6 @@ __metadata: languageName: node linkType: hard -"typedarray-to-buffer@npm:^3.1.5": - version: 3.1.5 - resolution: "typedarray-to-buffer@npm:3.1.5" - dependencies: - is-typedarray: ^1.0.0 - checksum: 99c11aaa8f45189fcfba6b8a4825fd684a321caa9bd7a76a27cf0c7732c174d198b99f449c52c3818107430b5f41c0ccbbfb75cb2ee3ca4a9451710986d61a60 - languageName: node - linkType: hard - "typedarray@npm:^0.0.6": version: 0.0.6 resolution: "typedarray@npm:0.0.6" @@ -18504,28 +18366,6 @@ __metadata: languageName: node linkType: hard -"update-notifier@npm:^5.1.0": - version: 5.1.0 - resolution: "update-notifier@npm:5.1.0" - dependencies: - boxen: ^5.0.0 - chalk: ^4.1.0 - configstore: ^5.0.1 - has-yarn: ^2.1.0 - import-lazy: ^2.1.0 - is-ci: ^2.0.0 - is-installed-globally: ^0.4.0 - is-npm: ^5.0.0 - is-yarn-global: ^0.3.0 - latest-version: ^5.1.0 - pupa: ^2.1.1 - semver: ^7.3.4 - semver-diff: ^3.1.1 - xdg-basedir: ^4.0.0 - checksum: 461e5e5b002419296d3868ee2abe0f9ab3e1846d9db642936d0c46f838872ec56069eddfe662c45ce1af0a8d6d5026353728de2e0a95ab2e3546a22ea077caf1 - languageName: node - linkType: hard - "uri-js@npm:^4.2.2": version: 4.4.1 resolution: "uri-js@npm:4.4.1" @@ -19277,15 +19117,6 @@ __metadata: languageName: node linkType: hard -"widest-line@npm:^3.1.0": - version: 3.1.0 - resolution: "widest-line@npm:3.1.0" - dependencies: - string-width: ^4.0.0 - checksum: 03db6c9d0af9329c37d74378ff1d91972b12553c7d72a6f4e8525fe61563fa7adb0b9d6e8d546b7e059688712ea874edd5ded475999abdeedf708de9849310e0 - languageName: node - linkType: hard - "winreg@npm:1.2.4": version: 1.2.4 resolution: "winreg@npm:1.2.4" @@ -19370,18 +19201,6 @@ __metadata: languageName: node linkType: hard -"write-file-atomic@npm:^3.0.0": - version: 3.0.3 - resolution: "write-file-atomic@npm:3.0.3" - dependencies: - imurmurhash: ^0.1.4 - is-typedarray: ^1.0.0 - signal-exit: ^3.0.2 - typedarray-to-buffer: ^3.1.5 - checksum: c55b24617cc61c3a4379f425fc62a386cc51916a9b9d993f39734d005a09d5a4bb748bc251f1304e7abd71d0a26d339996c275955f527a131b1dcded67878280 - languageName: node - linkType: hard - "write@npm:1.0.3": version: 1.0.3 resolution: "write@npm:1.0.3" @@ -19414,13 +19233,6 @@ __metadata: languageName: node linkType: hard -"xdg-basedir@npm:^4.0.0": - version: 4.0.0 - resolution: "xdg-basedir@npm:4.0.0" - checksum: 0073d5b59a37224ed3a5ac0dd2ec1d36f09c49f0afd769008a6e9cd3cd666bd6317bd1c7ce2eab47e1de285a286bad11a9b038196413cd753b79770361855f3c - languageName: node - linkType: hard - "xmlbuilder@npm:>=11.0.1": version: 15.1.1 resolution: "xmlbuilder@npm:15.1.1" @@ -19539,10 +19351,10 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^21.0.0": - version: 21.0.1 - resolution: "yargs-parser@npm:21.0.1" - checksum: c3ea2ed12cad0377ce3096b3f138df8267edf7b1aa7d710cd502fe16af417bafe4443dd71b28158c22fcd1be5dfd0e86319597e47badf42ff83815485887323a +"yargs-parser@npm:^21.1.1": + version: 21.1.1 + resolution: "yargs-parser@npm:21.1.1" + checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c languageName: node linkType: hard @@ -19598,18 +19410,18 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.0.1": - version: 17.5.1 - resolution: "yargs@npm:17.5.1" +"yargs@npm:^17.5.1": + version: 17.6.2 + resolution: "yargs@npm:17.6.2" dependencies: - cliui: ^7.0.2 + cliui: ^8.0.1 escalade: ^3.1.1 get-caller-file: ^2.0.5 require-directory: ^2.1.1 string-width: ^4.2.3 y18n: ^5.0.5 - yargs-parser: ^21.0.0 - checksum: 00d58a2c052937fa044834313f07910fd0a115dec5ee35919e857eeee3736b21a4eafa8264535800ba8bac312991ce785ecb8a51f4d2cc8c4676d865af1cfbde + yargs-parser: ^21.1.1 + checksum: 47da1b0d854fa16d45a3ded57b716b013b2179022352a5f7467409da5a04a1eef5b3b3d97a2dfc13e8bbe5f2ffc0afe3bc6a4a72f8254e60f5a4bd7947138643 languageName: node linkType: hard -- 2.43.4 From ca289bb1904c51233832b8dddbdcaaa7bd6a7bb6 Mon Sep 17 00:00:00 2001 From: zeppi Date: Wed, 16 Nov 2022 22:40:21 -0500 Subject: [PATCH 05/14] try use_hard_links=false --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 14d74788a..74cddef3a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -77,6 +77,7 @@ jobs: DEFAULT_LANGUAGE: en KNOWN_APP_DOMAINS: lbry.tv,lbry.lat,odysee.com CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS: 0 + USE_HARD_LINKS: false - uses: actions/upload-artifact@v2.2.4 if: | -- 2.43.4 From bb3ef4805a3a4e647184a91a0cc97359001f3463 Mon Sep 17 00:00:00 2001 From: zeppi Date: Wed, 16 Nov 2022 23:15:39 -0500 Subject: [PATCH 06/14] no USE_HARD_LINKS --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 74cddef3a..14d74788a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -77,7 +77,6 @@ jobs: DEFAULT_LANGUAGE: en KNOWN_APP_DOMAINS: lbry.tv,lbry.lat,odysee.com CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS: 0 - USE_HARD_LINKS: false - uses: actions/upload-artifact@v2.2.4 if: | -- 2.43.4 From bcab949e2a63228937a06988f67fea87361e03fd Mon Sep 17 00:00:00 2001 From: zeppi Date: Wed, 16 Nov 2022 23:26:41 -0500 Subject: [PATCH 07/14] upgrate electron-builder 23_3_3 --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c6a5965ac..3d96d4899 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "dotenv-defaults": "^2.0.1", "dotenv-webpack": "^1.8.0", "electron": "17.2.0", - "electron-builder": "^23.0.2", + "electron-builder": "^23.3.3", "electron-devtools-installer": "^3.1.1", "electron-is-dev": "^0.3.0", "electron-webpack": "^2.8.2", diff --git a/yarn.lock b/yarn.lock index 4b840cc10..385b75964 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7045,7 +7045,7 @@ __metadata: languageName: node linkType: hard -"electron-builder@npm:^23.0.2": +"electron-builder@npm:^23.3.3": version: 23.6.0 resolution: "electron-builder@npm:23.6.0" dependencies: @@ -11346,7 +11346,7 @@ __metadata: dotenv-defaults: ^2.0.1 dotenv-webpack: ^1.8.0 electron: 17.2.0 - electron-builder: ^23.0.2 + electron-builder: ^23.3.3 electron-devtools-installer: ^3.1.1 electron-dl: ^3.2.0 electron-is-dev: ^0.3.0 -- 2.43.4 From 016c8411a79d933f3753e7d0b5535916488f8896 Mon Sep 17 00:00:00 2001 From: zeppi Date: Thu, 17 Nov 2022 00:05:53 -0500 Subject: [PATCH 08/14] revert to electron-builder 22_10_5 electron-builder/issues/6124 says regressions happen after this version. --- package.json | 2 +- yarn.lock | 406 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 309 insertions(+), 99 deletions(-) diff --git a/package.json b/package.json index 3d96d4899..08343ec2c 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "dotenv-defaults": "^2.0.1", "dotenv-webpack": "^1.8.0", "electron": "17.2.0", - "electron-builder": "^23.3.3", + "electron-builder": "^22.10.5", "electron-devtools-installer": "^3.1.1", "electron-is-dev": "^0.3.0", "electron-webpack": "^2.8.2", diff --git a/yarn.lock b/yarn.lock index 385b75964..6a65d2aab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1521,18 +1521,16 @@ __metadata: languageName: node linkType: hard -"@electron/universal@npm:1.2.1": - version: 1.2.1 - resolution: "@electron/universal@npm:1.2.1" +"@electron/universal@npm:1.0.5": + version: 1.0.5 + resolution: "@electron/universal@npm:1.0.5" dependencies: "@malept/cross-spawn-promise": ^1.1.0 - asar: ^3.1.0 + asar: ^3.0.3 debug: ^4.3.1 dir-compare: ^2.4.0 fs-extra: ^9.0.1 - minimatch: ^3.0.4 - plist: ^3.0.4 - checksum: 9a7d98cf2b8414ff0274384fef1b72b5a545a0feb7ce03163d2e2ee1b13e4f7064dfe7147cdd652708a1314d1b5e68acdd907847a1747866ec8d2d3e757ec1f7 + checksum: 64eae3bbbfa422f28dbc1e92d12d954059cec7dac9ecc3ecad2c7895bb6cd10d30e8b3848092bfba8815bc71b60393a42f792751e50b9b5f643d6f1d03826b86 languageName: node linkType: hard @@ -3517,6 +3515,15 @@ __metadata: languageName: node linkType: hard +"ansi-align@npm:^3.0.0": + version: 3.0.1 + resolution: "ansi-align@npm:3.0.1" + dependencies: + string-width: ^4.1.0 + checksum: 6abfa08f2141d231c257162b15292467081fa49a208593e055c866aa0455b57f3a86b5a678c190c618faa79b4c59e254493099cb700dd9cf2293c6be2c8f5d8d + languageName: node + linkType: hard + "ansi-colors@npm:^3.0.0": version: 3.2.4 resolution: "ansi-colors@npm:3.2.4" @@ -3620,44 +3627,43 @@ __metadata: languageName: node linkType: hard -"app-builder-bin@npm:4.0.0": - version: 4.0.0 - resolution: "app-builder-bin@npm:4.0.0" - checksum: c3c8fd85c371b7a396c1bb1160ab2e3231ba4309abea5b36a5b366e42511e347c65a33ff50d56f4960b337833d539c263137b0ba131e2fa268c32edeb6c9f683 +"app-builder-bin@npm:3.7.1": + version: 3.7.1 + resolution: "app-builder-bin@npm:3.7.1" + checksum: aae6152d7e7e6eabe35e5430f8b4733cc713bd3f80fdb861c5b675ebc8951aa26b520821d27c5ee31f05e850cdfd9b923b58064307f1ae583fb4e7434d380209 languageName: node linkType: hard -"app-builder-lib@npm:23.6.0": - version: 23.6.0 - resolution: "app-builder-lib@npm:23.6.0" +"app-builder-lib@npm:22.14.13": + version: 22.14.13 + resolution: "app-builder-lib@npm:22.14.13" dependencies: 7zip-bin: ~5.1.1 "@develar/schema-utils": ~2.6.5 - "@electron/universal": 1.2.1 + "@electron/universal": 1.0.5 "@malept/flatpak-bundler": ^0.4.0 async-exit-hook: ^2.0.1 bluebird-lst: ^1.0.9 - builder-util: 23.6.0 - builder-util-runtime: 9.1.1 + builder-util: 22.14.13 + builder-util-runtime: 8.9.2 chromium-pickle-js: ^0.2.0 - debug: ^4.3.4 - ejs: ^3.1.7 - electron-osx-sign: ^0.6.0 - electron-publish: 23.6.0 + debug: ^4.3.2 + ejs: ^3.1.6 + electron-osx-sign: ^0.5.0 + electron-publish: 22.14.13 form-data: ^4.0.0 - fs-extra: ^10.1.0 - hosted-git-info: ^4.1.0 + fs-extra: ^10.0.0 + hosted-git-info: ^4.0.2 is-ci: ^3.0.0 - isbinaryfile: ^4.0.10 + isbinaryfile: ^4.0.8 js-yaml: ^4.1.0 lazy-val: ^1.0.5 - minimatch: ^3.1.2 + minimatch: ^3.0.4 read-config-file: 6.2.0 sanitize-filename: ^1.6.3 - semver: ^7.3.7 - tar: ^6.1.11 + semver: ^7.3.5 temp-file: ^3.4.0 - checksum: da3cc9f24e127add651197076c5fa2f68bc7979bcd6a441df7f69629e96bf3aca3118d61c63a85d382a824748f8056a7639464f07b1ded09db53ff1c4b3101be + checksum: a32a5ef25b3f70ddcd9b6ba0691221b9e66b0b0a4e1c28e9dc90854d7dcd0183445af55132587458963202afe40b1860b705558b990622d9e5953931b0de2572 languageName: node linkType: hard @@ -3850,7 +3856,7 @@ __metadata: languageName: node linkType: hard -"asar@npm:^3.1.0": +"asar@npm:^3.0.3": version: 3.2.0 resolution: "asar@npm:3.2.0" dependencies: @@ -4438,6 +4444,22 @@ __metadata: languageName: node linkType: hard +"boxen@npm:^5.0.0": + version: 5.1.2 + resolution: "boxen@npm:5.1.2" + dependencies: + ansi-align: ^3.0.0 + camelcase: ^6.2.0 + chalk: ^4.1.0 + cli-boxes: ^2.2.1 + string-width: ^4.2.2 + type-fest: ^0.20.2 + widest-line: ^3.1.0 + wrap-ansi: ^7.0.0 + checksum: 82d03e42a72576ff235123f17b7c505372fe05c83f75f61e7d4fa4bcb393897ec95ce766fecb8f26b915f0f7a7227d66e5ec7cef43f5b2bd9d3aeed47ec55877 + languageName: node + linkType: hard + "brace-expansion@npm:^1.1.7": version: 1.1.11 resolution: "brace-expansion@npm:1.1.11" @@ -4677,29 +4699,19 @@ __metadata: languageName: node linkType: hard -"builder-util-runtime@npm:9.1.1": - version: 9.1.1 - resolution: "builder-util-runtime@npm:9.1.1" - dependencies: - debug: ^4.3.4 - sax: ^1.2.4 - checksum: 3458f9c8accad6e934c841cffa93f5d4b342c22b10b9c1a2eb3fd44ca96ea2c662b1048f9a075da9b8a4fada17206887b7e92ebdca331b1071520916e013e245 - languageName: node - linkType: hard - -"builder-util@npm:23.6.0": - version: 23.6.0 - resolution: "builder-util@npm:23.6.0" +"builder-util@npm:22.14.13": + version: 22.14.13 + resolution: "builder-util@npm:22.14.13" dependencies: 7zip-bin: ~5.1.1 "@types/debug": ^4.1.6 "@types/fs-extra": ^9.0.11 - app-builder-bin: 4.0.0 + app-builder-bin: 3.7.1 bluebird-lst: ^1.0.9 - builder-util-runtime: 9.1.1 + builder-util-runtime: 8.9.2 chalk: ^4.1.1 cross-spawn: ^7.0.3 - debug: ^4.3.4 + debug: ^4.3.2 fs-extra: ^10.0.0 http-proxy-agent: ^5.0.0 https-proxy-agent: ^5.0.0 @@ -4708,7 +4720,7 @@ __metadata: source-map-support: ^0.5.19 stat-mode: ^1.0.0 temp-file: ^3.4.0 - checksum: 138fb9abed01ea2e5ac895e6a6ed75310ca6c89e0050483c81801b052f61b42ae5a042f457088b6e205ec8b4403b1ff3a325955f110255afb4da2310e3cf14ad + checksum: 6d72cc1f0bf7e72debe70049dede2a5eac302fb98b87eb7e60b7feed8631dc66877821367d5e7a87aea881f937a565c25e4e24042b421ef12c1d2afa8b7cc02d languageName: node linkType: hard @@ -4954,6 +4966,13 @@ __metadata: languageName: node linkType: hard +"camelcase@npm:^6.2.0": + version: 6.3.0 + resolution: "camelcase@npm:6.3.0" + checksum: 8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d + languageName: node + linkType: hard + "caniuse-api@npm:^3.0.0": version: 3.0.0 resolution: "caniuse-api@npm:3.0.0" @@ -5220,6 +5239,13 @@ __metadata: languageName: node linkType: hard +"cli-boxes@npm:^2.2.1": + version: 2.2.1 + resolution: "cli-boxes@npm:2.2.1" + checksum: be79f8ec23a558b49e01311b39a1ea01243ecee30539c880cf14bf518a12e223ef40c57ead0cb44f509bffdffc5c129c746cd50d863ab879385370112af4f585 + languageName: node + linkType: hard + "cli-cursor@npm:^2.0.0, cli-cursor@npm:^2.1.0": version: 2.1.0 resolution: "cli-cursor@npm:2.1.0" @@ -5625,6 +5651,20 @@ __metadata: languageName: node linkType: hard +"configstore@npm:^5.0.1": + version: 5.0.1 + resolution: "configstore@npm:5.0.1" + dependencies: + dot-prop: ^5.2.0 + graceful-fs: ^4.1.2 + make-dir: ^3.0.0 + unique-string: ^2.0.0 + write-file-atomic: ^3.0.0 + xdg-basedir: ^4.0.0 + checksum: 60ef65d493b63f96e14b11ba7ec072fdbf3d40110a94fb7199d1c287761bdea5c5244e76b2596325f30c1b652213aa75de96ea20afd4a5f82065e61ea090988e + languageName: node + linkType: hard + "connect-history-api-fallback@npm:^1.6.0": version: 1.6.0 resolution: "connect-history-api-fallback@npm:1.6.0" @@ -6323,7 +6363,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -6690,25 +6730,25 @@ __metadata: languageName: node linkType: hard -"dmg-builder@npm:23.6.0": - version: 23.6.0 - resolution: "dmg-builder@npm:23.6.0" +"dmg-builder@npm:22.14.13": + version: 22.14.13 + resolution: "dmg-builder@npm:22.14.13" dependencies: - app-builder-lib: 23.6.0 - builder-util: 23.6.0 - builder-util-runtime: 9.1.1 - dmg-license: ^1.0.11 + app-builder-lib: 22.14.13 + builder-util: 22.14.13 + builder-util-runtime: 8.9.2 + dmg-license: ^1.0.9 fs-extra: ^10.0.0 iconv-lite: ^0.6.2 js-yaml: ^4.1.0 dependenciesMeta: dmg-license: optional: true - checksum: 3e37a4b191cf40c9c7b97d07408c2bf58e7632d78de0dc49a142fb7c68670fd2a7123f31ee8803b3cd100f38feea7b785c28698dfaace508254659d81ecc0b80 + checksum: 01be77f99b9309e356e3ae4fbccc294c4f1dcb65b9b21c434807cbaa9d0c22b2338a5b688bba1b277e0110ac33dd1eb126f4267d09382b1fa12d0878162ac648 languageName: node linkType: hard -"dmg-license@npm:^1.0.11": +"dmg-license@npm:^1.0.9": version: 1.0.11 resolution: "dmg-license@npm:1.0.11" dependencies: @@ -7034,7 +7074,7 @@ __metadata: languageName: node linkType: hard -"ejs@npm:^3.1.5, ejs@npm:^3.1.7": +"ejs@npm:^3.1.5, ejs@npm:^3.1.6": version: 3.1.8 resolution: "ejs@npm:3.1.8" dependencies: @@ -7045,26 +7085,26 @@ __metadata: languageName: node linkType: hard -"electron-builder@npm:^23.3.3": - version: 23.6.0 - resolution: "electron-builder@npm:23.6.0" +"electron-builder@npm:^22.10.5": + version: 22.14.13 + resolution: "electron-builder@npm:22.14.13" dependencies: "@types/yargs": ^17.0.1 - app-builder-lib: 23.6.0 - builder-util: 23.6.0 - builder-util-runtime: 9.1.1 + app-builder-lib: 22.14.13 + builder-util: 22.14.13 + builder-util-runtime: 8.9.2 chalk: ^4.1.1 - dmg-builder: 23.6.0 + dmg-builder: 22.14.13 fs-extra: ^10.0.0 is-ci: ^3.0.0 lazy-val: ^1.0.5 read-config-file: 6.2.0 - simple-update-notifier: ^1.0.7 - yargs: ^17.5.1 + update-notifier: ^5.1.0 + yargs: ^17.0.1 bin: electron-builder: cli.js install-app-deps: install-app-deps.js - checksum: 227f8fb9c9bb11a11d999f2ade6a5cd1afb720d6ff5053c88b4be62d1265b6268c8f6b4b3b8ad6d0a7261d57ea5acd6619ef301b843865f260b616c474cf8cbd + checksum: 1c5179ca9c4db3886377f86b6aa00db703180358134fefbf4c32daa54ed2620c47bf5495d0e4ee12bd3694dd7d3553a6561f088d2e5ab571b9e9b2f07ff594f2 languageName: node linkType: hard @@ -7127,9 +7167,9 @@ __metadata: languageName: node linkType: hard -"electron-osx-sign@npm:^0.6.0": - version: 0.6.0 - resolution: "electron-osx-sign@npm:0.6.0" +"electron-osx-sign@npm:^0.5.0": + version: 0.5.0 + resolution: "electron-osx-sign@npm:0.5.0" dependencies: bluebird: ^3.5.0 compare-version: ^0.1.2 @@ -7140,22 +7180,22 @@ __metadata: bin: electron-osx-flat: bin/electron-osx-flat.js electron-osx-sign: bin/electron-osx-sign.js - checksum: b688f9efb013670b4226cff7c38101e7b1384ea44e1ab203259995f1eefc019c63aa18e936217a76d33b5a5a452b987ab3d86a56a961294582ce42acbb950de6 + checksum: ca1e55d8cb0987b78bfaf197860e73f7e6266cb219f3d6fd32f25665a8393efb284115db9e2246b42f75cdf6163c148060aff8a02960f4f810c6502d6f7d447c languageName: node linkType: hard -"electron-publish@npm:23.6.0": - version: 23.6.0 - resolution: "electron-publish@npm:23.6.0" +"electron-publish@npm:22.14.13": + version: 22.14.13 + resolution: "electron-publish@npm:22.14.13" dependencies: "@types/fs-extra": ^9.0.11 - builder-util: 23.6.0 - builder-util-runtime: 9.1.1 + builder-util: 22.14.13 + builder-util-runtime: 8.9.2 chalk: ^4.1.1 fs-extra: ^10.0.0 lazy-val: ^1.0.5 mime: ^2.5.2 - checksum: 70473d800f0607b5ffc32473e87004079fe3e5f133242bb498dcff0be89bfaa4ce967860809e12b97ce216b1e907649a8a916b7483daf7a00ea28db3d665878e + checksum: 66cf15ad52c9dea67d744eb9080c20d43792a734f4e524b8ffc676e8ce9541a2fe4b11a25e4bd3f48e670160e72edfc7eeb77767e843232f4454075ee91d2475 languageName: node linkType: hard @@ -8716,7 +8756,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^10.0.0, fs-extra@npm:^10.1.0": +"fs-extra@npm:^10.0.0": version: 10.1.0 resolution: "fs-extra@npm:10.1.0" dependencies: @@ -9068,6 +9108,15 @@ __metadata: languageName: node linkType: hard +"global-dirs@npm:^3.0.0": + version: 3.0.1 + resolution: "global-dirs@npm:3.0.1" + dependencies: + ini: 2.0.0 + checksum: 70147b80261601fd40ac02a104581432325c1c47329706acd773f3a6ce99bb36d1d996038c85ccacd482ad22258ec233c586b6a91535b1a116b89663d49d6438 + languageName: node + linkType: hard + "global-modules@npm:^1.0.0": version: 1.0.0 resolution: "global-modules@npm:1.0.0" @@ -9392,6 +9441,13 @@ __metadata: languageName: node linkType: hard +"has-yarn@npm:^2.1.0": + version: 2.1.0 + resolution: "has-yarn@npm:2.1.0" + checksum: 5eb1d0bb8518103d7da24532bdbc7124ffc6d367b5d3c10840b508116f2f1bcbcf10fd3ba843ff6e2e991bdf9969fd862d42b2ed58aade88343326c950b7e7f7 + languageName: node + linkType: hard + "has@npm:^1.0.0, has@npm:^1.0.1, has@npm:^1.0.3": version: 1.0.3 resolution: "has@npm:1.0.3" @@ -9552,7 +9608,7 @@ __metadata: languageName: node linkType: hard -"hosted-git-info@npm:^4.1.0": +"hosted-git-info@npm:^4.0.2": version: 4.1.0 resolution: "hosted-git-info@npm:4.1.0" dependencies: @@ -10087,6 +10143,13 @@ __metadata: languageName: node linkType: hard +"ini@npm:2.0.0": + version: 2.0.0 + resolution: "ini@npm:2.0.0" + checksum: e7aadc5fb2e4aefc666d74ee2160c073995a4061556b1b5b4241ecb19ad609243b9cceafe91bae49c219519394bbd31512516cb22a3b1ca6e66d869e0447e84e + languageName: node + linkType: hard + "ini@npm:^1.3.4, ini@npm:^1.3.5, ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" @@ -10322,6 +10385,17 @@ __metadata: languageName: node linkType: hard +"is-ci@npm:^2.0.0": + version: 2.0.0 + resolution: "is-ci@npm:2.0.0" + dependencies: + ci-info: ^2.0.0 + bin: + is-ci: bin.js + checksum: 77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144 + languageName: node + linkType: hard + "is-ci@npm:^3.0.0": version: 3.0.1 resolution: "is-ci@npm:3.0.1" @@ -10532,6 +10606,16 @@ __metadata: languageName: node linkType: hard +"is-installed-globally@npm:^0.4.0": + version: 0.4.0 + resolution: "is-installed-globally@npm:0.4.0" + dependencies: + global-dirs: ^3.0.0 + is-path-inside: ^3.0.2 + checksum: 3359840d5982d22e9b350034237b2cda2a12bac1b48a721912e1ab8e0631dd07d45a2797a120b7b87552759a65ba03e819f1bd63f2d7ab8657ec0b44ee0bf399 + languageName: node + linkType: hard + "is-invalid-path@npm:^0.1.0": version: 0.1.0 resolution: "is-invalid-path@npm:0.1.0" @@ -10569,6 +10653,13 @@ __metadata: languageName: node linkType: hard +"is-npm@npm:^5.0.0": + version: 5.0.0 + resolution: "is-npm@npm:5.0.0" + checksum: 9baff02b0c69a3d3c79b162cb2f9e67fb40ef6d172c16601b2e2471c21e9a4fa1fc9885a308d7bc6f3a3cd2a324c27fa0bf284c133c3349bb22571ab70d041cc + languageName: node + linkType: hard + "is-number-object@npm:^1.0.4": version: 1.0.7 resolution: "is-number-object@npm:1.0.7" @@ -10667,6 +10758,13 @@ __metadata: languageName: node linkType: hard +"is-path-inside@npm:^3.0.2": + version: 3.0.3 + resolution: "is-path-inside@npm:3.0.3" + checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 + languageName: node + linkType: hard + "is-plain-obj@npm:^1.0.0, is-plain-obj@npm:^1.1.0": version: 1.1.0 resolution: "is-plain-obj@npm:1.1.0" @@ -10776,7 +10874,7 @@ __metadata: languageName: node linkType: hard -"is-typedarray@npm:~1.0.0": +"is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0": version: 1.0.0 resolution: "is-typedarray@npm:1.0.0" checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7 @@ -10838,6 +10936,13 @@ __metadata: languageName: node linkType: hard +"is-yarn-global@npm:^0.3.0": + version: 0.3.0 + resolution: "is-yarn-global@npm:0.3.0" + checksum: bca013d65fee2862024c9fbb3ba13720ffca2fe750095174c1c80922fdda16402b5c233f5ac9e265bc12ecb5446e7b7f519a32d9541788f01d4d44e24d2bf481 + languageName: node + linkType: hard + "isarray@npm:0.0.1": version: 0.0.1 resolution: "isarray@npm:0.0.1" @@ -10861,7 +10966,7 @@ __metadata: languageName: node linkType: hard -"isbinaryfile@npm:^4.0.10": +"isbinaryfile@npm:^4.0.8": version: 4.0.10 resolution: "isbinaryfile@npm:4.0.10" checksum: a6b28db7e23ac7a77d3707567cac81356ea18bd602a4f21f424f862a31d0e7ab4f250759c98a559ece35ffe4d99f0d339f1ab884ffa9795172f632ab8f88e686 @@ -11279,6 +11384,15 @@ __metadata: languageName: node linkType: hard +"latest-version@npm:^5.1.0": + version: 5.1.0 + resolution: "latest-version@npm:5.1.0" + dependencies: + package-json: ^6.3.0 + checksum: fbc72b071eb66c40f652441fd783a9cca62f08bf42433651937f078cd9ef94bf728ec7743992777826e4e89305aef24f234b515e6030503a2cbee7fc9bdc2c0f + languageName: node + linkType: hard + "lazy-val@npm:^1.0.4, lazy-val@npm:^1.0.5": version: 1.0.5 resolution: "lazy-val@npm:1.0.5" @@ -11346,7 +11460,7 @@ __metadata: dotenv-defaults: ^2.0.1 dotenv-webpack: ^1.8.0 electron: 17.2.0 - electron-builder: ^23.3.3 + electron-builder: ^22.10.5 electron-devtools-installer: ^3.1.1 electron-dl: ^3.2.0 electron-is-dev: ^0.3.0 @@ -11984,7 +12098,7 @@ __metadata: languageName: node linkType: hard -"make-dir@npm:^3.0.2, make-dir@npm:^3.1.0": +"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0": version: 3.1.0 resolution: "make-dir@npm:3.1.0" dependencies: @@ -13499,6 +13613,18 @@ __metadata: languageName: node linkType: hard +"package-json@npm:^6.3.0": + version: 6.5.0 + resolution: "package-json@npm:6.5.0" + dependencies: + got: ^9.6.0 + registry-auth-token: ^4.0.0 + registry-url: ^5.0.0 + semver: ^6.2.0 + checksum: cc9f890d3667d7610e6184decf543278b87f657d1ace0deb4a9c9155feca738ef88f660c82200763d3348010f4e42e9c7adc91e96ab0f86a770955995b5351e2 + languageName: node + linkType: hard + "pako@npm:~1.0.2, pako@npm:~1.0.5": version: 1.0.11 resolution: "pako@npm:1.0.11" @@ -14589,7 +14715,7 @@ __metadata: languageName: node linkType: hard -"pupa@npm:^2.0.1": +"pupa@npm:^2.0.1, pupa@npm:^2.1.1": version: 2.1.1 resolution: "pupa@npm:2.1.1" dependencies: @@ -14768,7 +14894,7 @@ __metadata: languageName: node linkType: hard -"rc@npm:^1.0.1, rc@npm:^1.1.6": +"rc@npm:1.2.8, rc@npm:^1.0.1, rc@npm:^1.1.6, rc@npm:^1.2.8": version: 1.2.8 resolution: "rc@npm:1.2.8" dependencies: @@ -15508,6 +15634,15 @@ __metadata: languageName: node linkType: hard +"registry-auth-token@npm:^4.0.0": + version: 4.2.2 + resolution: "registry-auth-token@npm:4.2.2" + dependencies: + rc: 1.2.8 + checksum: c5030198546ecfdcbcb0722cbc3e260c4f5f174d8d07bdfedd4620e79bfdf17a2db735aa230d600bd388fce6edd26c0a9ed2eb7e9b4641ec15213a28a806688b + languageName: node + linkType: hard + "registry-url@npm:^3.0.3": version: 3.1.0 resolution: "registry-url@npm:3.1.0" @@ -15517,6 +15652,15 @@ __metadata: languageName: node linkType: hard +"registry-url@npm:^5.0.0": + version: 5.1.0 + resolution: "registry-url@npm:5.1.0" + dependencies: + rc: ^1.2.8 + checksum: bcea86c84a0dbb66467b53187fadebfea79017cddfb4a45cf27530d7275e49082fe9f44301976eb0164c438e395684bcf3dae4819b36ff9d1640d8cc60c73df9 + languageName: node + linkType: hard + "regjsgen@npm:^0.6.0": version: 0.6.0 resolution: "regjsgen@npm:0.6.0" @@ -16237,6 +16381,15 @@ __metadata: languageName: node linkType: hard +"semver-diff@npm:^3.1.1": + version: 3.1.1 + resolution: "semver-diff@npm:3.1.1" + dependencies: + semver: ^6.3.0 + checksum: 8bbe5a5d7add2d5e51b72314a9215cd294d71f41cdc2bf6bd59ee76411f3610b576172896f1d191d0d7294cb9f2f847438d2ee158adacc0c224dca79052812fe + languageName: node + linkType: hard + "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.3.0, semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.6.0, semver@npm:^5.7.1": version: 5.7.1 resolution: "semver@npm:5.7.1" @@ -16246,7 +16399,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.0.0, semver@npm:~7.0.0": +"semver@npm:7.0.0": version: 7.0.0 resolution: "semver@npm:7.0.0" bin: @@ -16284,7 +16437,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.7": +"semver@npm:^7.3.4": version: 7.3.8 resolution: "semver@npm:7.3.8" dependencies: @@ -16510,15 +16663,6 @@ __metadata: languageName: node linkType: hard -"simple-update-notifier@npm:^1.0.7": - version: 1.0.7 - resolution: "simple-update-notifier@npm:1.0.7" - dependencies: - semver: ~7.0.0 - checksum: aaadc1f158ad5101b363d1c7aed1f30fc1cac59a760aa31702633e0e6fe423348f07d0e78185aef0aad29130a7b7f0f188c21c7bc7353f897a0ea3682e051a70 - languageName: node - linkType: hard - "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -17037,7 +17181,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": +"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -17939,6 +18083,13 @@ __metadata: languageName: node linkType: hard +"type-fest@npm:^0.20.2": + version: 0.20.2 + resolution: "type-fest@npm:0.20.2" + checksum: 4fb3272df21ad1c552486f8a2f8e115c09a521ad7a8db3d56d53718d0c907b62c6e9141ba5f584af3f6830d0872c521357e512381f24f7c44acae583ad517d73 + languageName: node + linkType: hard + "type-fest@npm:^0.6.0": version: 0.6.0 resolution: "type-fest@npm:0.6.0" @@ -17956,6 +18107,15 @@ __metadata: languageName: node linkType: hard +"typedarray-to-buffer@npm:^3.1.5": + version: 3.1.5 + resolution: "typedarray-to-buffer@npm:3.1.5" + dependencies: + is-typedarray: ^1.0.0 + checksum: 99c11aaa8f45189fcfba6b8a4825fd684a321caa9bd7a76a27cf0c7732c174d198b99f449c52c3818107430b5f41c0ccbbfb75cb2ee3ca4a9451710986d61a60 + languageName: node + linkType: hard + "typedarray@npm:^0.0.6": version: 0.0.6 resolution: "typedarray@npm:0.0.6" @@ -18366,6 +18526,28 @@ __metadata: languageName: node linkType: hard +"update-notifier@npm:^5.1.0": + version: 5.1.0 + resolution: "update-notifier@npm:5.1.0" + dependencies: + boxen: ^5.0.0 + chalk: ^4.1.0 + configstore: ^5.0.1 + has-yarn: ^2.1.0 + import-lazy: ^2.1.0 + is-ci: ^2.0.0 + is-installed-globally: ^0.4.0 + is-npm: ^5.0.0 + is-yarn-global: ^0.3.0 + latest-version: ^5.1.0 + pupa: ^2.1.1 + semver: ^7.3.4 + semver-diff: ^3.1.1 + xdg-basedir: ^4.0.0 + checksum: 461e5e5b002419296d3868ee2abe0f9ab3e1846d9db642936d0c46f838872ec56069eddfe662c45ce1af0a8d6d5026353728de2e0a95ab2e3546a22ea077caf1 + languageName: node + linkType: hard + "uri-js@npm:^4.2.2": version: 4.4.1 resolution: "uri-js@npm:4.4.1" @@ -19117,6 +19299,15 @@ __metadata: languageName: node linkType: hard +"widest-line@npm:^3.1.0": + version: 3.1.0 + resolution: "widest-line@npm:3.1.0" + dependencies: + string-width: ^4.0.0 + checksum: 03db6c9d0af9329c37d74378ff1d91972b12553c7d72a6f4e8525fe61563fa7adb0b9d6e8d546b7e059688712ea874edd5ded475999abdeedf708de9849310e0 + languageName: node + linkType: hard + "winreg@npm:1.2.4": version: 1.2.4 resolution: "winreg@npm:1.2.4" @@ -19201,6 +19392,18 @@ __metadata: languageName: node linkType: hard +"write-file-atomic@npm:^3.0.0": + version: 3.0.3 + resolution: "write-file-atomic@npm:3.0.3" + dependencies: + imurmurhash: ^0.1.4 + is-typedarray: ^1.0.0 + signal-exit: ^3.0.2 + typedarray-to-buffer: ^3.1.5 + checksum: c55b24617cc61c3a4379f425fc62a386cc51916a9b9d993f39734d005a09d5a4bb748bc251f1304e7abd71d0a26d339996c275955f527a131b1dcded67878280 + languageName: node + linkType: hard + "write@npm:1.0.3": version: 1.0.3 resolution: "write@npm:1.0.3" @@ -19233,6 +19436,13 @@ __metadata: languageName: node linkType: hard +"xdg-basedir@npm:^4.0.0": + version: 4.0.0 + resolution: "xdg-basedir@npm:4.0.0" + checksum: 0073d5b59a37224ed3a5ac0dd2ec1d36f09c49f0afd769008a6e9cd3cd666bd6317bd1c7ce2eab47e1de285a286bad11a9b038196413cd753b79770361855f3c + languageName: node + linkType: hard + "xmlbuilder@npm:>=11.0.1": version: 15.1.1 resolution: "xmlbuilder@npm:15.1.1" @@ -19410,7 +19620,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.5.1": +"yargs@npm:^17.0.1": version: 17.6.2 resolution: "yargs@npm:17.6.2" dependencies: -- 2.43.4 From fb63e2e00aae28e4e8511b8bdf007cd4732999a5 Mon Sep 17 00:00:00 2001 From: zeppi Date: Thu, 17 Nov 2022 11:26:24 -0500 Subject: [PATCH 09/14] try mac install homebrew, python2 --- .github/workflows/deploy.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 14d74788a..ffff45b30 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -40,6 +40,14 @@ jobs: with: xcode-version: '13.1.0' + - uses: Homebrew/actions/setup-homebrew@master + if: startsWith(runner.os, 'mac') + + - name: Install Python2 + if: startsWith(runner.os, 'mac') + run: | + /bin/bash -c "$(curl -fsSL https://github.com/alfredapp/dependency-scripts/raw/main/scripts/install-python2.sh)" + - name: Download blockchain headers run: | mkdir -p ./static/daemon @@ -47,6 +55,8 @@ jobs: ls ./static/daemon - name: Build + if: startsWith(runner.os, 'mac') + run: | yarn dlx cross-env yarn --network-timeout 600000 -- 2.43.4 From f7681445762daf7394dda780651f9d2a18cd8b5f Mon Sep 17 00:00:00 2001 From: zeppi Date: Thu, 17 Nov 2022 11:55:33 -0500 Subject: [PATCH 10/14] typo and ln /usr/bin/python --- .github/workflows/deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ffff45b30..b21137587 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,6 +47,9 @@ jobs: if: startsWith(runner.os, 'mac') run: | /bin/bash -c "$(curl -fsSL https://github.com/alfredapp/dependency-scripts/raw/main/scripts/install-python2.sh)" + ln -sf /usr/local/bin/python /usr/bin/python + + - name: Create Python Link - name: Download blockchain headers run: | @@ -55,8 +58,6 @@ jobs: ls ./static/daemon - name: Build - if: startsWith(runner.os, 'mac') - run: | yarn dlx cross-env yarn --network-timeout 600000 -- 2.43.4 From ac86dd58ae002b91c07b55eeb4ae8c5b9394f9da Mon Sep 17 00:00:00 2001 From: zeppi Date: Thu, 17 Nov 2022 11:59:33 -0500 Subject: [PATCH 11/14] oops --- .github/workflows/deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b21137587..2d8c2bc4f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -49,8 +49,6 @@ jobs: /bin/bash -c "$(curl -fsSL https://github.com/alfredapp/dependency-scripts/raw/main/scripts/install-python2.sh)" ln -sf /usr/local/bin/python /usr/bin/python - - name: Create Python Link - - name: Download blockchain headers run: | mkdir -p ./static/daemon -- 2.43.4 From f30e0214aa2c6a3ad38acbc290d7cf5a52b48d01 Mon Sep 17 00:00:00 2001 From: zeppi Date: Thu, 17 Nov 2022 12:10:25 -0500 Subject: [PATCH 12/14] try sudo --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2d8c2bc4f..9f6d10f4d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,7 +47,7 @@ jobs: if: startsWith(runner.os, 'mac') run: | /bin/bash -c "$(curl -fsSL https://github.com/alfredapp/dependency-scripts/raw/main/scripts/install-python2.sh)" - ln -sf /usr/local/bin/python /usr/bin/python + sudo ln -sf /usr/local/bin/python /usr/bin/python - name: Download blockchain headers run: | -- 2.43.4 From b332023bcc9f0c8e87348c5135117c3817f61826 Mon Sep 17 00:00:00 2001 From: zeppi Date: Thu, 17 Nov 2022 12:50:19 -0500 Subject: [PATCH 13/14] try PYTHON_PATH --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9f6d10f4d..0c8dc2813 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,7 +47,7 @@ jobs: if: startsWith(runner.os, 'mac') run: | /bin/bash -c "$(curl -fsSL https://github.com/alfredapp/dependency-scripts/raw/main/scripts/install-python2.sh)" - sudo ln -sf /usr/local/bin/python /usr/bin/python + echo "PYTHON_PATH=/usr/local/bin/python" >> $GITHUB_ENV - name: Download blockchain headers run: | -- 2.43.4 From 5f9ffd52d4cf45c13142dfaff2fab2825f5d50f0 Mon Sep 17 00:00:00 2001 From: zeppi Date: Thu, 17 Nov 2022 13:19:16 -0500 Subject: [PATCH 14/14] comment github action mac python hack --- .github/workflows/deploy.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0c8dc2813..03e9e886f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,10 +39,16 @@ jobs: if: startsWith(runner.os, 'mac') with: xcode-version: '13.1.0' - + # This is gonna be hacky. + # Github made us upgrade xcode, which would force an upgrade of electron-builder to fix mac. + # But there were bugs with copyfiles / extraFiles that kept seeing duplicates erroring on ln. + # A flag USE_HARD_LINKS=false in electron-builder.json was suggested in comments, but that broke windows builds. + # So for now we'll install python2 on mac and make sure it can find it. + # Remove this after successfully upgrading electron-builder. + # HACK part 1 - uses: Homebrew/actions/setup-homebrew@master if: startsWith(runner.os, 'mac') - + # HACK part 2 - name: Install Python2 if: startsWith(runner.os, 'mac') run: | -- 2.43.4