Update test commands. Update Changelog

bryanjos · bryanjos · commit c87dc7083929 · 2017-03-11T19:17:49.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,11 +9,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - `super`
 - `defoverridable`
+- `Elixir.load` for loading generated JavaScript modules in bundled output.
+Unlike `Elixir.start`, this will only call `__load` on the module and return the functions on it
+
+```javascript
+const exports = Elixir.load(Elixir.MyApp);
+exports.hello();
+```
 
 ### Changed
 - `-ex` alias is now `-e`
 - A filename can be specified for output
 
+### Fixed
+- Make sure mix compiler works in umbrella apps
+
 ## [0.26.1] - 2017-02-27
 
 ### Fixed
@@ -46,7 +56,7 @@ elixirscript "app/elixirscript" -o dist --js-module React:react --js-module Reac
 - Now bundles all output, including the boostrap code.
   The exported object has Elixir modules in JavaScript namespaces that are lazily loaded when called.
 
-  To start your application import the bundle according to whichever module format was selected and 
+  To start your application import the bundle according to whichever module format was selected and
   then call start giving it the module and the initial args
 
   ```javascript
@@ -67,7 +77,7 @@ elixirscript "app/elixirscript" -o dist --js-module React:react --js-module Reac
 - Updated elixir_script mix compiler to support compiling elixir_script paths in dependencies if dependency has mix compiler defined as well
 - Add `Collectable` protocol implementations
 - Updated `for` implementation to use `Collectable`
-- `format` option. Can now specify the module format of output. 
+- `format` option. Can now specify the module format of output.
     Choices are:
         * `:es` (default) for ES Modules
         * `:umd` for UMD
diff --git a/GettingStarted.md b/GettingStarted.md
@@ -30,9 +30,9 @@ This is the help output of elixirscript
      the elixir code string if passed the -e flag
      options:
     --js-module [<identifer>:<path>] A js module used in your code. ex: React:react
-                            Multiple can be defined      
+                            Multiple can be defined
      -f --format [format]   module format of output. options: es (default), common, umd
-     -o  --output [path]    places output at the given path. 
+     -o  --output [path]    places output at the given path.
                             Can be a directory or filename.
      -e --elixir read input as elixir code string
      --full-build informs the compiler to do a full build instead of an incremental one
@@ -49,10 +49,10 @@ elixirscript also takes a path to your `.ex` files as well:
 
 If you look in the dist folder you'll see a file called `Elixir.App.js`
 
-To start your application import the bundle according to whichever module format was selected and 
+To start your application import the bundle according to whichever module format was selected and
 then call start giving it the module and the initial args.
 
-Ex. If you have a module like so 
+Ex. If you have a module like so
 ```elixir
 defmodule Example do
     start(type, args) do
@@ -87,14 +87,14 @@ Add dependency to your deps in mix.exs:
      version: "0.1.0",
      elixir: "~> 1.0",
      deps: deps,
-     elixir_script: [ 
-        input: "lib/elixirscript", 
-        output: "priv/elixirscript/Elixir.App.js", 
+     elixir_script: [
+        input: "lib/elixirscript",
+        output: "priv/elixirscript/Elixir.App.js",
         format: :es,
         js_modules: [
           {React, "react"},
           {ReactDOM, "react-dom"}
-        ]         
+        ]
      ],
      compilers: [:elixir_script] ++ Mix.compilers
     ]
@@ -160,6 +160,6 @@ There is an [elixirscript frontend boilerplate project](https://github.com/elixi
 
 There is an Brunch plugin, [elixirscript-brunch](https://www.npmjs.com/package/elixirscript-brunch).
 
-#### 
+#### elixirscript-loader
 
-There is also a webpack loader, [elixirscript-loader](https://www.npmjs.com/package/elixirscript-loader).
+There is also a webpack loader, [elixirscript-loader](https://www.npmjs.com/package/elixirscript-loader).
diff --git a/lib/elixir_script/passes/handle_output.ex b/lib/elixir_script/passes/handle_output.ex
@@ -22,7 +22,7 @@ defmodule ElixirScript.Passes.HandleOutput do
       code -> code
     end
 
-    IO.write(concat(code)) 
+    IO.write(concat(code))
   end
 
   defp out(compiler_output, %{output: output_path, core_path: _}) do
diff --git a/lib/elixir_script/translator/kernel/special_forms/call.ex b/lib/elixir_script/translator/kernel/special_forms/call.ex
@@ -22,7 +22,7 @@ defmodule ElixirScript.Translator.Call do
      )
 
     {ast, env}
-  end  
+  end
 
   def make_local_function_call(function_name, params, env) do
     ast = JS.call_expression(
@@ -42,7 +42,7 @@ defmodule ElixirScript.Translator.Call do
           Identifier.make_namespace_members(members),
           [JS.identifier("Elixir")]
         ),
-        Identifier.make_identifier(function_name)        
+        Identifier.make_identifier(function_name)
       ),
       Enum.map(params, &Translator.translate!(&1, env))
      )
@@ -52,7 +52,7 @@ defmodule ElixirScript.Translator.Call do
 
   def make_module_function_call(module_name, function_name, env) do
     make_module_function_call(module_name, function_name, [], env)
-  end 
+  end
 
   def make_extern_function_or_property_call(module_name, function_name, env) do
     members = Module.split(module_name)
@@ -87,7 +87,7 @@ defmodule ElixirScript.Translator.Call do
      )
 
     {ast, env}
-  end 
+  end
 
   def make_function_or_property_call(module_name, function_name, env) do
     js_ast = JS.call_expression(
@@ -128,19 +128,19 @@ defmodule ElixirScript.Translator.Call do
       ]
     )
 
-    {js_ast, env}  
+    {js_ast, env}
   end
 
   def make_function_call(module_name, function_name, params, env) when is_atom(module_name) and is_atom(function_name) do
     js_ast = JS.call_expression(
        JS.member_expression(
         Identifier.make_identifier(module_name),
-        Identifier.make_identifier(function_name)    
+        Identifier.make_identifier(function_name)
        ),
        Enum.map(params, &Translator.translate!(&1, env))
     )
 
-    {js_ast, env}  
+    {js_ast, env}
   end
 
   def make_function_call({{:., _, _}, _, _} = module_name, function_name, [], env) do
@@ -161,19 +161,19 @@ defmodule ElixirScript.Translator.Call do
       ]
     )
 
-    {js_ast, env}  
+    {js_ast, env}
   end
 
   def make_function_call({{:., _, _}, _, _} = module_name, function_name, params, env) do
      js_ast = JS.call_expression(
        JS.member_expression(
         Translator.translate!(module_name, env),
-        Identifier.make_identifier(function_name)    
+        Identifier.make_identifier(function_name)
        ),
        Enum.map(params, &Translator.translate!(&1, env))
     )
 
-    {js_ast, env}   
+    {js_ast, env}
   end
 
   def make_function_call(module_name, function_name, [], env) do
@@ -195,7 +195,7 @@ defmodule ElixirScript.Translator.Call do
     )
 
     {js_ast, env}
-  end  
+  end
 
   def make_function_call(module_name, function_name, params, env) do
     call = JS.call_expression(
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "build": "rollup -c rollup.config.js",
     "clean": "rm -rf priv/build",
     "test": "mocha src/javascript/tests --recursive --compilers js:babel-core/register",
-    "test-app": "./test/app/convert-exjs && NODE_ENV=test mocha 'test/app/spec/*.spec.js'"
+    "build:test-app": "mix elixirscript test/app/src/ -f common -o test/app/build/",
+    "test-app": "yarn run build:test-app && NODE_ENV=test mocha 'test/app/spec/*.spec.js'"
   },
   "repository": {
     "type": "git",
diff --git a/test/app/convert-exjs b/test/app/convert-exjs
