remove phoenix mix task deps

Author: karim-semmoud

e2e/assets/corex/components/toast.css

@@ -71,6 +71,21 @@
     min-height: var(--spacing-mini-sm);
     right: var(--spacing-mini-gap);
     top: var(--spacing-ui-gap-sm);
+    color: var(--color-layer--text);
+    background-color: transparent;
+    border-color: transparent;
+  }
+
+  .toast [data-scope="toast"][data-part="close-trigger"]:hover {
+    background-color: --alpha(var(--color-layer--text) / 0.12);
+  }
+
+  .toast [data-scope="toast"][data-part="close-trigger"]:active {
+    background-color: --alpha(var(--color-layer--text) / 0.2);
+  }
+
+  .toast [data-scope="toast"][data-part="close-trigger"]:focus-visible {
+    box-shadow: inset 0 0 0 2px var(--color-layer--text);
   }
 
   .toast [data-scope="toast"][data-part="root"][data-type="error"] [data-scope="toast"][data-part="title"] {

e2e/lib/e2e_web/controllers/page_html/home.html.heex

@@ -17,15 +17,21 @@
     </h1>
 
     <p class="md:text-ui-lg my-0">
-      From design tokens to accessible, interactive components, <br />
-      Corex provides a complete foundation for creating <br />
+      From design tokens to interactive components, <br />
+      Corex provides unstyled components for creating <br />
       beautiful, scalable, and performant websites.
     </p>
     <div class="gap-ui-gap p-ui-padding flex flex-wrap justify-start">
+      <.navigate
+        to={~p"/#{@locale}/accordion"}
+        class="button button--brand button--sm md:button--md w-full md:w-auto hidden lg:flex"
+      >
+        Examples <.heroicon name="hero-arrow-right" />
+      </.navigate>
       <.navigate
         to="https://hexdocs.pm/corex"
         external
-        class="button button--brand button--sm md:button--md w-full md:w-auto"
+        class="button button--sm md:button--md w-full md:w-auto"
       >
         Hex Documentation <.heroicon name="hero-arrow-top-right-on-square" />
       </.navigate>
@@ -42,12 +48,6 @@
       >
         Captures <.heroicon name="hero-arrow-top-right-on-square" />
       </.navigate>
-      <.navigate
-        to={~p"/#{@locale}/accordion"}
-        class="button button--sm md:button--md w-full md:w-auto hidden lg:flex"
-      >
-        Examples <.heroicon name="hero-arrow-right" />
-      </.navigate>
     </div>
   </section>
 </Layouts.app>

installer/templates/corex_web/router.ex

@@ -34,7 +34,7 @@ defmodule <%= @web_namespace %>.Router do
       on_mount: [<%= Enum.join(@on_mount_hooks, ", ") %>] do
       live "/live", ExampleLive
     end
-<% else %>    live "/live", ExampleLive
+<% else %>      live "/live", ExampleLive
 <% end %>  end
 <% else %>
   scope "/", <%= @web_namespace %> do

integration_test/test/code_generation/full_stack_with_options_test.exs

@@ -0,0 +1,97 @@
+defmodule Corex.Integration.CodeGeneration.FullStackWithOptionsTest do
+  use Corex.Integration.CodeGeneratorCase, async: true
+
+  @rich_attrs ~w(name:string age:integer score:float balance:decimal active:boolean bio:text birth_date:date start_time:time published_at:utc_datetime drafted_at:naive_datetime tags:array:string status:enum:draft:published:archived)
+
+  describe "full stack with heavy options and locale" do
+    @tag database: :postgresql
+    test "corex.new with --lang en:fr --mode --theme neo:uno:duo:leo --dev --live, then corex.gen.live and corex.gen.html with rich attrs, compiles formats and tests pass" do
+      with_installer_tmp("full_stack_locale", fn tmp_dir ->
+        {app_root_path, _} =
+          generate_corex_app(tmp_dir, "full_app", [
+            "--lang", "en:fr",
+            "--mode",
+            "--theme", "neo:uno:duo:leo",
+            "--dev",
+            "--live"
+          ])
+
+        router_path = Path.join(app_root_path, "lib/full_app_web/router.ex")
+
+        mix_run!(
+          ["corex.gen.live", "Admin", "admins" | @rich_attrs],
+          app_root_path
+        )
+
+        mix_run!(
+          ["corex.gen.html", "User", "users" | @rich_attrs],
+          app_root_path
+        )
+
+        live_routes =
+          """
+            live "/admins", AdminLive.Index, :index
+            live "/admins/new", AdminLive.Form, :new
+            live "/admins/:id", AdminLive.Show, :show
+            live "/admins/:id/edit", AdminLive.Form, :edit
+          """
+          |> String.replace(~r/^            /m, "      ")
+
+        inject_live_routes(router_path, live_routes, locale_scope: true)
+
+        resources_routes = "    resources \"/users\", UserController\n"
+        inject_resources(router_path, resources_routes, locale_scope: true)
+
+        assert_no_compilation_warnings(app_root_path)
+        assert_passes_formatter_check(app_root_path)
+        drop_test_database(app_root_path)
+        assert_tests_pass(app_root_path)
+      end)
+    end
+  end
+
+  describe "full stack with rich attrs without locale" do
+    @tag database: :postgresql
+    test "corex.new with --live, then corex.gen.live and corex.gen.html with rich attrs, compiles formats and tests pass" do
+      with_installer_tmp("full_stack_no_locale", fn tmp_dir ->
+        {app_root_path, _} = generate_corex_app(tmp_dir, "phx_blog", ["--live"])
+        router_path = Path.join(app_root_path, "lib/phx_blog_web/router.ex")
+
+        mix_run!(
+          ["corex.gen.live", "Admin", "admins" | @rich_attrs],
+          app_root_path
+        )
+
+        mix_run!(
+          ["corex.gen.html", "User", "users" | @rich_attrs],
+          app_root_path
+        )
+
+        modify_file(router_path, fn file ->
+          inject_before_final_end(file, """
+
+            scope "/", PhxBlogWeb do
+              pipe_through [:browser]
+
+              resources "/users", UserController
+            end
+
+            scope "/", PhxBlogWeb do
+              pipe_through [:browser]
+
+              live "/admins", AdminLive.Index, :index
+              live "/admins/new", AdminLive.Form, :new
+              live "/admins/:id", AdminLive.Show, :show
+              live "/admins/:id/edit", AdminLive.Form, :edit
+            end
+          """)
+        end)
+
+        assert_no_compilation_warnings(app_root_path)
+        assert_passes_formatter_check(app_root_path)
+        drop_test_database(app_root_path)
+        assert_tests_pass(app_root_path)
+      end)
+    end
+  end
+end

integration_test/test/support/code_generator_case.ex

@@ -137,6 +137,49 @@ defmodule Corex.Integration.CodeGeneratorCase do
     |> Kernel.<>("end\n")
   end
 
+  def inject_live_routes(router_path, live_routes, opts \\ []) do
+    content = File.read!(router_path)
+
+    if Keyword.get(opts, :locale_scope) do
+      pattern = "live \"/live\", ExampleLive\n"
+      new_content = String.replace(content, pattern, pattern <> live_routes, global: false)
+      File.write!(router_path, new_content)
+    else
+      new_content = inject_before_final_end(content, live_routes)
+      File.write!(router_path, new_content)
+    end
+  end
+
+  def inject_resources(router_path, resources_routes, opts \\ []) do
+    content = File.read!(router_path)
+
+    if Keyword.get(opts, :locale_scope) do
+      parts = String.split(content, ~r/scope "\/:locale"/, parts: 2)
+
+      if length(parts) == 2 do
+        [head, locale_block] = parts
+        get_pattern = "get \"/\", PageController, :home\n"
+        locale_parts = String.split(locale_block, get_pattern, parts: 2)
+
+        if length(locale_parts) == 2 do
+          [before_get, after_get] = locale_parts
+          new_locale_block = before_get <> get_pattern <> resources_routes <> after_get
+          new_content = head <> "scope \"/:locale\"" <> new_locale_block
+          File.write!(router_path, new_content)
+        else
+          new_content = inject_before_final_end(content, resources_routes)
+          File.write!(router_path, new_content)
+        end
+      else
+        new_content = inject_before_final_end(content, resources_routes)
+        File.write!(router_path, new_content)
+      end
+    else
+      new_content = inject_before_final_end(content, resources_routes)
+      File.write!(router_path, new_content)
+    end
+  end
+
   def modify_file(path, function) when is_binary(path) and is_function(function, 1) do
     path
     |> File.read!()

lib/mix/corex.ex

@@ -19,6 +19,37 @@ defmodule Mix.Corex do
     EEx.eval_string(content, binding)
   end
 
+  def eval_from_roots(roots, relative_path, binding) when is_list(roots) do
+    path =
+      Enum.find_value(roots, fn root ->
+        full = Path.join(root, relative_path)
+        if File.exists?(full), do: full
+      end) || raise "could not find #{relative_path} in any of the template roots"
+
+    content = File.read!(path)
+    EEx.eval_string(content, binding)
+  end
+
+  def inject_eex_before_final_end(content_to_inject, file_path, binding) do
+    file = File.read!(file_path)
+
+    if String.contains?(file, content_to_inject) do
+      :ok
+    else
+      Mix.shell().info([:green, "* injecting ", :reset, Path.relative_to_cwd(file_path)])
+
+      new_content =
+        file
+        |> String.trim_trailing()
+        |> String.trim_trailing("end")
+        |> EEx.eval_string(binding)
+        |> Kernel.<>(content_to_inject)
+        |> Kernel.<>("end\n")
+
+      File.write!(file_path, new_content)
+    end
+  end
+
   @doc """
   Copies files from source dir to target dir
   according to the given map.
@@ -27,7 +58,12 @@ defmodule Mix.Corex do
   the given binding.
   """
   def copy_from(apps, source_dir, binding, mapping) when is_list(mapping) do
-    roots = Enum.map(apps, &to_app_source(&1, source_dir))
+    roots =
+      if source_dir == "" do
+        apps
+      else
+        Enum.map(apps, &to_app_source(&1, source_dir))
+      end
 
     binding =
       Keyword.merge(binding,
@@ -199,6 +235,30 @@ defmodule Mix.Corex do
     [".", :corex]
   end
 
+  @doc """
+  Returns the list of template directory paths for a Corex generator, in lookup order.
+
+  Used when copying generator files so that the project can override templates
+  without editing Corex's priv. Order:
+
+    1. `priv/corex_templates/<generator_name>` in the current project
+    2. `priv/templates/<generator_name>` in the current project
+    3. Corex's `priv/templates/<generator_name>`
+
+  Pass the result to `copy_from/4` with `source_dir` set to `""` so files
+  are resolved under each directory.
+  """
+  def generator_template_dirs(generator_name) do
+    cwd = File.cwd!()
+    corex_priv = Application.app_dir(:corex, "priv/templates")
+
+    [
+      Path.join([cwd, "priv", "corex_templates", generator_name]),
+      Path.join([cwd, "priv", "templates", generator_name]),
+      Path.join(corex_priv, generator_name)
+    ]
+  end
+
   @doc """
   Checks if the given `app_path` is inside an umbrella.
   """