chore: clean up require tests

Author: fraidev

cli/factory.rs

@@ -1271,7 +1271,7 @@ impl CliFactory {
           } else {
             deno_resolver::loader::AllowJsonImports::WithAttribute
           },
-          require_modules: options.require_modules().unwrap_or_default(),
+          require_modules: options.require_modules()?,
         },
       )))
     })

cli/lib/worker.rs

@@ -883,6 +883,8 @@ impl LibMainWorker {
       self.worker.evaluate_module(id).await?;
       self.worker.run_event_loop(false).await?;
     }
+    // Even though we load as ESM here, these files will be forced to be loaded as CJS
+    // because of checks in get_known_mode_with_is_script
     for require_module_url in self.require_modules.iter() {
       let id = self.worker.preload_side_module(require_module_url).await?;
       self.worker.evaluate_module(id).await?;

cli/rt/run.rs

@@ -1089,12 +1089,6 @@ pub async fn run(
     .map(|key| root_dir_url.join(key).unwrap())
     .collect::<Vec<_>>();
 
-  let require_modules = metadata
-    .require_modules
-    .iter()
-    .map(|key| root_dir_url.join(key).unwrap())
-    .collect::<Vec<_>>();
-
   let mut worker = worker_factory.create_main_worker(
     WorkerExecutionMode::Run,
     permissions,

tests/specs/run/require_modules_multiple/main_multiple.ts

@@ -2,5 +2,9 @@ console.log("main_multiple.ts starts");
 
 console.log(`First: ${globalThis.__first__}`);
 console.log(`Second: ${globalThis.__second__}`);
+console.log(`First filename: ${globalThis.__first_filename__}`);
+console.log(`Second filename: ${globalThis.__second_filename__}`);
+console.log(`First dirname: ${globalThis.__first_dirname__}`);
+console.log(`Second dirname: ${globalThis.__second_dirname__}`);
 
 console.log("main_multiple.ts finished");

tests/specs/run/require_modules_multiple/multiple.out

@@ -1,6 +1,12 @@
 require_first.js loading
+require_first.js platform: [WILDCARD]
 require_second.js loading
+require_second.js path separator: [WILDCARD]
 main_multiple.ts starts
 First: first
 Second: second
+First filename: [WILDCARD]require_first.js
+Second filename: [WILDCARD]require_second.js
+First dirname: [WILDCARD]require_modules_multiple
+Second dirname: [WILDCARD]require_modules_multiple
 main_multiple.ts finished

tests/specs/run/require_modules_multiple/require_first.js

@@ -1,2 +1,9 @@
 console.log("require_first.js loading");
+
+const os = require("node:os");
+
+console.log(`require_first.js platform: ${os.platform()}`);
+
 globalThis.__first__ = "first";
+globalThis.__first_filename__ = __filename;
+globalThis.__first_dirname__ = __dirname;

tests/specs/run/require_modules_multiple/require_second.js

@@ -1,2 +1,9 @@
 console.log("require_second.js loading");
+
+const path = require("node:path");
+
+console.log(`require_second.js path separator: ${path.sep}`);
+
 globalThis.__second__ = "second";
+globalThis.__second_filename__ = __filename;
+globalThis.__second_dirname__ = __dirname;