Fix css dependencies

Author: Ives van Hoorne

src/sandbox/eval/js/babel-parser.js

@@ -8,7 +8,6 @@ import decoratorsPlugin from 'babel-plugin-transform-decorators-legacy';
 
 import evalModule from '../';
 import resolveDependency from './dependency-resolver';
-import DependencyNotFoundError from '../../errors/dependency-not-found-error';
 
 const CUSTOM_BABEL_CONFIG_ENABLED = false;
 
@@ -24,11 +23,11 @@ const DEFAULT_BABEL_CONFIG = {
 };
 
 const resolvePlugin = (plugin: string, externals) => {
-  const resolvedPlugin =
-    resolveDependency(plugin, externals) ||
-    resolveDependency(`babel-plugin-${plugin}`, externals);
-
-  if (!resolvedPlugin) throw new DependencyNotFoundError(plugin);
+  try {
+    return resolveDependency(plugin, externals)
+  } catch (e) {
+    return resolveDependency(`babel-plugin-${plugin}`, externals);
+  }
 };
 
 /**

src/sandbox/eval/js/dependency-resolver.js

@@ -1,3 +1,5 @@
+import DependencyNotFoundError from '../../errors/dependency-not-found-error';
+
 /**
  * Converts a dependency string to an actual dependency, this can return null
  * if the dependency is not found.
@@ -24,6 +26,5 @@ export default function getDependency(
       }
     }
   }
-
-  return null;
+  throw new DependencyNotFoundError(dependencyPath);
 }

src/sandbox/eval/js/index.js

@@ -5,7 +5,6 @@ import type { Module, Directory } from 'common/types';
 
 import evalModule from '../';
 import resolveModule from '../../utils/resolve-module';
-import DependencyNotFoundError from '../../errors/dependency-not-found-error';
 import resolveDependency from './dependency-resolver';
 import getBabelConfig from './babel-parser';
 
@@ -59,31 +58,28 @@ export default function evaluateJS(
       // eslint-disable-line no-unused-vars
       if (/^(\w|@)/.test(path)) {
         // So it must be a dependency
-        const dependency = resolveDependency(path, externals);
-        if (dependency) return dependency;
+        return resolveDependency(path, externals);
+      }
 
-        throw new DependencyNotFoundError(path);
-      } else {
-        const module = resolveModule(
-          path,
-          modules,
-          directories,
-          mainModule.directoryShortid,
-        );
-        if (mainModule === module) {
-          throw new Error(`${mainModule.title} is importing itself`);
-        }
+      const module = resolveModule(
+        path,
+        modules,
+        directories,
+        mainModule.directoryShortid,
+      );
+      if (mainModule === module) {
+        throw new Error(`${mainModule.title} is importing itself`);
+      }
 
-        if (!module) throw new Error(`Cannot find module in path: ${path}`);
+      if (!module) throw new Error(`Cannot find module in path: ${path}`);
 
-        requires.push(module.id);
-        // Check if this module has been evaluated before, if so return that
-        const cache = moduleCache.get(module.id);
+      requires.push(module.id);
+      // Check if this module has been evaluated before, if so return that
+      const cache = moduleCache.get(module.id);
 
-        return cache
-          ? cache.exports
-          : evalModule(module, modules, directories, externals, depth + 1);
-      }
+      return cache
+        ? cache.exports
+        : evalModule(module, modules, directories, externals, depth + 1);
     };
 
     const babelConfig = getBabelConfig(