diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e2d11ad58..6e5e93d18 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -4,7 +4,7 @@ - None ## Bugfixes -- None +- The automatic updating was broken on Windows, to solve this the updater, builder and electron was downgraded to the latest stable versions. ([#1004](https://github.com/realm/realm-studio/pull/1004)) ## Internal - None diff --git a/package-lock.json b/package-lock.json index 1c3943c13..fdfd0b433 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1753,17 +1753,6 @@ } } }, - "builder-util-runtime": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.0.0.tgz", - "integrity": "sha512-kRZqtGLTUb4JgreE9Oqxu/okdA/Nlw0tKuiX75w5lLVNlXJwBAoPWzsZXO2fbBZ8c5nJ5VIr2bpX2U8I/T817g==", - "requires": { - "bluebird-lst": "1.0.6", - "debug": "4.1.0", - "fs-extra-p": "7.0.0", - "sax": "1.2.4" - } - }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -3568,14 +3557,89 @@ "dev": true }, "electron": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.8.tgz", - "integrity": "sha512-UVj+K59lYU/vH/7TxrmDidPssFwGQZ6Ljuupugdr9h6ipMuhwgk3WRO+OlJ2TsyhKhJ6tp3AcJunuN4mprblhQ==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.13.tgz", + "integrity": "sha512-8ouYaLsp0F4sPI7QKgJkkJhrwj1JPSnBwbz6HHA9l6u7WofEt94lV+gHw71KJrDl7UaIkFwlSjyhIjG8lIZqxw==", "dev": true, "requires": { "@types/node": "8.10.37", - "electron-download": "4.1.1", + "electron-download": "3.3.0", "extract-zip": "1.6.7" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "electron-download": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz", + "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=", + "dev": true, + "requires": { + "debug": "2.6.9", + "fs-extra": "0.30.0", + "home-path": "1.0.6", + "minimist": "1.2.0", + "nugget": "2.0.1", + "path-exists": "2.1.0", + "rc": "1.2.8", + "semver": "5.6.0", + "sumchecker": "1.3.1" + } + }, + "fs-extra": { + "version": "0.30.0", + "resolved": "http://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", + "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", + "dev": true, + "requires": { + "graceful-fs": "4.1.15", + "jsonfile": "2.4.0", + "klaw": "1.3.1", + "path-is-absolute": "1.0.1", + "rimraf": "2.6.2" + } + }, + "jsonfile": { + "version": "2.4.0", + "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "dev": true, + "requires": { + "graceful-fs": "4.1.15" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "sumchecker": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz", + "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=", + "dev": true, + "requires": { + "debug": "2.6.9", + "es6-promise": "4.2.5" + } + } } }, "electron-builder": { @@ -3659,11 +3723,6 @@ "encoding": "0.1.12" } }, - "electron-is-dev": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.0.1.tgz", - "integrity": "sha512-iwM3EotA9HTXqMGpQRkR/kT8OZqBbdfHTnlwcxsjSLYqY8svvsq0MuujsWCn3/vtgRmDv/PC/gKUUpoZvi5C1w==" - }, "electron-osx-sign": { "version": "0.4.11", "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz", @@ -3846,13 +3905,13 @@ "dev": true }, "electron-updater": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.0.0.tgz", - "integrity": "sha512-qsD3JSR1ELY4JpP/GnZ2CXS2KabUDDJJ7/NcjC5rPfQBOT0+Z0p7+1gfUolJssTeIY1c3DT65Pd3k+eWMuns9w==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-3.2.3.tgz", + "integrity": "sha512-QkLS+hYyTTHzZ2gGtTyQQ3kY5zQaEf/VwJW+UP37CPi58/VNUOx0xNA9iChwwYa6mzeEyo1xhrS1XjePwkeTbA==", "requires": { "bluebird-lst": "1.0.6", - "builder-util-runtime": "8.0.0", - "electron-is-dev": "1.0.1", + "builder-util-runtime": "7.1.0", + "electron-is-dev": "0.3.0", "fs-extra-p": "7.0.0", "js-yaml": "3.12.0", "lazy-val": "1.0.3", @@ -3860,6 +3919,24 @@ "pako": "1.0.6", "semver": "5.6.0", "source-map-support": "0.5.9" + }, + "dependencies": { + "builder-util-runtime": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-7.1.0.tgz", + "integrity": "sha512-TAsx651+q6bXYry21SzQblYQBUlfu4ixbDa6k2Nvts+kHO9ajyr0gDuHJsamxBaAyUUi5EldPABqsFERDEK3Hg==", + "requires": { + "bluebird-lst": "1.0.6", + "debug": "4.1.0", + "fs-extra-p": "7.0.0", + "sax": "1.2.4" + } + }, + "electron-is-dev": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz", + "integrity": "sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4=" + } } }, "elegant-spinner": { @@ -6028,6 +6105,12 @@ "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==", "dev": true }, + "home-path": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz", + "integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==", + "dev": true + }, "hosted-git-info": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", @@ -7130,6 +7213,15 @@ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true }, + "klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "dev": true, + "requires": { + "graceful-fs": "4.1.15" + } + }, "known-css-properties": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.3.0.tgz", diff --git a/package.json b/package.json index 8dfaa51f4..bf99ecd1b 100755 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "classnames": "^2.2.5", "compare-versions": "^3.4.0", "electron-store": "^2.0.0", - "electron-updater": "^4.0.0", + "electron-updater": "3.2.3", "font-awesome": "^4.7.0", "fs-extra": "^4.0.2", "isomorphic-fetch": "^2.2.1", @@ -193,8 +193,8 @@ "copy-webpack-plugin": "^4.5.1", "css-loader": "^0.28.4", "devtron": "^1.4.0", - "electron": "3.0.8", - "electron-builder": "^20.34.0", + "electron": "2.0.13", + "electron-builder": "20.34.0", "electron-download": "^4.1.1", "electron-publisher-s3": "^20.17.2", "faker": "^4.1.0", diff --git a/src/main/Application.ts b/src/main/Application.ts index f61bd8314..363648b01 100644 --- a/src/main/Application.ts +++ b/src/main/Application.ts @@ -117,7 +117,7 @@ export class Application { public run() { // Check to see if this is the first instance or not - const hasAnotherInstance = app.requestSingleInstanceLock() === false; + const hasAnotherInstance = app.makeSingleInstance(this.onInstanceStarted); if (hasAnotherInstance) { // Quit the app if started multiple times @@ -136,8 +136,6 @@ export class Application { if (app.isReady()) { this.onReady(); } - // Handle any second instances of the Application - app.on('second-instance', this.onInstanceStarted); } } @@ -512,7 +510,6 @@ export class Application { * This is called when another instance of the app is started on Windows or Linux */ private onInstanceStarted = async ( - event: Event, argv: string[], workingDirectory: string, ) => {