From 4dbbdb1671d44eae553b4d8a2e352c03c0050fa6 Mon Sep 17 00:00:00 2001
From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Date: Sun, 9 Oct 2022 00:49:45 -0700
Subject: Clean up how we reload entry point a little
---
src/bun.js/javascript.zig | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
(limited to 'src/bun.js/javascript.zig')
diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig
index 34cd0610d..8fccee097 100644
--- a/src/bun.js/javascript.zig
+++ b/src/bun.js/javascript.zig
@@ -384,7 +384,7 @@ pub const VirtualMachine = struct {
pub fn reload(this: *VirtualMachine) void {
Output.debug("Reloading...", .{});
this.global.reload();
- this.pending_internal_promise = this.loadEntryPoint(this.main) catch @panic("Failed to reload");
+ this.pending_internal_promise = this.reloadEntryPoint(this.main) catch @panic("Failed to reload");
}
pub fn io(this: *VirtualMachine) *IO {
@@ -1474,7 +1474,7 @@ pub const VirtualMachine = struct {
this.global.deleteModuleRegistryEntry(&str);
}
- pub fn loadEntryPoint(this: *VirtualMachine, entry_path: string) !*JSInternalPromise {
+ pub fn reloadEntryPoint(this: *VirtualMachine, entry_path: []const u8) !*JSInternalPromise {
this.main = entry_path;
try this.entry_point.generate(this.bun_watcher != null, Fs.PathName.init(entry_path), main_file_name);
this.eventLoop().ensureWaker();
@@ -1500,7 +1500,29 @@ pub const VirtualMachine = struct {
this.pending_internal_promise = promise;
}
- this.waitForPromise(promise);
+ return promise;
+ }
+
+ pub fn loadEntryPoint(this: *VirtualMachine, entry_path: string) !*JSInternalPromise {
+ var promise = try this.reloadEntryPoint(entry_path);
+
+ // pending_internal_promise can change if hot module reloading is enabled
+ if (this.bun_watcher != null) {
+ switch (this.pending_internal_promise.status(this.global.vm())) {
+ JSC.JSPromise.Status.Pending => {
+ while (this.pending_internal_promise.status(this.global.vm()) == .Pending) {
+ this.eventLoop().tick();
+
+ if (this.pending_internal_promise.status(this.global.vm()) == .Pending) {
+ this.eventLoop().autoTick();
+ }
+ }
+ },
+ else => {},
+ }
+ } else {
+ this.waitForPromise(promise);
+ }
this.eventLoop().autoTick();
--
cgit v1.2.3
preloadmodules'>dave/nodemodule-preloadmodules
| Unnamed repository; edit this file 'description' to name the repository. | |
Derrick Farris
Jarred Sumner
Michał Warda