Skip to content

Commit 7d739b1

Browse files
committed
chore: clean up require tests
1 parent 335adb4 commit 7d739b1

File tree

9 files changed

+29
-28
lines changed

9 files changed

+29
-28
lines changed

cli/lib/worker.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,8 @@ impl LibMainWorker {
883883
self.worker.evaluate_module(id).await?;
884884
self.worker.run_event_loop(false).await?;
885885
}
886+
// Even though we load as ESM here, these files will be forced to be loaded as CJS
887+
// because of checks in get_known_mode_with_is_script
886888
for require_module_url in self.require_modules.iter() {
887889
let id = self.worker.preload_side_module(require_module_url).await?;
888890
self.worker.evaluate_module(id).await?;

tests/specs/run/require_modules_multiple/main_multiple.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@ console.log("main_multiple.ts starts");
22

33
console.log(`First: ${globalThis.__first__}`);
44
console.log(`Second: ${globalThis.__second__}`);
5+
console.log(`First filename: ${globalThis.__first_filename__}`);
6+
console.log(`Second filename: ${globalThis.__second_filename__}`);
7+
console.log(`First dirname: ${globalThis.__first__dirname__}`);
8+
console.log(`Second dirname: ${globalThis.__second__dirname__}`);
59

610
console.log("main_multiple.ts finished");
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
require_first.js loading
2+
require_first.js platform: [WILDCARD]
23
require_second.js loading
4+
require_second.js path separator: [WILDCARD]
35
main_multiple.ts starts
46
First: first
57
Second: second
8+
First filename: [WILDCARD]/tests/specs/run/require_modules_multiple/require_first.js
9+
Second filename: [WILDCARD]/tests/specs/run/require_modules_multiple/require_second.js
10+
First dirname: [WILDCARD]/tests/specs/run/require_modules_multiple
11+
Second dirname: [WILDCARD]/tests/specs/run/require_modules_multiple
612
main_multiple.ts finished
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
console.log("require_first.js loading");
2+
3+
const os = require("node:os");
4+
5+
console.log(`require_first.js platform: ${os.platform()}`);
6+
27
globalThis.__first__ = "first";
8+
globalThis.__first_filename__ = __filename
9+
globalThis.__first__dirname__ = __dirname
10+
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
11
console.log("require_second.js loading");
2+
3+
const path = require("node:path");
4+
5+
console.log(`require_second.js path separator: ${path.sep}`);
6+
27
globalThis.__second__ = "second";
8+
globalThis.__second_filename__ = __filename
9+
globalThis.__second__dirname__ = __dirname
10+
11+

tests/specs/run/require_modules_node/__test__.jsonc

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/specs/run/require_modules_node/main_node.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

tests/specs/run/require_modules_node/node.out

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/specs/run/require_modules_node/require_node.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)