From 9d96c436c2dce537f1b286149212a480e8070cbc Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Fri, 26 Jan 2018 09:38:09 +0100
Subject: [PATCH 1/6] fix: Allow css-modules HMR when classes are unchanged

Fixes webpack-contrib/css-loader#669.

Previously, HMR was disabled if css-modules was enabled (in css-loader)
and at least one class was present in the file. This was because JS
files depend on the classes, and as such have to be reloaded when the
CSS changes in case the classes have changed.

Now, HMR _is_ used if no classes change. Othewise the whole page is
reloaded like before.
---
 index.js | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/index.js b/index.js
index 0179a4c0..abe355ba 100644
--- a/index.js
+++ b/index.js
@@ -23,13 +23,34 @@ module.exports.pitch = function (request) {
 		"// Hot Module Replacement",
 		"if(module.hot) {",
 		"	// When the styles change, update the <style> tags",
-		"	if(!content.locals) {",
-		"		module.hot.accept(" + loaderUtils.stringifyRequest(this, "!!" + request) + ", function() {",
-		"			var newContent = require(" + loaderUtils.stringifyRequest(this, "!!" + request) + ");",
-		"			if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];",
+		"	module.hot.accept(" + loaderUtils.stringifyRequest(this, "!!" + request) + ", function() {",
+		"		var newContent = require(" + loaderUtils.stringifyRequest(this, "!!" + request) + ");",
+		"		if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];",
+		"		var localsSame = true;",
+		"		if(!content.locals && newContent.locals) {",
+		"			localsSame = false;",
+		"		} else if(content.locals && !newContent.locals) {",
+		"			localsSame = false;",
+		"		} else if(content.locals && newContent.locals) {",
+		"			var oldKeys = Object.keys(content.locals);",
+		"			var newKeys = Object.keys(newContent.locals);",
+		"			if(oldKeys.length !== newKeys.length) {",
+		"				localsSame = false;",
+		"			} else {",
+		"				localsSame = oldKeys.every(function(oldKey) {",
+		"					var oldValue = content.locals[oldKey];",
+		"					var newValue = newContent.locals[oldKey];",
+		"					return oldValue === newValue;",
+		"				});",
+		"			}",
+		"		}",
+		"		if(localsSame) {",
 		"			update(newContent);",
-		"		});",
-		"	}",
+		"		} else {",
+		"			// This error is caught and not shown and causes a full reload.",
+		"			throw new Error('Aborting CSS HMR due to changed css-modules locals.');",
+		"		}",
+		"	});",
 		"	// When the module is disposed, remove the <style> tags",
 		"	module.hot.dispose(function() { update(); });",
 		"}"

From 3bb5ae5172f6cbba9c35faee4c3ef1d814a3f9c7 Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Fri, 26 Jan 2018 14:07:07 +0100
Subject: [PATCH 2/6] Shorten some code

---
 index.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/index.js b/index.js
index abe355ba..1d840ce3 100644
--- a/index.js
+++ b/index.js
@@ -37,19 +37,14 @@ module.exports.pitch = function (request) {
 		"			if(oldKeys.length !== newKeys.length) {",
 		"				localsSame = false;",
 		"			} else {",
-		"				localsSame = oldKeys.every(function(oldKey) {",
-		"					var oldValue = content.locals[oldKey];",
-		"					var newValue = newContent.locals[oldKey];",
-		"					return oldValue === newValue;",
+		"				localsSame = oldKeys.every(function(key) {",
+		"					return content.locals[key] === newContent.locals[key];",
 		"				});",
 		"			}",
 		"		}",
-		"		if(localsSame) {",
-		"			update(newContent);",
-		"		} else {",
-		"			// This error is caught and not shown and causes a full reload.",
-		"			throw new Error('Aborting CSS HMR due to changed css-modules locals.');",
-		"		}",
+		"		// This error is caught and not shown and causes a full reload.",
+		"		if(!localsSame) throw new Error('Aborting CSS HMR due to changed css-modules locals.')",
+		"		update(newContent);",
 		"	});",
 		"	// When the module is disposed, remove the <style> tags",
 		"	module.hot.dispose(function() { update(); });",

From 19ba925de7fa17136229865198252c491eab4156 Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Fri, 26 Jan 2018 19:01:00 +0100
Subject: [PATCH 3/6] ES3 (IE8) support

---
 index.js | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/index.js b/index.js
index 1d840ce3..65361ceb 100644
--- a/index.js
+++ b/index.js
@@ -26,22 +26,15 @@ module.exports.pitch = function (request) {
 		"	module.hot.accept(" + loaderUtils.stringifyRequest(this, "!!" + request) + ", function() {",
 		"		var newContent = require(" + loaderUtils.stringifyRequest(this, "!!" + request) + ");",
 		"		if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];",
-		"		var localsSame = true;",
-		"		if(!content.locals && newContent.locals) {",
-		"			localsSame = false;",
-		"		} else if(content.locals && !newContent.locals) {",
-		"			localsSame = false;",
-		"		} else if(content.locals && newContent.locals) {",
-		"			var oldKeys = Object.keys(content.locals);",
-		"			var newKeys = Object.keys(newContent.locals);",
-		"			if(oldKeys.length !== newKeys.length) {",
-		"				localsSame = false;",
-		"			} else {",
-		"				localsSame = oldKeys.every(function(key) {",
-		"					return content.locals[key] === newContent.locals[key];",
-		"				});",
+		"		var localsSame = (function(a, b) {",
+		"			var key, numKeys = 0;",
+		"			for(key in a) {",
+		"				if(!b || a[key] !== b[key]) return false",
+		"				numKeys++;",
 		"			}",
-		"		}",
+		"			for(key in b) numKeys--;",
+		"			return numKeys === 0;",
+		"		}(content.locals, newContent.locals));",
 		"		// This error is caught and not shown and causes a full reload.",
 		"		if(!localsSame) throw new Error('Aborting CSS HMR due to changed css-modules locals.')",
 		"		update(newContent);",

From 1007d409206c6b3499d77d94f4178d0fe3b86d11 Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Fri, 26 Jan 2018 19:41:50 +0100
Subject: [PATCH 4/6] Use worse variable names

---
 index.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/index.js b/index.js
index 65361ceb..ad5cc8ac 100644
--- a/index.js
+++ b/index.js
@@ -26,17 +26,17 @@ module.exports.pitch = function (request) {
 		"	module.hot.accept(" + loaderUtils.stringifyRequest(this, "!!" + request) + ", function() {",
 		"		var newContent = require(" + loaderUtils.stringifyRequest(this, "!!" + request) + ");",
 		"		if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];",
-		"		var localsSame = (function(a, b) {",
-		"			var key, numKeys = 0;",
+		"		var locals = (function(a, b) {",
+		"			var key, idx = 0;",
 		"			for(key in a) {",
 		"				if(!b || a[key] !== b[key]) return false",
-		"				numKeys++;",
+		"				idx++;",
 		"			}",
-		"			for(key in b) numKeys--;",
-		"			return numKeys === 0;",
+		"			for(key in b) idx--;",
+		"			return idx === 0;",
 		"		}(content.locals, newContent.locals));",
 		"		// This error is caught and not shown and causes a full reload.",
-		"		if(!localsSame) throw new Error('Aborting CSS HMR due to changed css-modules locals.')",
+		"		if(!locals) throw new Error('Aborting CSS HMR due to changed css-modules locals.')",
 		"		update(newContent);",
 		"	});",
 		"	// When the module is disposed, remove the <style> tags",

From b516fc01d64b9a291512b1605d52c6af1f7dbf29 Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Fri, 26 Jan 2018 19:42:09 +0100
Subject: [PATCH 5/6] Add missing semicolon

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index ad5cc8ac..a0c293a3 100644
--- a/index.js
+++ b/index.js
@@ -36,7 +36,7 @@ module.exports.pitch = function (request) {
 		"			return idx === 0;",
 		"		}(content.locals, newContent.locals));",
 		"		// This error is caught and not shown and causes a full reload.",
-		"		if(!locals) throw new Error('Aborting CSS HMR due to changed css-modules locals.')",
+		"		if(!locals) throw new Error('Aborting CSS HMR due to changed css-modules locals.');",
 		"		update(newContent);",
 		"	});",
 		"	// When the module is disposed, remove the <style> tags",

From 0d52dee2e62dcee47ce6a822711fb4ba85953b5d Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Fri, 26 Jan 2018 19:52:50 +0100
Subject: [PATCH 6/6] Add another missing semicolon

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index a0c293a3..05c16f93 100644
--- a/index.js
+++ b/index.js
@@ -29,7 +29,7 @@ module.exports.pitch = function (request) {
 		"		var locals = (function(a, b) {",
 		"			var key, idx = 0;",
 		"			for(key in a) {",
-		"				if(!b || a[key] !== b[key]) return false",
+		"				if(!b || a[key] !== b[key]) return false;",
 		"				idx++;",
 		"			}",
 		"			for(key in b) idx--;",