Skip to content

Commit dda2d0e

Browse files
Merge pull request #182 from 5k-mirrors/re-add-electron-unhandled
Re-add electron-unhandled
2 parents 22a73d7 + 09d728a commit dda2d0e

4 files changed

Lines changed: 54 additions & 0 deletions

File tree

app/main/app.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ import {
1414
devLog,
1515
} from "../shared/utils/JavaScriptUtils/JavaScriptUtils";
1616

17+
require("electron-unhandled")({
18+
showDialog: envIs("development"),
19+
});
20+
1721
let win;
1822

1923
// https://stackoverflow.com/a/52195400/9599137, https://www.electron.build/configuration/nsis#guid-vs-application-name

app/renderer/index.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import React from "react";
22
import * as ReactDOM from "react-dom";
33
import { HashRouter as Router } from "react-router-dom";
4+
45
import App from "./containers/App/App";
6+
import { envIs } from "../shared/utils/JavaScriptUtils/JavaScriptUtils";
7+
8+
require("electron-unhandled")({
9+
showDialog: envIs("development"),
10+
});
511

612
ReactDOM.render(
713
<Router>

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"async-mutex": "^0.1.3",
5050
"bottleneck": "^2.19.2",
5151
"electron-store": "^8.1.0",
52+
"electron-unhandled": "^4.0.1",
5253
"js-yaml": "^3.13.1",
5354
"moment": "^2.24.0",
5455
"node-fetch": "^2.6.1",

yarn.lock

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2707,6 +2707,11 @@ classnames@^2.2.6:
27072707
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
27082708
integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
27092709

2710+
clean-stack@^2.1.0:
2711+
version "2.2.0"
2712+
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
2713+
integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
2714+
27102715
cli-boxes@^2.2.0:
27112716
version "2.2.0"
27122717
resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
@@ -3523,6 +3528,11 @@ electron-devtools-installer@^3.2.0:
35233528
tslib "^2.1.0"
35243529
unzip-crx-3 "^0.2.0"
35253530

3531+
electron-is-dev@^2.0.0:
3532+
version "2.0.0"
3533+
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd"
3534+
integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA==
3535+
35263536
electron-publish@22.9.1:
35273537
version "22.9.1"
35283538
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz#7cc76ac4cc53efd29ee31c1e5facb9724329068e"
@@ -3550,6 +3560,17 @@ electron-to-chromium@^1.3.571:
35503560
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.583.tgz#47a9fde74740b1205dba96db2e433132964ba3ee"
35513561
integrity sha512-L9BwLwJohjZW9mQESI79HRzhicPk1DFgM+8hOCfGgGCFEcA3Otpv7QK6SGtYoZvfQfE3wKLh0Hd5ptqUFv3gvQ==
35523562

3563+
electron-unhandled@^4.0.1:
3564+
version "4.0.1"
3565+
resolved "https://registry.yarnpkg.com/electron-unhandled/-/electron-unhandled-4.0.1.tgz#82bbcb5ee5423f611f6122e006bf4842dfd7c908"
3566+
integrity sha512-6BsLnBg+i96eUnbaIFZyYdyfNX3f80/Nlfqy34YEMxXT9JP3ddNsNnUeiOF8ezN4+et4t4D37gjghKTP0V3jyw==
3567+
dependencies:
3568+
clean-stack "^2.1.0"
3569+
electron-is-dev "^2.0.0"
3570+
ensure-error "^2.0.0"
3571+
lodash.debounce "^4.0.8"
3572+
serialize-error "^8.1.0"
3573+
35533574
electron@^19.0.10:
35543575
version "19.0.10"
35553576
resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.10.tgz#4d2f03f307fbb70a295ff419112130b75661eda9"
@@ -3597,6 +3618,11 @@ enquirer@^2.3.4:
35973618
dependencies:
35983619
ansi-colors "^4.1.1"
35993620

3621+
ensure-error@^2.0.0:
3622+
version "2.1.0"
3623+
resolved "https://registry.yarnpkg.com/ensure-error/-/ensure-error-2.1.0.tgz#f11fbe383c0cf4a54850ac77acceb7bc06e0f99d"
3624+
integrity sha512-+BMSJHw9gxiJAAp2ZR1E0TNcL09dD3lOvkl7WVm4+Y6xnes/pMetP/TzCHiDduh8ihNDjbGfuYxl7l4PA1xZ8A==
3625+
36003626
entities@^1.1.1, entities@~1.1.1:
36013627
version "1.1.2"
36023628
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -6085,6 +6111,11 @@ lodash.camelcase@^4.3.0:
60856111
version "4.3.0"
60866112
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
60876113

6114+
lodash.debounce@^4.0.8:
6115+
version "4.0.8"
6116+
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
6117+
integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
6118+
60886119
lodash.escape@^4.0.1:
60896120
version "4.0.1"
60906121
resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
@@ -8111,6 +8142,13 @@ serialize-error@^7.0.1:
81118142
dependencies:
81128143
type-fest "^0.13.1"
81138144

8145+
serialize-error@^8.1.0:
8146+
version "8.1.0"
8147+
resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-8.1.0.tgz#3a069970c712f78634942ddd50fbbc0eaebe2f67"
8148+
integrity sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==
8149+
dependencies:
8150+
type-fest "^0.20.2"
8151+
81148152
serialize-javascript@^5.0.1:
81158153
version "5.0.1"
81168154
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
@@ -8832,6 +8870,11 @@ type-fest@^0.13.1:
88328870
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
88338871
integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
88348872

8873+
type-fest@^0.20.2:
8874+
version "0.20.2"
8875+
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
8876+
integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
8877+
88358878
type-fest@^0.8.1:
88368879
version "0.8.1"
88378880
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"

0 commit comments

Comments
 (0)