4 files changed, 15 insertions, 12 deletions

diff --git a/src/bundler.zig b/src/bundler.zig
index cf971dc6e..b5f576e21 100644
--- a/src/bundler.zig
+++ b/src/bundler.zig
@@ -88,26 +88,30 @@ pub const Transformer = struct {
         var jsx = if (opts.jsx) |_jsx| options.JSX.Pragma.fromApi(_jsx) else options.JSX.Pragma{};
 
         var output_i: usize = 0;
+
         for (opts.entry_points) |entry_point, i| {
+            var arena = std.heap.ArenaAllocator.init(allocator);
+            var chosen_alloc = &arena.allocator;
+            defer arena.deinit();
             var _log = logger.Log.init(allocator);
             var __log = &_log;
             var paths = [_]string{ cwd, entry_point };
-            const absolutePath = try std.fs.path.resolve(alloc.dynamic, &paths);
+            const absolutePath = try std.fs.path.resolve(chosen_alloc, &paths);
 
             const file = try std.fs.openFileAbsolute(absolutePath, std.fs.File.OpenFlags{ .read = true });
             defer file.close();
             const stat = try file.stat();
 
-            const code = try file.readToEndAlloc(alloc.dynamic, stat.size);
+            const code = try file.readToEndAlloc(allocator, stat.size);
             defer {
                 if (_log.msgs.items.len == 0) {
                     allocator.free(code);
                 }
-                alloc.dynamic.free(absolutePath);
+                chosen_alloc.free(absolutePath);
                 _log.appendTo(log) catch {};
             }
             const _file = fs.File{ .path = fs.Path.init(entry_point), .contents = code };
-            var source = try logger.Source.initFile(_file, alloc.dynamic);
+            var source = try logger.Source.initFile(_file, chosen_alloc);
             var loader: options.Loader = undefined;
             if (use_default_loaders) {
                 loader = options.defaultLoaders.get(std.fs.path.extension(absolutePath)) orelse continue;
@@ -122,9 +126,9 @@ pub const Transformer = struct {
 
             const parser_opts = js_parser.Parser.Options.init(jsx, loader);
             var _source = &source;
-            const res = _transform(allocator, allocator, __log, parser_opts, loader, define, _source) catch continue;
+            const res = _transform(chosen_alloc, allocator, __log, parser_opts, loader, define, _source) catch continue;
 
-            const relative_path = try std.fs.path.relative(allocator, cwd, absolutePath);
+            const relative_path = try std.fs.path.relative(chosen_alloc, cwd, absolutePath);
             var out_parts = [_]string{ output_dir, relative_path };
             const out_path = try std.fs.path.join(allocator, &out_parts);
             try output_files.append(options.OutputFile{ .path = out_path, .contents = res.js });
@@ -159,7 +163,7 @@ pub const Transformer = struct {
                 ast = js_ast.Ast.initTest(&([_]js_ast.Part{part}));
             },
             .jsx, .tsx, .ts, .js => {
-                var parser = try js_parser.Parser.init(opts, log, source, define, alloc.dynamic);
+                var parser = try js_parser.Parser.init(opts, log, source, define, allocator);
                 var res = try parser.parse();
                 ast = res.ast;
             },
diff --git a/src/cli.zig b/src/cli.zig
index 19537e515..ecebc2ee0 100644
--- a/src/cli.zig
+++ b/src/cli.zig
@@ -277,7 +277,7 @@ pub const Cli = struct {
     pub fn startTransform(allocator: *std.mem.Allocator, args: Api.TransformOptions, log: *logger.Log) anyerror!void {}
     pub fn start(allocator: *std.mem.Allocator, stdout: anytype, stderr: anytype, comptime MainPanicHandler: type) anyerror!void {
         const start_time = std.time.nanoTimestamp();
-        var log = logger.Log.init(alloc.dynamic);
+        var log = logger.Log.init(allocator);
         var panicker = MainPanicHandler.init(&log);
         MainPanicHandler.Singleton = &panicker;
 
diff --git a/src/js_lexer_tables.zig b/src/js_lexer_tables.zig
index ef4b13e8c..c6a5d4954 100644
--- a/src/js_lexer_tables.zig
+++ b/src/js_lexer_tables.zig
@@ -545,7 +545,7 @@ pub fn initJSXEntityMap() !void {
     }
 
     has_loaded_jsx_map = true;
-    jsxEntity = JSXEntityMap.init(alloc.dynamic);
+    jsxEntity = JSXEntityMap.init(alloc.static);
     // return jsxEntity;
     jsxEntity.ensureCapacity(255) catch unreachable;
 
diff --git a/src/options.zig b/src/options.zig
index 59cb11573..a3f55a368 100644
--- a/src/options.zig
+++ b/src/options.zig
@@ -237,7 +237,7 @@ pub const BundleOptions = struct {
     define: defines.Define,
     loaders: std.StringHashMap(Loader),
     resolve_dir: string = "/",
-    jsx: ?JSX.Pragma,
+    jsx: JSX.Pragma = JSX.Pragma{},
     react_fast_refresh: bool = false,
     inject: ?[]string = null,
     public_url: string = "/",
@@ -246,7 +246,6 @@ pub const BundleOptions = struct {
     preserve_symlinks: bool = false,
     resolve_mode: api.Api.ResolveMode,
     tsconfig_override: ?string = null,
-    fs: *fs.FileSystem,
     platform: Platform = Platform.browser,
     main_fields: []string = Platform.DefaultMainFields.get(Platform.browser),
     log: *logger.Log,
@@ -254,12 +253,12 @@ pub const BundleOptions = struct {
     entry_points: []string,
     pub fn fromApi(
         allocator: *std.mem.Allocator,
+        fs: *fs.FileSystem,
         transform: Api.TransformOptions,
     ) !BundleOptions {
         var log = logger.Log.init(allocator);
         var opts: BundleOptions = std.mem.zeroes(BundleOptions);
 
-        opts.fs = try fs.FileSystem.init1(allocator, transform.absolute_working_dir, false);
         opts.write = transform.write;
         if (transform.jsx) |jsx| {
             opts.jsx = JSX.Pragma.fromApi(jsx);