From 472e0728832910baed9ac16ff1eff2fecb69b30b Mon Sep 17 00:00:00 2001
From: Scott Ming <therealscottming@gmail.com>
Date: Wed, 27 Sep 2023 11:39:20 +0800
Subject: [PATCH] Resolve conflicts

---
 apps/remote_control/mix.exs                                     | 2 +-
 .../remote_control/build/document/compilers/heex_test.exs       | 2 ++
 mix.lock                                                        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/remote_control/mix.exs b/apps/remote_control/mix.exs
index 40bc59109..86094c6a1 100644
--- a/apps/remote_control/mix.exs
+++ b/apps/remote_control/mix.exs
@@ -41,7 +41,7 @@ defmodule Lexical.RemoteControl.MixProject do
       {:lexical_test, path: "../../projects/lexical_test", only: :test},
       {:patch, "~> 0.12", only: [:dev, :test], optional: true, runtime: false},
       {:path_glob, "~> 0.2", optional: true},
-      {:sourceror, "~> 0.12"},
+      {:sourceror, "~> 0.14.0"},
       {:phoenix_live_view, "~> 0.19.5", only: [:test], optional: true, runtime: false}
     ]
   end
diff --git a/apps/remote_control/test/lexical/remote_control/build/document/compilers/heex_test.exs b/apps/remote_control/test/lexical/remote_control/build/document/compilers/heex_test.exs
index 29193f910..a8e232749 100644
--- a/apps/remote_control/test/lexical/remote_control/build/document/compilers/heex_test.exs
+++ b/apps/remote_control/test/lexical/remote_control/build/document/compilers/heex_test.exs
@@ -3,6 +3,7 @@ defmodule Lexical.RemoteControl.Build.Document.Compilers.HeexTest do
   alias Lexical.Plugin.V1.Diagnostic.Result
   alias Lexical.RemoteControl.Build.CaptureServer
   alias Lexical.RemoteControl.Build.Document.Compilers
+  alias Lexical.RemoteControl.Dispatch
   alias Lexical.RemoteControl.ModuleMappings
 
   import Lexical.Test.CodeSigil
@@ -12,6 +13,7 @@ defmodule Lexical.RemoteControl.Build.Document.Compilers.HeexTest do
 
   def with_capture_server(_) do
     start_supervised!(CaptureServer)
+    start_supervised!(Dispatch)
     start_supervised!(ModuleMappings)
     :ok
   end
diff --git a/mix.lock b/mix.lock
index beeaec8cd..eabf41fb8 100644
--- a/mix.lock
+++ b/mix.lock
@@ -24,7 +24,7 @@
   "phoenix_template": {:hex, :phoenix_template, "1.0.3", "32de561eefcefa951aead30a1f94f1b5f0379bc9e340bb5c667f65f1edfa4326", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"},
   "plug": {:hex, :plug, "1.14.2", "cff7d4ec45b4ae176a227acd94a7ab536d9b37b942c8e8fa6dfc0fff98ff4d80", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"},
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
-  "sourceror": {:hex, :sourceror, "0.12.3", "a2ad3a1a4554b486d8a113ae7adad5646f938cad99bf8bfcef26dc0c88e8fade", [:mix], [], "hexpm", "4d4e78010ca046524e8194ffc4683422f34a96f6b82901abbb45acc79ace0316"},
+  "sourceror": {:hex, :sourceror, "0.14.0", "b6b8552d0240400d66b6f107c1bab7ac1726e998efc797f178b7b517e928e314", [:mix], [], "hexpm", "809c71270ad48092d40bbe251a133e49ae229433ce103f762a2373b7a10a8d8b"},
   "stream_data": {:hex, :stream_data, "0.6.0", "e87a9a79d7ec23d10ff83eb025141ef4915eeb09d4491f79e52f2562b73e5f47", [:mix], [], "hexpm", "b92b5031b650ca480ced047578f1d57ea6dd563f5b57464ad274718c9c29501c"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},