diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /devtools/shared/loader/base-loader.sys.mjs | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | devtools/shared/loader/base-loader.sys.mjs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/devtools/shared/loader/base-loader.sys.mjs b/devtools/shared/loader/base-loader.sys.mjs index ab005b81e2..c777cf3e10 100644 --- a/devtools/shared/loader/base-loader.sys.mjs +++ b/devtools/shared/loader/base-loader.sys.mjs @@ -37,9 +37,6 @@ function* getOwnIdentifiers(x) { function isJSONURI(uri) { return uri.endsWith(".json"); } -function isJSMURI(uri) { - return uri.endsWith(".jsm"); -} function isSYSMJSURI(uri) { return uri.endsWith(".sys.mjs"); } @@ -218,7 +215,7 @@ function load(loader, module) { // Utility function to normalize module `uri`s so they have `.js` extension. function normalizeExt(uri) { - if (isJSURI(uri) || isJSONURI(uri) || isJSMURI(uri) || isSYSMJSURI(uri)) { + if (isJSURI(uri) || isJSONURI(uri) || isSYSMJSURI(uri)) { return uri; } return uri + ".js"; @@ -336,9 +333,6 @@ export function Require(loader, requirer) { // If module is already cached by loader then just use it. if (uri in modules) { module = modules[uri]; - } else if (isJSMURI(uri)) { - module = modules[uri] = Module(requirement, uri); - module.exports = ChromeUtils.import(uri); } else if (isSYSMJSURI(uri)) { module = modules[uri] = Module(requirement, uri); module.exports = ChromeUtils.importESModule(uri, { |