Skip to content

Commit b382476

Browse files
committed
updated electron, added react-webcam & qrcode-decoder deps
1 parent 06071ec commit b382476

File tree

2 files changed

+60
-18
lines changed

2 files changed

+60
-18
lines changed

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@
187187
"cross-spawn": "^7.0.1",
188188
"css-loader": "^3.2.1",
189189
"detect-port": "^1.3.0",
190-
"electron": "^7.1.3",
191190
"electron-builder": "^21.2.0",
192191
"electron-devtools-installer": "^2.2.4",
193192
"enzyme": "^3.7.0",
@@ -251,6 +250,7 @@
251250
"bootstrap": "^4.3.1",
252251
"crypto": "^1.0.1",
253252
"devtron": "^1.4.0",
253+
"electron": "^7.1.7",
254254
"electron-debug": "^3.0.1",
255255
"electron-dl": "^1.13.0",
256256
"electron-log": "^3.0.1",
@@ -267,6 +267,7 @@
267267
"node-fetch": "^2.3.0",
268268
"popper.js": "^1.14.6",
269269
"ps-node": "^0.1.6",
270+
"qrcode-decoder": "^0.1.2",
270271
"qrcode.react": "^1.0.0",
271272
"react": "^16.6.3",
272273
"react-bootstrap": "^1.0.0-beta.5",
@@ -277,6 +278,7 @@
277278
"react-redux": "^7.1.3",
278279
"react-router": "^5.1.2",
279280
"react-router-dom": "^5.1.2",
281+
"react-webcam": "^4.0.0",
280282
"redux": "^4.0.1",
281283
"redux-thunk": "^2.3.0",
282284
"sjcl": "^1.0.8",

yarn.lock

Lines changed: 57 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,16 +1024,16 @@
10241024
ajv-keywords "^3.1.0"
10251025

10261026
"@electron/get@^1.0.1":
1027-
version "1.7.1"
1028-
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.7.1.tgz#41aa60871b9d7e225bbe68135012f88a9ef87012"
1029-
integrity sha512-+BOIzkmYbe+oOBGqSByq8zXYXCFztccoymR3uNkvX5ckJ/5xU+4peVyEvFyH6+zfv58hCo99RxgIpwuaMfRtRg==
1027+
version "1.7.2"
1028+
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.7.2.tgz#286436a9fb56ff1a1fcdf0e80131fd65f4d1e0fd"
1029+
integrity sha512-LSE4LZGMjGS9TloDx0yO44D2UTbaeKRk+QjlhWLiQlikV6J4spgDCjb6z4YIcqmPAwNzlNCnWF4dubytwI+ATA==
10301030
dependencies:
10311031
debug "^4.1.1"
10321032
env-paths "^2.2.0"
10331033
fs-extra "^8.1.0"
10341034
got "^9.6.0"
10351035
sanitize-filename "^1.6.2"
1036-
sumchecker "^3.0.0"
1036+
sumchecker "^3.0.1"
10371037
optionalDependencies:
10381038
global-agent "^2.0.2"
10391039
global-tunnel-ng "^2.7.1"
@@ -1468,7 +1468,7 @@
14681468
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
14691469
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
14701470

1471-
"@types/node@*", "@types/node@>= 8", "@types/node@^12.0.12":
1471+
"@types/node@*", "@types/node@>= 8":
14721472
version "12.12.14"
14731473
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
14741474
integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
@@ -1478,6 +1478,11 @@
14781478
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.6.tgz#1aaabd6f6470a6ac3824ab1e94d731ca1326d93d"
14791479
integrity sha512-0a2X6cgN3RdPBL2MIlR6Lt0KlM7fOFsutuXcdglcOq6WvLnYXgPQSh0Mx6tO1KCAE8MxbHSOSTWDoUxRq+l3DA==
14801480

1481+
"@types/node@^12.0.12":
1482+
version "12.12.22"
1483+
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.22.tgz#b8d9eae3328b96910a373cf06ac8d3c5abe9c200"
1484+
integrity sha512-r5i93jqbPWGXYXxianGATOxTelkp6ih/U0WVnvaqAvTqM+0U6J3kw6Xk6uq/dWNRkEVw/0SLcO5ORXbVNz4FMQ==
1485+
14811486
"@types/normalize-package-data@^2.4.0":
14821487
version "2.4.0"
14831488
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -2930,6 +2935,15 @@ babel-plugin-transform-strict-mode@^6.24.1:
29302935
babel-runtime "^6.22.0"
29312936
babel-types "^6.24.1"
29322937

2938+
babel-polyfill@^6.26.0:
2939+
version "6.26.0"
2940+
resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
2941+
integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
2942+
dependencies:
2943+
babel-runtime "^6.26.0"
2944+
core-js "^2.5.0"
2945+
regenerator-runtime "^0.10.5"
2946+
29332947
babel-preset-env@^1.1.8:
29342948
version "1.7.0"
29352949
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
@@ -4361,11 +4375,16 @@ core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.6.5:
43614375
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
43624376
integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
43634377

4364-
core-js@^3.1.3, core-js@^3.4.1:
4378+
core-js@^3.1.3:
43654379
version "3.4.7"
43664380
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.7.tgz#57c35937da80fe494fbc3adcf9cf3dc00eb86b34"
43674381
integrity sha512-qaPVGw30J1wQ0GR3GvoPqlGf9GZfKKF4kFC7kiHlcsPTqH3txrs9crCp3ZiMAXuSenhz89Jnl4GZs/67S5VOSg==
43684382

4383+
core-js@^3.4.1:
4384+
version "3.6.1"
4385+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.1.tgz#39d5e2e346258cc01eb7d44345b1c3c014ca3f05"
4386+
integrity sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ==
4387+
43694388
core-util-is@1.0.2, core-util-is@~1.0.0:
43704389
version "1.0.2"
43714390
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -5449,10 +5468,10 @@ electron-updater@^4.0.0:
54495468
pako "^1.0.10"
54505469
semver "^6.3.0"
54515470

5452-
electron@^7.1.3:
5453-
version "7.1.3"
5454-
resolved "https://registry.yarnpkg.com/electron/-/electron-7.1.3.tgz#9f6779846ced5b145b6303f10dcf4bf7f84e7f27"
5455-
integrity sha512-FdzGNR/tX0kC53lQnL7K+ZrxwrxKHf9i8KdL+O2LF5yXHJ3M8oZWc0OM1+nfqQUWCBoBV+7UblMF0+6E/tplEg==
5471+
electron@^7.1.7:
5472+
version "7.1.7"
5473+
resolved "https://registry.yarnpkg.com/electron/-/electron-7.1.7.tgz#520e2bc422e3dfd4bae166dd3be62101f2cbdc52"
5474+
integrity sha512-aCLJ4BJwnvOckJgovNul22AYlMFDzm4S4KqKCG2iBlFJyMHBxXAKFKMsgYd40LBZWS3hcY6RHpaYjHSAPLS1pw==
54565475
dependencies:
54575476
"@electron/get" "^1.0.1"
54585477
"@types/node" "^12.0.12"
@@ -7019,13 +7038,11 @@ globals@^9.18.0:
70197038
integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
70207039

70217040
globalthis@^1.0.0:
7022-
version "1.0.0"
7023-
resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.0.tgz#c5fb98213a9b4595f59cf3e7074f141b4169daae"
7024-
integrity sha512-vcCAZTJ3r5Qcu5l8/2oyVdoFwxKgfYnMTR2vwWeux/NAVZK3PwcMaWkdUIn4GJbmKuRK7xcvDsLuK+CKcXyodg==
7041+
version "1.0.1"
7042+
resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
7043+
integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==
70257044
dependencies:
7026-
define-properties "^1.1.2"
7027-
function-bind "^1.1.1"
7028-
object-keys "^1.0.12"
7045+
define-properties "^1.1.3"
70297046

70307047
globby@^10.0.1:
70317048
version "10.0.1"
@@ -8934,6 +8951,11 @@ jsprim@^1.2.2:
89348951
json-schema "0.2.3"
89358952
verror "1.10.0"
89368953

8954+
jsqr@^1.1.1:
8955+
version "1.2.0"
8956+
resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-1.2.0.tgz#f93fc65fa7d1ded78b1bcb020fa044352b04261a"
8957+
integrity sha512-wKcQS9QC2VHGk7aphWCp1RrFyC0CM6fMgC5prZZ2KV/Lk6OKNoCod9IR6bao+yx3KPY0gZFC5dc+h+KFzCI0Wg==
8958+
89378959
jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3:
89388960
version "2.2.3"
89398961
resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"
@@ -11704,6 +11726,14 @@ qr.js@0.0.0:
1170411726
resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
1170511727
integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
1170611728

11729+
qrcode-decoder@^0.1.2:
11730+
version "0.1.2"
11731+
resolved "https://registry.yarnpkg.com/qrcode-decoder/-/qrcode-decoder-0.1.2.tgz#ad306254e84403ca157b373682b885af6059155c"
11732+
integrity sha512-//e4yWO9UUTLxULH3SOXcuNhw95USDhJQHrT5ncjDg9XkoeBFZrYE6Xr4C8TRcLcxkVTfh+BIXhhQohxodw4NQ==
11733+
dependencies:
11734+
babel-polyfill "^6.26.0"
11735+
jsqr "^1.1.1"
11736+
1170711737
qrcode-terminal@^0.10.0:
1170811738
version "0.10.0"
1170911739
resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.10.0.tgz#a76a48e2610a18f97fa3a2bd532b682acff86c53"
@@ -11999,6 +12029,11 @@ react-transition-group@^4.0.0:
1199912029
loose-envify "^1.4.0"
1200012030
prop-types "^15.6.2"
1200112031

12032+
react-webcam@^4.0.0:
12033+
version "4.0.0"
12034+
resolved "https://registry.yarnpkg.com/react-webcam/-/react-webcam-4.0.0.tgz#137493ba35e581ba3ba4b3a520204587b979214b"
12035+
integrity sha512-6V7wMX4NhT8bYkjd9G+HcS1EkU2LJgIZ/0oiqLpQJ78LxMX1Oo8ZxbAtR28NuEWnVVh9YlvgNdTKydL8Mjy0Vw==
12036+
1200212037
react@^16.6.3:
1200312038
version "16.12.0"
1200412039
resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
@@ -12223,6 +12258,11 @@ regenerate@^1.2.1, regenerate@^1.4.0:
1222312258
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
1222412259
integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
1222512260

12261+
regenerator-runtime@^0.10.5:
12262+
version "0.10.5"
12263+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
12264+
integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
12265+
1222612266
regenerator-runtime@^0.11.0:
1222712267
version "0.11.1"
1222812268
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -13735,7 +13775,7 @@ sumchecker@^2.0.2:
1373513775
dependencies:
1373613776
debug "^2.2.0"
1373713777

13738-
sumchecker@^3.0.0:
13778+
sumchecker@^3.0.1:
1373913779
version "3.0.1"
1374013780
resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42"
1374113781
integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==

0 commit comments

Comments
 (0)