[gh315] Update - 1

nimblehq · Mar 10, 2023 · 8285a95 · 8285a95
1 parent ec3d4b8
commit 8285a95
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 115 deletions.
diff --git a/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex b/lib/nimble_template/addons/variants/phoenix/web/es_lint.ex
@@ -10,18 +10,6 @@ defmodule NimbleTemplate.Addons.Phoenix.Web.EsLint do
     |> copy_files!()
   end
 
-  def edit_app_js!(%Project{live_project?: true} = project) do
-    update_topbar_js_variables!()
-
-    project
-  end
-
-  def edit_app_js!(%Project{web_project?: true} = project) do
-    update_topbar_js_variables!()
-
-    project
-  end
-
   def edit_app_js!(project), do: project
 
   defp edit_files!(%Project{} = project) do
@@ -91,18 +79,4 @@ defmodule NimbleTemplate.Addons.Phoenix.Web.EsLint do
 
     project
   end
-
-  defp update_topbar_js_variables! do
-    Generator.replace_content!(
-      "assets/js/app.js",
-      "window.addEventListener(\"phx:page-loading-start\", info => topbar.show())",
-      "window.addEventListener(\"phx:page-loading-start\", _info => topbar.show())"
-    )
-
-    Generator.replace_content!(
-      "assets/js/app.js",
-      "window.addEventListener(\"phx:page-loading-stop\", info => topbar.hide())",
-      "window.addEventListener(\"phx:page-loading-stop\", _info => topbar.hide())"
-    )
-  end
 end
diff --git a/lib/nimble_template/addons/variants/phoenix/web/heex_formatter.ex b/lib/nimble_template/addons/variants/phoenix/web/heex_formatter.ex
diff --git a/lib/nimble_template/addons/variants/phoenix/web/svg_sprite.ex b/lib/nimble_template/addons/variants/phoenix/web/svg_sprite.ex
@@ -53,14 +53,14 @@ defmodule NimbleTemplate.Addons.Phoenix.Web.SvgSprite do
     Generator.replace_content!(
       "#{web_path}.ex",
       """
-            # Include shared imports and aliases for views
-            unquote(view_helpers())
+            # HTML escaping functionality
+            import Phoenix.HTML
       """,
       """
-            import #{web_module}.IconHelper
+            # HTML escaping functionality
+            import Phoenix.HTML
 
-            # Include shared imports and aliases for views
-            unquote(view_helpers())
+            import #{web_module}.IconHelper
       """
     )
 

diff --git a/lib/nimble_template/helpers/credo.ex b/lib/nimble_template/helpers/credo.ex
@@ -41,8 +41,7 @@ defmodule NimbleTemplate.CredoHelper do
     [
       "#{base_path}/release_tasks.ex",
       "#{web_path}/controllers/page_controller.ex",
-      "#{web_path}/telemetry.ex",
-      "#{web_path}/views/error_view.ex"
+      "#{web_path}/telemetry.ex"
     ]
   end
 

diff --git a/lib/nimble_template/templates/variants/phoenix/web/template.ex b/lib/nimble_template/templates/variants/phoenix/web/template.ex
@@ -22,7 +22,6 @@ defmodule NimbleTemplate.Templates.Phoenix.Web.Template do
     |> Web.StyleLint.apply!()
     |> Web.EsBuild.apply!()
     |> Web.PostCSS.apply!()
-    |> Web.HeexFormatter.apply!()
   end
 
   defp apply_optional_web_addons(%Project{optional_addons: optional_addons} = project) do

diff --git a/test/nimble_template/addons/variants/phoenix/web/es_lint_test.exs b/test/nimble_template/addons/variants/phoenix/web/es_lint_test.exs
@@ -82,26 +82,4 @@ defmodule NimbleTemplate.Addons.Phoenix.Web.EsLintTest do
       end)
     end
   end
-
-  describe "#apply!/2 to a Live project" do
-    @describetag live_project?: true
-    @describetag required_addons: [:TestEnv, :"Phoenix.Web.NodePackage"]
-
-    test "updates the assets/js/app.js", %{
-      project: project,
-      test_project_path: test_project_path
-    } do
-      in_test_project!(test_project_path, fn ->
-        WebAddons.EsLint.apply!(project)
-
-        assert_file("assets/js/app.js", fn file ->
-          assert file =~
-                   "window.addEventListener(\"phx:page-loading-start\", _info => topbar.show())"
-
-          assert file =~
-                   "window.addEventListener(\"phx:page-loading-stop\", _info => topbar.hide())"
-        end)
-      end)
-    end
-  end
 end
diff --git a/test/nimble_template/addons/variants/phoenix/web/hex_formatter_test.exs b/test/nimble_template/addons/variants/phoenix/web/hex_formatter_test.exs
diff --git a/test/nimble_template/helpers/credo_test.exs b/test/nimble_template/helpers/credo_test.exs
@@ -42,12 +42,6 @@ defmodule NimbleTemplate.CredoHelperTest do
                  # credo:disable-for-this-file CompassCredoPlugin.Check.DoSingleExpression
                  """
         end)
-
-        assert_file("#{test_project_path}/lib/nimble_template_web/views/error_view.ex", fn file ->
-          assert file =~ """
-                 # credo:disable-for-this-file CompassCredoPlugin.Check.DoSingleExpression
-                 """
-        end)
       end)
     end
   end