From 32733210dc1de752e297ad4b2d4893d7a22ae4f6 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Thu, 27 Jan 2022 01:25:09 -0800 Subject: [bunfig] Implement config file format --- src/javascript/jsc/javascript.zig | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/javascript/jsc/javascript.zig') 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; -- cgit v1.2.3