From a2f53b2ce27c3e6f642c3d7b8ba92994d19f315f Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@protonmail.com>
Date: Mon, 30 Jul 2018 14:06:06 +0200
Subject: [PATCH] Speed up initial builds

---
 Gruntfile.js                                    | 10 ++++++----
 src/crypto/cipher/aes.js                        |  2 +-
 src/crypto/cmac.js                              |  2 +-
 src/crypto/eax.js                               |  2 +-
 src/crypto/gcm.js                               |  2 +-
 src/crypto/hash/index.js                        |  6 +++---
 src/packet/sym_encrypted_integrity_protected.js |  2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 39f2f21b..32affc4a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -302,14 +302,16 @@ module.exports = function(grunt) {
   }
 
   // Build tasks
-  grunt.registerTask('version', ['replace:openpgp', 'replace:openpgp_debug']);
+  grunt.registerTask('version', ['replace:openpgp']);
   grunt.registerTask('replace_min', ['replace:openpgp_min', 'replace:worker_min']);
-  grunt.registerTask('default', ['clean', 'copy:bzip2', 'browserify', 'version', 'uglify', 'replace_min']);
+  grunt.registerTask('build', ['clean', 'copy:bzip2', 'browserify:openpgp', 'browserify:worker', 'version', 'uglify', 'replace_min']);
+  grunt.registerTask('build_debug', ['copy:bzip2', 'browserify:openpgp_debug', 'browserify:worker']);
   grunt.registerTask('documentation', ['jsdoc']);
+  grunt.registerTask('default', ['build']);
   // Test/Dev tasks
   grunt.registerTask('test', ['eslint', 'mochaTest']);
   grunt.registerTask('coverage', ['mocha_istanbul:coverage']);
-  grunt.registerTask('saucelabs', ['default', 'copy:browsertest', 'connect:test', 'saucelabs-mocha']);
-  grunt.registerTask('browsertest', ['default', 'copy:browsertest', 'connect:test', 'watch']);
+  grunt.registerTask('saucelabs', ['build', 'browserify:unittests', 'copy:browsertest', 'connect:test', 'saucelabs-mocha']);
+  grunt.registerTask('browsertest', ['build', 'copy:browsertest', 'connect:test', 'watch']);
 
 };
diff --git a/src/crypto/cipher/aes.js b/src/crypto/cipher/aes.js
index ff389480..9a82dbb8 100644
--- a/src/crypto/cipher/aes.js
+++ b/src/crypto/cipher/aes.js
@@ -2,7 +2,7 @@
  * @requires asmcrypto.js
  */
 
-import { AES_ECB } from 'asmcrypto.js/dist_es8/aes/ecb';
+import { AES_ECB } from 'asmcrypto.js/dist_es5/aes/ecb';
 
 // TODO use webCrypto or nodeCrypto when possible.
 function aes(length) {
diff --git a/src/crypto/cmac.js b/src/crypto/cmac.js
index d34838a6..b6d31ec7 100644
--- a/src/crypto/cmac.js
+++ b/src/crypto/cmac.js
@@ -6,7 +6,7 @@
  * @module crypto/cmac
  */
 
-import { AES_CBC } from 'asmcrypto.js/dist_es8/aes/cbc';
+import { AES_CBC } from 'asmcrypto.js/dist_es5/aes/cbc';
 import util from '../util';
 
 const webCrypto = util.getWebCrypto();
diff --git a/src/crypto/eax.js b/src/crypto/eax.js
index b40f64ef..08444185 100644
--- a/src/crypto/eax.js
+++ b/src/crypto/eax.js
@@ -24,7 +24,7 @@
  * @module crypto/eax
  */
 
-import { AES_CTR } from 'asmcrypto.js/dist_es8/aes/ctr';
+import { AES_CTR } from 'asmcrypto.js/dist_es5/aes/ctr';
 import CMAC from './cmac';
 import util from '../util';
 
diff --git a/src/crypto/gcm.js b/src/crypto/gcm.js
index 55c25c80..dc268211 100644
--- a/src/crypto/gcm.js
+++ b/src/crypto/gcm.js
@@ -23,7 +23,7 @@
  * @module crypto/gcm
  */
 
-import { AES_GCM } from 'asmcrypto.js/dist_es8/aes/gcm';
+import { AES_GCM } from 'asmcrypto.js/dist_es5/aes/gcm';
 import util from '../util';
 
 const webCrypto = util.getWebCrypto(); // no GCM support in IE11, Safari 9
diff --git a/src/crypto/hash/index.js b/src/crypto/hash/index.js
index 66d56f27..de879114 100644
--- a/src/crypto/hash/index.js
+++ b/src/crypto/hash/index.js
@@ -10,9 +10,9 @@
  * @module crypto/hash
  */
 
-import { Sha1 } from 'asmcrypto.js/dist_es8/hash/sha1/sha1';
-import { Sha256 } from 'asmcrypto.js/dist_es8/hash/sha256/sha256';
-import { Sha512 } from 'asmcrypto.js/dist_es8/hash/sha512/sha512';
+import { Sha1 } from 'asmcrypto.js/dist_es5/hash/sha1/sha1';
+import { Sha256 } from 'asmcrypto.js/dist_es5/hash/sha256/sha256';
+import { Sha512 } from 'asmcrypto.js/dist_es5/hash/sha512/sha512';
 import sha224 from 'hash.js/lib/hash/sha/224';
 import sha384 from 'hash.js/lib/hash/sha/384';
 import { ripemd160 } from 'hash.js/lib/hash/ripemd';
diff --git a/src/packet/sym_encrypted_integrity_protected.js b/src/packet/sym_encrypted_integrity_protected.js
index b8e873f4..88468576 100644
--- a/src/packet/sym_encrypted_integrity_protected.js
+++ b/src/packet/sym_encrypted_integrity_protected.js
@@ -24,7 +24,7 @@
  * @requires util
  */
 
-import { AES_CFB } from 'asmcrypto.js/dist_es8/aes/cfb';
+import { AES_CFB } from 'asmcrypto.js/dist_es5/aes/cfb';
 
 import stream from 'web-stream-tools';
 import config from '../config';