From 90832e3f3b4799626bfe2e90a96efb454b298af6 Mon Sep 17 00:00:00 2001
From: alex <alex+git@fremantle.io>
Date: Tue, 19 Oct 2021 09:56:03 -0700
Subject: [PATCH] WIP: Try to bump phoenix + live view again

- Requires Typescript to be fixed for 4.5. https://github.com/microsoft/TypeScript/issues/46408
---
 assets/package-lock.json                         | 11 +++++++----
 assets/tsconfig.json                             |  1 +
 config/runtime.exs                               |  4 ++--
 lib/workbench_web/router.ex                      | 14 +++++++-------
 lib/workbench_web/templates/layout/root.html.eex |  2 +-
 mix.exs                                          |  8 ++++----
 mix.lock                                         |  9 +++++----
 7 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/assets/package-lock.json b/assets/package-lock.json
index 8682d807..027562e2 100644
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@@ -52,16 +52,19 @@
       }
     },
     "../deps/notified_phoenix": {
-      "version": "0.0.1"
+      "name": "phoenix_html",
+      "version": "0.0.5"
     },
     "../deps/phoenix": {
-      "version": "0.0.1"
+      "version": "1.6.2",
+      "license": "MIT"
     },
     "../deps/phoenix_html": {
-      "version": "0.0.1"
+      "version": "3.0.4"
     },
     "../deps/phoenix_live_view": {
-      "version": "0.0.1"
+      "version": "0.16.4",
+      "license": "MIT"
     },
     "node_modules/@babel/code-frame": {
       "version": "7.16.0",
diff --git a/assets/tsconfig.json b/assets/tsconfig.json
index f0cb30ea..60b21867 100644
--- a/assets/tsconfig.json
+++ b/assets/tsconfig.json
@@ -3,6 +3,7 @@
     "outDir": "./dist/",
     "noImplicitAny": true,
     "module": "CommonJS",
+    "moduleResolution": "node12",
     "target": "ES5",
     "lib": [
       "ES2020",
diff --git a/config/runtime.exs b/config/runtime.exs
index dfbeba0b..31c5be84 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -116,8 +116,8 @@ config :notified,
     {NotifiedPhoenix.Receivers.BrowserNotification, []}
   ]
 
-config :notified_phoenix,
-  to_list: {WorkbenchWeb.Router.Helpers, :notification_path, [WorkbenchWeb.Endpoint, :index]}
+# config :notified_phoenix,
+#   to_list: {WorkbenchWeb.Router.Helpers, :notification_path, [WorkbenchWeb.Endpoint, :index]}
 
 # Tai
 config :tai, Tai.Orders.OrderRepo,
diff --git a/lib/workbench_web/router.ex b/lib/workbench_web/router.ex
index 2c88bb5a..5e42cbfe 100644
--- a/lib/workbench_web/router.ex
+++ b/lib/workbench_web/router.ex
@@ -36,12 +36,12 @@ defmodule WorkbenchWeb.Router do
     live("/fleets", FleetLive.Index, :index, as: :fleet)
   end
 
-  scope "/", NotifiedPhoenix do
-    pipe_through([:browser])
+  # scope "/", NotifiedPhoenix do
+  #   pipe_through([:browser])
 
-    live("/notifications", ListLive, :index,
-      as: :notification,
-      layout: {WorkbenchWeb.LayoutView, :root}
-    )
-  end
+  #   live("/notifications", ListLive, :index,
+  #     as: :notification,
+  #     layout: {WorkbenchWeb.LayoutView, :root}
+  #   )
+  # end
 end
diff --git a/lib/workbench_web/templates/layout/root.html.eex b/lib/workbench_web/templates/layout/root.html.eex
index 7b6c5b01..2ee4c7c1 100644
--- a/lib/workbench_web/templates/layout/root.html.eex
+++ b/lib/workbench_web/templates/layout/root.html.eex
@@ -15,7 +15,7 @@
     <header class="bg-gray-50 py-4 px-4">
       <div class="flex justify-between items-center">
         <%= render Navigator, "horizontal.html", conn: @conn %>
-        <%= live_render(@conn, NotifiedPhoenix.BadgeLive, []) %>
+        <%# <%= live_render(@conn, NotifiedPhoenix.BadgeLive, []) %1> %>
       </div>
     </header>
     <main role="main" class="mx-4 py-4">
diff --git a/mix.exs b/mix.exs
index a537de08..da91a722 100644
--- a/mix.exs
+++ b/mix.exs
@@ -46,10 +46,10 @@ defmodule Workbench.MixProject do
       {:navigator, "~> 0.0.5"},
       {:notified_phoenix, "~> 0.0.6"},
       {:number, "~> 1.0.0"},
-      {:phoenix, "~> 1.5.12"},
-      {:phoenix_ecto, "~> 4.0"},
-      {:phoenix_html, "~> 2.14 or ~> 3.0"},
-      {:phoenix_live_view, "~> 0.15"},
+      {:phoenix, "~> 1.6.2"},
+      {:phoenix_ecto, "~> 4.4"},
+      {:phoenix_html, "~> 3.0"},
+      {:phoenix_live_view, "~> 0.16.4"},
       {:phoenix_pubsub, "~> 2.0"},
       {:plug_cowboy, "~> 2.1"},
       {:postgrex, ">= 0.0.0"},
diff --git a/mix.lock b/mix.lock
index 23241a05..f9ae34b2 100644
--- a/mix.lock
+++ b/mix.lock
@@ -62,12 +62,13 @@
   "number": {:hex, :number, "1.0.3", "932c8a2d478a181c624138958ca88a78070332191b8061717270d939778c9857", [:mix], [{:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "dd397bbc096b2ca965a6a430126cc9cf7b9ef7421130def69bcf572232ca0f18"},
   "paged_query": {:hex, :paged_query, "0.0.2", "657c9f48a28caf4e8b214a59271ef3da2db7c62f3242fa43b359a1249d6d7c8d", [:mix], [{:ecto, "~> 3.6", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "b6c5fbee31b5bea881814c7e35c89c85b6cdbbb80ae0b665cccedfb2d58b1bec"},
   "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
-  "phoenix": {:hex, :phoenix, "1.5.13", "d4e0805ec0973bed80d67302631130fb47d75b1a0b7335a0b23c4432b6ce55ee", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1a7c4f1900e6e60bb60ae6680e48418e3f7c360d58bcb9f812487b6d0d281a0f"},
-  "phoenix_ecto": {:hex, :phoenix_ecto, "4.2.1", "13f124cf0a3ce0f1948cf24654c7b9f2347169ff75c1123f44674afee6af3b03", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 2.15", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "478a1bae899cac0a6e02be1deec7e2944b7754c04e7d4107fc5a517f877743c0"},
-  "phoenix_html": {:hex, :phoenix_html, "2.14.3", "51f720d0d543e4e157ff06b65de38e13303d5778a7919bcc696599e5934271b8", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "efd697a7fff35a13eeeb6b43db884705cba353a1a41d127d118fda5f90c8e80f"},
+  "phoenix": {:hex, :phoenix, "1.6.2", "6cbd5c8ed7a797f25a919a37fafbc2fb1634c9cdb12a4448d7a5d0b26926f005", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7bbee475acae0c3abc229b7f189e210ea788e63bd168e585f60c299a4b2f9133"},
+  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.0", "0672ed4e4808b3fbed494dded89958e22fb882de47a97634c0b13e7b0b5f7720", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "09864e558ed31ee00bd48fcc1d4fc58ae9678c9e81649075431e69dbabb43cc1"},
+  "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.15.7", "09720b8e5151b3ca8ef739cd7626d4feb987c69ba0b509c9bbdb861d5a365881", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.5.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 0.5", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3a756cf662420272d0f1b3b908cce5222163b5a95aa9bab404f9d29aff53276e"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.16.4", "5692edd0bac247a9a816eee7394e32e7a764959c7d0cf9190662fc8b0cd24c97", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.5.9 or ~> 1.6.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "754ba49aa2e8601afd4f151492c93eb72df69b0b9856bab17711b8397e43bba0"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.0.0", "a1ae76717bb168cdeb10ec9d92d1480fec99e3080f011402c0a2d68d47395ffb", [:mix], [], "hexpm", "c52d948c4f261577b9c6fa804be91884b381a7f8f18450c5045975435350f771"},
+  "phoenix_view": {:hex, :phoenix_view, "1.0.0", "fea71ecaaed71178b26dd65c401607de5ec22e2e9ef141389c721b3f3d4d8011", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "82be3e2516f5633220246e2e58181282c71640dab7afc04f70ad94253025db0c"},
   "plug": {:hex, :plug, "1.12.1", "645678c800601d8d9f27ad1aebba1fdb9ce5b2623ddb961a074da0b96c35187d", [: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", "d57e799a777bc20494b784966dc5fbda91eb4a09f571f76545b72a634ce0d30b"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.5.2", "62894ccd601cf9597e2c23911ff12798a8a18d237e9739f58a6b04e4988899fe", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "ea6e87f774c8608d60c8d34022a7d073bd7680a0a013f049fc62bf35efea1044"},
   "plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"},