From 18290dee8b7e338e5ee1a33348fdf27275b91ec5 Mon Sep 17 00:00:00 2001
From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Date: Tue, 5 Jul 2022 00:55:43 -0700
Subject: [jsc] More careful code in dynamic require

---
 src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp')

diff --git a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp
index c24d67a81..65d2f206c 100644
--- a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp
+++ b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp
@@ -96,7 +96,7 @@ const char* const s_importMetaObjectRequireCode =
 
 const JSC::ConstructAbility s_importMetaObjectLoadModuleCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
 const JSC::ConstructorKind s_importMetaObjectLoadModuleCodeConstructorKind = JSC::ConstructorKind::None;
-const int s_importMetaObjectLoadModuleCodeLength = 2818;
+const int s_importMetaObjectLoadModuleCodeLength = 2834;
 static const JSC::Intrinsic s_importMetaObjectLoadModuleCodeIntrinsic = JSC::NoIntrinsic;
 const char* const s_importMetaObjectLoadModuleCode =
     "(function (meta, resolvedSpecifier) {\n" \
@@ -110,7 +110,7 @@ const char* const s_importMetaObjectLoadModuleCode =
     "    //\n" \
     "    var entry = Loader.registry.@get(key);\n" \
     "\n" \
-    "    if (!entry || entry.state <= @ModuleFetch) {\n" \
+    "    if (!entry || !entry.state || entry.state <= @ModuleFetch) {\n" \
     "      @fulfillModuleSync(key);\n" \
     "      entry = Loader.registry.@get(key);\n" \
     "    }\n" \
-- 
cgit v1.2.3