packaging

7 files changed, 29 insertions, 22 deletions

diff --git a/src/bindgen.zig b/src/bindgen.zig
new file mode 100644
index 000000000..e76a1ce6d
--- /dev/null
+++ b/src/bindgen.zig
@@ -0,0 +1,3 @@
+pub const bindgen = true;
+
+pub const main = @import("./javascript/jsc/bindings/bindings-generator.zig").main;
diff --git a/src/fallback.version b/src/fallback.version
index 23bd52db7..74aeaab27 100644
--- a/src/fallback.version
+++ b/src/fallback.version
@@ -1 +1 @@
-796022f759787f0a
\ No newline at end of file
+2bbe5942da63d2ba
\ No newline at end of file
diff --git a/src/http.zig b/src/http.zig
index be34629ae..11c3d4077 100644
--- a/src/http.zig
+++ b/src/http.zig
@@ -1159,7 +1159,7 @@ pub const RequestContext = struct {
                     handler.handleJSError(.configure_defines, err) catch {};
                     return;
                 };
-
+                
                 var entry_point = boot;
                 if (!std.fs.path.isAbsolute(entry_point)) {
                     const resolved_entry_point = vm.bundler.resolver.resolve(
@@ -1270,6 +1270,7 @@ pub const RequestContext = struct {
                 __arena = std.heap.ArenaAllocator.init(vm.allocator);
                 JavaScript.VirtualMachine.vm.arena = &__arena;
                 JavaScript.VirtualMachine.vm.has_loaded = true;
+                JavaScript.VirtualMachine.vm.tick();
                 defer {
                     JavaScript.VirtualMachine.vm.flush();
                     std.debug.assert(
@@ -1285,6 +1286,7 @@ pub const RequestContext = struct {
                 }
 
                 var handler: *JavaScriptHandler = try channel.readItem();
+                JavaScript.VirtualMachine.vm.tick();
 
                 JavaScript.VirtualMachine.vm.preflush();
 
@@ -1295,6 +1297,7 @@ pub const RequestContext = struct {
                     thread,
                     HandlerThread.handleFetchEventError,
                 ) catch |err| {};
+                JavaScript.VirtualMachine.vm.tick();
             }
         }
 
diff --git a/src/http/network_thread.zig b/src/http/network_thread.zig
index e7a3c033b..d3826dcb3 100644
--- a/src/http/network_thread.zig
+++ b/src/http/network_thread.zig
@@ -1,5 +1,6 @@
-const ThreadPool = @import("../thread_pool.zig");
-const Batch = ThreadPool.Batch;
+const ThreadPool = @import("thread_pool");
+pub const Batch = ThreadPool.Batch;
+pub const Task = ThreadPool.Task;
 const std = @import("std");
 const AsyncIO = @import("io");
 
diff --git a/src/http/http_client_async.zig b/src/http_client_async.zig
index b29234da4..684e4bc2c 100644
--- a/src/http/http_client_async.zig
+++ b/src/http_client_async.zig
@@ -1,21 +1,21 @@
-const picohttp = @import("../deps/picohttp.zig");
-usingnamespace @import("../global.zig");
+const picohttp = @import("picohttp");
+usingnamespace @import("./global.zig");
 const std = @import("std");
-const Headers = @import("../javascript/jsc/webcore/response.zig").Headers;
-const URL = @import("../query_string_map.zig").URL;
-const Method = @import("../http/method.zig").Method;
-const Api = @import("../api/schema.zig").Api;
-const Lock = @import("../lock.zig").Lock;
+const Headers = @import("./javascript/jsc/webcore/response.zig").Headers;
+const URL = @import("./query_string_map.zig").URL;
+const Method = @import("./http/method.zig").Method;
+const Api = @import("./api/schema.zig").Api;
+const Lock = @import("./lock.zig").Lock;
 const HTTPClient = @This();
 const SOCKET_FLAGS = os.SOCK_CLOEXEC;
-// const S2n = @import("../s2n.zig");
-const Zlib = @import("../zlib.zig");
-const StringBuilder = @import("../string_builder.zig");
+// const S2n = @import("./s2n.zig");
+const Zlib = @import("./zlib.zig");
+const StringBuilder = @import("./string_builder.zig");
 const AsyncIO = @import("io");
-const ThreadPool = @import("../thread_pool.zig");
+const ThreadPool = @import("thread_pool");
 const boring = @import("boringssl");
 
-const NetworkThread = @import("./network_thread.zig");
+const NetworkThread = @import("network_thread");
 
 const extremely_verbose = false;
 
@@ -198,7 +198,7 @@ pub const HeaderBuilder = struct {
     }
 };
 
-pub const HTTPChannel = @import("../sync.zig").Channel(*AsyncHTTP, .{ .Static = 1000 });
+pub const HTTPChannel = @import("./sync.zig").Channel(*AsyncHTTP, .{ .Static = 1000 });
 
 pub const HTTPChannelContext = struct {
     http: AsyncHTTP = undefined,
diff --git a/src/install/install.zig b/src/install/install.zig
index 34159bb2f..486613023 100644
--- a/src/install/install.zig
+++ b/src/install/install.zig
@@ -30,9 +30,9 @@ const Lock = @import("../lock.zig").Lock;
 var path_buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
 var path_buf2: [std.fs.MAX_PATH_BYTES]u8 = undefined;
 const URL = @import("../query_string_map.zig").URL;
-const NetworkThread = @import("../http/network_thread.zig");
-const AsyncHTTP = @import("../http/http_client_async.zig").AsyncHTTP;
-const HTTPChannel = @import("../http/http_client_async.zig").HTTPChannel;
+const NetworkThread = @import("network_thread");
+const AsyncHTTP = @import("http").AsyncHTTP;
+const HTTPChannel = @import("http").HTTPChannel;
 const Integrity = @import("./integrity.zig").Integrity;
 const clap = @import("clap");
 const ExtractTarball = @import("./extract_tarball.zig");
@@ -3626,7 +3626,7 @@ const TaskCallbackList = std.ArrayListUnmanaged(TaskCallbackContext);
 const TaskDependencyQueue = std.HashMapUnmanaged(u64, TaskCallbackList, IdentityContext(u64), 80);
 const TaskChannel = sync.Channel(Task, .{ .Static = 4096 });
 const NetworkChannel = sync.Channel(*NetworkTask, .{ .Static = 8192 });
-const ThreadPool = @import("../thread_pool.zig");
+const ThreadPool = @import("thread_pool");
 const PackageManifestMap = std.HashMapUnmanaged(PackageNameHash, Npm.PackageManifest, IdentityContext(PackageNameHash), 80);
 
 pub const CacheLevel = struct {
diff --git a/src/install/npm.zig b/src/install/npm.zig
index e9added64..9d12255d4 100644
--- a/src/install/npm.zig
+++ b/src/install/npm.zig
@@ -17,7 +17,7 @@ const Integrity = @import("./integrity.zig").Integrity;
 const Bin = @import("./bin.zig").Bin;
 const Environment = @import("../global.zig").Environment;
 const Aligner = @import("./install.zig").Aligner;
-const HTTPClient = @import("../http/http_client_async.zig");
+const HTTPClient = @import("http");
 const json_parser = @import("../json_parser.zig");
 const default_allocator = @import("../global.zig").default_allocator;
 const IdentityContext = @import("../identity_context.zig").IdentityContext;