Update to latest version of elixirscript

Author: bryanjos

.gitignore

@@ -23,3 +23,4 @@ assets/node_modules
 # variables.
 /config/prod.secret.exs
 assets/js/build/
+/.elixir_ls

.tool-versions

@@ -1,3 +1,3 @@
-erlang 20.0
-elixir 1.5.0-otp-20
-nodejs 8.2.0
+erlang 20.1
+elixir 1.6.0-otp-20
+nodejs 9.5.0

assets/.babelrc

@@ -4,7 +4,7 @@
       "env",
       {
         "targets": {
-          "browsers": ["last 2 versions", "safari >= 7"]
+          "chrome": 52
         },
         "modules": false,
         "useBuiltIns": true

assets/js/app.js

@@ -19,6 +19,6 @@ import '../css/app.css';
 // Local files can be imported directly using relative
 // paths "./socket" or full ones "web/static/js/socket".
 // import socket from "./socket"
-import Elixir from './build/elixirscript.build.js';
+import Main from './build/Elixir.Todo.Main.js';
 
-Elixir.start(Elixir.Todo.Main, []);
+Main.start(Symbol.for('normal'), []);

lib/todo_frontend/data.ex

@@ -6,50 +6,63 @@ defmodule Todo.Data do
   """
 
   def list() do
-    Todo.Data.Http.fetch("/api/todo").then(fn(response) ->
+    ElixirScript.Web.Window.fetch("/api/todo").then(fn response ->
       response.json()
-    end).then(fn(todos) ->
-        todos
-      |> Enum.map(fn(x) -> %Todo.Todo{ id: x.id, completed: x.completed, title: x.title } end)
+    end).then(fn todos ->
+      todos
+      |> Enum.map(fn x -> %Todo.Todo{id: x.id, completed: x.completed, title: x.title} end)
       |> Todo.Main.update()
-    end).catch(fn(err) ->
-      Todo.Data.Http.log(err)
+    end).catch(fn err ->
+      ElixirScript.Web.Console.log(err)
     end)
   end
 
   def add(the_title) do
-    Todo.Data.Http.fetch("/api/todo", ElixirScript.JS.map_to_object(%{
-      "method" => "post",
-      "headers" => %{
-        "Content-type" => "application/json"
-      },
-      "body" => Todo.Data.Http.stringify(ElixirScript.JS.map_to_object(%{"title" => the_title}))
-    })).then(fn(response) ->
+    ElixirScript.Web.Window.fetch(
+      "/api/todo",
+      ElixirScript.JS.map_to_object(%{
+        "method" => "post",
+        "headers" => %{
+          "Content-type" => "application/json"
+        },
+        "body" =>
+          ElixirScript.Web.JSON.stringify(ElixirScript.JS.map_to_object(%{"title" => the_title}))
+      })
+    ).then(fn response ->
       list()
-    end).catch(fn(err) ->
-      Todo.Data.Http.log(err)
+    end).catch(fn err ->
+      ElixirScript.Web.Console.log(err)
     end)
   end
 
   def remove(id) do
-    Todo.Data.Http.fetch("/api/todo/" <> id, ElixirScript.JS.map_to_object(%{ "method" => "delete" })).then(fn(response) ->
+    ElixirScript.Web.Window.fetch(
+      "/api/todo/" <> id,
+      ElixirScript.JS.map_to_object(%{"method" => "delete"})
+    ).then(fn response ->
       list()
-    end).catch(fn(err) ->
-      Todo.Data.Http.log(err)
+    end).catch(fn err ->
+      ElixirScript.Web.Console.log(err)
     end)
   end
 
   def update(id, completed) do
-    Todo.Data.Http.fetch("/api/todo/" <> id, ElixirScript.JS.map_to_object(%{
-      "method" => "put",
-      "headers" => %{
-        "Content-type" => "application/json"
-      },
-      "body" => Todo.Data.Http.stringify(ElixirScript.JS.map_to_object(%{ "completed" => completed }))
-    })).then(fn(response) ->
+    ElixirScript.Web.Window.fetch(
+      "/api/todo/" <> id,
+      ElixirScript.JS.map_to_object(%{
+        "method" => "put",
+        "headers" => %{
+          "Content-type" => "application/json"
+        },
+        "body" =>
+          ElixirScript.Web.JSON.stringify(
+            ElixirScript.JS.map_to_object(%{"completed" => completed})
+          )
+      })
+    ).then(fn response ->
       list()
-    end).catch(fn(err) ->
-      Todo.Data.Http.log(err)
+    end).catch(fn err ->
+      ElixirScript.Web.Console.log(err)
     end)
   end
 end

lib/todo_frontend/data_http.ex

@@ -20,7 +20,7 @@ defmodule Todo.Main do
   """
 
   def start(_, _) do
-    Agent.start(&initial_state/0, [name: :state])
+    Agent.start(&initial_state/0, name: :state)
     render()
     Todo.Data.list()
   end
@@ -30,7 +30,7 @@ defmodule Todo.Main do
   end
 
   def render() do
-    Agent.get(:state, fn(state) -> state end)
+    Agent.get(:state, fn state -> state end)
     |> view
     |> ReactDOM.render("#app")
   end
@@ -42,51 +42,57 @@ defmodule Todo.Main do
           h1 do
             "todos"
           end
-          input [
+
+          input(
             id: "new-todo",
             placeholder: "What needs to be done?",
             autoFocus: true,
-            onKeyPress: fn(event, _) -> process_event(event) end
-          ]
+            onKeyPress: fn event -> process_event(event) end
+          )
         end
+
         section id: "main" do
           ul id: "todo-list" do
-            Enum.map(todos, fn(todo) ->
-              {the_completed, checked} = if todo.completed do
-                {"completed", "checked"}
-              else
-                {"", ""}
-              end
+            Enum.map(todos, fn todo ->
+              {the_completed, checked} =
+                if todo.completed do
+                  {"completed", "checked"}
+                else
+                  {"", ""}
+                end
 
               li key: todo.id, className: the_completed do
                 React.HTML.div className: "view" do
-                  input [
+                  input(
                     className: "toggle",
                     type: "checkbox",
                     checked: todo.completed,
-                    onChange: fn(event) -> Todo.Data.update(todo.id, event.target.checked) end
-                  ]
+                    onChange: fn event -> Todo.Data.update(todo.id, event.target.checked) end
+                  )
+
                   label do
                     todo.title
                   end
-                  button [
+
+                  button(
                     className: "destroy",
-                    onClick: fn(event, _) ->
+                    onClick: fn event ->
                       Todo.Data.remove(todo.id)
                     end
-                  ]
+                  )
                 end
               end
             end)
           end
         end
-        footer id: "footer"
+
+        footer(id: "footer")
       end
     end
   end
 
   def update(todos) do
-    Agent.update(:state, fn(_) ->
+    Agent.update(:state, fn _ ->
       todos
     end)
 
@@ -98,7 +104,7 @@ defmodule Todo.Main do
       Todo.Data.add(event.target.value)
       ElixirScript.JS.mutate(event.target, "value", "")
     else
-      Todo.Data.Http.log(event)
+      ElixirScript.Web.Console.log(event)
     end
   end
 end

lib/todo_frontend/document.ex

@@ -2,46 +2,51 @@ defmodule Todo.Mixfile do
   use Mix.Project
 
   def project do
-    [app: :todo,
-     version: "0.0.1",
-     elixir: "~> 1.2",
-     elixirc_paths: elixirc_paths(Mix.env),
-     compilers: [:phoenix, :gettext] ++ Mix.compilers ++ [:elixir_script],
-     build_embedded: Mix.env == :prod,
-     start_permanent: Mix.env == :prod,
-     deps: deps(),
-     elixir_script: [
-       input: [Todo.Main],
-       output: "assets/js/build"
-     ]
+    [
+      app: :todo,
+      version: "0.0.1",
+      elixir: "~> 1.6",
+      elixirc_paths: elixirc_paths(Mix.env()),
+      compilers: [:phoenix, :gettext] ++ Mix.compilers() ++ [:elixir_script],
+      build_embedded: Mix.env() == :prod,
+      start_permanent: Mix.env() == :prod,
+      deps: deps(),
+      elixir_script: [
+        input: [Todo.Main],
+        output: "assets/js/build"
+      ]
     ]
   end
 
   # Configuration for the OTP application.
   #
   # Type `mix help compile.app` for more information.
   def application do
-    [mod: {Todo, []},
-     applications: [:phoenix, :phoenix_pubsub, :phoenix_html, :cowboy, :logger, :gettext]]
+    [
+      mod: {Todo, []},
+      applications: [:phoenix, :phoenix_pubsub, :phoenix_html, :cowboy, :logger, :gettext]
+    ]
   end
 
   # Specifies which paths to compile per environment.
   defp elixirc_paths(:test), do: ["lib", "test/support"]
-  defp elixirc_paths(_),     do: ["lib"]
+  defp elixirc_paths(_), do: ["lib"]
 
   # Specifies your project dependencies.
   #
   # Type `mix help deps` for examples and options.
   defp deps do
-    [{:phoenix, "~> 1.3"},
-     {:phoenix_pubsub, "~> 1.0"},
-     {:phoenix_html, "~> 2.6"},
-     {:phoenix_live_reload, "~> 1.0", only: :dev},
-     {:gettext, "~> 0.11"},
-     {:cowboy, "~> 1.0"},
-     {:elixir_script, "~> 0.30"},
-     {:fs, "~> 2.12", override: true},
-     {:elixir_script_react, "~> 1.0.1-react"}
+    [
+      {:phoenix, "~> 1.3"},
+      {:phoenix_pubsub, "~> 1.0"},
+      {:phoenix_html, "~> 2.6"},
+      {:phoenix_live_reload, "~> 1.0", only: :dev},
+      {:gettext, "~> 0.11"},
+      {:cowboy, "~> 1.0"},
+      {:elixir_script, "~> 0.32.1"},
+      {:fs, "~> 2.12", override: true},
+      {:elixir_script_react, "~> 16.2"},
+      {:elixir_script_web, "~> 0.2"}
     ]
   end
 end

lib/todo_frontend/main.ex

@@ -1,15 +1,19 @@
-%{"cowboy": {:hex, :cowboy, "1.1.2", "61ac29ea970389a88eca5a65601460162d370a70018afe6f949a29dca91f3bb0", [:rebar3], [{:cowlib, "~> 1.0.2", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3.2", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
+%{
+  "cowboy": {:hex, :cowboy, "1.1.2", "61ac29ea970389a88eca5a65601460162d370a70018afe6f949a29dca91f3bb0", [:rebar3], [{:cowlib, "~> 1.0.2", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3.2", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
   "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], [], "hexpm"},
-  "elixir_script": {:hex, :elixir_script, "0.30.0", "c67b2d9b6cdfa432717f4bffa3f31f476ff5c5bf15cef59142c6a85e7089d530", [:mix], [{:estree, "~> 2.6", [hex: :estree, repo: "hexpm", optional: false]}], "hexpm"},
-  "elixir_script_react": {:hex, :elixir_script_react, "1.0.1-react.15.6.1", "dc6f46a809100cb2c941e7b189b6626a1ec53889937dec53ff3006622d0bcc3e", [:mix], [{:elixir_script, "~> 0.30", [hex: :elixir_script, repo: "hexpm", optional: false]}], "hexpm"},
+  "elixir_script": {:hex, :elixir_script, "0.32.1", "c97e753faf1dd8bc93244fec93d7c88c3a7eef85e2bad7eb3e014ba3f1e06931", [:mix], [{:estree, "~> 2.6", [hex: :estree, repo: "hexpm", optional: false]}], "hexpm"},
+  "elixir_script_react": {:hex, :elixir_script_react, "16.2.0", "b1f1a12b01be3603a84c39e6d1cc544dc967ba835655d29072a249a960e973d1", [:mix], [{:elixir_script, "~> 0.32", [hex: :elixir_script, repo: "hexpm", optional: false]}], "hexpm"},
+  "elixir_script_web": {:hex, :elixir_script_web, "0.2.0", "78e1c0191c8d3ddc4760dca3248967746a8c0b7d571d8fed773584dca968b9ee", [:mix], [{:elixir_script, "~> 0.32", [hex: :elixir_script, repo: "hexpm", optional: false]}], "hexpm"},
   "estree": {:hex, :estree, "2.6.1", "0a17cc0e9e35315dc4fcd79d30a746b1f3e9ed654be6084ce882ab491165ae22", [:mix], [], "hexpm"},
+  "file_system": {:hex, :file_system, "0.2.4", "f0bdda195c0e46e987333e986452ec523aed21d784189144f647c43eaf307064", [:mix], [], "hexpm"},
   "fs": {:hex, :fs, "2.12.0", "ad631efacc9a5683c8eaa1b274e24fa64a1b8eb30747e9595b93bec7e492e25e", [:rebar3], [], "hexpm"},
-  "gettext": {:hex, :gettext, "0.13.1", "5e0daf4e7636d771c4c71ad5f3f53ba09a9ae5c250e1ab9c42ba9edccc476263", [:mix], [], "hexpm"},
-  "mime": {:hex, :mime, "1.1.0", "01c1d6f4083d8aa5c7b8c246ade95139620ef8effb009edde934e0ec3b28090a", [:mix], [], "hexpm"},
-  "phoenix": {:hex, :phoenix, "1.3.0", "1c01124caa1b4a7af46f2050ff11b267baa3edb441b45dbf243e979cd4c5891b", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.3 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
-  "phoenix_html": {:hex, :phoenix_html, "2.10.3", "432dec9e04372eeb7a6dbf59a778cf43eb44518441932217371fa535f2bcfd80", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
-  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.0.8", "4333f9c74190f485a74866beff2f9304f069d53f047f5fbb0fb8d1ee4c495f73", [:mix], [{:fs, "~> 0.9.1", [hex: :fs, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.0 or ~> 1.2-rc", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm"},
+  "gettext": {:hex, :gettext, "0.15.0", "40a2b8ce33a80ced7727e36768499fc9286881c43ebafccae6bab731e2b2b8ce", [:mix], [], "hexpm"},
+  "mime": {:hex, :mime, "1.2.0", "78adaa84832b3680de06f88f0997e3ead3b451a440d183d688085be2d709b534", [:mix], [], "hexpm"},
+  "phoenix": {:hex, :phoenix, "1.3.2", "2a00d751f51670ea6bc3f2ba4e6eb27ecb8a2c71e7978d9cd3e5de5ccf7378bd", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.3 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
+  "phoenix_html": {:hex, :phoenix_html, "2.11.0", "ead10dd1e36d5b8b5cc55642ba337832ec62617efd5765cddaa1a36c8b3891ca", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
+  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.1.3", "1d178429fc8950b12457d09c6afec247bfe1fcb6f36209e18fbb0221bdfe4d41", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.0 or ~> 1.2 or ~> 1.3", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.0.2", "bfa7fd52788b5eaa09cb51ff9fcad1d9edfeb68251add458523f839392f034c1", [:mix], [], "hexpm"},
-  "plug": {:hex, :plug, "1.4.3", "236d77ce7bf3e3a2668dc0d32a9b6f1f9b1f05361019946aae49874904be4aed", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1", [hex: :cowboy, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}], "hexpm"},
+  "plug": {:hex, :plug, "1.5.0", "224b25b4039bedc1eac149fb52ed456770b9678bbf0349cdd810460e1e09195b", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1 or ~> 2.1", [hex: :cowboy, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}], "hexpm"},
   "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
-  "ranch": {:hex, :ranch, "1.3.2", "e4965a144dc9fbe70e5c077c65e73c57165416a901bd02ea899cfd95aa890986", [:rebar3], [], "hexpm"}}
+  "ranch": {:hex, :ranch, "1.3.2", "e4965a144dc9fbe70e5c077c65e73c57165416a901bd02ea899cfd95aa890986", [:rebar3], [], "hexpm"},
+}