From e7760e253f4aa03df4430d984622b1544c5e7a40 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Wed, 27 Apr 2016 11:48:35 -0400 Subject: [PATCH] Lock electron development version, and re-use it in Makefile (#371) By locking the electron version in `package.json`, we can require it from the Makefile to ensure production and development are both running the exact same electron version, and ensures they don't easily get out of sync. Signed-off-by: Juan Cruz Viotti --- Makefile | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 945e73e1..24c9d713 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.37.6 +ELECTRON_VERSION=$(shell node -e "console.log(require('./package.json').devDependencies['electron-prebuilt'])") 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/package.json b/package.json index 244d2fdd..d7780042 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "electron-mocha": "^1.2.2", "electron-osx-sign": "^0.3.0", "electron-packager": "^7.0.1", - "electron-prebuilt": "^0.37.6", + "electron-prebuilt": "0.37.6", "gulp": "^3.9.0", "gulp-jscs": "^3.0.2", "gulp-jshint": "^2.0.0",