Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/bun.js/VirtualMachine.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1836,10 +1836,16 @@ pub fn resolveMaybeNeedsTrailingSlash(
jsc_vm.log = &log;
jsc_vm.transpiler.resolver.log = &log;
jsc_vm.transpiler.linker.log = &log;
if (jsc_vm.transpiler.resolver.package_manager) |pm| {
pm.log = &log;
}
defer {
jsc_vm.log = old_log;
jsc_vm.transpiler.linker.log = old_log;
jsc_vm.transpiler.resolver.log = old_log;
if (jsc_vm.transpiler.resolver.package_manager) |pm| {
pm.log = old_log;
}
}
jsc_vm._resolve(&result, specifier_utf8.slice(), normalizeSource(source_utf8.slice()), is_esm, is_a_file_path) catch |err_| {
var err = err_;
Expand Down
10 changes: 10 additions & 0 deletions test/js/bun/test/mock/mock-module-resolve-log.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { expect, mock, test } from "bun:test";

// Regression test: mock.module() with a non-existent specifier must not crash
// when module resolution triggers auto-install and the package manager uses
// a stale log pointer from the resolver's stack frame.
test("mock.module with non-existent specifier does not crash", async () => {
mock.module("this-package-does-not-exist-abcdef123", () => ({ a: 1 }));
const mod = await import("this-package-does-not-exist-abcdef123");
expect(mod.a).toBe(1);
});
Loading