fixup! Replace require() with library symbols in EXPORT_ES6 library files

Move $nodeOs to libcore.js, use makeNodeImport, always use symbols via __deps

Author: Bartek Wrona

src/lib/libatomic.js

@@ -159,16 +159,12 @@ addToLibrary({
 
   emscripten_has_threading_support: () => !!globalThis.SharedArrayBuffer,
 
-#if EXPORT_ES6 && ENVIRONMENT_MAY_BE_NODE
+#if ENVIRONMENT_MAY_BE_NODE
   emscripten_num_logical_cores__deps: ['$nodeOs'],
 #endif
   emscripten_num_logical_cores: () =>
 #if ENVIRONMENT_MAY_BE_NODE
-#if EXPORT_ES6
     ENVIRONMENT_IS_NODE ? nodeOs.cpus().length :
-#else
-    ENVIRONMENT_IS_NODE ? require('node:os').cpus().length :
-#endif
 #endif
     navigator['hardwareConcurrency'],
 });

src/lib/libcore.js

@@ -343,8 +343,9 @@ addToLibrary({
   },
 #endif
 
-#if EXPORT_ES6 && ENVIRONMENT_MAY_BE_NODE
-  $nodeChildProcess: "ENVIRONMENT_IS_NODE ? await import('node:child_process') : undefined",
+#if ENVIRONMENT_MAY_BE_NODE
+  $nodeOs: "ENVIRONMENT_IS_NODE ? {{{ makeNodeImport('node:os') }}} : undefined",
+  $nodeChildProcess: "ENVIRONMENT_IS_NODE ? {{{ makeNodeImport('node:child_process') }}} : undefined",
   _emscripten_system__deps: ['$nodeChildProcess'],
 #endif
   _emscripten_system: (command) => {
@@ -355,11 +356,7 @@ addToLibrary({
       var cmdstr = UTF8ToString(command);
       if (!cmdstr.length) return 0; // this is what glibc seems to do (shell works test?)
 
-#if EXPORT_ES6
       var cp = nodeChildProcess;
-#else
-      var cp = require('node:child_process');
-#endif
       var ret = cp.spawnSync(cmdstr, [], {shell:true, stdio:'inherit'});
 
       var _W_EXITCODE = (ret, sig) => ((ret) << 8 | (sig));

src/lib/libnode_imports.js

@@ -12,11 +12,7 @@
 // operations. Hence, using `nodePath` should be safe here.
 
 addToLibrary({
-#if EXPORT_ES6
-  $nodePath: "await import('node:path')",
-#else
-  $nodePath: "require('node:path')",
-#endif
+  $nodePath: "{{{ makeNodeImport('node:path') }}}",
   $PATH__deps: ['$nodePath'],
   $PATH: `{
     isAbs: nodePath.isAbsolute,

src/lib/libnodepath.js

@@ -5,17 +5,19 @@
  */
 
 addToLibrary({
-#if EXPORT_ES6 && ENVIRONMENT_MAY_BE_NODE
-  $nodeWs: "ENVIRONMENT_IS_NODE ? (await import('ws')).default : undefined",
+#if ENVIRONMENT_MAY_BE_NODE
+#if EXPORT_ES6
+  $nodeWs: "ENVIRONMENT_IS_NODE ? ({{{ makeNodeImport('ws') }}}).default : undefined",
+#else
+  $nodeWs: "ENVIRONMENT_IS_NODE ? {{{ makeNodeImport('ws') }}} : undefined",
 #endif
-  $SOCKFS__postset: () => {
-    addAtInit('SOCKFS.root = FS.mount(SOCKFS, {}, null);');
-  },
-#if EXPORT_ES6 && ENVIRONMENT_MAY_BE_NODE
   $SOCKFS__deps: ['$FS', '$nodeWs'],
 #else
   $SOCKFS__deps: ['$FS'],
 #endif
+  $SOCKFS__postset: () => {
+    addAtInit('SOCKFS.root = FS.mount(SOCKFS, {}, null);');
+  },
   $SOCKFS: {
 #if expectToReceiveOnModule('websocket')
     websocketArgs: {},
@@ -223,11 +225,7 @@ addToLibrary({
             var WebSocketConstructor;
 #if ENVIRONMENT_MAY_BE_NODE
             if (ENVIRONMENT_IS_NODE) {
-#if EXPORT_ES6
               WebSocketConstructor = /** @type{(typeof WebSocket)} */(nodeWs);
-#else
-              WebSocketConstructor = /** @type{(typeof WebSocket)} */(require('ws'));
-#endif
             } else
 #endif // ENVIRONMENT_MAY_BE_NODE
             {
@@ -533,11 +531,7 @@ addToLibrary({
         if (sock.server) {
            throw new FS.ErrnoError({{{ cDefs.EINVAL }}});  // already listening
         }
-#if EXPORT_ES6
         var WebSocketServer = nodeWs.Server;
-#else
-        var WebSocketServer = require('ws').Server;
-#endif
         var host = sock.saddr;
 #if SOCKET_DEBUG
         dbg(`websocket: listen: ${host}:${sock.sport}`);

src/lib/libsockfs.js

@@ -569,27 +569,22 @@ var WasiLibrary = {
 
   // random.h
 
-#if EXPORT_ES6 && ENVIRONMENT_MAY_BE_NODE && MIN_NODE_VERSION < 190000
-  $nodeCrypto: "ENVIRONMENT_IS_NODE ? await import('node:crypto') : undefined",
+#if ENVIRONMENT_MAY_BE_NODE && MIN_NODE_VERSION < 190000
+  $nodeCrypto: "ENVIRONMENT_IS_NODE ? {{{ makeNodeImport('node:crypto') }}} : undefined",
 #endif
 
-#if ENVIRONMENT_MAY_BE_SHELL && EXPORT_ES6 && ENVIRONMENT_MAY_BE_NODE && MIN_NODE_VERSION < 190000
+#if ENVIRONMENT_MAY_BE_SHELL && ENVIRONMENT_MAY_BE_NODE && MIN_NODE_VERSION < 190000
   $initRandomFill__deps: ['$base64Decode', '$nodeCrypto'],
 #elif ENVIRONMENT_MAY_BE_SHELL
   $initRandomFill__deps: ['$base64Decode'],
-#elif EXPORT_ES6 && ENVIRONMENT_MAY_BE_NODE && MIN_NODE_VERSION < 190000
+#elif ENVIRONMENT_MAY_BE_NODE && MIN_NODE_VERSION < 190000
   $initRandomFill__deps: ['$nodeCrypto'],
 #endif
   $initRandomFill: () => {
 #if ENVIRONMENT_MAY_BE_NODE && MIN_NODE_VERSION < 190000
     // This block is not needed on v19+ since crypto.getRandomValues is builtin
     if (ENVIRONMENT_IS_NODE) {
-#if EXPORT_ES6
-      return (view) => nodeCrypto.randomFillSync(view);
-#else
-      var nodeCrypto = require('node:crypto');
       return (view) => nodeCrypto.randomFillSync(view);
-#endif
     }
 #endif // ENVIRONMENT_MAY_BE_NODE
 

src/lib/libwasi.js

@@ -289,16 +289,12 @@ if (ENVIRONMENT_IS_WASM_WORKER
     _wasmWorkers[id].postMessage({'_wsc': funcPtr, 'x': readEmAsmArgs(sigPtr, varargs) });
   },
 
-#if EXPORT_ES6 && ENVIRONMENT_MAY_BE_NODE
+#if ENVIRONMENT_MAY_BE_NODE
   emscripten_navigator_hardware_concurrency__deps: ['$nodeOs'],
 #endif
   emscripten_navigator_hardware_concurrency: () => {
 #if ENVIRONMENT_MAY_BE_NODE
-#if EXPORT_ES6
     if (ENVIRONMENT_IS_NODE) return nodeOs.cpus().length;
-#else
-    if (ENVIRONMENT_IS_NODE) return require('node:os').cpus().length;
-#endif
 #endif
     return navigator['hardwareConcurrency'];
   },

src/lib/libwasm_worker.js

@@ -166,10 +166,6 @@ function calculateLibraries() {
     libraries.push('libatomic.js');
   }
 
-  if (EXPORT_ES6) {
-    libraries.push('libnode_imports.js');
-  }
-
   if (MAX_WEBGL_VERSION >= 2) {
     // libwebgl2.js must be included only after libwebgl.js, so if we are
     // about to include libwebgl2.js, first squeeze in libwebgl.js.