Skip to content

Commit dd0cd74

Browse files
committed
Update deps
1 parent e34873d commit dd0cd74

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

lib/phoenix_playground/code_reloader.ex

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@ defmodule PhoenixPlayground.CodeReloader do
33

44
def reload(_endpoint, _options \\ []) do
55
if path = Application.get_env(:phoenix_playground, :file) do
6-
old = Code.get_compiler_option(:ignore_module_conflict) == true
7-
Code.put_compiler_option(:ignore_module_conflict, true)
8-
Code.eval_file(path)
9-
Code.put_compiler_option(:ignore_module_conflict, old)
10-
:ok
6+
case File.read(path) do
7+
{:ok, contents} ->
8+
old = Code.get_compiler_option(:ignore_module_conflict) == true
9+
Code.put_compiler_option(:ignore_module_conflict, true)
10+
Code.eval_string(contents)
11+
Code.put_compiler_option(:ignore_module_conflict, old)
12+
13+
# ignore fs errors. (Seems like saving file in vim sometimes make it temp dissapear?)
14+
{:error, reason} ->
15+
:ok
16+
end
1117
else
1218
# in Livebook, path is nil
1319
:ok

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ defmodule PhoenixPlayground.MixProject do
8282
{:jason, "~> 1.0"},
8383
{:phoenix, "~> 1.0"},
8484
{:phoenix_live_view, "~> 1.0-rc",
85-
github: "wojtekmach/phoenix_live_view", branch: "wm-reloader"},
85+
github: "wojtekmach/phoenix_live_view", branch: "wm-code-reloader"},
8686
{:bandit, "~> 1.0"},
8787
{:floki, "~> 0.35"},
8888

mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"phoenix": {:hex, :phoenix, "1.7.12", "1cc589e0eab99f593a8aa38ec45f15d25297dd6187ee801c8de8947090b5a9d3", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "d646192fbade9f485b01bc9920c139bfdd19d0f8df3d73fd8eaf2dfbe0d2837c"},
1616
"phoenix_html": {:hex, :phoenix_html, "4.1.1", "4c064fd3873d12ebb1388425a8f2a19348cef56e7289e1998e2d2fa758aa982e", [:mix], [], "hexpm", "f2f2df5a72bc9a2f510b21497fd7d2b86d932ec0598f0210fed4114adc546c6f"},
1717
"phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.3", "f2161c207fda0e4fb55165f650f7f8db23f02b29e3bff00ff7ef161d6ac1f09d", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "b4ec9cd73cb01ff1bd1cac92e045d13e7030330b74164297d1aee3907b54803c"},
18-
"phoenix_live_view": {:git, "https://github.com/wojtekmach/phoenix_live_view.git", "f5b4a8d037d8cb88f36e9a1eb3666857b7e000f4", [branch: "wm-reloader"]},
18+
"phoenix_live_view": {:git, "https://github.com/wojtekmach/phoenix_live_view.git", "cf27e75dde5d1716b5ae386f4761bb289cf9d0eb", [branch: "wm-code-reloader"]},
1919
"phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
2020
"phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
2121
"plug": {:hex, :plug, "1.15.3", "712976f504418f6dff0a3e554c40d705a9bcf89a7ccef92fc6a5ef8f16a30a97", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "cc4365a3c010a56af402e0809208873d113e9c38c401cabd88027ef4f5c01fd2"},

0 commit comments

Comments
 (0)