Add filter_exjs so that only exjs files are compiled

bryanjos · bryanjos · commit ac49d9782ae3 · 2016-10-18T09:02:34.000-05:00
diff --git a/lib/elixir_script.ex b/lib/elixir_script.ex
@@ -126,6 +126,7 @@ defmodule ElixirScript do
     |> ElixirScript.Passes.RemoveUnused.execute(opts)
     |> ElixirScript.Passes.LoadModules.execute(opts)
     |> ElixirScript.Passes.FindChangedFiles.execute(opts)
+    |> ElixirScript.Passes.FilterExjs.execute(opts)
     |> ElixirScript.Passes.FindFunctions.execute(opts)
     |> ElixirScript.Passes.JavaScriptAST.execute(opts)
     |> ElixirScript.Passes.ConsolidateProtocols.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(Mix.env)
+        deps = get_deps_paths(:elixirscript)
         deps ++ [{opts[:app], [compiler_data.path]}]
       true ->
         [{opts[:app], [compiler_data.path]}]
diff --git a/lib/elixir_script/passes/filter_exjs.ex b/lib/elixir_script/passes/filter_exjs.ex
@@ -0,0 +1,11 @@
+defmodule ElixirScript.Passes.FilterExjs do
+
+
+  def execute(compiler_data, opts) do
+
+    data = Enum.filter(compiler_data.data, fn({m, data}) -> Path.extname(data.path) == ".exjs" end)
+
+    Map.put(compiler_data, :data, data)
+  end
+
+end
diff --git a/lib/elixir_script/passes/load_modules.ex b/lib/elixir_script/passes/load_modules.ex
@@ -5,8 +5,14 @@ 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 = Kernel.ParallelRequire.files(ex_files)
-    Map.put(compiler_data, :loaded_modules, loaded_modules)
+    loaded_modules = try do
+                       Kernel.ParallelRequire.files(ex_files)
+                     rescue
+                       _ ->
+                         []
+                     end
+
+    Map.put(compiler_data, :loaded_modules, [])
   end
 
 end
