Skip to content

Commit fe29a55

Browse files
authored
Avoid uses of ?. in locations that are not Babeled (#25880)
Avoid uses of ?. in locations that are not Babeled, to help Firefox 68.12.0esr pass browser tests.
1 parent 4e07c17 commit fe29a55

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/modularize.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ var {{{ EXPORT_NAME }}} = (() => {
1818
// When MODULARIZE this JS may be executed later,
1919
// after document.currentScript is gone, so we save it.
2020
// In EXPORT_ES6 mode we can just use 'import.meta.url'.
21+
#if MIN_FIREFOX_VERSION < 74 || LEGACY_VM_SUPPORT
22+
// This modularize.js script is not Babeled, so manually adapt for old browsers.
23+
var _scriptName = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : undefined;
24+
#else
2125
var _scriptName = globalThis.document?.currentScript?.src;
26+
#endif
2227
return async function(moduleArg = {}) {
2328
var moduleRtn;
2429

test/browser_reporting.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ if (hasModule) {
125125
const origPrintErr = Module['printErr'];
126126

127127
Module['print'] = (...args) => {
128-
origPrint?.(...args);
128+
origPrint && origPrint(args);
129129
reportStdoutToServer(args.join(' '));
130130
};
131131

132132
Module['printErr'] = (...args) => {
133-
origPrintErr?.(...args);
133+
origPrintErr && origPrintErr(args);
134134
reportStderrToServer(args.join(' '));
135135
};
136136
}

tools/file_packager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ def generate_preload_js(data_target, data_files, metadata):
10171017
# is async, so we handle both orderings.
10181018
ret += '''
10191019
var fetchPromise;
1020-
var fetched = Module['getPreloadedPackage']?.(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE);
1020+
var fetched = Module['getPreloadedPackage'] && Module['getPreloadedPackage'](REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE);
10211021
10221022
if (!fetched) {
10231023
// Note that we don't use await here because we want to execute the

0 commit comments

Comments
 (0)