From f05b8f04a9c3ca3bcea1531d9e189210a22f5dc3 Mon Sep 17 00:00:00 2001 From: Andrew Anguiano Date: Fri, 26 Oct 2018 22:14:30 -0400 Subject: [PATCH 1/3] catch css file not found --- packages/core/parcel-bundler/src/assets/RawAsset.js | 6 +++++- packages/core/parcel-bundler/src/utils/md5.js | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/core/parcel-bundler/src/assets/RawAsset.js b/packages/core/parcel-bundler/src/assets/RawAsset.js index d44abf2e306..967c566ea4e 100644 --- a/packages/core/parcel-bundler/src/assets/RawAsset.js +++ b/packages/core/parcel-bundler/src/assets/RawAsset.js @@ -27,7 +27,11 @@ class RawAsset extends Asset { } async generateHash() { - return await md5.file(this.name); + try { + return await md5.file(this.name); + } catch (err) { + throw new Error(err); + } } } diff --git a/packages/core/parcel-bundler/src/utils/md5.js b/packages/core/parcel-bundler/src/utils/md5.js index 5d53698d51e..d0ae151cd4e 100644 --- a/packages/core/parcel-bundler/src/utils/md5.js +++ b/packages/core/parcel-bundler/src/utils/md5.js @@ -11,11 +11,13 @@ function md5(string, encoding = 'hex') { md5.file = function(filename) { return new Promise((resolve, reject) => { fs.createReadStream(filename) + .on('error', function(error) { + reject(error); + }) .pipe(crypto.createHash('md5').setEncoding('hex')) .on('finish', function() { resolve(this.read()); - }) - .on('error', reject); + }); }); }; From b8874efa6695a145fe7d0264585abf3dba319618 Mon Sep 17 00:00:00 2001 From: Andrew Anguiano Date: Mon, 5 Nov 2018 13:19:10 -0500 Subject: [PATCH 2/3] tweak error callback --- packages/core/parcel-bundler/src/utils/md5.js | 4 +--- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/core/parcel-bundler/src/utils/md5.js b/packages/core/parcel-bundler/src/utils/md5.js index d0ae151cd4e..a111cd4a2a1 100644 --- a/packages/core/parcel-bundler/src/utils/md5.js +++ b/packages/core/parcel-bundler/src/utils/md5.js @@ -11,9 +11,7 @@ function md5(string, encoding = 'hex') { md5.file = function(filename) { return new Promise((resolve, reject) => { fs.createReadStream(filename) - .on('error', function(error) { - reject(error); - }) + .on('error', reject) .pipe(crypto.createHash('md5').setEncoding('hex')) .on('finish', function() { resolve(this.read()); diff --git a/yarn.lock b/yarn.lock index ff74458bcf2..9cc95356657 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2422,7 +2422,7 @@ browserslist@^4.0.0, browserslist@^4.1.0: electron-to-chromium "^1.3.81" node-releases "^1.0.0-alpha.15" -bsb-js@^1.0.1: +bsb-js@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/bsb-js/-/bsb-js-1.0.2.tgz#b9e7af1dfdb8de6191bb36fdff43f59359a7dfe7" integrity sha512-vJODKWqPx4vFQoH+1s4l4ozys9UrJne1gu1G4AcPi/FZlJXdHHYtsYPy+FVHqaCWH6nlR9jh7dhVraVoGx+wPg== From 6c3b71f5bc348f2dcdb1e7c38a57fc85dfcef0de Mon Sep 17 00:00:00 2001 From: Andrew Anguiano Date: Mon, 5 Nov 2018 13:20:02 -0500 Subject: [PATCH 3/3] remove unneeded try/catch --- packages/core/parcel-bundler/src/assets/RawAsset.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/core/parcel-bundler/src/assets/RawAsset.js b/packages/core/parcel-bundler/src/assets/RawAsset.js index 967c566ea4e..d44abf2e306 100644 --- a/packages/core/parcel-bundler/src/assets/RawAsset.js +++ b/packages/core/parcel-bundler/src/assets/RawAsset.js @@ -27,11 +27,7 @@ class RawAsset extends Asset { } async generateHash() { - try { - return await md5.file(this.name); - } catch (err) { - throw new Error(err); - } + return await md5.file(this.name); } }