Backed out 2 changesets (bug 1811633) for causing lint bustage CLOSED…

… TREE

Backed out changeset 3ef0fe45b191 (bug 1811633)
Backed out changeset 92a7ec78a4ce (bug 1811633)

.eslintrc.js

@@ -1716,8 +1716,8 @@ module.exports = {
         "toolkit/components/antitracking/test/browser/head.js",
         "toolkit/components/antitracking/test/browser/storageAccessAPIHelpers.js",
         "toolkit/components/certviewer/tests/browser/adjustedCerts.js",
-        "toolkit/components/certviewer/tests/chrome/CSoutput.mjs",
-        "toolkit/components/certviewer/tests/chrome/parseOutput.mjs",
+        "toolkit/components/certviewer/tests/chrome/CSoutput.js",
+        "toolkit/components/certviewer/tests/chrome/parseOutput.js",
         "toolkit/components/cleardata/tests/browser/browser_css_cache.js",
         "toolkit/components/cleardata/tests/browser/browser_image_cache.js",
         "toolkit/components/cleardata/tests/browser/browser_preflight_cache.js",

.hgignore

@@ -131,9 +131,6 @@ _OPT\.OBJ/
 ^remote/test/puppeteer/utils/mochaRunner/lib/
 ^remote/test/puppeteer/website
 
-^third_party/js/PKI.js/node_modules/
-^third_party/js/PKI.js/package-lock.json
-
 # git checkout of libstagefright
 ^media/libstagefright/android$
 
@@ -246,6 +243,10 @@ gfx/wgpu/target
 gfx/wgpu/.*/build
 gfx/wr/target/
 
+# Ignore this files in certviewer
+toolkit/components/certviewer/content/node_modules/
+toolkit/components/certviewer/content/package-lock.json
+
 # Ignore Rust/Cargo output from running `cargo` directly for image_builder docker image
 ^taskcluster/docker/image_builder/build-image/target
 

devtools/shared/network-observer/NetworkHelper.sys.mjs

@@ -73,11 +73,31 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
   NetUtil: "resource://gre/modules/NetUtil.jsm",
 });
 
-// It would make sense to put this in the above
-// ChromeUtils.defineESModuleGetters, but that doesn't seem to work.
 XPCOMUtils.defineLazyGetter(lazy, "certDecoder", () => {
-  const { parse, pemToDER } = ChromeUtils.importESModule(
-    "chrome://global/content/certviewer/certDecoder.mjs"
+  const { asn1js } = ChromeUtils.import(
+    "chrome://global/content/certviewer/asn1js_bundle.jsm"
+  );
+  const { pkijs } = ChromeUtils.import(
+    "chrome://global/content/certviewer/pkijs_bundle.jsm"
+  );
+  const { pvutils } = ChromeUtils.import(
+    "chrome://global/content/certviewer/pvutils_bundle.jsm"
+  );
+
+  const { Integer, fromBER } = asn1js.asn1js;
+  const { Certificate } = pkijs.pkijs;
+  const { fromBase64, stringToArrayBuffer } = pvutils.pvutils;
+
+  const { certDecoderInitializer } = ChromeUtils.import(
+    "chrome://global/content/certviewer/certDecoder.jsm"
+  );
+  const { parse, pemToDER } = certDecoderInitializer(
+    Integer,
+    fromBER,
+    Certificate,
+    fromBase64,
+    stringToArrayBuffer,
+    crypto
   );
   return { parse, pemToDER };
 });

security/manager/pki/resources/content/clientauthask.js

@@ -6,8 +6,30 @@
 /* import-globals-from pippki.js */
 "use strict";
 
-const { parse, pemToDER } = ChromeUtils.importESModule(
-  "chrome://global/content/certviewer/certDecoder.mjs"
+const { asn1js } = ChromeUtils.import(
+  "chrome://global/content/certviewer/asn1js_bundle.jsm"
+);
+const { pkijs } = ChromeUtils.import(
+  "chrome://global/content/certviewer/pkijs_bundle.jsm"
+);
+const { pvutils } = ChromeUtils.import(
+  "chrome://global/content/certviewer/pvutils_bundle.jsm"
+);
+
+const { Integer, fromBER } = asn1js.asn1js;
+const { Certificate } = pkijs.pkijs;
+const { fromBase64, stringToArrayBuffer } = pvutils.pvutils;
+
+const { certDecoderInitializer } = ChromeUtils.import(
+  "chrome://global/content/certviewer/certDecoder.jsm"
+);
+const { parse, pemToDER } = certDecoderInitializer(
+  Integer,
+  fromBER,
+  Certificate,
+  fromBase64,
+  stringToArrayBuffer,
+  crypto
 );
 
 /**