Update to include css content in id hash

Author: Walker

lib/util.js

@@ -4,7 +4,6 @@ const path = require('path');
 const { promisify } = require('util');
 const fs = require('fs');
 const readFile = promisify(fs.readFile);
-const { hasher } = require('asset-pipe-common');
 const readPkgUp = require('read-pkg-up');
 const postcss = require('postcss');
 const atImport = require('postcss-import');
@@ -16,8 +15,7 @@ module.exports.identifyCssModule = async function identifyCssModule (filePath) {
     });
     const file = filePath.replace(path.dirname(packagePath), name);
 
-    const id = hasher(`${name}|${version}|${file}`);
-    return { id, name, version, file };
+    return { name, version, file };
 };
 
 module.exports.bundleCssModule = async function bundleCssModule (filePath) {

lib/writer.js

@@ -5,6 +5,7 @@ const { identifyCssModule, bundleCssModule } = require('./util');
 const { existsSync } = require('fs');
 const { isAbsolute } = require('path');
 const assert = require('assert');
+const { hasher } = require('asset-pipe-common');
 
 module.exports = class Writer extends Readable {
     constructor (files = []) {
@@ -31,6 +32,7 @@ module.exports = class Writer extends Readable {
 
         try {
             const [css, meta] = await Promise.all([bundleCssModule(file), identifyCssModule(file)]);
+            meta.id = hasher(`${meta.name}|${meta.version}|${meta.file}|${css}`);
             meta.content = css;
             this.push(meta);
         } catch (err) {

test/writer.test.js

@@ -20,7 +20,6 @@ test('identifyCssModule(filePath)', async () => {
     const result = await identifyCssModule(filePath);
 
     const identifier = {
-        id: hasher(`my-module-1|1.0.1|${fileRef}`),
         name: 'my-module-1',
         version: '1.0.1',
         file: fileRef,
@@ -36,7 +35,6 @@ test('identifyCssModule(filePath) css in nested directory', async () => {
     const result = await identifyCssModule(filePath);
 
     const identifier = {
-        id: hasher(`my-module-2|1.0.1|${fileRef}`),
         name: 'my-module-2',
         version: '1.0.1',
         file: fileRef,
@@ -70,7 +68,7 @@ test('new Writer(filePath)', done => {
     writer.on('end', () => {
         const result1 = items[0];
         const result2 = items[1];
-        expect(result1.id).toBe(hasher(`my-module-1|1.0.1|${fileRef}`));
+        expect(result1.id).toBe(hasher(`my-module-1|1.0.1|${fileRef}|${result1.content}`));
         expect(result2).toBeFalsy();
         done();
     });
@@ -100,7 +98,7 @@ test('new Writer([filePath])', done => {
     writer.on('end', () => {
         const result1 = items[0];
         const result2 = items[1];
-        expect(result1.id).toBe(hasher(`my-module-1|1.0.1|${fileRef}`));
+        expect(result1.id).toBe(hasher(`my-module-1|1.0.1|${fileRef}|${result1.content}`));
         expect(result2).toBeFalsy();
         done();
     });
@@ -122,7 +120,7 @@ test('Writer processes @import statements', done => {
         const result1 = items[0];
         const result2 = items[1];
 
-        expect(result1.id).toBe(hasher(`my-module-3|1.0.1|${fileRef}`));
+        expect(result1.id).toBe(hasher(`my-module-3|1.0.1|${fileRef}|${result1.content}`));
         expect(result1.content).toMatch('my-module-3/main.css');
         expect(result1.content).toMatch('my-module-3/dep.css');
         expect(result1.content).toMatch('dep/main.css');
@@ -150,8 +148,8 @@ test('new Writer([filePath1, filePath2]) ensures correct order', done => {
         const result2 = items[1];
         const result3 = items[2];
 
-        expect(result1.id).toBe(hasher(`my-module-1|1.0.1|${fileRef1}`));
-        expect(result2.id).toBe(hasher(`my-module-2|1.0.1|${fileRef2}`));
+        expect(result1.id).toBe(hasher(`my-module-1|1.0.1|${fileRef1}|${result1.content}`));
+        expect(result2.id).toBe(hasher(`my-module-2|1.0.1|${fileRef2}|${result2.content}`));
         expect(result3).toBeFalsy();
         done();
     });