diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2021-08-04 13:02:16 -0700 |
|---|---|---|
| committer | Jarred Sumner <jarred@jarredsumner.com>
| 2021-08-04 13:02:16 -0700 |
| commit | 5ecf48a21dffc5aebabe439ec534fea7b91b16b8 (patch) | |
| tree | 01f0cb9a7fde566e8d7bed6a454d5bff7562e5e0 | |
| parent | bb00c519c3e0086954421f5ecc6494672e4e1fb5 (diff) | |
| download | bun-5ecf48a21dffc5aebabe439ec534fea7b91b16b8.tar.gz bun-5ecf48a21dffc5aebabe439ec534fea7b91b16b8.tar.zst bun-5ecf48a21dffc5aebabe439ec534fea7b91b16b8.zip | |
Fix node_modules.jsb loading in JSC
Former-commit-id: 43366ce3634ca35629e1f8234df86206f6411910
| -rw-r--r-- | src/javascript/jsc/javascript.zig | 3 | ||||
| -rw-r--r-- | src/node_module_bundle.zig | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/javascript/jsc/javascript.zig b/src/javascript/jsc/javascript.zig index 230bbcf83..3df351a24 100644 --- a/src/javascript/jsc/javascript.zig +++ b/src/javascript/jsc/javascript.zig @@ -113,7 +113,7 @@ pub const VirtualMachine = struct { threadlocal var source_code_printer: js_printer.BufferPrinter = undefined; threadlocal var source_code_printer_loaded: bool = false; - fn _fetch( + inline fn _fetch( global: *JSGlobalObject, specifier: string, source: string, @@ -130,6 +130,7 @@ pub const VirtualMachine = struct { // - file path + file descriptor for bytecode caching // - separate bundles for server build vs browser build OR at least separate sections const code = try vm.node_modules.?.readCodeAsStringSlow(vm.allocator); + return ResolvedSource{ .source_code = ZigString.init(code), .specifier = ZigString.init(vm.bundler.linker.nodeModuleBundleImportPath()), diff --git a/src/node_module_bundle.zig b/src/node_module_bundle.zig index f745581fe..63bb678d7 100644 --- a/src/node_module_bundle.zig +++ b/src/node_module_bundle.zig @@ -303,7 +303,7 @@ pub const NodeModuleBundle = struct { .bundle = container.bundle.?, .fd = stream.handle, // sorry you can't have 4 GB of node_modules - .code_end_pos = @truncate(u32, file_end) - @intCast(u32, jsbundle_prefix.len), + .code_end_pos = end - @intCast(u32, jsbundle_prefix.len), .bytes = read_bytes, .bytes_ptr = file_bytes, .package_id_map = undefined, |