Skip to content

Commit 722699e

Browse files
lostdesignlostdesign
committed
🐛 fixing macos build
1 parent b91dc9c commit 722699e

File tree

2 files changed

+134
-85
lines changed

2 files changed

+134
-85
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"babel-eslint": "10.1.0",
7474
"dotenv": "16.0.0",
7575
"electron": "17.0.0",
76-
"electron-builder": "22.11.4",
76+
"electron-builder": "23.0.2",
7777
"electron-devtools-installer": "3.1.1",
7878
"electron-icon-builder": "1.0.2",
7979
"electron-notarize": "1.0.0",

‎yarn.lock

Lines changed: 133 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,19 @@
970970
dir-compare "^2.4.0"
971971
fs-extra "^9.0.1"
972972

973+
"@electron/[email protected]":
974+
version "1.2.0"
975+
resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.0.tgz#518cac72bccd79c00bf41345119e6fdbabdb871d"
976+
integrity sha512-eu20BwNsrMPKoe2bZ3/l9c78LclDvxg3PlVXrQf3L50NaUuW5M59gbPytI+V4z7/QMrohUHetQaU0ou+p1UG9Q==
977+
dependencies:
978+
"@malept/cross-spawn-promise" "^1.1.0"
979+
asar "^3.1.0"
980+
debug "^4.3.1"
981+
dir-compare "^2.4.0"
982+
fs-extra "^9.0.1"
983+
minimatch "^3.0.4"
984+
plist "^3.0.4"
985+
973986
"@eslint/eslintrc@^0.4.3":
974987
version "0.4.3"
975988
resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"
@@ -1731,6 +1744,11 @@
17311744
"@tiptap/extension-floating-menu" "^2.0.0-beta.50"
17321745
prosemirror-view "^1.23.6"
17331746

1747+
"@tootallnate/once@2":
1748+
version "2.0.0"
1749+
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
1750+
integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
1751+
17341752
"@types/body-parser@*":
17351753
version "1.19.2"
17361754
resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"
@@ -1754,7 +1772,7 @@
17541772
dependencies:
17551773
"@types/node" "*"
17561774

1757-
"@types/debug@^4.1.5", "@types/debug@^4.1.6":
1775+
"@types/debug@^4.1.6":
17581776
version "4.1.7"
17591777
resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz"
17601778
integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
@@ -2030,13 +2048,6 @@
20302048
resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"
20312049
integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
20322050

2033-
"@types/yargs@^16.0.1":
2034-
version "16.0.4"
2035-
resolved "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz"
2036-
integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
2037-
dependencies:
2038-
"@types/yargs-parser" "*"
2039-
20402051
"@types/yargs@^17.0.1":
20412052
version "17.0.8"
20422053
resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.8.tgz"
@@ -2663,33 +2674,35 @@ anymatch@^3.0.0, anymatch@~3.1.2:
26632674
normalize-path "^3.0.0"
26642675
picomatch "^2.0.4"
26652676

2666-
[email protected]:
2667-
version "3.5.13"
2668-
resolved "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.13.tgz"
2669-
integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg==
2670-
26712677
[email protected]:
26722678
version "3.7.1"
26732679
resolved "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.7.1.tgz"
26742680
integrity sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==
26752681

2676-
[email protected]:
2677-
version "22.11.4"
2678-
resolved "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.11.4.tgz"
2679-
integrity sha512-6YIrUpRPrs3mG2Po/8Y9DxrnsqgdhUBjUKJJW78kCZR1rwvuxrYjIC57njmWohVYplSGLeauEDBQKpiY58YxJw==
2682+
[email protected]:
2683+
version "4.0.0"
2684+
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
2685+
integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
2686+
2687+
[email protected]:
2688+
version "22.14.5"
2689+
resolved "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.5.tgz"
2690+
integrity sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg==
26802691
dependencies:
26812692
"7zip-bin" "~5.1.1"
26822693
"@develar/schema-utils" "~2.6.5"
26832694
"@electron/universal" "1.0.5"
26842695
"@malept/flatpak-bundler" "^0.4.0"
26852696
async-exit-hook "^2.0.1"
26862697
bluebird-lst "^1.0.9"
2687-
builder-util "22.11.4"
2688-
builder-util-runtime "8.7.5"
2698+
builder-util "22.14.5"
2699+
builder-util-runtime "8.9.1"
26892700
chromium-pickle-js "^0.2.0"
26902701
debug "^4.3.2"
26912702
ejs "^3.1.6"
2692-
electron-publish "22.11.4"
2703+
electron-osx-sign "^0.5.0"
2704+
electron-publish "22.14.5"
2705+
form-data "^4.0.0"
26932706
fs-extra "^10.0.0"
26942707
hosted-git-info "^4.0.2"
26952708
is-ci "^3.0.0"
@@ -2702,24 +2715,24 @@ [email protected]:
27022715
semver "^7.3.5"
27032716
temp-file "^3.4.0"
27042717

2705-
app-builder-lib@22.14.5:
2706-
version "22.14.5"
2707-
resolved "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.5.tgz"
2708-
integrity sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg==
2718+
app-builder-lib@23.0.2:
2719+
version "23.0.2"
2720+
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.2.tgz#43f168a233812d7b65bee21962c1a9d1a62d30c4"
2721+
integrity sha512-2ytlOKavGQVvVujsGajJURtyrXHRXWIqHTzzZKUtYNrJUbDG2HcPZN7aktf+SDBeoXX0Lp/QA6dBpBpSRuG6rQ==
27092722
dependencies:
27102723
"7zip-bin" "~5.1.1"
27112724
"@develar/schema-utils" "~2.6.5"
2712-
"@electron/universal" "1.0.5"
2725+
"@electron/universal" "1.2.0"
27132726
"@malept/flatpak-bundler" "^0.4.0"
27142727
async-exit-hook "^2.0.1"
27152728
bluebird-lst "^1.0.9"
2716-
builder-util "22.14.5"
2717-
builder-util-runtime "8.9.1"
2729+
builder-util "23.0.2"
2730+
builder-util-runtime "9.0.0"
27182731
chromium-pickle-js "^0.2.0"
27192732
debug "^4.3.2"
27202733
ejs "^3.1.6"
2721-
electron-osx-sign "^0.5.0"
2722-
electron-publish "22.14.5"
2734+
electron-osx-sign "^0.6.0"
2735+
electron-publish "23.0.2"
27232736
form-data "^4.0.0"
27242737
fs-extra "^10.0.0"
27252738
hosted-git-info "^4.0.2"
@@ -2829,6 +2842,18 @@ asar@^3.0.3:
28292842
optionalDependencies:
28302843
"@types/glob" "^7.1.1"
28312844

2845+
asar@^3.1.0:
2846+
version "3.2.0"
2847+
resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221"
2848+
integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==
2849+
dependencies:
2850+
chromium-pickle-js "^0.2.0"
2851+
commander "^5.0.0"
2852+
glob "^7.1.6"
2853+
minimatch "^3.0.4"
2854+
optionalDependencies:
2855+
"@types/glob" "^7.1.1"
2856+
28322857
asn1.js@^5.2.0:
28332858
version "5.4.1"
28342859
resolved "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"
@@ -3321,14 +3346,6 @@ buffer@^5.1.0, buffer@^5.2.0:
33213346
base64-js "^1.3.1"
33223347
ieee754 "^1.1.13"
33233348

3324-
[email protected]:
3325-
version "8.7.5"
3326-
resolved "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.5.tgz"
3327-
integrity sha512-fgUFHKtMNjdvH6PDRFntdIGUPgwZ69sXsAqEulCtoiqgWes5agrMq/Ud274zjJRTbckYh2PHh8/1CpFc6dpsbQ==
3328-
dependencies:
3329-
debug "^4.3.2"
3330-
sax "^1.2.4"
3331-
33323349
[email protected]:
33333350
version "8.9.1"
33343351
resolved "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz"
@@ -3345,18 +3362,27 @@ [email protected]:
33453362
debug "^4.3.2"
33463363
sax "^1.2.4"
33473364

3348-
[email protected]:
3349-
version "22.11.4"
3350-
resolved "https://registry.npmjs.org/builder-util/-/builder-util-22.11.4.tgz"
3351-
integrity sha512-EIjvZZH0TpfFa+EoG7Y7B0qOAGtL+VIBGd1ri4LhpqC9s9rpyYIYO4JZflbWKMgyCdQSZA6GbLgDsrCJJKxNaA==
3365+
[email protected]:
3366+
version "9.0.0"
3367+
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.0.tgz#3a40ba7382712ccdb24471567f91d7c167e00830"
3368+
integrity sha512-SkpEtSmTkREDHRJnxKEv43aAYp8sYWY8fxYBhGLBLOBIRXeaIp6Kv3lBgSD7uR8jQtC7CA659sqJrpSV6zNvSA==
3369+
dependencies:
3370+
debug "^4.3.2"
3371+
sax "^1.2.4"
3372+
3373+
[email protected]:
3374+
version "22.14.5"
3375+
resolved "https://registry.npmjs.org/builder-util/-/builder-util-22.14.5.tgz"
3376+
integrity sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA==
33523377
dependencies:
33533378
"7zip-bin" "~5.1.1"
3354-
"@types/debug" "^4.1.5"
3379+
"@types/debug" "^4.1.6"
33553380
"@types/fs-extra" "^9.0.11"
3356-
app-builder-bin "3.5.13"
3381+
app-builder-bin "3.7.1"
33573382
bluebird-lst "^1.0.9"
3358-
builder-util-runtime "8.7.5"
3383+
builder-util-runtime "8.9.1"
33593384
chalk "^4.1.1"
3385+
cross-spawn "^7.0.3"
33603386
debug "^4.3.2"
33613387
fs-extra "^10.0.0"
33623388
is-ci "^3.0.0"
@@ -3365,21 +3391,23 @@ [email protected]:
33653391
stat-mode "^1.0.0"
33663392
temp-file "^3.4.0"
33673393

3368-
builder-util@22.14.5:
3369-
version "22.14.5"
3370-
resolved "https://registry.npmjs.org/builder-util/-/builder-util-22.14.5.tgz"
3371-
integrity sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA==
3394+
builder-util@23.0.2:
3395+
version "23.0.2"
3396+
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.2.tgz#da84a971076397e3a671726f4bb96f0c2214fea7"
3397+
integrity sha512-HaNHL3axNW/Ms8O1mDx3I07G+ZnZ/TKSWWvorOAPau128cdt9S+lNx5ocbx8deSaHHX4WFXSZVHh3mxlaKJNgg==
33723398
dependencies:
33733399
"7zip-bin" "~5.1.1"
33743400
"@types/debug" "^4.1.6"
33753401
"@types/fs-extra" "^9.0.11"
3376-
app-builder-bin "3.7.1"
3402+
app-builder-bin "4.0.0"
33773403
bluebird-lst "^1.0.9"
3378-
builder-util-runtime "8.9.1"
3404+
builder-util-runtime "9.0.0"
33793405
chalk "^4.1.1"
33803406
cross-spawn "^7.0.3"
33813407
debug "^4.3.2"
33823408
fs-extra "^10.0.0"
3409+
http-proxy-agent "^5.0.0"
3410+
https-proxy-agent "^5.0.0"
33833411
is-ci "^3.0.0"
33843412
js-yaml "^4.1.0"
33853413
source-map-support "^0.5.19"
@@ -4712,20 +4740,6 @@ dlv@^1.1.3:
47124740
resolved "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz"
47134741
integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
47144742

4715-
[email protected]:
4716-
version "22.11.4"
4717-
resolved "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.11.4.tgz"
4718-
integrity sha512-Qrrl/LLkN9HeoUgriUY3M4lTq0b+qYvJsf8Vxikp6JUe0d+HY8M93bGa2sBxBW1L0EQxPXAhbQAuvy06mSToAg==
4719-
dependencies:
4720-
app-builder-lib "22.11.4"
4721-
builder-util "22.11.4"
4722-
builder-util-runtime "8.7.5"
4723-
fs-extra "^10.0.0"
4724-
iconv-lite "^0.6.2"
4725-
js-yaml "^4.1.0"
4726-
optionalDependencies:
4727-
dmg-license "^1.0.9"
4728-
47294743
[email protected]:
47304744
version "22.14.5"
47314745
resolved "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.5.tgz"
@@ -4740,6 +4754,20 @@ [email protected]:
47404754
optionalDependencies:
47414755
dmg-license "^1.0.9"
47424756

4757+
[email protected]:
4758+
version "23.0.2"
4759+
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.2.tgz#06ac1a551e9b6ea2826b4b2063dc2f6fc775fd86"
4760+
integrity sha512-kfJZRKbIN6kM/Vuzrme8SGSA+M/F0VvNrSGa6idWXbqtxIbGZZMF1QxVrXJbxSayf0Jh4hPy6NUNZAfbX9/m3g==
4761+
dependencies:
4762+
app-builder-lib "23.0.2"
4763+
builder-util "23.0.2"
4764+
builder-util-runtime "9.0.0"
4765+
fs-extra "^10.0.0"
4766+
iconv-lite "^0.6.2"
4767+
js-yaml "^4.1.0"
4768+
optionalDependencies:
4769+
dmg-license "^1.0.9"
4770+
47434771
dmg-license@^1.0.9:
47444772
version "1.0.10"
47454773
resolved "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.10.tgz"
@@ -4951,17 +4979,17 @@ ejs@^3.1.6:
49514979
dependencies:
49524980
jake "^10.6.1"
49534981

4954-
electron-builder@22.11.4:
4955-
version "22.11.4"
4956-
resolved "https://registry.npmjs.org/electron-builder/-/electron-builder-22.11.4.tgz"
4957-
integrity sha512-BCy45DiP/w6Au6aYszsWc/k16Nb5ZUIP6lPaAhchlOqdfdnOiHhGZi0efx79dUoEBKx/296uaA5d8ThOEa7hiQ==
4982+
electron-builder@23.0.2:
4983+
version "23.0.2"
4984+
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.2.tgz#55982959ac91b72f397a936afba2eb989cd3fc1a"
4985+
integrity sha512-NG8ywuoHZpq6uk/2fEo9XVKBnjyGwNCnCyPxgGLdEk6xLAXr6nkF54+kqdhrDw4E8alwxc/TPHxUY3G0B8k/Dw==
49584986
dependencies:
4959-
"@types/yargs" "^16.0.1"
4960-
app-builder-lib "22.11.4"
4961-
builder-util "22.11.4"
4962-
builder-util-runtime "8.7.5"
4987+
"@types/yargs" "^17.0.1"
4988+
app-builder-lib "23.0.2"
4989+
builder-util "23.0.2"
4990+
builder-util-runtime "9.0.0"
49634991
chalk "^4.1.1"
4964-
dmg-builder "22.11.4"
4992+
dmg-builder "23.0.2"
49654993
fs-extra "^10.0.0"
49664994
is-ci "^3.0.0"
49674995
lazy-val "^1.0.5"
@@ -5025,18 +5053,17 @@ electron-osx-sign@^0.5.0:
50255053
minimist "^1.2.0"
50265054
plist "^3.0.1"
50275055

5028-
electron-[email protected]:
5029-
version "22.11.4"
5030-
resolved "https://registry.npmjs.org/electron-publish/-/electron-publish-22.11.4.tgz"
5031-
integrity sha512-Gjho2EQx822H1t0kogP++aLDw44a4KL0BpnWZQmBtvCWWnB2pbJdwDl/s8ohXGK4pNyR3lmiHjvqvpWPsX3ChA==
5056+
electron-osx-sign@^0.6.0:
5057+
version "0.6.0"
5058+
resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8"
5059+
integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==
50325060
dependencies:
5033-
"@types/fs-extra" "^9.0.11"
5034-
builder-util "22.11.4"
5035-
builder-util-runtime "8.7.5"
5036-
chalk "^4.1.1"
5037-
fs-extra "^10.0.0"
5038-
lazy-val "^1.0.5"
5039-
mime "^2.5.2"
5061+
bluebird "^3.5.0"
5062+
compare-version "^0.1.2"
5063+
debug "^2.6.8"
5064+
isbinaryfile "^3.0.2"
5065+
minimist "^1.2.0"
5066+
plist "^3.0.1"
50405067

50415068
[email protected]:
50425069
version "22.14.5"
@@ -5051,6 +5078,19 @@ [email protected]:
50515078
lazy-val "^1.0.5"
50525079
mime "^2.5.2"
50535080

5081+
[email protected]:
5082+
version "23.0.2"
5083+
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.2.tgz#aa11419ae57b847df4beb63b95e2b2a43161957c"
5084+
integrity sha512-8gMYgWqv96lc83FCm85wd+tEyxNTJQK7WKyPkNkO8GxModZqt1GO8S+/vAnFGxilS/7vsrVRXFfqiCDUCSuxEg==
5085+
dependencies:
5086+
"@types/fs-extra" "^9.0.11"
5087+
builder-util "23.0.2"
5088+
builder-util-runtime "9.0.0"
5089+
chalk "^4.1.1"
5090+
fs-extra "^10.0.0"
5091+
lazy-val "^1.0.5"
5092+
mime "^2.5.2"
5093+
50545094
[email protected]:
50555095
version "8.0.1"
50565096
resolved "https://registry.npmjs.org/electron-store/-/electron-store-8.0.1.tgz"
@@ -6527,6 +6567,15 @@ http-parser-js@>=0.5.1:
65276567
resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz"
65286568
integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
65296569

6570+
http-proxy-agent@^5.0.0:
6571+
version "5.0.0"
6572+
resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
6573+
integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
6574+
dependencies:
6575+
"@tootallnate/once" "2"
6576+
agent-base "6"
6577+
debug "4"
6578+
65306579
[email protected]:
65316580
version "0.19.1"
65326581
resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"

0 commit comments

Comments
 (0)