Skip to content

Commit a0ccf76

Browse files
committed
Update to elixirscript 0.26
1 parent ca405a7 commit a0ccf76

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

mix.exs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ defmodule Todo.Mixfile do
1010
build_embedded: Mix.env == :prod,
1111
start_permanent: Mix.env == :prod,
1212
deps: deps(),
13-
elixir_script: [ input: ["web/static/exjs", "lib/shared"], output: "web/static/js/build" ]
13+
elixir_script: [
14+
input: ["web/static/exjs", "lib/shared"],
15+
output: "web/static/js/build",
16+
js_modules: [
17+
{React, "react"},
18+
{ReactDOM, "react-dom"}
19+
]
20+
]
1421
]
1522
end
1623

@@ -36,7 +43,7 @@ defmodule Todo.Mixfile do
3643
{:phoenix_live_reload, "~> 1.0", only: :dev},
3744
{:gettext, "~> 0.11"},
3845
{:cowboy, "~> 1.0"},
39-
{:elixir_script, "~> 0.24.0"},
46+
{:elixir_script, "~> 0.26.0"},
4047
{:fs, "2.12.0", override: true}
4148
]
4249
end

mix.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%{"cowboy": {:hex, :cowboy, "1.0.4", "a324a8df9f2316c833a470d918aaf73ae894278b8aa6226ce7a9bf699388f878", [:make, :rebar], [{:cowlib, "~> 1.0.0", [hex: :cowlib, optional: false]}, {:ranch, "~> 1.0", [hex: :ranch, optional: false]}]},
22
"cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], []},
3-
"elixir_script": {:hex, :elixir_script, "0.24.0", "cb4d827a3082984f317ff8c30d61b839e0c5b8c5d44c63ce881ae2ce5aa1691d", [:mix], [{:estree, "~> 2.5", [hex: :estree, optional: false]}, {:fs, "~> 0.9.1", [hex: :fs, optional: false]}]},
4-
"estree": {:hex, :estree, "2.5.0", "9776c1705a72dc5a0d56cdf431173c3e75f9e509278a857ec55374a49f5699ef", [:mix], []},
3+
"elixir_script": {:hex, :elixir_script, "0.26.1", "f8458f226e0aaf5379ab20aff24e7023c18068a05321461029417b57f6d3676c", [:mix], [{:estree, "~> 2.5", [hex: :estree, optional: false]}, {:fs, "~> 2.12", [hex: :fs, optional: false]}]},
4+
"estree": {:hex, :estree, "2.5.1", "c93a8fa8a29886e6a6f6c489ba6dc949b998d2985b189967e41e69a92b58e846", [:mix], []},
55
"fs": {:hex, :fs, "2.12.0", "ad631efacc9a5683c8eaa1b274e24fa64a1b8eb30747e9595b93bec7e492e25e", [:rebar3], []},
66
"gettext": {:hex, :gettext, "0.13.0", "daafbddc5cda12738bb93b01d84105fe75b916a302f1c50ab9fb066b95ec9db4", [:mix], []},
77
"mime": {:hex, :mime, "1.0.1", "05c393850524767d13a53627df71beeebb016205eb43bfbd92d14d24ec7a1b51", [:mix], []},

web/static/exjs/main.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ defmodule Main do
7979
|> ReactDOM.render(:document.getElementById("app"))
8080
end
8181

82-
def main() do
82+
def start(_, _) do
8383
Agent.start(&initial_state/0, [name: :model])
8484
render()
8585
Todo.Data.list()

web/static/exjs/react_ui.ex

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ defmodule ReactUI do
33

44
defmacro __using__(_) do
55
quote do
6-
JS.import React, "react"
7-
JS.import ReactDOM, "react-dom"
86
import ReactUI
97
end
108
end

web/static/js/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ import 'phoenix_html';
1818
// Local files can be imported directly using relative
1919
// paths "./socket" or full ones "web/static/js/socket".
2020
// import socket from "./socket"
21-
import Main from './build/app/Elixir.Main';
21+
import Elixir from './build/Elixir.App';
2222

23-
Main.main();
23+
Elixir.start(Elixir.Main, [])

0 commit comments

Comments
 (0)