mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-13 12:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[bunfig] Implement config file format

Browse Source
This commit is contained in:
Jarred Sumner
2022-01-27 01:25:09 -08:00
parent 9f5a1705a5
commit 32733210dc
20 changed files with 667 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/javascript/jsc/api/transpiler.zig
View File

@@ -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);

18
src/javascript/jsc/javascript.zig
View File

@@ -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;

2
src/javascript/jsc/test/jest.zig
View File

@@ -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);