fixup: cleanup and rebase

bmeck · bmeck · commit 19e3aa4433a6 · 2022-03-18T12:38:48.000-05:00
diff --git a/lib/internal/policy/manifest.js b/lib/internal/policy/manifest.js
@@ -345,22 +345,20 @@ function findScopeHREF(href, scopeStore, allowSame) {
  * @typedef {boolean | string | SRI[] | typeof kCascade} Integrity
  */
 
-let URL;
 let shouldAbortOnUncaughtException;
-let createHash, timingSafeEqual, HashUpdate, HashDigest;
+const crypto = require('crypto');
+const timingSafeEqual = crypto.timingSafeEqual;
+const createHash = crypto.createHash;
+const HashUpdate = uncurryThis(crypto.Hash.prototype.update);
+const HashDigest = uncurryThis(crypto.Hash.prototype.digest);
+const { getOptionValue } = require('internal/options');
+const { URL } = require('internal/url');
 // To get this in the snapshot we can't have things that use getOptionsValue or
 // expose C++ functions so we do these lazily
 function lazyBits() {
-  const { getOptionValue } = require('internal/options');
   shouldAbortOnUncaughtException = getOptionValue(
     '--abort-on-uncaught-exception'
   );
-  URL = require('internal/url').URL;
-  const crypto = require('crypto');
-  timingSafeEqual = crypto.timingSafeEqual;
-  createHash = crypto.createHash;
-  HashUpdate = uncurryThis(crypto.Hash.prototype.update);
-  HashDigest = uncurryThis(crypto.Hash.prototype.digest);
 }
 
 class Manifest {
