diff options
Diffstat (limited to 'src/javascript')
| -rw-r--r-- | src/javascript/jsc/api/transpiler.zig | 3 | ||||
| -rw-r--r-- | src/javascript/jsc/javascript.zig | 18 | ||||
| -rw-r--r-- | src/javascript/jsc/test/jest.zig | 2 |
3 files changed, 5 insertions, 18 deletions
diff --git a/src/javascript/jsc/api/transpiler.zig b/src/javascript/jsc/api/transpiler.zig index c301311b3..894287b7c 100644 --- a/src/javascript/jsc/api/transpiler.zig +++ b/src/javascript/jsc/api/transpiler.zig @@ -538,9 +538,8 @@ pub fn constructor( .scan_pass_result = ScanPassResult.init(getAllocator(ctx)), }; - transpiler.bundler.macro_context = JSAst.Macro.MacroContext.init(&transpiler.bundler); if (transpiler_options.macro_map.count() > 0) { - transpiler.bundler.macro_context.?.remap = transpiler_options.macro_map; + bundler.options.macro_remap = transpiler_options.macro_map; } return Class.make(ctx, transpiler); diff --git a/src/javascript/jsc/javascript.zig b/src/javascript/jsc/javascript.zig index fe8aeb0c5..639736f91 100644 --- a/src/javascript/jsc/javascript.zig +++ b/src/javascript/jsc/javascript.zig @@ -1517,16 +1517,8 @@ pub const VirtualMachine = struct { const macro_remappings = if (vm.macro_mode or !vm.has_any_macro_remappings or is_node_override) MacroRemap{} - else brk: { - if (package_json) |pkg| { - break :brk pkg.macros; - } - - // TODO: find a way to pass the package_json through the resolve - const resolve_result = vm.bundler.resolver.resolve(vm.bundler.fs.top_level_dir, specifier, .stmt) catch break :brk MacroRemap{}; - - break :brk resolve_result.getMacroRemappings(); - }; + else + vm.bundler.options.macro_remap; var fallback_source: logger.Source = undefined; @@ -1646,11 +1638,7 @@ pub const VirtualMachine = struct { ); if (!vm.macro_mode) { - vm.has_any_macro_remappings = vm.has_any_macro_remappings or brk: { - if (result.package_json == null) break :brk false; - - break :brk result.package_json.?.macros.count() > 0; - }; + vm.has_any_macro_remappings = vm.has_any_macro_remappings or vm.bundler.options.macro_remap.count() > 0; } ret.result = result; const result_path = result.pathConst() orelse return error.ModuleNotFound; diff --git a/src/javascript/jsc/test/jest.zig b/src/javascript/jsc/test/jest.zig index 2ffc8bd01..0c7392623 100644 --- a/src/javascript/jsc/test/jest.zig +++ b/src/javascript/jsc/test/jest.zig @@ -117,7 +117,7 @@ pub const TestRunner = struct { pub const File = struct { source: logger.Source = logger.Source.initEmptyFile(""), - log: logger.Log = logger.Log.init(default_allocator), + log: logger.Log = logger.Log.initComptime(default_allocator), module_scope: *DescribeScope = undefined, pub const List = std.MultiArrayList(File); |