Bug 1954074 - drop the now-unneeded github-only module exporting code in the webcompat addon, and load the modules without eval in the tests; r?denschub

wisniewskit · wisniewskit · commit cb81c2da4aff · 2025-03-19T17:48:41.000-04:00
diff --git a/spec/intervention_helpers.spec.js b/spec/intervention_helpers.spec.js
diff --git a/spec/ua_helpers.spec.js b/spec/ua_helpers.spec.js
diff --git a/src/data/shims.js b/src/data/shims.js
@@ -1027,4 +1027,6 @@ const AVAILABLE_SHIMS = [
   },
 ];
 
-module.exports = AVAILABLE_SHIMS;
+if (typeof module !== "undefined") {
+  module.exports = AVAILABLE_SHIMS;
+}
diff --git a/src/lib/about_compat_broker.js b/src/lib/about_compat_broker.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-/* global browser, module, onMessageFromTab */
+/* global browser, onMessageFromTab */
 
 class AboutCompatBroker {
   constructor(bindings) {
@@ -122,5 +122,3 @@ class AboutCompatBroker {
     });
   }
 }
-
-module.exports = AboutCompatBroker;
diff --git a/src/lib/custom_functions.js b/src/lib/custom_functions.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-/* globals browser, module */
+/* globals browser */
 
 const replaceStringInRequest = (
   requestId,
@@ -35,7 +35,7 @@ const replaceStringInRequest = (
   };
 };
 
-const CUSTOM_FUNCTIONS = {
+var CUSTOM_FUNCTIONS = {
   replace_string_in_request: {
     details: ["find", "replace", "urls", "types"],
     enable(details) {
@@ -99,5 +99,3 @@ const CUSTOM_FUNCTIONS = {
     },
   },
 };
-
-module.exports = CUSTOM_FUNCTIONS;
diff --git a/src/lib/intervention_helpers.js b/src/lib/intervention_helpers.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-/* globals browser, module, UAHelpers */
+/* globals browser, UAHelpers */
 
 const GOOGLE_TLDS = [
   "com",
@@ -415,5 +415,3 @@ var InterventionHelpers = {
     return InterventionHelpers.matchPatternsForTLDs(base, suffix, GOOGLE_TLDS);
   },
 };
-
-module.exports = InterventionHelpers;
diff --git a/src/lib/interventions.js b/src/lib/interventions.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-/* globals browser, InterventionHelpers, module */
+/* globals browser, InterventionHelpers */
 
 class Interventions {
   constructor(availableInterventions, customFunctions) {
@@ -430,5 +430,3 @@ class Interventions {
     return [registration];
   }
 }
-
-module.exports = Interventions;
diff --git a/src/lib/module_shim.js b/src/lib/module_shim.js
diff --git a/src/lib/shims.js b/src/lib/shims.js
@@ -1307,4 +1307,6 @@ class Shims {
   }
 }
 
-module.exports = Shims;
+if (typeof module !== "undefined") {
+  module.exports = Shims;
+}
diff --git a/src/lib/ua_helpers.js b/src/lib/ua_helpers.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-/* globals browser, exportFunction, module */
+/* globals browser, exportFunction */
 
 var UAHelpers = {
   _deviceAppropriateChromeUAs: {},
@@ -159,7 +159,3 @@ var UAHelpers = {
     return `Mozilla/5.0 (Windows NT 10.0; Win64; x64; ${rv}) Gecko/20100101 ${ver}`;
   },
 };
-
-if (typeof module !== "undefined") {
-  module.exports = UAHelpers;
-}
diff --git a/src/manifest.json b/src/manifest.json
@@ -89,7 +89,6 @@
 
   "background": {
     "scripts": [
-      "lib/module_shim.js",
       "lib/messaging_helper.js",
       "lib/ua_helpers.js",
       "lib/intervention_helpers.js",
diff --git a/src/moz.build b/src/moz.build
@@ -220,7 +220,6 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["lib"] += [
     "lib/intervention_helpers.js",
     "lib/interventions.js",
     "lib/messaging_helper.js",
-    "lib/module_shim.js",
     "lib/requestStorageAccess_helper.js",
     "lib/shim_messaging_helper.js",
     "lib/shims.js",
diff --git a/src/tests/browser/browser_interventions.js b/src/tests/browser/browser_interventions.js
@@ -64,20 +64,25 @@ function check_valid_array(a, key, id) {
 
 // eslint-disable-next-line complexity
 add_task(async function test_json_data() {
-  const module = {};
+  const addon = await AddonManager.getAddonByID("webcompat@mozilla.org");
+  const addonURI = addon.getResourceURI().spec;
 
-  // eslint-disable-next-line no-eval
-  eval(await (await fetch(addon_url("lib/intervention_helpers.js"))).text());
-  const helpers = module.exports;
+  const exports = {};
+  Services.scriptloader.loadSubScript(
+    `${addonURI}/lib/intervention_helpers.js`,
+    exports
+  );
+  Services.scriptloader.loadSubScript(
+    `${addonURI}/lib/custom_functions.js`,
+    exports
+  );
+  const helpers = exports.InterventionHelpers;
+  const custom_fns = exports.CUSTOM_FUNCTIONS;
 
   for (const [name, fn] of Object.entries(helpers.skip_if_functions)) {
     Assert.strictEqual(typeof fn, "function", `Skip-if ${name} is a function`);
   }
 
-  // eslint-disable-next-line no-eval
-  eval(await (await fetch(addon_url("lib/custom_functions.js"))).text());
-  const custom_fns = module.exports;
-
   for (const [name, { disable, enable }] of Object.entries(custom_fns)) {
     Assert.strictEqual(
       typeof enable,

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`"use strict";`
`6`	`6`
`7`		`-/* global browser, module, onMessageFromTab */`
	`7`	`+/* global browser, onMessageFromTab */`
`8`	`8`
`9`	`9`	`class AboutCompatBroker {`
`10`	`10`	`constructor(bindings) {`
`@@ -122,5 +122,3 @@ class AboutCompatBroker {`
`122`	`122`	`});`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`-`
`126`		`-module.exports = AboutCompatBroker;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`"use strict";`
`6`	`6`
`7`		`-/* globals browser, InterventionHelpers, module */`
	`7`	`+/* globals browser, InterventionHelpers */`
`8`	`8`
`9`	`9`	`class Interventions {`
`10`	`10`	`constructor(availableInterventions, customFunctions) {`
`@@ -430,5 +430,3 @@ class Interventions {`
`430`	`430`	`return [registration];`
`431`	`431`	`}`
`432`	`432`	`}`
`433`		`-`
`434`		`-module.exports = Interventions;`
Original file line number	Diff line number	Diff line change
`@@ -1307,4 +1307,6 @@ class Shims {`
`1307`	`1307`	`}`
`1308`	`1308`	`}`
`1309`	`1309`
`1310`		`-module.exports = Shims;`
	`1310`	`+if (typeof module !== "undefined") {`
	`1311`	`+ module.exports = Shims;`
	`1312`	`+}`