From b6d2b0206f33c5dbade6991c743b042e6c9a8d39 Mon Sep 17 00:00:00 2001 From: Jasper De Moor Date: Fri, 24 Aug 2018 12:20:21 -0700 Subject: [PATCH] Fix non-updating asset hashes (#1861) --- packages/core/parcel/src/Asset.js | 3 +-- packages/core/parcel/src/Pipeline.js | 6 +++--- yarn.lock | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/core/parcel/src/Asset.js b/packages/core/parcel/src/Asset.js index e08758baee0..7406c129c16 100644 --- a/packages/core/parcel/src/Asset.js +++ b/packages/core/parcel/src/Asset.js @@ -2,13 +2,13 @@ const URL = require('url'); const path = require('path'); const clone = require('clone'); const fs = require('./utils/fs'); -const objectHash = require('./utils/objectHash'); const md5 = require('./utils/md5'); const isURL = require('./utils/is-url'); const config = require('./utils/config'); const syncPromise = require('./utils/syncPromise'); const logger = require('./Logger'); const Resolver = require('./Resolver'); +const objectHash = require('./utils/objectHash'); /** * An Asset represents a file in the dependency tree. Assets can have multiple @@ -203,7 +203,6 @@ class Asset { await this.getDependencies(); await this.transform(); this.generated = await this.generate(); - this.hash = await this.generateHash(); } return this.generated; diff --git a/packages/core/parcel/src/Pipeline.js b/packages/core/parcel/src/Pipeline.js index 4d20622ae3c..b311e43f0ef 100644 --- a/packages/core/parcel/src/Pipeline.js +++ b/packages/core/parcel/src/Pipeline.js @@ -1,6 +1,5 @@ const Parser = require('./Parser'); const path = require('path'); -const md5 = require('./utils/md5'); /** * A Pipeline composes multiple Asset types together. @@ -72,20 +71,21 @@ class Pipeline { } generated = generated.concat(processed); - asset.hash = md5(asset.hash + subAsset.hash); } else { generated.push(rendition); } } // Post process. This allows assets a chance to modify the output produced by sub-asset types. - asset.generated = generated; try { generated = await asset.postProcess(generated); } catch (err) { throw asset.generateErrorMessage(err); } + asset.generated = generated; + asset.hash = await asset.generateHash(); + return generated; } diff --git a/yarn.lock b/yarn.lock index b386fffa5a8..48de7b043f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7255,4 +7255,4 @@ yargs@~3.10.0: camelcase "^1.0.2" cliui "^2.1.0" decamelize "^1.0.0" - window-size "0.1.0" + window-size "0.1.0" \ No newline at end of file