@sanity/export 2.30.3-shopify.3 → 2.30.3

package/lib/AssetHandler.js

@@ -292,14 +292,13 @@ class AssetHandler {
       var remoteSha1 = stream.headers['x-sanity-sha1'];
       var remoteMd5 = stream.headers['x-sanity-md5'];
       var hasHash = Boolean(remoteSha1 || remoteMd5);
-      var method = md5 ? 'md5' : 'sha1';
-      var differs = false;
+      var method = sha1 ? 'sha1' : 'md5'; // Asset validity is primarily determined by the sha1 hash. However, the sha1 hash is computed
+      // before certain processes (i.e. svg sanitization) which can result in a different hash.
+      // When the sha1 hashes don't match, fallback to using the md5 hash.
 
-      if (remoteMd5 && md5) {
-        differs = remoteMd5 !== md5;
-      } else if (remoteSha1 && sha1) {
-        differs = remoteSha1 !== sha1;
-      }
+      var sha1Differs = remoteSha1 && sha1 !== remoteSha1;
+      var md5Differs = remoteMd5 && md5 !== remoteMd5;
+      var differs = sha1Differs && md5Differs;
 
       if (differs && attemptNum < 3) {
         debug('%s does not match downloaded asset, retrying (#%d) [%s]', method, attemptNum + 1, url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/export",
-  "version": "2.30.3-shopify.3+5f5c0d52b",
+  "version": "2.30.3",
   "description": "Export Sanity documents and assets",
   "main": "lib/export.js",
   "engines": {
@@ -49,5 +49,5 @@
     "url": "https://github.com/sanity-io/sanity/issues"
   },
   "homepage": "https://www.sanity.io/",
-  "gitHead": "5f5c0d52b65c070465b876da4b91080a4df9ef4a"
+  "gitHead": "78ec08868a5da69946759f298d9cd71a11bd0e8d"
 }

package/src/AssetHandler.js

@@ -167,14 +167,14 @@ class AssetHandler {
     const remoteSha1 = stream.headers['x-sanity-sha1']
     const remoteMd5 = stream.headers['x-sanity-md5']
     const hasHash = Boolean(remoteSha1 || remoteMd5)
-    const method = md5 ? 'md5' : 'sha1'
-
-    let differs = false
-    if (remoteMd5 && md5) {
-      differs = remoteMd5 !== md5
-    } else if (remoteSha1 && sha1) {
-      differs = remoteSha1 !== sha1
-    }
+    const method = sha1 ? 'sha1' : 'md5'
+
+    // Asset validity is primarily determined by the sha1 hash. However, the sha1 hash is computed
+    // before certain processes (i.e. svg sanitization) which can result in a different hash.
+    // When the sha1 hashes don't match, fallback to using the md5 hash.
+    const sha1Differs = remoteSha1 && sha1 !== remoteSha1
+    const md5Differs = remoteMd5 && md5 !== remoteMd5
+    const differs = sha1Differs && md5Differs
 
     if (differs && attemptNum < 3) {
       debug('%s does not match downloaded asset, retrying (#%d) [%s]', method, attemptNum + 1, url)