From dcff257f207423dc1b586aae7e49390d760166f2 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Thu, 21 Apr 2016 10:26:29 -0400 Subject: [PATCH] Upgrade Electron to v0.37.6 (#350) * Upgrade Electron to v0.37.6 The main motiviation for such upgrade is that an error manifesting itself as `Cannot read property 'object' of undefined` on certain Linux systems was fixed in v0.37.4. See https://github.com/electron/electron/issues/5229 Signed-off-by: Juan Cruz Viotti * Make use of shell module by requiring `shell` Otherwise we get a strange issue when trying to stub it: TypeError: Attempted to wrap undefined property openExternal as function Signed-off-by: Juan Cruz Viotti --- Makefile | 2 +- lib/browser/os/open-external/directives/open-external.js | 3 +-- package.json | 2 +- tests/browser/os/open-external.spec.js | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f71eb0e6..6754e0c9 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ ELECTRON_PACKAGER=./node_modules/.bin/electron-packager ELECTRON_BUILDER=./node_modules/.bin/electron-builder ELECTRON_OSX_SIGN=./node_modules/.bin/electron-osx-sign ELECTRON_IGNORE=$(shell node scripts/packageignore.js) -ELECTRON_VERSION=0.36.11 +ELECTRON_VERSION=0.37.6 ETCHER_VERSION=$(shell node -e "console.log(require('./package.json').version)") APPLICATION_NAME=$(shell node -e "console.log(require('./package.json').displayName)") APPLICATION_DESCRIPTION=$(shell node -e "console.log(require('./package.json').description)") diff --git a/lib/browser/os/open-external/directives/open-external.js b/lib/browser/os/open-external/directives/open-external.js index 6b591803..c195672a 100644 --- a/lib/browser/os/open-external/directives/open-external.js +++ b/lib/browser/os/open-external/directives/open-external.js @@ -16,8 +16,7 @@ 'use strict'; -const electron = require('electron'); -const shell = electron.remote.require('shell'); +const shell = require('shell'); const os = require('os'); const nodeOpen = require('open'); diff --git a/package.json b/package.json index 0c4090ad..a9ecce0b 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "electron-mocha": "^0.8.0", "electron-osx-sign": "^0.3.0", "electron-packager": "^6.0.0", - "electron-prebuilt": "^0.36.11", + "electron-prebuilt": "^0.37.6", "gulp": "^3.9.0", "gulp-jscs": "^3.0.2", "gulp-jshint": "^2.0.0", diff --git a/tests/browser/os/open-external.spec.js b/tests/browser/os/open-external.spec.js index 771149cf..f7737d56 100644 --- a/tests/browser/os/open-external.spec.js +++ b/tests/browser/os/open-external.spec.js @@ -19,8 +19,7 @@ const m = require('mochainon'); const os = require('os'); const angular = require('angular'); -const electron = require('electron'); -const shell = electron.remote.require('shell'); +const shell = require('shell'); require('angular-mocks'); describe('Browser: OSOpenExternal', function() {