Merge 0434d12 into 63f10cf

lib/configure.js

@@ -6,6 +6,10 @@ module.exports = function(root, options) {
 	var pkgPath = path.join(root, "package.json");
 	var optionsMain = options.main;
 
+	function updatePackage(pkgSource, pkgPath) {
+		return asap(fse.writeFile)(pkgPath, pkgSource, "utf8");
+	}
+
 	return Promise.resolve().then(function(){
 		if(!optionsMain) {
 			throw new Error("electronOptions.main is required.");
@@ -15,6 +19,7 @@ module.exports = function(root, options) {
 	})
 	.then(function(pkgSource){
 		var pkg = JSON.parse(pkgSource);
+		var restoreMainPackage = function() {};
 		var setPkgMainPromise = Promise.resolve();
 		var copyElectronMainPromise = Promise.resolve();
 
@@ -32,11 +37,22 @@ module.exports = function(root, options) {
 		var shouldUpdatePackageJSON = pkg.main !== optionsMain;
 
 		if(shouldUpdatePackageJSON) {
+			// callback to restore the original package.json source
+			restoreMainPackage = function() {
+				return updatePackage(pkgSource, pkgPath);
+			};
+
+			// update the package.json with the electron main
 			pkg.main = optionsMain;
-			pkgSource = JSON.stringify(pkg, null, "  ");
-			setPkgMainPromise = asap(fse.writeFile)(pkgPath, pkgSource, "utf8");
+			setPkgMainPromise = updatePackage(
+				JSON.stringify(pkg, null, "  "),
+				pkgPath
+			);
 		}
 
-		return Promise.all([setPkgMainPromise, copyElectronMainPromise]);
+		return Promise.all([setPkgMainPromise, copyElectronMainPromise])
+			.then(function() {
+				return restoreMainPackage;
+			});
 	});
 };

lib/main.js

@@ -14,24 +14,35 @@ exports = module.exports = function(options, buildResult) {
 	});
 	var rewritePromise = rewriter.rewrite();
 
+	var restoreMainPackage;
 	var restoreHTML = function(){
 		return rewriter.restore();
 	};
 
 	process.on("exit", restoreHTML);
 
 	return configure(root(), options)
-	.then(function(){
+	.then(function(restorePkg) {
+		restoreMainPackage = restorePkg;
 		return rewritePromise;
 	})
 	.then(function(){
 		var ElectronPackager = exports.getElectronPackager();
 		return build(options, buildResult, ElectronPackager);
 	})
-	.then(restoreHTML, function(err){
-		restoreHTML();
-		return Promise.reject(err);
-	});
+	.then(
+		function() {
+			return Promise.all([
+				restoreHTML(),
+				restoreMainPackage()
+			]);
+		},
+		function(err) {
+			restoreHTML();
+			restoreMainPackage();
+			return Promise.reject(err);
+		}
+	);
 };
 
 // This exists so we can stub it in tests

test/helpers.js

@@ -1,8 +1,6 @@
 var copy = require("copy");
 var fse = require("fs-extra");
-var exists = fse.existsSync;
 var readFile = fse.readFileSync;
-var writeFile = fse.writeFileSync;
 var path = require("path");
 var stealElectron = require("../lib/main");
 
@@ -90,11 +88,16 @@ exports.setup = function(projectPath, setup, dontFail){
 		});
 	});
 
-	after(function(done){
-		writeFile(path.join(projectPath, "package.json"), this.oldPackageJSON);
+	after(function(done) {
+		var oldPackageJson = this.oldPackageJSON.toString();
+		var packageJson = readFile(path.join(projectPath, "package.json")).toString();
 
-		var fin = function() { done(); };
 		exports.rmdir(path.join(projectPath, "build"))
-		.then(fin, done);
+			.then(function() {
+				if (packageJson !== oldPackageJson) {
+					throw new Error("Application package.json should not be mutated");
+				}
+			})
+			.then(done, done);
 	});
 };