From d7946d0abb777a86a8e0b1a70245550a4f170aa1 Mon Sep 17 00:00:00 2001 From: Alfredo Lopez Date: Tue, 2 Oct 2018 11:26:29 -0400 Subject: [PATCH] fix(index): assign empty `module.id` to prevent `contenthash` from changing unnecessarily (#284) * fix: add empty id to prevent contenthash from changing unnecessarily * fix: updated tests --- src/index.js | 3 ++- test/cases/composes-async/expected/1.css | 4 ++-- test/cases/composes-async/expected/2.css | 4 ++-- .../{651d2818ea64cfe50dbe.css => 10adcc6fa8f8a3cf8d8d.css} | 0 .../{f36605fe5d863d4c4785.css => 3023a4e1067adc5b1950.css} | 0 .../expected/7bb844e9f5514d392e40.css | 4 ---- ...f8d14ae542d0855a7d.css => 1.main.e0d1c5b21d098a0a371f.css} | 0 ...0f5d087b9f049f864a.css => 2.main.9728193f8673cfdafd0e.css} | 0 ...ss => style.11a76e1512072d65b9db.35ee3780b5b76904cef5.css} | 0 ....3ffccb34a605ebf39f4d.js => style.25d094fb4a6ef6ef0222.js} | 0 ...ss => style.822a674590ef68e758b3.ca7d26e87c697b1c7039.css} | 0 11 files changed, 6 insertions(+), 9 deletions(-) rename test/cases/contenthash-multiple-entries/expected/{651d2818ea64cfe50dbe.css => 10adcc6fa8f8a3cf8d8d.css} (100%) rename test/cases/contenthash-multiple-entries/expected/{f36605fe5d863d4c4785.css => 3023a4e1067adc5b1950.css} (100%) delete mode 100644 test/cases/contenthash-multiple-entries/expected/7bb844e9f5514d392e40.css rename test/cases/contenthash/expected/{1.main.eaf8d14ae542d0855a7d.css => 1.main.e0d1c5b21d098a0a371f.css} (100%) rename test/cases/contenthash/expected/{2.main.ae0f5d087b9f049f864a.css => 2.main.9728193f8673cfdafd0e.css} (100%) rename test/cases/js-hash/expected/{style.44c5db65e2b053b76abc.8e8857ef6b5304f0d692.css => style.11a76e1512072d65b9db.35ee3780b5b76904cef5.css} (100%) rename test/cases/js-hash/expected/{style.3ffccb34a605ebf39f4d.js => style.25d094fb4a6ef6ef0222.js} (100%) rename test/cases/js-hash/expected/{style.fadeeffaa38bf4f2edd8.18c4f2aa98e85a5465a6.css => style.822a674590ef68e758b3.ca7d26e87c697b1c7039.css} (100%) diff --git a/src/index.js b/src/index.js index 57d915d6..49d458ff 100644 --- a/src/index.js +++ b/src/index.js @@ -42,6 +42,7 @@ class CssDependencyTemplate { class CssModule extends webpack.Module { constructor(dependency) { super(MODULE_TYPE, dependency.context); + this.id = ''; this._identifier = dependency.identifier; this._identifierIndex = dependency.identifierIndex; this.content = dependency.content; @@ -92,7 +93,7 @@ class CssModule extends webpack.Module { super.updateHash(hash); hash.update(this.content); hash.update(this.media || ''); - hash.update(JSON.stringify(this.sourceMap || '')); + hash.update(this.sourceMap ? JSON.stringify(this.sourceMap) : ''); } } diff --git a/test/cases/composes-async/expected/1.css b/test/cases/composes-async/expected/1.css index 2fa9e2cb..23f2a9f7 100644 --- a/test/cases/composes-async/expected/1.css +++ b/test/cases/composes-async/expected/1.css @@ -1,4 +1,4 @@ -.base { - background: blue; +.composed { + background: green; } diff --git a/test/cases/composes-async/expected/2.css b/test/cases/composes-async/expected/2.css index 23f2a9f7..2fa9e2cb 100644 --- a/test/cases/composes-async/expected/2.css +++ b/test/cases/composes-async/expected/2.css @@ -1,4 +1,4 @@ -.composed { - background: green; +.base { + background: blue; } diff --git a/test/cases/contenthash-multiple-entries/expected/651d2818ea64cfe50dbe.css b/test/cases/contenthash-multiple-entries/expected/10adcc6fa8f8a3cf8d8d.css similarity index 100% rename from test/cases/contenthash-multiple-entries/expected/651d2818ea64cfe50dbe.css rename to test/cases/contenthash-multiple-entries/expected/10adcc6fa8f8a3cf8d8d.css diff --git a/test/cases/contenthash-multiple-entries/expected/f36605fe5d863d4c4785.css b/test/cases/contenthash-multiple-entries/expected/3023a4e1067adc5b1950.css similarity index 100% rename from test/cases/contenthash-multiple-entries/expected/f36605fe5d863d4c4785.css rename to test/cases/contenthash-multiple-entries/expected/3023a4e1067adc5b1950.css diff --git a/test/cases/contenthash-multiple-entries/expected/7bb844e9f5514d392e40.css b/test/cases/contenthash-multiple-entries/expected/7bb844e9f5514d392e40.css deleted file mode 100644 index 7dad92ee..00000000 --- a/test/cases/contenthash-multiple-entries/expected/7bb844e9f5514d392e40.css +++ /dev/null @@ -1,4 +0,0 @@ -.styleA { background: red; } - -.styleB { background: blue; } - diff --git a/test/cases/contenthash/expected/1.main.eaf8d14ae542d0855a7d.css b/test/cases/contenthash/expected/1.main.e0d1c5b21d098a0a371f.css similarity index 100% rename from test/cases/contenthash/expected/1.main.eaf8d14ae542d0855a7d.css rename to test/cases/contenthash/expected/1.main.e0d1c5b21d098a0a371f.css diff --git a/test/cases/contenthash/expected/2.main.ae0f5d087b9f049f864a.css b/test/cases/contenthash/expected/2.main.9728193f8673cfdafd0e.css similarity index 100% rename from test/cases/contenthash/expected/2.main.ae0f5d087b9f049f864a.css rename to test/cases/contenthash/expected/2.main.9728193f8673cfdafd0e.css diff --git a/test/cases/js-hash/expected/style.44c5db65e2b053b76abc.8e8857ef6b5304f0d692.css b/test/cases/js-hash/expected/style.11a76e1512072d65b9db.35ee3780b5b76904cef5.css similarity index 100% rename from test/cases/js-hash/expected/style.44c5db65e2b053b76abc.8e8857ef6b5304f0d692.css rename to test/cases/js-hash/expected/style.11a76e1512072d65b9db.35ee3780b5b76904cef5.css diff --git a/test/cases/js-hash/expected/style.3ffccb34a605ebf39f4d.js b/test/cases/js-hash/expected/style.25d094fb4a6ef6ef0222.js similarity index 100% rename from test/cases/js-hash/expected/style.3ffccb34a605ebf39f4d.js rename to test/cases/js-hash/expected/style.25d094fb4a6ef6ef0222.js diff --git a/test/cases/js-hash/expected/style.fadeeffaa38bf4f2edd8.18c4f2aa98e85a5465a6.css b/test/cases/js-hash/expected/style.822a674590ef68e758b3.ca7d26e87c697b1c7039.css similarity index 100% rename from test/cases/js-hash/expected/style.fadeeffaa38bf4f2edd8.18c4f2aa98e85a5465a6.css rename to test/cases/js-hash/expected/style.822a674590ef68e758b3.ca7d26e87c697b1c7039.css