7 files changed, 22 insertions, 23 deletions

diff --git a/src/javascript/jsc/bindings/bindings.zig b/src/javascript/jsc/bindings/bindings.zig
index 026c283a9..02f026ea5 100644
--- a/src/javascript/jsc/bindings/bindings.zig
+++ b/src/javascript/jsc/bindings/bindings.zig
@@ -127,6 +127,10 @@ pub const ZigString = extern struct {
     }
 
     pub fn toJSStringRef(this: *const ZigString) C_API.JSStringRef {
+        if (comptime @hasDecl(@import("root"), "bindgen")) {
+            return undefined;
+        }
+
         return C_API.JSStringCreateStatic(this.ptr, this.len);
     }
 
diff --git a/src/javascript/jsc/bindings/exports.zig b/src/javascript/jsc/bindings/exports.zig
index b2e556e04..b325a1208 100644
--- a/src/javascript/jsc/bindings/exports.zig
+++ b/src/javascript/jsc/bindings/exports.zig
@@ -689,6 +689,10 @@ pub const ZigConsoleClient = struct {
         vals: [*]JSValue,
         len: usize,
     ) callconv(.C) void {
+        if (comptime @hasDecl(@import("root"), "bindgen")) {
+            return;
+        }
+
         var console = JS.VirtualMachine.vm.console;
         var i: usize = 0;
         var buffered_writer = console.writer;
@@ -751,6 +755,10 @@ pub const ZigConsoleClient = struct {
         const CellType = CAPI.CellType;
         threadlocal var name_buf: [512]u8 = undefined;
         pub fn format(comptime Writer: type, writer: Writer, value: JSValue, globalThis: *JSGlobalObject, comptime enable_ansi_colors: bool) anyerror!void {
+            if (comptime @hasDecl(@import("root"), "bindgen")) {
+                return;
+            }
+
             if (value.isCell()) {
                 if (CAPI.JSObjectGetPrivate(value.asRef())) |private_data_ptr| {
                     const priv_data = JS.JSPrivateDataPtr.from(private_data_ptr);
diff --git a/src/javascript/jsc/bindings/headers-cpp.h b/src/javascript/jsc/bindings/headers-cpp.h
index c97c8804d..d23d5fa8b 100644
--- a/src/javascript/jsc/bindings/headers-cpp.h
+++ b/src/javascript/jsc/bindings/headers-cpp.h
@@ -1,4 +1,4 @@
-//-- AUTOGENERATED FILE -- 1635119991
+//-- AUTOGENERATED FILE -- 1635574929
 // clang-format off
 #pragma once
 
diff --git a/src/javascript/jsc/bindings/headers.h b/src/javascript/jsc/bindings/headers.h
index c5d5f1932..db0893f46 100644
--- a/src/javascript/jsc/bindings/headers.h
+++ b/src/javascript/jsc/bindings/headers.h
@@ -1,5 +1,5 @@
 // clang-format: off
-//-- AUTOGENERATED FILE -- 1635119991
+//-- AUTOGENERATED FILE -- 1635574929
 #pragma once
 
 #include <stddef.h>
diff --git a/src/javascript/jsc/bindings/headers.zig b/src/javascript/jsc/bindings/headers.zig
index 79aff5a09..51e74b386 100644
--- a/src/javascript/jsc/bindings/headers.zig
+++ b/src/javascript/jsc/bindings/headers.zig
@@ -2,26 +2,6 @@ usingnamespace @import("./headers-replacements.zig");
 pub usingnamespace @import("std").zig.c_builtins;
 pub const ptrdiff_t = c_long;
 pub const wchar_t = c_int;
-pub const max_align_t = c_longdouble;
-pub const int_least8_t = i8;
-pub const int_least16_t = i16;
-pub const int_least32_t = i32;
-pub const int_least64_t = i64;
-pub const uint_least8_t = u8;
-pub const uint_least16_t = u16;
-pub const uint_least32_t = u32;
-pub const uint_least64_t = u64;
-pub const int_fast8_t = i8;
-pub const int_fast16_t = i16;
-pub const int_fast32_t = i32;
-pub const int_fast64_t = i64;
-pub const uint_fast8_t = u8;
-pub const uint_fast16_t = u16;
-pub const uint_fast32_t = u32;
-pub const uint_fast64_t = u64;
-pub const __int8_t = i8;
-pub const __uint8_t = u8;
-pub const __int16_t = c_short;
 pub const __uint16_t = c_ushort;
 pub const __int32_t = c_int;
 pub const __uint32_t = c_uint;
diff --git a/src/javascript/jsc/javascript.zig b/src/javascript/jsc/javascript.zig
index c14073de7..574f1a158 100644
--- a/src/javascript/jsc/javascript.zig
+++ b/src/javascript/jsc/javascript.zig
@@ -700,7 +700,7 @@ pub const VirtualMachine = struct {
         _args: Api.TransformOptions,
         existing_bundle: ?*NodeModuleBundle,
         _log: ?*logger.Log,
-        env_loader: *DotEnv.Loader,
+        env_loader: ?*DotEnv.Loader,
     ) !*VirtualMachine {
         var log: *logger.Log = undefined;
         if (_log) |__log| {
@@ -1383,6 +1383,10 @@ pub const VirtualMachine = struct {
     // In all other cases, we will convert it to a ZigException.
     const errors_property = ZigString.init("errors");
     pub fn printErrorlikeObject(this: *VirtualMachine, value: JSValue, exception: ?*Exception, exception_list: ?*ExceptionList, comptime allow_ansi_color: bool) void {
+        if (comptime @hasDecl(@import("root"), "bindgen")) {
+            return;
+        }
+
         var was_internal = false;
 
         defer {
@@ -1496,6 +1500,7 @@ pub const VirtualMachine = struct {
     }
 
     pub fn printStackTrace(comptime Writer: type, writer: Writer, trace: ZigStackTrace, comptime allow_ansi_colors: bool) !void {
+
         // We are going to print the stack trace backwards
         const stack = trace.frames();
         if (stack.len > 0) {
diff --git a/src/js_parser/js_parser.zig b/src/js_parser/js_parser.zig
index d5f120686..50a94d582 100644
--- a/src/js_parser/js_parser.zig
+++ b/src/js_parser/js_parser.zig
@@ -15482,6 +15482,8 @@ pub fn NewParser(
             this.import_transposer = @TypeOf(this.import_transposer).init(this);
             this.require_transposer = @TypeOf(this.require_transposer).init(this);
             this.require_resolve_transposer = @TypeOf(this.require_resolve_transposer).init(this);
+
+            if (opts.features.top_level_await) this.fn_or_arrow_data_parse.allow_await = .allow_expr;
         }
     };
 }