Merge pull request webpack#2087 from SimenB/getters-setters

sokra · sokra · commit 729905dcefbc · 2016-02-24T20:27:00.000+01:00
Check for (g/s)etter support, not Object.defineProperty
diff --git a/lib/HotModuleReplacement.runtime.js b/lib/HotModuleReplacement.runtime.js
@@ -5,6 +5,17 @@
 /*global $hash$ installedModules $require$ hotDownloadManifest hotDownloadUpdateChunk modules */
 module.exports = function() {
 
+	// Copied from https://github.com/facebook/react/blob/bef45b0/src/shared/utils/canDefineProperty.js
+	var canDefineProperty = false;
+	try {
+		Object.defineProperty({}, "x", {
+			get: function() {}
+		});
+		canDefineProperty = true;
+	} catch(x) {
+		// IE will fail on defineProperty
+	}
+
 	var hotApplyOnUpdate = true;
 	var hotCurrentHash = $hash$; // eslint-disable-line no-unused-vars
 	var hotCurrentModuleData = {};
@@ -29,7 +40,7 @@ module.exports = function() {
 		};
 		for(var name in $require$) {
 			if(Object.prototype.hasOwnProperty.call($require$, name)) {
-				if(Object.defineProperty) {
+				if(canDefineProperty) {
 					Object.defineProperty(fn, name, (function(name) {
 						return {
 							configurable: true,
@@ -72,7 +83,7 @@ module.exports = function() {
 				}
 			});
 		}
-		if(Object.defineProperty) {
+		if(canDefineProperty) {
 			Object.defineProperty(fn, "e", {
 				enumerable: true,
 				value: ensure
