From 4f78fcab1bf15c634eb623e8901801d3ba036006 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Fri, 16 Aug 2024 19:40:41 -0400
Subject: [PATCH] Resolve index files for script imports

---
 src/utils/ScriptTransformer.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/utils/ScriptTransformer.ts b/src/utils/ScriptTransformer.ts
index e6361bf23..5a0481cf6 100644
--- a/src/utils/ScriptTransformer.ts
+++ b/src/utils/ScriptTransformer.ts
@@ -110,14 +110,18 @@ export function getModuleScript(
       throw new ModuleResolutionError(`Invalid module: "${moduleName}". Base module: "${baseModule}".`);
     }
     script = scripts.get(filename);
-    if (script) {
-      break;
+    if (script) return script;
+  }
+  // If no script was found with the base name, check for a folder with index file
+  for (const extension of validScriptExtensions) {
+    const filename = resolveScriptFilePath(`${moduleName}/index`, baseModule, extension);
+    if (!filename) {
+      throw new ModuleResolutionError(`Invalid module: "${moduleName}". Base module: "${baseModule}".`);
     }
+    script = scripts.get(filename);
+    if (script) return script;
   }
-  if (!script) {
-    throw new ModuleResolutionError(`Invalid module: "${moduleName}". Base module: "${baseModule}".`);
-  }
-  return script;
+  throw new ModuleResolutionError(`Invalid module: "${moduleName}". Base module: "${baseModule}".`);
 }
 
 /**