ESMify some modules for m-c (bug 1824610)

mozilla · Mar 27, 2023 · d0d70c3 · d0d70c3
1 parent 384bd96
commit d0d70c3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/...refox/content/PdfJsDefaultPreferences.jsm → ...x/content/PdfJsDefaultPreferences.sys.mjs b/...refox/content/PdfJsDefaultPreferences.jsm → ...x/content/PdfJsDefaultPreferences.sys.mjs
@@ -15,8 +15,6 @@
 
 "use strict";
 
-var EXPORTED_SYMBOLS = ["PdfJsDefaultPreferences"];
-
-var PdfJsDefaultPreferences = Object.freeze(
+export const PdfJsDefaultPreferences = Object.freeze(
   PDFJSDev.eval("DEFAULT_PREFERENCES")
 );
diff --git a/gulpfile.js b/gulpfile.js
@@ -438,7 +438,7 @@ function createSandboxExternal(defines) {
     transform("utf8", content => {
       content = preprocessor2.preprocessPDFJSCode(ctx, content);
       return `${licenseHeader}\n${content}`;
-    })
+    }).pipe(rename("pdf.sandbox.external.sys.mjs"))
   );
 }
 
@@ -1381,7 +1381,7 @@ gulp.task(
           .pipe(gulp.dest(MOZCENTRAL_L10N_DIR)),
         gulp.src("LICENSE").pipe(gulp.dest(MOZCENTRAL_EXTENSION_DIR)),
         gulp
-          .src(FIREFOX_CONTENT_DIR + "PdfJsDefaultPreferences.jsm")
+          .src(FIREFOX_CONTENT_DIR + "PdfJsDefaultPreferences.sys.mjs")
           .pipe(transform("utf8", preprocessDefaultPreferences))
           .pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR)),
       ]);

diff --git a/src/pdf.sandbox.external.js b/src/pdf.sandbox.external.js
@@ -16,7 +16,7 @@
 // In mozilla-central, this file is loaded as non-module script,
 // so it mustn't have any dependencies.
 
-class SandboxSupportBase {
+export class SandboxSupportBase {
   /**
    * @param {DOMWindow} - win
    */
@@ -181,10 +181,3 @@ class SandboxSupportBase {
     };
   }
 }
-
-if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
-  exports.SandboxSupportBase = SandboxSupportBase;
-} else {
-  /* eslint-disable-next-line no-unused-vars, no-var */
-  var EXPORTED_SYMBOLS = ["SandboxSupportBase"];
-}