only adding deps from projects with elixirscript configs

bryanjos · bryanjos · commit 64893861f831 · 2016-10-18T21:42:12.000-05:00
diff --git a/lib/elixir_script.ex b/lib/elixir_script.ex
@@ -123,7 +123,6 @@ defmodule ElixirScript do
     |> ElixirScript.Passes.DepsPaths.execute(opts)
     |> ElixirScript.Passes.ASTFromFile.execute(opts)
     |> ElixirScript.Passes.FindModules.execute(opts)
-    |> ElixirScript.Passes.RemoveUnused.execute(opts)
     |> ElixirScript.Passes.LoadModules.execute(opts)
     |> ElixirScript.Passes.FindChangedFiles.execute(opts)
     |> ElixirScript.Passes.FilterExjs.execute(opts)
diff --git a/lib/elixir_script/passes/deps_paths.ex b/lib/elixir_script/passes/deps_paths.ex
@@ -8,7 +8,7 @@ defmodule ElixirScript.Passes.DepsPaths do
       Map.get(opts, :std_lib, false) ->
         [{opts[:app], [compiler_data.path]}]
       Code.ensure_loaded?(Mix) ->
-        deps = get_deps_paths(:elixirscript)
+        deps = get_deps_paths(Mix.env)
         deps ++ [{opts[:app], [compiler_data.path]}]
       true ->
         [{opts[:app], [compiler_data.path]}]
@@ -24,12 +24,18 @@ defmodule ElixirScript.Passes.DepsPaths do
 
   defp do_get_deps_paths(deps) do
     Enum.reduce(deps, [], fn(dep, list) ->
-      paths = Mix.Project.in_project dep.app, dep.opts[:dest], fn mixfile -> Mix.Project.config()[:elixirc_paths] end
-      paths = Enum.map(paths, fn path -> Path.join([dep.opts[:dest], path]) end)
-
-      deps = do_get_deps_paths(dep.deps)
-
-      deps ++ [{dep.app, paths}] ++ list
+      elixirscript_config = Mix.Project.in_project dep.app, dep.opts[:dest], fn mixfile -> Mix.Project.config()[:elixirscript] end
+
+      paths = case elixirscript_config do
+                nil ->
+                  list
+
+                config ->
+                  paths = Keyword.get(config, :input, "") |> List.wrap
+                  paths = Enum.map(paths, fn path -> Path.join([dep.opts[:dest], path]) end)
+                  deps = do_get_deps_paths(dep.deps)
+                  deps ++ [{dep.app, paths}] ++ list
+              end
     end)
     |> Enum.uniq
   end
diff --git a/lib/elixir_script/passes/load_modules.ex b/lib/elixir_script/passes/load_modules.ex
@@ -5,14 +5,19 @@ defmodule ElixirScript.Passes.LoadModules do
     ex_files = Enum.map(compiler_data.data, fn { module, %{path: path} } -> path end)
     |> Enum.filter(fn path -> Path.extname(path) == ".ex" || Path.extname(path) == ".exs" end)
 
-    loaded_modules = try do
-                       Kernel.ParallelRequire.files(ex_files)
-                     rescue
-                       _ ->
-                         []
-                     end
+    loaded_modules = case ex_files do
+      [] ->
+        []
+      files ->
+        try do
+          Kernel.ParallelRequire.files(files)
+        rescue
+          _ ->
+            []
+        end
+    end
 
-    Map.put(compiler_data, :loaded_modules, [])
+    Map.put(compiler_data, :loaded_modules, loaded_modules)
   end
 
 end
