remove 'preload' execution

Author: JakobJingleheimer

lib/internal/modules/esm/hooks.js

@@ -138,7 +138,6 @@ class Hooks {
 
   /**
    * Collect custom/user-defined module loader hook(s).
-   * After all hooks have been collected, the global preload hook(s) must be initialized.
    * @param {string} url Custom loader specifier
    * @param {Record<string, unknown>} exports
    * @param {any} [data] Arbitrary data to be passed from the custom loader (user-land)
@@ -501,8 +500,6 @@ class HooksProxy {
         AtomicsWait(this.#lock, WORKER_TO_MAIN_THREAD_NOTIFICATION, 0);
         const response = this.#worker.receiveMessageSync();
         if (response == null || response.message.status === 'exit') { return; }
-        const { preloadScripts } = this.#unwrapMessage(response);
-        this.#executePreloadScripts(preloadScripts);
       }
 
       this.#isReady = true;
@@ -619,63 +616,6 @@ class HooksProxy {
   importMetaInitialize(meta, context, loader) {
     this.#importMetaInitializer(meta, context, loader);
   }
-
-  #executePreloadScripts(preloadScripts) {
-    for (let i = 0; i < preloadScripts.length; i++) {
-      const { code, port } = preloadScripts[i];
-      const { compileFunction } = require('vm');
-      const preloadInit = compileFunction(
-        code,
-        ['getBuiltin', 'port', 'setImportMetaCallback'],
-        {
-          filename: '<preload>',
-        },
-      );
-      let finished = false;
-      let replacedImportMetaInitializer = false;
-      let next = this.#importMetaInitializer;
-      const { BuiltinModule } = require('internal/bootstrap/realm');
-      // Calls the compiled preload source text gotten from the hook
-      // Since the parameters are named we use positional parameters
-      // see compileFunction above to cross reference the names
-      try {
-        FunctionPrototypeCall(
-          preloadInit,
-          globalThis,
-          // Param getBuiltin
-          (builtinName) => {
-            if (StringPrototypeStartsWith(builtinName, 'node:')) {
-              builtinName = StringPrototypeSlice(builtinName, 5);
-            } else if (!BuiltinModule.canBeRequiredWithoutScheme(builtinName)) {
-              throw new ERR_UNKNOWN_BUILTIN_MODULE(builtinName);
-            }
-            if (BuiltinModule.canBeRequiredByUsers(builtinName)) {
-              return require(builtinName);
-            }
-            throw new ERR_UNKNOWN_BUILTIN_MODULE(builtinName);
-          },
-          // Param port
-          port,
-          // setImportMetaCallback
-          (fn) => {
-            if (finished || typeof fn !== 'function') {
-              throw new ERR_INVALID_ARG_TYPE('fn', fn);
-            }
-            replacedImportMetaInitializer = true;
-            const parent = next;
-            next = (meta, context) => {
-              return fn(meta, context, parent);
-            };
-          },
-        );
-      } finally {
-        finished = true;
-        if (replacedImportMetaInitializer) {
-          this.#importMetaInitializer = next;
-        }
-      }
-    }
-  }
 }
 ObjectSetPrototypeOf(HooksProxy.prototype, null);
 

lib/internal/modules/esm/worker.js

@@ -74,7 +74,8 @@ function wrapMessage(status, body) {
 }
 
 async function customizedModuleWorker(lock, syncCommPort, errorHandler) {
-  let hooks, preloadScripts, initializationError;
+  let hooks;
+  let initializationError;
   let hasInitializationError = false;
 
   {
@@ -93,7 +94,6 @@ async function customizedModuleWorker(lock, syncCommPort, errorHandler) {
   try {
     const initResult = await initializeHooks();
     hooks = initResult.hooks;
-    preloadScripts = initResult.preloadScripts;
   } catch (exception) {
     // If there was an error while parsing and executing a user loader, for example if because a
     // loader contained a syntax error, then we need to send the error to the main thread so it can
@@ -107,7 +107,7 @@ async function customizedModuleWorker(lock, syncCommPort, errorHandler) {
   if (hasInitializationError) {
     syncCommPort.postMessage(wrapMessage('error', initializationError));
   } else {
-    syncCommPort.postMessage(wrapMessage('success', { preloadScripts }), preloadScripts.map(({ port }) => port));
+    syncCommPort.postMessage(wrapMessage('success'));
   }
 
   // We're ready, so unlock the main thread.