diff --git a/src/closure-externs/modularize-externs.js b/src/closure-externs/modularize-externs.js
index fd29362e99559..b0fec4a9dc4b0 100644
--- a/src/closure-externs/modularize-externs.js
+++ b/src/closure-externs/modularize-externs.js
@@ -1,6 +1,7 @@
-// Due to the way MODULARIZE works, Closure is run on generated code that does not define _scriptName,
-// but only after MODULARIZE has finished, _scriptName is injected to the generated code.
-// Therefore it cannot be minified.
+// In MODULARIZE mode the JS code may be executed later, after `document.currentScript` is gone, so we store
+// it to `_scriptName` outside the wrapper function. Therefore, it cannot be minified.
+// In EXPORT_ES6 mode we use `import.meta.url` and for Node.js CommonJS builds we use `__filename`.
+
 /**
  * @suppress {duplicate, undefinedVars}
  */
diff --git a/src/shell.js b/src/shell.js
index 08f65d57ea52d..a30d4278b059d 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -139,24 +139,32 @@ var quit_ = (status, toThrow) => {
   throw toThrow;
 };
 
-#if SHARED_MEMORY && !MODULARIZE
+#if EXPORT_ES6
+var _scriptName = import.meta.url;
+#else
+#if ENVIRONMENT_MAY_BE_WEB
+#if !MODULARIZE
 // In MODULARIZE mode _scriptName needs to be captured already at the very top of the page immediately when the page is parsed, so it is generated there
 // before the page load. In non-MODULARIZE modes generate it here.
-var _scriptName = (typeof document != 'undefined') ? document.currentScript?.src : undefined;
+var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
+#endif // !MODULARIZE
+#elif ENVIRONMENT_MAY_BE_NODE || ENVIRONMENT_MAY_BE_WORKER
+var _scriptName;
+#endif // ENVIRONMENT_MAY_BE_WEB
 
 #if ENVIRONMENT_MAY_BE_NODE
-if (ENVIRONMENT_IS_NODE) {
-#if EXPORT_ES6
-  _scriptName = typeof __filename != 'undefined' ? __filename : import.meta.url
-#else
+if (typeof __filename != 'undefined') { // Node
   _scriptName = __filename;
-#endif
 } else
 #endif // ENVIRONMENT_MAY_BE_NODE
+#if ENVIRONMENT_MAY_BE_WORKER
 if (ENVIRONMENT_IS_WORKER) {
   _scriptName = self.location.href;
 }
-#endif // SHARED_MEMORY && !MODULARIZE
+#elif ENVIRONMENT_MAY_BE_NODE
+  /*no-op*/{}
+#endif // ENVIRONMENT_MAY_BE_WORKER
+#endif // EXPORT_ES6
 
 // `/` should be present at the end if `scriptDirectory` is not empty
 var scriptDirectory = '';
@@ -197,11 +205,8 @@ if (ENVIRONMENT_IS_NODE) {
   var nodePath = require('path');
 
 #if EXPORT_ES6
-  // EXPORT_ES6 + ENVIRONMENT_IS_NODE always requires use of import.meta.url,
-  // since there's no way getting the current absolute path of the module when
-  // support for that is not available.
-  if (!import.meta.url.startsWith('data:')) {
-    scriptDirectory = nodePath.dirname(require('url').fileURLToPath(import.meta.url)) + '/';
+  if (_scriptName.startsWith('file:')) {
+    scriptDirectory = nodePath.dirname(require('url').fileURLToPath(_scriptName)) + '/';
   }
 #else
   scriptDirectory = __dirname + '/';
@@ -335,28 +340,11 @@ if (ENVIRONMENT_IS_SHELL) {
 // ENVIRONMENT_IS_NODE.
 #if ENVIRONMENT_MAY_BE_WEB || ENVIRONMENT_MAY_BE_WORKER
 if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
-  if (ENVIRONMENT_IS_WORKER) { // Check worker, not web, since window could be polyfilled
-    scriptDirectory = self.location.href;
-  } else if (typeof document != 'undefined' && document.currentScript) { // web
-    scriptDirectory = document.currentScript.src;
-  }
-#if MODULARIZE
-  // When MODULARIZE, this JS may be executed later, after document.currentScript
-  // is gone, so we saved it, and we use it here instead of any other info.
-  if (_scriptName) {
-    scriptDirectory = _scriptName;
-  }
-#endif
-  // blob urls look like blob:http://site.com/etc/etc and we cannot infer anything from them.
-  // otherwise, slice off the final part of the url to find the script directory.
-  // if scriptDirectory does not contain a slash, lastIndexOf will return -1,
-  // and scriptDirectory will correctly be replaced with an empty string.
-  // If scriptDirectory contains a query (starting with ?) or a fragment (starting with #),
-  // they are removed because they could contain a slash.
-  if (scriptDirectory.startsWith('blob:')) {
-    scriptDirectory = '';
-  } else {
-    scriptDirectory = scriptDirectory.slice(0, scriptDirectory.replace(/[?#].*/, '').lastIndexOf('/')+1);
+  try {
+    scriptDirectory = new URL('.', _scriptName).href; // includes trailing slash
+  } catch {
+    // Must be a `blob:` or `data:` URL (e.g. `blob:http://site.com/etc/etc`), we cannot
+    // infer anything from them.
   }
 
 #if ENVIRONMENT && ASSERTIONS
diff --git a/src/shell_minimal.js b/src/shell_minimal.js
index 60c7089602559..a34167d431cba 100644
--- a/src/shell_minimal.js
+++ b/src/shell_minimal.js
@@ -134,7 +134,7 @@ var ENVIRONMENT_IS_PTHREAD = ENVIRONMENT_IS_WORKER && self.name?.startsWith('em-
 #if !MODULARIZE
 // In MODULARIZE mode _scriptName needs to be captured already at the very top of the page immediately when the page is parsed, so it is generated there
 // before the page load. In non-MODULARIZE modes generate it here.
-var _scriptName = (typeof document != 'undefined') ? document.currentScript?.src : undefined;
+var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
 #endif
 
 #if ENVIRONMENT_MAY_BE_NODE
@@ -145,9 +145,11 @@ if (ENVIRONMENT_IS_NODE) {
   // Under node we set `workerData` to `em-pthread` to signal that the worker
   // is hosting a pthread.
   ENVIRONMENT_IS_PTHREAD = ENVIRONMENT_IS_WORKER && worker_threads['workerData'] == 'em-pthread'
+#if !EXPORT_ES6
   _scriptName = __filename;
-} else
 #endif
+} else
+#endif // ENVIRONMENT_MAY_BE_NODE
 if (ENVIRONMENT_IS_WORKER) {
   _scriptName = self.location.href;
 }
diff --git a/src/wasm_worker.js b/src/wasm_worker.js
index 68ca396deb5a7..b08b60877ead4 100644
--- a/src/wasm_worker.js
+++ b/src/wasm_worker.js
@@ -34,8 +34,11 @@ if (ENVIRONMENT_IS_NODE) {
   Object.assign(global, {
     self: global,
     require,
+#if !EXPORT_ES6
+    // `vm.runInThisContext` global scope lacks `__filename` and `__dirname`
     __filename,
     __dirname,
+#endif
     Worker: nodeWorkerThreads.Worker,
     importScripts: (f) => vm.runInThisContext(fs.readFileSync(f, 'utf8'), {filename: f}),
     postMessage: (msg) => parentPort.postMessage(msg),
diff --git a/test/browser/test_small_js_flags.js.size b/test/browser/test_small_js_flags.js.size
index 1263586a20af3..5e583deec4ef3 100644
--- a/test/browser/test_small_js_flags.js.size
+++ b/test/browser/test_small_js_flags.js.size
@@ -1 +1 @@
-3996
+3934
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.gzsize b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
index 4cf697da3feb7..614b636125d1c 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
@@ -1 +1 @@
-8237
+8208
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.jssize b/test/other/codesize/test_codesize_cxx_ctors1.jssize
index 939e37374aaf9..c70330d26edbd 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.jssize
@@ -1 +1 @@
-19928
+19920
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
index 468231aea1872..d3c299e77bb6c 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
@@ -1 +1 @@
-8226
+8196
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.jssize b/test/other/codesize/test_codesize_cxx_ctors2.jssize
index 7a89dbbce27cf..c37185470ec84 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.jssize
@@ -1 +1 @@
-19906
+19898
diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize
index 29f2864697ffd..0f871ad1ad37a 100644
--- a/test/other/codesize/test_codesize_cxx_except.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except.gzsize
@@ -1 +1 @@
-9227
+9203
diff --git a/test/other/codesize/test_codesize_cxx_except.jssize b/test/other/codesize/test_codesize_cxx_except.jssize
index 0e93cb0738eda..ef23d37ada345 100644
--- a/test/other/codesize/test_codesize_cxx_except.jssize
+++ b/test/other/codesize/test_codesize_cxx_except.jssize
@@ -1 +1 @@
-23665
+23657
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
index 19a884d3effa1..0d6cf5caf246c 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
@@ -1 +1 @@
-8178
+8156
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.jssize b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
index 0ad70010616d0..b9a148366b441 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
@@ -1 +1 @@
-19821
+19813
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize
index 19a884d3effa1..0d6cf5caf246c 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize
@@ -1 +1 @@
-8178
+8156
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.jssize b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.jssize
index 0ad70010616d0..b9a148366b441 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_legacy.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_legacy.jssize
@@ -1 +1 @@
-19821
+19813
diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize
index 8302b01826eac..20b00fdceabbf 100644
--- a/test/other/codesize/test_codesize_cxx_lto.gzsize
+++ b/test/other/codesize/test_codesize_cxx_lto.gzsize
@@ -1 +1 @@
-8244
+8217
diff --git a/test/other/codesize/test_codesize_cxx_lto.jssize b/test/other/codesize/test_codesize_cxx_lto.jssize
index 8ebad44492287..30f36b4f7ffe2 100644
--- a/test/other/codesize/test_codesize_cxx_lto.jssize
+++ b/test/other/codesize/test_codesize_cxx_lto.jssize
@@ -1 +1 @@
-20003
+19994
diff --git a/test/other/codesize/test_codesize_cxx_mangle.gzsize b/test/other/codesize/test_codesize_cxx_mangle.gzsize
index b61efeefa5948..bdfb192711ab0 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.gzsize
+++ b/test/other/codesize/test_codesize_cxx_mangle.gzsize
@@ -1 +1 @@
-9270
+9246
diff --git a/test/other/codesize/test_codesize_cxx_mangle.jssize b/test/other/codesize/test_codesize_cxx_mangle.jssize
index 33208100dcef2..21ba851fc4475 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.jssize
+++ b/test/other/codesize/test_codesize_cxx_mangle.jssize
@@ -1 +1 @@
-23780
+23772
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.gzsize b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
index 4cf697da3feb7..614b636125d1c 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.gzsize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
@@ -1 +1 @@
-8237
+8208
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.jssize b/test/other/codesize/test_codesize_cxx_noexcept.jssize
index 939e37374aaf9..c70330d26edbd 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.jssize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.jssize
@@ -1 +1 @@
-19928
+19920
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.gzsize b/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
index 81b84ec4307f9..bf6950a47c65d 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
@@ -1 +1 @@
-3413
+3387
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.jssize b/test/other/codesize/test_codesize_cxx_wasmfs.jssize
index 6ef8ea8bd4e8d..4af1768ab5caa 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.jssize
@@ -1 +1 @@
-7329
+7320
diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize
index df2cbb6c7806e..ceccb3db5f230 100644
--- a/test/other/codesize/test_codesize_files_js_fs.gzsize
+++ b/test/other/codesize/test_codesize_files_js_fs.gzsize
@@ -1 +1 @@
-7527
+7499
diff --git a/test/other/codesize/test_codesize_files_js_fs.jssize b/test/other/codesize/test_codesize_files_js_fs.jssize
index d5b25236a758d..cf8b4dceb2b42 100644
--- a/test/other/codesize/test_codesize_files_js_fs.jssize
+++ b/test/other/codesize/test_codesize_files_js_fs.jssize
@@ -1 +1 @@
-18510
+18501
diff --git a/test/other/codesize/test_codesize_files_wasmfs.gzsize b/test/other/codesize/test_codesize_files_wasmfs.gzsize
index f91abb4dc9679..d16660a3e6cee 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_files_wasmfs.gzsize
@@ -1 +1 @@
-2668
+2640
diff --git a/test/other/codesize/test_codesize_files_wasmfs.jssize b/test/other/codesize/test_codesize_files_wasmfs.jssize
index a5d7be726c961..3b224ae05f5e7 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_files_wasmfs.jssize
@@ -1 +1 @@
-5714
+5703
diff --git a/test/other/codesize/test_codesize_hello_O0.gzsize b/test/other/codesize/test_codesize_hello_O0.gzsize
index dd58302fe95a0..236eccc18d0b8 100644
--- a/test/other/codesize/test_codesize_hello_O0.gzsize
+++ b/test/other/codesize/test_codesize_hello_O0.gzsize
@@ -1 +1 @@
-7806
+7785
diff --git a/test/other/codesize/test_codesize_hello_O0.jssize b/test/other/codesize/test_codesize_hello_O0.jssize
index bb3ab7eb10f83..2429ccac36e1d 100644
--- a/test/other/codesize/test_codesize_hello_O0.jssize
+++ b/test/other/codesize/test_codesize_hello_O0.jssize
@@ -1 +1 @@
-20758
+20761
diff --git a/test/other/codesize/test_codesize_hello_O1.gzsize b/test/other/codesize/test_codesize_hello_O1.gzsize
index 2c7a84e8e4dca..d0f0d290cd436 100644
--- a/test/other/codesize/test_codesize_hello_O1.gzsize
+++ b/test/other/codesize/test_codesize_hello_O1.gzsize
@@ -1 +1 @@
-2534
+2510
diff --git a/test/other/codesize/test_codesize_hello_O1.jssize b/test/other/codesize/test_codesize_hello_O1.jssize
index 45c6100d633b0..564868d8a88a5 100644
--- a/test/other/codesize/test_codesize_hello_O1.jssize
+++ b/test/other/codesize/test_codesize_hello_O1.jssize
@@ -1 +1 @@
-6528
+6536
diff --git a/test/other/codesize/test_codesize_hello_O2.gzsize b/test/other/codesize/test_codesize_hello_O2.gzsize
index 811f4e3ac1613..d03b13697b271 100644
--- a/test/other/codesize/test_codesize_hello_O2.gzsize
+++ b/test/other/codesize/test_codesize_hello_O2.gzsize
@@ -1 +1 @@
-2193
+2170
diff --git a/test/other/codesize/test_codesize_hello_O2.jssize b/test/other/codesize/test_codesize_hello_O2.jssize
index 7553ea5ef9400..7a8caf9dcefa2 100644
--- a/test/other/codesize/test_codesize_hello_O2.jssize
+++ b/test/other/codesize/test_codesize_hello_O2.jssize
@@ -1 +1 @@
-4508
+4497
diff --git a/test/other/codesize/test_codesize_hello_O3.gzsize b/test/other/codesize/test_codesize_hello_O3.gzsize
index e144591da40d9..10c8452b2c3ab 100644
--- a/test/other/codesize/test_codesize_hello_O3.gzsize
+++ b/test/other/codesize/test_codesize_hello_O3.gzsize
@@ -1 +1 @@
-2149
+2128
diff --git a/test/other/codesize/test_codesize_hello_O3.jssize b/test/other/codesize/test_codesize_hello_O3.jssize
index 788789d02756c..032405f2d9a25 100644
--- a/test/other/codesize/test_codesize_hello_O3.jssize
+++ b/test/other/codesize/test_codesize_hello_O3.jssize
@@ -1 +1 @@
-4450
+4439
diff --git a/test/other/codesize/test_codesize_hello_Os.gzsize b/test/other/codesize/test_codesize_hello_Os.gzsize
index e144591da40d9..10c8452b2c3ab 100644
--- a/test/other/codesize/test_codesize_hello_Os.gzsize
+++ b/test/other/codesize/test_codesize_hello_Os.gzsize
@@ -1 +1 @@
-2149
+2128
diff --git a/test/other/codesize/test_codesize_hello_Os.jssize b/test/other/codesize/test_codesize_hello_Os.jssize
index 788789d02756c..032405f2d9a25 100644
--- a/test/other/codesize/test_codesize_hello_Os.jssize
+++ b/test/other/codesize/test_codesize_hello_Os.jssize
@@ -1 +1 @@
-4450
+4439
diff --git a/test/other/codesize/test_codesize_hello_Oz.gzsize b/test/other/codesize/test_codesize_hello_Oz.gzsize
index e144591da40d9..10c8452b2c3ab 100644
--- a/test/other/codesize/test_codesize_hello_Oz.gzsize
+++ b/test/other/codesize/test_codesize_hello_Oz.gzsize
@@ -1 +1 @@
-2149
+2128
diff --git a/test/other/codesize/test_codesize_hello_Oz.jssize b/test/other/codesize/test_codesize_hello_Oz.jssize
index 788789d02756c..032405f2d9a25 100644
--- a/test/other/codesize/test_codesize_hello_Oz.jssize
+++ b/test/other/codesize/test_codesize_hello_Oz.jssize
@@ -1 +1 @@
-4450
+4439
diff --git a/test/other/codesize/test_codesize_hello_dylink.gzsize b/test/other/codesize/test_codesize_hello_dylink.gzsize
index 27f49eac23ee3..a5755921eac44 100644
--- a/test/other/codesize/test_codesize_hello_dylink.gzsize
+++ b/test/other/codesize/test_codesize_hello_dylink.gzsize
@@ -1 +1 @@
-11753
+11735
diff --git a/test/other/codesize/test_codesize_hello_dylink.jssize b/test/other/codesize/test_codesize_hello_dylink.jssize
index 8c789d48edc34..c82e0d84da885 100644
--- a/test/other/codesize/test_codesize_hello_dylink.jssize
+++ b/test/other/codesize/test_codesize_hello_dylink.jssize
@@ -1 +1 @@
-27782
+27774
diff --git a/test/other/codesize/test_codesize_hello_export_nothing.gzsize b/test/other/codesize/test_codesize_hello_export_nothing.gzsize
index 47702a2467843..f02edd5f91078 100644
--- a/test/other/codesize/test_codesize_hello_export_nothing.gzsize
+++ b/test/other/codesize/test_codesize_hello_export_nothing.gzsize
@@ -1 +1 @@
-1545
+1520
diff --git a/test/other/codesize/test_codesize_hello_export_nothing.jssize b/test/other/codesize/test_codesize_hello_export_nothing.jssize
index 0287c2c3a04a9..a0b6cfe69b46f 100644
--- a/test/other/codesize/test_codesize_hello_export_nothing.jssize
+++ b/test/other/codesize/test_codesize_hello_export_nothing.jssize
@@ -1 +1 @@
-3338
+3325
diff --git a/test/other/codesize/test_codesize_hello_single_file.gzsize b/test/other/codesize/test_codesize_hello_single_file.gzsize
index 23d7fdb199202..61b86d0fa055c 100644
--- a/test/other/codesize/test_codesize_hello_single_file.gzsize
+++ b/test/other/codesize/test_codesize_hello_single_file.gzsize
@@ -1 +1 @@
-3673
+3626
diff --git a/test/other/codesize/test_codesize_hello_single_file.jssize b/test/other/codesize/test_codesize_hello_single_file.jssize
index a7ecce77abaaf..d99a176aab4c8 100644
--- a/test/other/codesize/test_codesize_hello_single_file.jssize
+++ b/test/other/codesize/test_codesize_hello_single_file.jssize
@@ -1 +1 @@
-6732
+6690
diff --git a/test/other/codesize/test_codesize_hello_wasmfs.gzsize b/test/other/codesize/test_codesize_hello_wasmfs.gzsize
index e144591da40d9..10c8452b2c3ab 100644
--- a/test/other/codesize/test_codesize_hello_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_hello_wasmfs.gzsize
@@ -1 +1 @@
-2149
+2128
diff --git a/test/other/codesize/test_codesize_hello_wasmfs.jssize b/test/other/codesize/test_codesize_hello_wasmfs.jssize
index 788789d02756c..032405f2d9a25 100644
--- a/test/other/codesize/test_codesize_hello_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_hello_wasmfs.jssize
@@ -1 +1 @@
-4450
+4439
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize b/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize
index 8d937ef32a302..058fbb17e4dbb 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize
@@ -1 +1 @@
-1736
+1713
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize b/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize
index f76268c8b2ac3..d8dbffaf9797f 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize
@@ -1 +1 @@
-3713
+3700
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize
index ff5a5069a753e..a8c5937bc3727 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize
@@ -1 +1 @@
-1769
+1745
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize
index bcd68d60a016c..3c3ed5d04892c 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize
@@ -1 +1 @@
-3756
+3743
diff --git a/test/other/codesize/test_codesize_mem_O3.gzsize b/test/other/codesize/test_codesize_mem_O3.gzsize
index 0ed0ea4a170d1..90b881dc9d5d4 100644
--- a/test/other/codesize/test_codesize_mem_O3.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3.gzsize
@@ -1 +1 @@
-2190
+2171
diff --git a/test/other/codesize/test_codesize_mem_O3.jssize b/test/other/codesize/test_codesize_mem_O3.jssize
index d9e6fc9300ea6..cc8a8a9f61c9e 100644
--- a/test/other/codesize/test_codesize_mem_O3.jssize
+++ b/test/other/codesize/test_codesize_mem_O3.jssize
@@ -1 +1 @@
-4579
+4569
diff --git a/test/other/codesize/test_codesize_mem_O3_grow.gzsize b/test/other/codesize/test_codesize_mem_O3_grow.gzsize
index 4f98fcfcae613..7279bd19dcd8b 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_grow.gzsize
@@ -1 +1 @@
-2342
+2323
diff --git a/test/other/codesize/test_codesize_mem_O3_grow.jssize b/test/other/codesize/test_codesize_mem_O3_grow.jssize
index 27c1cd345dd21..f9699dc9996d3 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_grow.jssize
@@ -1 +1 @@
-4864
+4854
diff --git a/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize b/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize
index b92935d9e1c94..e355f6dc2c905 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize
@@ -1 +1 @@
-2035
+2013
diff --git a/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize b/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize
index e3f38c7d9c1a7..d6fe433f4e039 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize
@@ -1 +1 @@
-4277
+4265
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone.gzsize
index d644427299908..90e525730040d 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone.gzsize
@@ -1 +1 @@
-1999
+1977
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone.jssize b/test/other/codesize/test_codesize_mem_O3_standalone.jssize
index 3fb6eda517958..26de2ed80572e 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone.jssize
@@ -1 +1 @@
-4210
+4197
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize
index ca06b0eafbbf3..e6a65601bda27 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize
@@ -1 +1 @@
-1761
+1739
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize b/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize
index ac5764e2098c7..bcd68d60a016c 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize
@@ -1 +1 @@
-3769
+3756
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize
index ff5a5069a753e..a8c5937bc3727 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize
@@ -1 +1 @@
-1769
+1745
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize b/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize
index bcd68d60a016c..3c3ed5d04892c 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize
@@ -1 +1 @@
-3756
+3743
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize
index ff5a5069a753e..a8c5937bc3727 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize
@@ -1 +1 @@
-1769
+1745
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize
index bcd68d60a016c..3c3ed5d04892c 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize
@@ -1 +1 @@
-3756
+3743
diff --git a/test/other/codesize/test_codesize_minimal_64.gzsize b/test/other/codesize/test_codesize_minimal_64.gzsize
index fe2568ccc291f..e6417f67d3d68 100644
--- a/test/other/codesize/test_codesize_minimal_64.gzsize
+++ b/test/other/codesize/test_codesize_minimal_64.gzsize
@@ -1 +1 @@
-1317
+1290
diff --git a/test/other/codesize/test_codesize_minimal_64.jssize b/test/other/codesize/test_codesize_minimal_64.jssize
index 024c51cbaff52..ed4e7db85ed49 100644
--- a/test/other/codesize/test_codesize_minimal_64.jssize
+++ b/test/other/codesize/test_codesize_minimal_64.jssize
@@ -1 +1 @@
-2775
+2763
diff --git a/test/other/codesize/test_codesize_minimal_O0.gzsize b/test/other/codesize/test_codesize_minimal_O0.gzsize
index cfa663dee1105..f01ddd67f2bcf 100644
--- a/test/other/codesize/test_codesize_minimal_O0.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O0.gzsize
@@ -1 +1 @@
-6119
+6099
diff --git a/test/other/codesize/test_codesize_minimal_O0.jssize b/test/other/codesize/test_codesize_minimal_O0.jssize
index a4f16ebda8c71..f754391fa4405 100644
--- a/test/other/codesize/test_codesize_minimal_O0.jssize
+++ b/test/other/codesize/test_codesize_minimal_O0.jssize
@@ -1 +1 @@
-16141
+16143
diff --git a/test/other/codesize/test_codesize_minimal_O1.gzsize b/test/other/codesize/test_codesize_minimal_O1.gzsize
index 1eea322546e5a..cdd1bbd776e8d 100644
--- a/test/other/codesize/test_codesize_minimal_O1.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O1.gzsize
@@ -1 +1 @@
-1381
+1352
diff --git a/test/other/codesize/test_codesize_minimal_O1.jssize b/test/other/codesize/test_codesize_minimal_O1.jssize
index c989d24ff3203..c092de8ce7cf1 100644
--- a/test/other/codesize/test_codesize_minimal_O1.jssize
+++ b/test/other/codesize/test_codesize_minimal_O1.jssize
@@ -1 +1 @@
-3240
+3246
diff --git a/test/other/codesize/test_codesize_minimal_O2.gzsize b/test/other/codesize/test_codesize_minimal_O2.gzsize
index 23ea2188912c0..3acca38af1aaf 100644
--- a/test/other/codesize/test_codesize_minimal_O2.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O2.gzsize
@@ -1 +1 @@
-1247
+1221
diff --git a/test/other/codesize/test_codesize_minimal_O2.jssize b/test/other/codesize/test_codesize_minimal_O2.jssize
index 6357d643027cd..d0f0d290cd436 100644
--- a/test/other/codesize/test_codesize_minimal_O2.jssize
+++ b/test/other/codesize/test_codesize_minimal_O2.jssize
@@ -1 +1 @@
-2522
+2510
diff --git a/test/other/codesize/test_codesize_minimal_O3.gzsize b/test/other/codesize/test_codesize_minimal_O3.gzsize
index 1f8248ceace7b..03183b0af291e 100644
--- a/test/other/codesize/test_codesize_minimal_O3.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O3.gzsize
@@ -1 +1 @@
-1212
+1187
diff --git a/test/other/codesize/test_codesize_minimal_O3.jssize b/test/other/codesize/test_codesize_minimal_O3.jssize
index 1717fe9e7fe81..1db299c003761 100644
--- a/test/other/codesize/test_codesize_minimal_O3.jssize
+++ b/test/other/codesize/test_codesize_minimal_O3.jssize
@@ -1 +1 @@
-2472
+2460
diff --git a/test/other/codesize/test_codesize_minimal_Os.gzsize b/test/other/codesize/test_codesize_minimal_Os.gzsize
index 1f8248ceace7b..03183b0af291e 100644
--- a/test/other/codesize/test_codesize_minimal_Os.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Os.gzsize
@@ -1 +1 @@
-1212
+1187
diff --git a/test/other/codesize/test_codesize_minimal_Os.jssize b/test/other/codesize/test_codesize_minimal_Os.jssize
index 1717fe9e7fe81..1db299c003761 100644
--- a/test/other/codesize/test_codesize_minimal_Os.jssize
+++ b/test/other/codesize/test_codesize_minimal_Os.jssize
@@ -1 +1 @@
-2472
+2460
diff --git a/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize b/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize
index 34a5f9bcac300..75fccd6963ecf 100644
--- a/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize
@@ -1 +1 @@
-1197
+1171
diff --git a/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize b/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize
index 0b0d24a555ebb..2e5d6e73f3d59 100644
--- a/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize
+++ b/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize
@@ -1 +1 @@
-2451
+2439
diff --git a/test/other/codesize/test_codesize_minimal_Oz.gzsize b/test/other/codesize/test_codesize_minimal_Oz.gzsize
index 1f8248ceace7b..03183b0af291e 100644
--- a/test/other/codesize/test_codesize_minimal_Oz.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Oz.gzsize
@@ -1 +1 @@
-1212
+1187
diff --git a/test/other/codesize/test_codesize_minimal_Oz.jssize b/test/other/codesize/test_codesize_minimal_Oz.jssize
index 1717fe9e7fe81..1db299c003761 100644
--- a/test/other/codesize/test_codesize_minimal_Oz.jssize
+++ b/test/other/codesize/test_codesize_minimal_Oz.jssize
@@ -1 +1 @@
-2472
+2460
diff --git a/test/other/codesize/test_codesize_minimal_esm.gzsize b/test/other/codesize/test_codesize_minimal_esm.gzsize
index ed45f450e2506..5b86c14e5253c 100644
--- a/test/other/codesize/test_codesize_minimal_esm.gzsize
+++ b/test/other/codesize/test_codesize_minimal_esm.gzsize
@@ -1 +1 @@
-1404
+1298
diff --git a/test/other/codesize/test_codesize_minimal_esm.jssize b/test/other/codesize/test_codesize_minimal_esm.jssize
index 9b0efd1d1a0ec..690c09f1c702d 100644
--- a/test/other/codesize/test_codesize_minimal_esm.jssize
+++ b/test/other/codesize/test_codesize_minimal_esm.jssize
@@ -1 +1 @@
-2928
+2697
diff --git a/test/other/codesize/test_codesize_minimal_pthreads.gzsize b/test/other/codesize/test_codesize_minimal_pthreads.gzsize
index ecfcd519daee5..c79ca50a799a1 100644
--- a/test/other/codesize/test_codesize_minimal_pthreads.gzsize
+++ b/test/other/codesize/test_codesize_minimal_pthreads.gzsize
@@ -1 +1 @@
-4041
+3983
diff --git a/test/other/codesize/test_codesize_minimal_pthreads.jssize b/test/other/codesize/test_codesize_minimal_pthreads.jssize
index a23e2d98917e5..6098d2d252fd2 100644
--- a/test/other/codesize/test_codesize_minimal_pthreads.jssize
+++ b/test/other/codesize/test_codesize_minimal_pthreads.jssize
@@ -1 +1 @@
-8380
+8257
diff --git a/test/other/codesize/test_codesize_minimal_wasmfs.gzsize b/test/other/codesize/test_codesize_minimal_wasmfs.gzsize
index 1f8248ceace7b..03183b0af291e 100644
--- a/test/other/codesize/test_codesize_minimal_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_minimal_wasmfs.gzsize
@@ -1 +1 @@
-1212
+1187
diff --git a/test/other/codesize/test_codesize_minimal_wasmfs.jssize b/test/other/codesize/test_codesize_minimal_wasmfs.jssize
index 1717fe9e7fe81..1db299c003761 100644
--- a/test/other/codesize/test_codesize_minimal_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_minimal_wasmfs.jssize
@@ -1 +1 @@
-2472
+2460
diff --git a/test/other/test_unoptimized_code_size.js.size b/test/other/test_unoptimized_code_size.js.size
index fb568a0e62518..5673af09f3a2b 100644
--- a/test/other/test_unoptimized_code_size.js.size
+++ b/test/other/test_unoptimized_code_size.js.size
@@ -1 +1 @@
-51838
+51593
diff --git a/test/other/test_unoptimized_code_size_no_asserts.js.size b/test/other/test_unoptimized_code_size_no_asserts.js.size
index 7f24041fc6173..6068c3460c88c 100644
--- a/test/other/test_unoptimized_code_size_no_asserts.js.size
+++ b/test/other/test_unoptimized_code_size_no_asserts.js.size
@@ -1 +1 @@
-27206
+26961
diff --git a/test/other/test_unoptimized_code_size_strict.js.size b/test/other/test_unoptimized_code_size_strict.js.size
index 6d5d2e8405a9e..80493101be264 100644
--- a/test/other/test_unoptimized_code_size_strict.js.size
+++ b/test/other/test_unoptimized_code_size_strict.js.size
@@ -1 +1 @@
-49906
+49661
diff --git a/test/test_other.py b/test/test_other.py
index d315015c2c136..df870e48bc39e 100644
--- a/test/test_other.py
+++ b/test/test_other.py
@@ -15981,3 +15981,35 @@ def test_mainScriptUrlOrBlob(self, es6):
     # Now create foo.[m]js and the program should run as expected.
     shutil.copy(outfile, ('foo.%s' % ext))
     self.assertContained('hello, world', self.run_js(outfile))
+
+  @parameterized({
+    '': ([],),
+    'node': (['-sENVIRONMENT=node'],),
+    'pthread': (['-pthread', '-sPROXY_TO_PTHREAD', '-sEXIT_RUNTIME'],),
+  })
+  def test_locate_file_abspath(self, args):
+    # Verify that `scriptDirectory` is an absolute path
+    create_file('pre.js', '''
+      Module['locateFile'] = (fileName, scriptDirectory) => {
+        assert(nodePath['isAbsolute'](scriptDirectory), `scriptDirectory (${scriptDirectory}) should be an absolute path`);
+        return scriptDirectory + fileName;
+      };
+      ''')
+    self.do_runf('hello_world.c', 'hello, world!', emcc_args=['--pre-js', 'pre.js'] + args)
+
+  @parameterized({
+    '': ([],),
+    'node': (['-sENVIRONMENT=node'],),
+  })
+  def test_locate_file_abspath_esm(self, args):
+    # Verify that `scriptDirectory` is an absolute path when `EXPORT_ES6`
+    create_file('pre.js', '''
+      Module['locateFile'] = (fileName, scriptDirectory) => {
+        assert(nodePath['isAbsolute'](scriptDirectory), `scriptDirectory (${scriptDirectory}) should be an absolute path`);
+        return scriptDirectory + fileName;
+      };
+      ''')
+    self.do_runf('hello_world.c', 'hello, world!',
+                 output_suffix='.mjs',
+                 emcc_args=['--pre-js', 'pre.js',
+                            '--extern-post-js', test_file('modularize_post_js.js')] + args)
diff --git a/tools/building.py b/tools/building.py
index 4e857ce46a87d..eb839afaf9008 100644
--- a/tools/building.py
+++ b/tools/building.py
@@ -555,7 +555,7 @@ def closure_compiler(filename, advanced=True, extra_closure_args=None):
   # should not minify these symbol names.
   CLOSURE_EXTERNS = [path_from_root('src/closure-externs/closure-externs.js')]
 
-  if settings.MODULARIZE:
+  if settings.MODULARIZE and settings.ENVIRONMENT_MAY_BE_WEB and not settings.EXPORT_ES6:
     CLOSURE_EXTERNS += [path_from_root('src/closure-externs/modularize-externs.js')]
 
   if settings.USE_WEBGPU:
diff --git a/tools/link.py b/tools/link.py
index 883074ad31a7e..2e22592e5c0e9 100644
--- a/tools/link.py
+++ b/tools/link.py
@@ -2470,30 +2470,22 @@ def modularize():
     # document.currentScript, so a simple export declaration is enough.
     src = f'var {settings.EXPORT_NAME} = {wrapper_function};'
   else:
-    script_url_node = ''
+    script_url_web = ''
     # When MODULARIZE this JS may be executed later,
     # after document.currentScript is gone, so we save it.
-    # In EXPORT_ES6 + PTHREADS the 'thread' is actually an ES6 module
-    # webworker running in strict mode, so doesn't have access to 'document'.
-    # In this case use 'import.meta' instead.
-    if settings.EXPORT_ES6:
-      script_url = 'import.meta.url'
-    else:
-      script_url = "typeof document != 'undefined' ? document.currentScript?.src : undefined"
-      if settings.ENVIRONMENT_MAY_BE_NODE:
-        script_url_node = "if (typeof __filename != 'undefined') _scriptName = _scriptName || __filename;"
+    # In EXPORT_ES6 mode we can just use 'import.meta.url'.
+    if settings.ENVIRONMENT_MAY_BE_WEB and not settings.EXPORT_ES6:
+       script_url_web = "var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;"
     src = '''\
 var %(EXPORT_NAME)s = (() => {
-  var _scriptName = %(script_url)s;
-  %(script_url_node)s
+  %(script_url_web)s
   return (%(wrapper_function)s);
 })();
 ''' % {
-        'EXPORT_NAME': settings.EXPORT_NAME,
-        'script_url': script_url,
-        'script_url_node': script_url_node,
-        'wrapper_function': wrapper_function,
-      }
+      'EXPORT_NAME': settings.EXPORT_NAME,
+      'script_url_web': script_url_web,
+      'wrapper_function': wrapper_function,
+    }
 
   if settings.SOURCE_PHASE_IMPORTS:
     src = f"import source wasmModule from './{settings.WASM_BINARY_FILE}';\n\n" + src