Simplify

Author: kleisauke

emcc.py

@@ -3916,9 +3916,9 @@ def modularize():
     if settings.EXPORT_ES6 and settings.USE_ES6_IMPORT_META:
       script_url = 'import.meta.url'
     else:
-      script_url = "typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : undefined"
+      script_url = "typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : ''"
       if shared.target_environment_may_be('node'):
-        script_url_node = "if (typeof __filename !== 'undefined') _scriptDir = _scriptDir || __filename;"
+        script_url_node = "if (typeof __filename !== 'undefined') _scriptDir = __filename;"
     src = '''%(node_imports)s
 var %(EXPORT_NAME)s = (() => {
   var _scriptDir = %(script_url)s;

src/shell.js

@@ -144,25 +144,15 @@ var ENVIRONMENT_IS_WASM_WORKER = Module['$ww'];
 #if SHARED_MEMORY && !MODULARIZE
 // In MODULARIZE mode _scriptDir 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 _scriptDir;
-
+#if EXPORT_ES6 && USE_ES6_IMPORT_META
+var _scriptDir = import.meta.url;
+#else
+var _scriptDir = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : '';
 #if ENVIRONMENT_MAY_BE_NODE
-if (ENVIRONMENT_IS_NODE) {
-  _scriptDir = __filename;
-} else
+if (typeof __filename !== 'undefined') _scriptDir = __filename;
 #endif // ENVIRONMENT_MAY_BE_NODE
-#if ENVIRONMENT_MAY_BE_WORKER
-if (ENVIRONMENT_IS_WORKER) {
-  _scriptDir = self.location.href;
-} else
-#endif // ENVIRONMENT_MAY_BE_WORKER
-#if ENVIRONMENT_MAY_BE_WEB
-if (typeof document != 'undefined' && document.currentScript) { // web
-  _scriptDir = document.currentScript.src;
-} else
-#endif // ENVIRONMENT_MAY_BE_WEB
-  _scriptDir = undefined;
-#endif // SHARED_MEMORY && !MODULARIZE
+#endif // EXPORT_ES6 && USE_ES6_IMPORT_META
+#endif // !MODULARIZE
 
 // `/` should be present at the end if `scriptDirectory` is not empty
 var scriptDirectory = '';
@@ -383,14 +373,13 @@ if (ENVIRONMENT_IS_SHELL) {
 // ENVIRONMENT_IS_NODE.
 #if ENVIRONMENT_MAY_BE_WEB || ENVIRONMENT_MAY_BE_WORKER
 if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
-  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 (_scriptDir) {
-    scriptDirectory = _scriptDir;
+  scriptDirectory = _scriptDir;
+#else
+  if (typeof document !== 'undefined' && document.currentScript) { // web
+    scriptDirectory = document.currentScript.src;
   }
 #endif
   // blob urls look like blob:http://site.com/etc/etc and we cannot infer anything from them.
@@ -402,7 +391,6 @@ if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   if (scriptDirectory.indexOf('blob:') !== 0) {
     scriptDirectory = scriptDirectory.substr(0, scriptDirectory.replace(/[?#].*/, "").lastIndexOf('/')+1);
   } else {
-    // TODO: Why? Does this mean that the previous `scriptDirectory`-logic is only for `blob:` URLs?
     scriptDirectory = '';
   }
 

src/shell_minimal.js

@@ -162,8 +162,15 @@ function ready() {
 #if !MODULARIZE
 // In MODULARIZE mode _scriptDir 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 _scriptDir = (typeof document != 'undefined' && document.currentScript) ? document.currentScript.src : undefined;
-#endif
+#if EXPORT_ES6 && USE_ES6_IMPORT_META
+var _scriptDir = import.meta.url;
+#else
+var _scriptDir = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : '';
+#if ENVIRONMENT_MAY_BE_NODE
+if (typeof __filename !== 'undefined') _scriptDir = __filename;
+#endif // ENVIRONMENT_MAY_BE_NODE
+#endif // EXPORT_ES6 && USE_ES6_IMPORT_META
+#endif // !MODULARIZE
 
 // MINIMAL_RUNTIME does not support --proxy-to-worker option, so Worker and Pthread environments
 // coincide.
@@ -174,5 +181,4 @@ var ENVIRONMENT_IS_WORKER = typeof importScripts == 'function',
 var ENVIRONMENT_IS_WORKER = ENVIRONMENT_IS_PTHREAD = typeof importScripts == 'function';
 #endif
 
-var currentScriptUrl = typeof _scriptDir != 'undefined' ? _scriptDir : ((typeof document != 'undefined' && document.currentScript) ? document.currentScript.src : undefined);
 #endif // PTHREADS