Skip to content

Commit

Permalink
Revert "Add HTMLFormatter to umbrella root (#4800)"
Browse files Browse the repository at this point in the history
This reverts commit 16021a6.
  • Loading branch information
chrismccord committed May 6, 2022
1 parent 24eeddc commit e106812
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
3 changes: 1 addition & 2 deletions installer/templates/phx_umbrella/formatter.exs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[<%= if @html and Version.match?(System.version(), ">= 1.13.4") do %>
plugins: [Phoenix.LiveView.HTMLFormatter],<% end %>
[
inputs: ["mix.exs", "config/*.exs"],
subdirectories: ["apps/*"]
]
12 changes: 0 additions & 12 deletions installer/test/phx_new_umbrella_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ defmodule Mix.Tasks.Phx.New.UmbrellaTest do
assert_file root_path(@app, "config/runtime.exs"), ~r/ip: {0, 0, 0, 0, 0, 0, 0, 0}/

if Version.match?(System.version(), ">= 1.13.4") do
assert_file root_path(@app, ".formatter.exs"), fn file ->
assert file =~ "plugins: [Phoenix.LiveView.HTMLFormatter]"
assert file =~ "inputs: [\"mix.exs\", \"config/*.exs\"]"
assert file =~ "subdirectories: [\"apps/*\"]"
end

assert_file app_path(@app, ".formatter.exs"), fn file ->
assert file =~ "import_deps: [:ecto]"
assert file =~ "subdirectories: [\"priv/*/migrations\"]"
Expand All @@ -109,12 +103,6 @@ defmodule Mix.Tasks.Phx.New.UmbrellaTest do
refute file =~ "subdirectories:"
end
else
assert_file root_path(@app, ".formatter.exs"), fn file ->
assert file =~ "inputs: [\"mix.exs\", \"config/*.exs\"]"
assert file =~ "subdirectories: [\"apps/*\"]"
refute file =~ "plugins:"
end

assert_file app_path(@app, ".formatter.exs"), fn file ->
assert file =~ "import_deps: [:ecto]"
assert file =~ "subdirectories: [\"priv/*/migrations\"]"
Expand Down

0 comments on commit e106812

Please sign in to comment.