Don't let options.hash override File#hash() salting.

phocks · Nov 8, 2016 · 9321151 · 9321151
1 parent 08016d2
commit 9321151
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
@@ -553,7 +553,8 @@ class File {
     this.assets = null;
 
     this._contents = options.data || null; // contents, if known, as a Buffer
-    this._hash = options.hash || null; // hash, if known, as a hex string
+    this._hashOfContents = options.hash || null;
+    this._hash = null;
   }
 
   toString() {
@@ -567,11 +568,16 @@ class File {
 
   hash() {
     if (! this._hash) {
+      if (! this._hashOfContents) {
+        this._hashOfContents = watch.sha1(this.contents());
+      }
+
       this._hash = watch.sha1(
         String(File._salt()),
-        this.contents(),
+        this._hashOfContents,
       );
     }
+
     return this._hash;
   }
 
@@ -595,7 +601,7 @@ class File {
     }
     this._contents = b;
     // Un-cache hash.
-    this._hash = null;
+    this._hashOfContents = this._hash = null;
   }
 
   size() {