mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass macro_context when appropriate. This needs to be refactored more.

Browse Source
This commit is contained in:
Jarred Sumner
2021-09-30 22:34:54 -07:00
parent 5855fb7cc6
commit 5fdaad9a2f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -627,10 +627,13 @@ pub const VirtualMachine = struct {
.macros = MacroMap.init(allocator),
.macro_entry_points = @TypeOf(VirtualMachine.vm.macro_entry_points).init(allocator),
};
vm.bundler.macro_context = null;
VirtualMachine.vm.bundler.configureLinker();
try VirtualMachine.vm.bundler.configureFramework(false);
vm.bundler.macro_context = js_ast.Macro.MacroContext.init(&vm.bundler);
if (_args.serve orelse false) {
VirtualMachine.vm.bundler.linker.onImportCSS = Bun.onImportCSS;
}
@@ -745,6 +748,7 @@ pub const VirtualMachine = struct {
opts.features.react_fast_refresh = false;
opts.filepath_hash_for_hmr = 0;
opts.warn_about_unbundled_modules = false;
opts.macro_context = &vm.bundler.macro_context.?;
const main_ast = (bundler.resolver.caches.js.parse(vm.allocator, opts, bundler.options.define, bundler.log, &vm.entry_point.source) catch null) orelse {
return error.ParseError;
};
@@ -870,7 +874,9 @@ pub const VirtualMachine = struct {
.absolute_path,
false,
);
vm.resolved_count += vm.bundler.linker.import_counter - start_count;
if (!vm.macro_mode)
vm.resolved_count += vm.bundler.linker.import_counter - start_count;
vm.bundler.linker.import_counter = 0;
source_code_printer.ctx.reset();