mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-02-27 02:21:23 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fix generated app sometimes keeps loading forever on Windows (#193)

Browse source
This commit is contained in:
Quang Lam 2020-04-14 20:02:35 +07:00 • committed by GitHub
parent 4042b12a7a
commit 1e33009e60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -19,7 +19,7 @@ The license:
- Permits uses on all of the devices you own (regardless of platforms or operating systems).
### Source Code
On the other hand, **the source code is freely available** for use, modification and distribution under the permissions, limitations, & conditions listed in the [Mozilla Public License 2.0](LICENSE).
On the other hand, **the source code is freely available** for use, modification and distribution under the permissions, limitations and conditions listed in the [Mozilla Public License 2.0](LICENSE).
---

6
package.json
View file

@ -28,7 +28,7 @@
"@cliqz/adblocker-electron": "1.14.1",
"cheerio": "1.0.0-rc.3",
"download": "8.0.0",
"electron-context-menu": "0.16.0",
"electron-context-menu": "1.0.0",
"electron-is-dev": "1.2.0",
"electron-settings": "3.2.0",
"electron-updater": "4.2.5",
@ -40,7 +40,7 @@
"menubar": "8.0.1",
"node-fetch": "2.6.0",
"proxy-agent": "3.1.1",
"semver": "7.2.2",
"semver": "7.3.0",
"tmp": "0.1.0",
"uuid": "7.0.3"
},
@ -58,7 +58,7 @@
"concurrently": "5.1.0",
"cross-env": "7.0.2",
"date-fns": "2.12.0",
"electron": "8.2.1",
"electron": "8.2.2",
"electron-builder": "22.4.1",
"electron-notarize": "0.3.0",
"eslint": "6.8.0",

17
public/windows/main.js
View file

@ -208,16 +208,15 @@ const createAsync = () => {
}
});
return new Promise((resolve) => {
win.once('ready-to-show', () => {
resolve();
if (!wasOpenedAsHidden) {
win.show();
}
});
win.loadURL(REACT_PATH);
win.once('ready-to-show', () => {
if (!wasOpenedAsHidden) {
win.show();
}
});
win.loadURL(REACT_PATH);
return Promise.resolve();
};
const show = () => {

53
yarn.lock
View file

@ -5414,23 +5414,23 @@ electron-builder@22.4.1:
update-notifier "^4.1.0"
yargs "^15.1.0"
electron-context-menu@0.16.0:
version "0.16.0"
resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-0.16.0.tgz#4f53b4640e321f536415a625505a908518f5dff7"
integrity sha512-lGr1/nRlNGmU8THc0hl2dYEB5bwXJpsi7vCjjsnsNGJKPZZLY8nHY3xvtjdtwKocErvp1h8wUb19moWenzoGPw==
electron-context-menu@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-1.0.0.tgz#ddf01999e51506dabd84ae3c7f0dab7dea6ef4fe"
integrity sha512-Vg20fMnUv/DQjcTg1F2pFVsufE+t5RhRDLbxMaPG5x7KOcevT7iWnNrenGPgAdPzezVMf/S2blin8jhUxJilcA==
dependencies:
cli-truncate "^2.0.0"
electron-dl "^1.2.0"
electron-dl "^3.0.0"
electron-is-dev "^1.0.1"
electron-dl@^1.2.0:
version "1.14.0"
resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-1.14.0.tgz#1466f1b945664ca3d784268307c2b935728177bf"
integrity sha512-4okyei42a1mLsvLK7hLrIfd20EQzB18nIlLTwBV992aMSmTGLUEFRTmO1MfSslGNrzD8nuPuy1l/VxO8so4lig==
electron-dl@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.0.0.tgz#42c5cb572af44e90b3aa4b709a14abe701bbc31c"
integrity sha512-TeBRv+vQgNVLGf/XLV4EYfYIBMI4TQcw84aDlM8xEm/1Lgxux3PUXDzaingivf+6jMvRojXSRPTHmiWI/6LrqQ==
dependencies:
ext-name "^5.0.0"
pupa "^1.0.0"
unused-filename "^1.0.0"
pupa "^2.0.1"
unused-filename "^2.1.0"
electron-is-dev@1.2.0, electron-is-dev@^1.0.1:
version "1.2.0"
@ -5499,10 +5499,10 @@ electron-window-state@5.0.3:
jsonfile "^4.0.0"
mkdirp "^0.5.1"
electron@8.2.1:
version "8.2.1"
resolved "https://registry.yarnpkg.com/electron/-/electron-8.2.1.tgz#0341ea01272a69f4f3a2bd4cb41521adb1e4ddcf"
integrity sha512-+1PispFqjyKj3VeOPbEKEl6LYxPW41OxHgh9CGN8KeGygsKDHSZuuG9rYc+b9NeeaAl+gnV9VO2JOe7BIzXyOg==
electron@8.2.2:
version "8.2.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-8.2.2.tgz#6ddb27c1f15fda5f6e891e1ad13c0a0d15b0f133"
integrity sha512-GH4RCbpuzEn3XpTmsf+wLaJ2KOPSOoBJvQ0s6ftTLs5+IQEgKZvkdYCj8TCBNXFhss31RT3BUqoEQQUyZErK0A==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^12.0.12"
@ -10966,11 +10966,6 @@ punycode@^2.1.0, punycode@^2.1.1:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
pupa@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/pupa/-/pupa-1.0.0.tgz#9a9568a5af7e657b8462a6e9d5328743560ceff6"
integrity sha1-mpVopa9+ZXuEYqbp1TKHQ1YM7/Y=
pupa@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz#dbdc9ff48ffbea4a26a069b6f9f7abb051008726"
@ -11910,10 +11905,10 @@ semver@7.0.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
semver@7.2.2:
version "7.2.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.2.tgz#d01432d74ed3010a20ffaf909d63a691520521cd"
integrity sha512-Zo84u6o2PebMSK3zjJ6Zp5wi8VnQZnEaCP13Ul/lt1ANsLACxnJxq4EEm1PY94/por1Hm9+7xpIswdS5AkieMA==
semver@7.3.0:
version "7.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.0.tgz#91f7c70ec944a63e5dc7a74cde2da375d8e0853c"
integrity sha512-uyvgU/igkrMgNHwLgXvlpD9jEADbJhB0+JXSywoO47JgJ6c16iau9F9cjtc/E5o0PoqRYTiTIAPRKaYe84z6eQ==
semver@^7.1.2, semver@^7.1.3:
version "7.1.3"
@ -13180,13 +13175,13 @@ unset-value@^1.0.0:
has-value "^0.3.1"
isobject "^3.0.0"
unused-filename@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unused-filename/-/unused-filename-1.0.0.tgz#d340880f71ae2115ebaa1325bef05cc6684469c6"
integrity sha1-00CID3GuIRXrqhMlvvBcxmhEacY=
unused-filename@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/unused-filename/-/unused-filename-2.1.0.tgz#33719c4e8d9644f32d2dec1bc8525c6aaeb4ba51"
integrity sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg==
dependencies:
modify-filename "^1.1.0"
path-exists "^3.0.0"
path-exists "^4.0.0"
upath@^1.1.1:
version "1.2.0"