Skip to content

Commit 5417766

Browse files
committed
fix(desktop): try to fix windows builds
1 parent 292388c commit 5417766

File tree

4 files changed

+25
-22
lines changed

4 files changed

+25
-22
lines changed

desktop/main/app/package.json

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"@ulixee/platform-specification": "2.0.0-alpha.22",
2121
"@ulixee/sidechain": "2.0.0-alpha.22",
2222
"@ulixee/specification": "2.0.0-alpha.22",
23-
"electron-log": "^4.4.6",
24-
"electron-updater": "^5.0.1",
23+
"electron-log": "^4.4.8",
24+
"electron-updater": "^5.3.0",
2525
"nanoid": "^3.3.6",
2626
"node-static": "^0.7.11",
2727
"tslib": "^2.3.1",
@@ -35,19 +35,5 @@
3535
"devDependencies": {
3636
"electron": "24.1.3",
3737
"electron-builder": "^24.3.0"
38-
},
39-
"workspaces": {
40-
"nohoist": [
41-
"**/electron",
42-
"**/electron-webpack",
43-
"**/electron-webpack/**",
44-
"**/@ulixee/datastore-docpage",
45-
"electron-positioner",
46-
"global-mouse-events",
47-
"nseventmonitor",
48-
"electron-updater",
49-
"better-sqlite3",
50-
"electron-clipboard-ex"
51-
]
5238
}
5339
}

desktop/main/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"@ulixee/datastore": "2.0.0-alpha.22",
3434
"@ulixee/datastore-packager": "2.0.0-alpha.22",
3535
"cross-env": "^7.0.3",
36-
"electron": "24.1.3",
37-
"electron-builder": "^24.3.0",
38-
"tslib": "^2.3.1"
36+
"electron": "25.1.0",
37+
"electron-builder": "^24.4.0",
38+
"tslib": "^2.5.3"
3939
},
4040
"build": {
4141
"appId": "dev.ulixee.desktop",

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,12 @@
8383
"**/@electron",
8484
"**/@electron/**",
8585
"**/electron",
86+
"**/desktop/**/@ulixee/datastore-docpage",
87+
"**/desktop/**/better-sqlite3",
8688
"**/electron-*",
8789
"**/electron-builder",
8890
"**/electron-webpack/**",
91+
"**/electron-updater",
8992
"**/nseventmonitor",
9093
"**/global-mouse-events",
9194
"**/electron-clipboard-ex",

yarn.lock

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6678,7 +6678,7 @@ ejs@^3.1.8:
66786678
dependencies:
66796679
jake "^10.8.5"
66806680

6681-
electron-builder@^24.3.0:
6681+
electron-builder@^24.3.0, electron-builder@^24.4.0:
66826682
version "24.4.0"
66836683
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.4.0.tgz#8846efa45bac8f6b9afc181abf71a4e12530f045"
66846684
integrity sha512-D5INxodxaUIJgEX6p/fqBd8wQNS8XRAToNIJ9SQC+taNS5D73ZsjLuXiRraFGCB0cVk9KeKhEkdEOH5AaVya4g==
@@ -6703,7 +6703,7 @@ electron-clipboard-ex@^1.3.3:
67036703
node-addon-api "^4.0.0"
67046704
node-gyp-build "^4.2.3"
67056705

6706-
electron-log@^4.4.6:
6706+
electron-log@^4.4.8:
67076707
version "4.4.8"
67086708
resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.8.tgz#fcb9f714dbcaefb6ac7984c4683912c74730248a"
67096709
integrity sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA==
@@ -6726,7 +6726,7 @@ electron-to-chromium@^1.4.411:
67266726
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.418.tgz#9092aca12db25acf02a2ddf9de59f0e4363c9928"
67276727
integrity sha512-1KnpDTS9onwAfMzW50LcpNtyOkMyjd/OLoD2Kx/DDITZqgNYixY71XNszPHNxyQQ/Brh+FDcUnf4BaM041sdWg==
67286728

6729-
electron-updater@^5.0.1:
6729+
electron-updater@^5.3.0:
67306730
version "5.3.0"
67316731
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-5.3.0.tgz#3ba0d20407911a2edc5a68bee45c5aa2023e9ff8"
67326732
integrity sha512-iKEr7yQBcvnQUPnSDYGSWC9t0eF2YbZWeYYYZzYxdl+HiRejXFENjYMnYjoOm2zxyD6Cr2JTHZhp9pqxiXuCOw==
@@ -6750,6 +6750,15 @@ electron@24.1.3:
67506750
"@types/node" "^18.11.18"
67516751
extract-zip "^2.0.1"
67526752

6753+
electron@25.1.0:
6754+
version "25.1.0"
6755+
resolved "https://registry.yarnpkg.com/electron/-/electron-25.1.0.tgz#78c79aba4bef941217c337dca46745b5551b5735"
6756+
integrity sha512-VKk4G/0euO7ysMKQKHXmI4d3/qR4uHsAtVFXK2WfQUVxBmc160OAm2R6PN9/EXmgXEioKQBtbc2/lvWyYpDbuA==
6757+
dependencies:
6758+
"@electron/get" "^2.0.0"
6759+
"@types/node" "^18.11.18"
6760+
extract-zip "^2.0.1"
6761+
67536762
emittery@^0.13.1:
67546763
version "0.13.1"
67556764
resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
@@ -15043,6 +15052,11 @@ tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.5.0:
1504315052
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.2.tgz#1b6f07185c881557b0ffa84b111a0106989e8338"
1504415053
integrity sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==
1504515054

15055+
tslib@^2.5.3:
15056+
version "2.5.3"
15057+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
15058+
integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
15059+
1504615060
tsscmp@1.0.6:
1504715061
version "1.0.6"
1504815062
resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"

0 commit comments

Comments
 (0)