Fix for WASM_WORKERS + node + MINIMAL_RUNTIME (emscripten-core#24172)

Author: sbc100

src/lib/libwasm_worker.js

@@ -37,7 +37,11 @@
 #if WASM_WORKERS == 2
     _wasmWorkerBlobUrl
 #elif MINIMAL_RUNTIME
+#if ENVIRONMENT_MAY_BE_NODE
+    Module['$wb'] || './${WASM_WORKER_FILE}'
+#else
     Module['$wb']
+#endif
 #else
     locateFile('${WASM_WORKER_FILE}')
 #endif
@@ -195,7 +199,11 @@ if (ENVIRONMENT_IS_WASM_WORKER
       '$ww': _wasmWorkersID,
 #if MINIMAL_RUNTIME
       'wasm': Module['wasm'],
+#if ENVIRONMENT_MAY_BE_NODE
+      'js': Module['js'] || './{{{ TARGET_JS_NAME }}}',
+#else
       'js': Module['js'],
+#endif
       'mem': wasmMemory,
 #else
       'wasm': wasmModule,

test/test_core.py

@@ -9568,6 +9568,7 @@ def test_emscripten_async_load_script(self):
 
   @node_pthreads
   @no_asan('ASan does not support WASM_WORKERS')
+  @also_with_minimal_runtime
   def test_wasm_worker_hello(self):
     self.do_run_in_out_file_test('wasm_worker/hello_wasm_worker.c', emcc_args=['-sWASM_WORKERS'])
 

tools/minimal_runtime_shell.py

@@ -51,7 +51,7 @@ def generate_minimal_runtime_load_statement(target_basename):
     download_wasm = f"binary('{target_basename}.wasm')"
 
   # Main JS file always in first entry
-  files_to_load = [f"script('{target_basename}.js')"]
+  files_to_load = [f"script('{settings.TARGET_JS_NAME}')"]
 
   # Download .wasm file
   if (settings.WASM == 1 and settings.WASM2JS == 0) or not download_wasm:
@@ -73,7 +73,7 @@ def generate_minimal_runtime_load_statement(target_basename):
         then_statements += ["%s.$wb = URL.createObjectURL(new Blob([r[%d]], { type: 'application/javascript' }));" % (settings.EXPORT_NAME, len(files_to_load))]
 
     if download_wasm and settings.WASM_WORKERS == 1:
-      files_to_load += [f"binary('{target_basename}.ww.js')"]
+      files_to_load += [f"binary('{settings.WASM_WORKER_FILE}')"]
 
   # Download Wasm2JS code if target browser does not support WebAssembly
   if settings.WASM == 2:
@@ -164,7 +164,7 @@ def generate_minimal_runtime_load_statement(target_basename):
     else:
       save_js = ''
 
-    files_to_load[0] = f"binary('{target_basename}.js')"
+    files_to_load[0] = f"binary('{settings.TARGET_JS_NAME}')"
     if not settings.MODULARIZE:
       then_statements += ["var url = %sURL.createObjectURL(new Blob([r[0]], { type: 'application/javascript' }));" % save_js,
                           script_load]
@@ -200,7 +200,7 @@ def generate_minimal_runtime_html(target, options, js_target, target_basename):
   if re.search(r'{{{\s*SCRIPT\s*}}}', shell):
     shared.exit_with_error('--shell-file "' + options.shell_path + '": MINIMAL_RUNTIME uses a different kind of HTML page shell file than the traditional runtime! Please see $EMSCRIPTEN/src/shell_minimal_runtime.html for a template to use as a basis.')
 
-  shell = shell.replace('{{{ TARGET_BASENAME }}}', target_basename)
+  shell = shell.replace('{{{ TARGET_BASENAME }}}', settings.TARGET_BASENAME)
   shell = shell.replace('{{{ EXPORT_NAME }}}', settings.EXPORT_NAME)
   shell = shell.replace('{{{ TARGET_JS_NAME }}}', settings.TARGET_JS_NAME)