Fix dynamically downloading modules

Author: CompuIves

packages/app/src/sandbox/eval/manager.ts

@@ -831,12 +831,12 @@ export default class Manager {
     const tModule =
       currentTModule || this.getTranspiledModule(this.modules['/package.json']); // Get arbitrary file from root
     try {
-      return this.resolveTranspiledModule(
+      const resolvedTModule = await this.resolveTranspiledModule(
         path,
         tModule.module.path,
-        ignoredExtensions,
-        true
+        ignoredExtensions
       );
+      return resolvedTModule;
     } catch (e) {
       if (e.type === 'module-not-found' && e.isDependency) {
         const { queryPath } = splitQueryFromPath(path);

packages/app/src/sandbox/eval/transpilers/babel/worker/babel-worker.js

@@ -175,6 +175,8 @@ async function installPlugin(Babel, BFSRequire, plugin, currentPath, isV7) {
 
   const pluginName = await resolveDependencyName(plugin, isV7);
 
+  await downloadPath(`/node_modules/${pluginName}`);
+
   try {
     await downloadPath(pluginName);
     evaluatedPlugin = evaluateFromPath(

packages/app/src/sandbox/eval/transpilers/babel/worker/dynamic-download.ts

@@ -96,6 +96,32 @@ export const resolveAsyncModule = (
   return downloadCache.get(modulePath);
 };
 
+function downloadRequires(currentPath: string, code: string) {
+  const requires = getRequireStatements(code);
+
+  // Download all other needed files
+  return Promise.all(
+    requires.map(async foundR => {
+      if (foundR.type === 'direct') {
+        if (foundR.path === 'babel-plugin-macros') {
+          return;
+        }
+
+        try {
+          resolve.sync(foundR.path, {
+            filename: currentPath,
+            extensions: ['.js', '.json'],
+            moduleDirectory: ['node_modules'],
+            packageFilter,
+          });
+        } catch (e) {
+          await downloadFromError(e);
+        }
+      }
+    })
+  );
+}
+
 export async function downloadPath(
   absolutePath: string
 ): Promise<{ code: string; path: string }> {
@@ -137,38 +163,19 @@ export async function downloadPath(
       /* ignore */
     }
 
+    const code = existingFile.toString();
+    await downloadRequires(r.path, code);
+
     return {
-      code: existingFile,
+      code,
       path: r.path,
     };
   }
 
   mkDirByPathSync(path.dirname(r.path));
   fs.writeFileSync(r.path, r.code);
 
-  const requires = getRequireStatements(r.code);
-
-  // Download all other needed files
-  await Promise.all(
-    requires.map(async foundR => {
-      if (foundR.type === 'direct') {
-        if (foundR.path === 'babel-plugin-macros') {
-          return;
-        }
-
-        try {
-          resolve.sync(foundR.path, {
-            filename: r.path,
-            extensions: ['.js', '.json'],
-            moduleDirectory: ['node_modules'],
-            packageFilter,
-          });
-        } catch (e) {
-          await downloadFromError(e);
-        }
-      }
-    })
-  );
+  await downloadRequires(r.path, r.code);
 
   return r;
 }