Skip to content

Commit 6657be6

Browse files
Merge pull request #138 from RedisInsight/update_electron_version
Update electron version
2 parents 885d310 + f9380d4 commit 6657be6

File tree

2 files changed

+87
-72
lines changed

2 files changed

+87
-72
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
"cross-env": "^7.0.2",
168168
"css-loader": "^5.0.1",
169169
"css-minimizer-webpack-plugin": "^1.2.0",
170-
"electron": "^15.3.1",
171-
"electron-builder": "^22.14.5",
170+
"electron": "^16.0.5",
171+
"electron-builder": "^22.14.10",
172172
"electron-builder-notarize": "^1.2.0",
173173
"electron-debug": "^3.1.0",
174174
"electron-devtools-installer": "^3.2.0",
@@ -236,7 +236,7 @@
236236
"electron-context-menu": "^3.1.0",
237237
"electron-log": "^4.2.4",
238238
"electron-store": "^8.0.0",
239-
"electron-updater": "4.6.1",
239+
"electron-updater": "4.6.5",
240240
"formik": "^2.2.9",
241241
"html-entities": "^2.3.2",
242242
"html-react-parser": "^1.2.4",
@@ -245,14 +245,14 @@
245245
"react-contenteditable": "^3.3.5",
246246
"react-dom": "^17.0.1",
247247
"react-hotkeys-hook": "^3.3.1",
248+
"react-jsx-parser": "^1.28.4",
248249
"react-monaco-editor": "^0.44.0",
249250
"react-redux": "^7.2.2",
250-
"react-jsx-parser": "^1.28.4",
251251
"react-router-dom": "^5.2.0",
252252
"react-virtualized": "^9.22.2",
253+
"rehype-stringify": "^9.0.2",
253254
"remark-parse": "^10.0.1",
254255
"remark-rehype": "^10.0.1",
255-
"rehype-stringify": "^9.0.2",
256256
"unified": "^10.1.1",
257257
"unist-util-visit": "^4.1.0"
258258
},

yarn.lock

Lines changed: 82 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,9 +1203,9 @@
12031203
vfile "^4.2.0"
12041204

12051205
"@electron/get@^1.13.0":
1206-
version "1.13.0"
1207-
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c"
1208-
integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ==
1206+
version "1.13.1"
1207+
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
1208+
integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
12091209
dependencies:
12101210
debug "^4.1.1"
12111211
env-paths "^2.2.0"
@@ -1215,7 +1215,7 @@
12151215
semver "^6.2.0"
12161216
sumchecker "^3.0.1"
12171217
optionalDependencies:
1218-
global-agent "^2.0.2"
1218+
global-agent "^3.0.0"
12191219
global-tunnel-ng "^2.7.1"
12201220

12211221
"@electron/[email protected]":
@@ -1723,6 +1723,11 @@
17231723
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
17241724
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
17251725

1726+
"@tootallnate/once@2":
1727+
version "2.0.0"
1728+
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
1729+
integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
1730+
17261731
"@types/anymatch@*":
17271732
version "1.3.1"
17281733
resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
@@ -2056,9 +2061,9 @@
20562061
integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==
20572062

20582063
"@types/node@^14.6.2":
2059-
version "14.14.34"
2060-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.34.tgz#07935194fc049069a1c56c0c274265abeddf88da"
2061-
integrity sha512-dBPaxocOK6UVyvhbnpFIj2W+S+1cBTkHQbFQfeeJhoKFbzYcVUGHvddeWPSucKATb3F0+pgDq0i6ghEaZjsugA==
2064+
version "14.18.2"
2065+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.2.tgz#00fe4d1686d5f6cf3a2f2e9a0eef42594d06abfc"
2066+
integrity sha512-fqtSN5xn/bBzDxMT77C1rJg6CsH/R49E7qsGuvdPJa20HtV5zSTuLJPNfnlyVH3wauKnkHdLggTVkOW/xP9oQg==
20622067

20632068
"@types/normalize-package-data@^2.4.0":
20642069
version "2.4.1"
@@ -2980,24 +2985,24 @@ [email protected]:
29802985
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz#cb0825c5e12efc85b196ac3ed9c89f076c61040e"
29812986
integrity sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==
29822987

2983-
2984-
version "22.14.5"
2985-
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.5.tgz#a61a50b132b858e98fdc70b6b88994ae99b4f96d"
2986-
integrity sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg==
2988+
2989+
version "22.14.10"
2990+
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.10.tgz#00a4017902c792c84405b1b47732c3da258e61d4"
2991+
integrity sha512-5g/0CztD/+OL3V6PH+hV5MeFDg1V827PoyPEnAzz4fXXhCzoBwDanyqKH9b7JwfHkLO6JqH5Des28qET3LkENg==
29872992
dependencies:
29882993
"7zip-bin" "~5.1.1"
29892994
"@develar/schema-utils" "~2.6.5"
29902995
"@electron/universal" "1.0.5"
29912996
"@malept/flatpak-bundler" "^0.4.0"
29922997
async-exit-hook "^2.0.1"
29932998
bluebird-lst "^1.0.9"
2994-
builder-util "22.14.5"
2995-
builder-util-runtime "8.9.1"
2999+
builder-util "22.14.7"
3000+
builder-util-runtime "8.9.2"
29963001
chromium-pickle-js "^0.2.0"
29973002
debug "^4.3.2"
29983003
ejs "^3.1.6"
29993004
electron-osx-sign "^0.5.0"
3000-
electron-publish "22.14.5"
3005+
electron-publish "22.14.7"
30013006
form-data "^4.0.0"
30023007
fs-extra "^10.0.0"
30033008
hosted-git-info "^4.0.2"
@@ -3526,9 +3531,9 @@ boolbase@^1.0.0, boolbase@~1.0.0:
35263531
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
35273532

35283533
boolean@^3.0.1:
3529-
version "3.0.2"
3530-
resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570"
3531-
integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==
3534+
version "3.1.4"
3535+
resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz#f51a2fb5838a99e06f9b6ec1edb674de67026435"
3536+
integrity sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w==
35323537

35333538
boxen@^5.0.0:
35343539
version "5.1.2"
@@ -3741,29 +3746,31 @@ buffer@^5.1.0, buffer@^5.5.0:
37413746
base64-js "^1.3.1"
37423747
ieee754 "^1.1.13"
37433748

3744-
3745-
version "8.9.1"
3746-
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz#25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a"
3747-
integrity sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==
3749+
3750+
version "8.9.2"
3751+
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28"
3752+
integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==
37483753
dependencies:
37493754
debug "^4.3.2"
37503755
sax "^1.2.4"
37513756

3752-
3753-
version "22.14.5"
3754-
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz#42a18608d2a566c0846e91266464776c8bfb0cc9"
3755-
integrity sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA==
3757+
3758+
version "22.14.7"
3759+
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.7.tgz#bb445f6102ccab4e4fdc8dd57de9dda9bb672666"
3760+
integrity sha512-M8ql8WPW/P9UKsF00YZjiP5h29MYrJ3svJx5suszC5EGwIdAztIhFyXoXKI3hPtDaR5b6EoWD9nLa5/Gr+QToQ==
37563761
dependencies:
37573762
"7zip-bin" "~5.1.1"
37583763
"@types/debug" "^4.1.6"
37593764
"@types/fs-extra" "^9.0.11"
37603765
app-builder-bin "3.7.1"
37613766
bluebird-lst "^1.0.9"
3762-
builder-util-runtime "8.9.1"
3767+
builder-util-runtime "8.9.2"
37633768
chalk "^4.1.1"
37643769
cross-spawn "^7.0.3"
37653770
debug "^4.3.2"
37663771
fs-extra "^10.0.0"
3772+
http-proxy-agent "^5.0.0"
3773+
https-proxy-agent "^5.0.0"
37673774
is-ci "^3.0.0"
37683775
js-yaml "^4.1.0"
37693776
source-map-support "^0.5.19"
@@ -4515,9 +4522,9 @@ conf@^10.0.0:
45154522
semver "^7.3.5"
45164523

45174524
config-chain@^1.1.11:
4518-
version "1.1.12"
4519-
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
4520-
integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
4525+
version "1.1.13"
4526+
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
4527+
integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
45214528
dependencies:
45224529
ini "^1.3.4"
45234530
proto-list "~1.2.1"
@@ -5273,14 +5280,14 @@ dir-glob@^3.0.1:
52735280
dependencies:
52745281
path-type "^4.0.0"
52755282

5276-
5277-
version "22.14.5"
5278-
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz#137c0b55e639badcc0b119eb060e6fa4ed61d948"
5279-
integrity sha512-1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w==
5283+
5284+
version "22.14.10"
5285+
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.10.tgz#34b7aa5645a17244096928af418f43b649ca9071"
5286+
integrity sha512-DMLdhVNvIEBo0tzODoFalbdahIxlNXDL4JmxjwGYS69csPTqg0ev+6GOMgWmXhvrdEyN8hQWl1kTFjM/jZ+qBA==
52805287
dependencies:
5281-
app-builder-lib "22.14.5"
5282-
builder-util "22.14.5"
5283-
builder-util-runtime "8.9.1"
5288+
app-builder-lib "22.14.10"
5289+
builder-util "22.14.7"
5290+
builder-util-runtime "8.9.2"
52845291
fs-extra "^10.0.0"
52855292
iconv-lite "^0.6.2"
52865293
js-yaml "^4.1.0"
@@ -5509,17 +5516,17 @@ electron-builder-notarize@^1.2.0:
55095516
js-yaml "^3.14.0"
55105517
read-pkg-up "^7.0.0"
55115518

5512-
electron-builder@^22.14.5:
5513-
version "22.14.5"
5514-
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz#3a25547bd4fe3728d4704da80956a794c5c31496"
5515-
integrity sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg==
5519+
electron-builder@^22.14.10:
5520+
version "22.14.10"
5521+
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.10.tgz#6d43748af311624a5e771d1ae2c2b85d63edc67a"
5522+
integrity sha512-IGYziKc3/nz6P/HhsO6ls2ACIvkMOHUu5jKw+h4g/muT2iBUSNCuyh20VuLQnmR5ggo8uGVuv485GtJc/HP8ig==
55165523
dependencies:
55175524
"@types/yargs" "^17.0.1"
5518-
app-builder-lib "22.14.5"
5519-
builder-util "22.14.5"
5520-
builder-util-runtime "8.9.1"
5525+
app-builder-lib "22.14.10"
5526+
builder-util "22.14.7"
5527+
builder-util-runtime "8.9.2"
55215528
chalk "^4.1.1"
5522-
dmg-builder "22.14.5"
5529+
dmg-builder "22.14.10"
55235530
fs-extra "^10.0.0"
55245531
is-ci "^3.0.0"
55255532
lazy-val "^1.0.5"
@@ -5613,14 +5620,14 @@ electron-osx-sign@^0.5.0:
56135620
minimist "^1.2.0"
56145621
plist "^3.0.1"
56155622

5616-
5617-
version "22.14.5"
5618-
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz#34bcdce671f0e651330db20040d6919c77c94bd6"
5619-
integrity sha512-h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg==
5623+
5624+
version "22.14.7"
5625+
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.7.tgz#5fb3a4278fdb7873c5a282152b909fe9814a4102"
5626+
integrity sha512-sqZX/64k0B7sQeaDzFDE6m7r2zOtFgdmWAFnkv10bLlbHagkH9AkwwcjiGBpIto7mUBp89ntL7Ij5QFvldqI4Q==
56205627
dependencies:
56215628
"@types/fs-extra" "^9.0.11"
5622-
builder-util "22.14.5"
5623-
builder-util-runtime "8.9.1"
5629+
builder-util "22.14.7"
5630+
builder-util-runtime "8.9.2"
56245631
chalk "^4.1.1"
56255632
fs-extra "^10.0.0"
56265633
lazy-val "^1.0.5"
@@ -5657,24 +5664,24 @@ electron-to-chromium@^1.3.857:
56575664
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.859.tgz#4e0abc918e1c22b306ba13b4c3649f78295f5937"
56585665
integrity sha512-gXRXKNWedfdiKIzwr0Mg/VGCvxXzy+4SuK9hp1BDvfbCwx0O5Ot+2f4CoqQkqEJ3Zj/eAV/GoAFgBVFgkBLXuQ==
56595666

5660-
5661-
version "4.6.1"
5662-
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.1.tgz#80ca805c4f51b2e682aac29d18fed75d6a533d32"
5663-
integrity sha512-YsU1mHqXLrXXmBMsxhxy24PrbaB8rnpZDPmFa2gOkTYk/Ch13+R0fjsRSpPYvqtskVVY0ux8fu+HnUkVkqc7og==
5667+
5668+
version "4.6.5"
5669+
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d"
5670+
integrity sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==
56645671
dependencies:
56655672
"@types/semver" "^7.3.6"
5666-
builder-util-runtime "8.9.1"
5673+
builder-util-runtime "8.9.2"
56675674
fs-extra "^10.0.0"
56685675
js-yaml "^4.1.0"
56695676
lazy-val "^1.0.5"
56705677
lodash.escaperegexp "^4.1.2"
56715678
lodash.isequal "^4.5.0"
56725679
semver "^7.3.5"
56735680

5674-
electron@^15.3.1:
5675-
version "15.3.1"
5676-
resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.1.tgz#38ce9dfcd4ec51a33d62de23de15fb5ceeaea25d"
5677-
integrity sha512-6/qp3Dor7HSGq28qhJEVD1zBFZoWicmo3/ZLvo7rhXPPZFwEMSJGPMEZM9WYSfWW4t/OozpWNuuDe970cF7g2Q==
5681+
electron@^16.0.5:
5682+
version "16.0.5"
5683+
resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.5.tgz#16394c196e42215a82da1f4f39a3f757caf33cb1"
5684+
integrity sha512-TgQXWmEGQ3uH2P2JDq5GyJDEu/fimRgqp1iNisARtGreU1k3630PqWlR+4SPnSEHN9NuSv92ng6NWxtefeFzxg==
56785685
dependencies:
56795686
"@electron/get" "^1.13.0"
56805687
"@types/node" "^14.6.2"
@@ -6997,13 +7004,12 @@ glob@~7.1.1:
69977004
once "^1.3.0"
69987005
path-is-absolute "^1.0.0"
69997006

7000-
global-agent@^2.0.2:
7001-
version "2.1.12"
7002-
resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
7003-
integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==
7007+
global-agent@^3.0.0:
7008+
version "3.0.0"
7009+
resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
7010+
integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
70047011
dependencies:
70057012
boolean "^3.0.1"
7006-
core-js "^3.6.5"
70077013
es6-error "^4.1.1"
70087014
matcher "^3.0.0"
70097015
roarr "^2.15.3"
@@ -7055,9 +7061,9 @@ globals@^13.6.0:
70557061
type-fest "^0.20.2"
70567062

70577063
globalthis@^1.0.1:
7058-
version "1.0.1"
7059-
resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
7060-
integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==
7064+
version "1.0.2"
7065+
resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b"
7066+
integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==
70617067
dependencies:
70627068
define-properties "^1.1.3"
70637069

@@ -7625,6 +7631,15 @@ http-proxy-agent@^4.0.1:
76257631
agent-base "6"
76267632
debug "4"
76277633

7634+
http-proxy-agent@^5.0.0:
7635+
version "5.0.0"
7636+
resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
7637+
integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
7638+
dependencies:
7639+
"@tootallnate/once" "2"
7640+
agent-base "6"
7641+
debug "4"
7642+
76287643
76297644
version "0.19.1"
76307645
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"

0 commit comments

Comments
 (0)