Improve alias finding

Author: CompuIves

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

@@ -445,6 +445,12 @@ export default class Manager {
     this.webpackHMR = true;
   }
 
+  getPresetAliasedPath(path: string) {
+    return this.preset
+      .getAliasedPath(path)
+      .replace(/.*\{\{sandboxRoot\}\}/, '');
+  }
+
   resolveModule(
     path: string,
     currentPath: string,
@@ -462,9 +468,7 @@ export default class Manager {
     if (cachedPath) {
       resolvedPath = cachedPath;
     } else {
-      const presetAliasedPath = this.preset
-        .getAliasedPath(path)
-        .replace(/.*\{\{sandboxRoot\}\}/, '');
+      const presetAliasedPath = this.getPresetAliasedPath(path);
 
       const aliasedPath = this.getAliasedDependencyPath(
         presetAliasedPath,

packages/app/src/sandbox/eval/presets/index.js

@@ -73,6 +73,7 @@ export default class Preset {
 
     this.hasDotEnv = hasDotEnv || false;
     this.alias = alias || {};
+    this.aliasedPathCache = {};
     this.defaultAliases = alias || {};
     this.ignoredExtensions = ignoredExtensions || ['js', 'jsx', 'json'];
 
@@ -84,13 +85,21 @@ export default class Preset {
 
   setAdditionalAliases = (aliases: Object) => {
     this.alias = { ...this.defaultAliases, ...aliases };
+    this.aliasedPathCache = {};
   };
 
+  aliasedPathCache = {};
   /**
    * Checks if there is an alias given for the path, if there is it will return
    * the altered path, otherwise it will just return the known path.
    */
   getAliasedPath(path: string): string {
+    if (this.aliasedPathCache[path] === null) {
+      return path;
+    } else if (this.aliasedPathCache[path]) {
+      return this.aliasedPathCache[path];
+    }
+
     const aliases = Object.keys(this.alias);
 
     const exactAliases = aliases.filter(a => a.endsWith('$'));
@@ -105,10 +114,11 @@ export default class Preset {
     });
 
     if (exactFoundAlias) {
+      this.aliasedPathCache[path] = this.alias[exactFoundAlias];
       return this.alias[exactFoundAlias];
     }
 
-    const pathParts = path.split('/'); // eslint-disable-line prefer-const
+    const pathParts = path.split('/');
 
     // Find matching aliases
     const foundAlias = orderBy(aliases, a => -a.split('/').length).find(a => {
@@ -117,10 +127,14 @@ export default class Preset {
     });
 
     if (foundAlias) {
+      const replacedPath = path.replace(foundAlias, this.alias[foundAlias]);
+      this.aliasedPathCache[path] = replacedPath;
       // if an alias is found we will replace the path with the alias
-      return path.replace(foundAlias, this.alias[foundAlias]);
+      return replacedPath;
     }
 
+    this.aliasedPathCache[path] = null;
+
     return path;
   }
 

packages/app/src/sandbox/eval/transpiled-module.js

@@ -798,7 +798,9 @@ export default class TranspiledModule {
     try {
       // eslint-disable-next-line no-inner-declarations
       function require(path: string) {
-        const bfsModule = BrowserFS.BFSRequire(path);
+        const usedPath = manager.getPresetAliasedPath(path);
+
+        const bfsModule = BrowserFS.BFSRequire(usedPath);
 
         if (bfsModule) {
           return bfsModule;