Skip to content

Commit

Permalink
Merge pull request #1464 from GSA/1426-challenge_gov-dependabot-alert…
Browse files Browse the repository at this point in the history 
…s-v2

Dependabots resolved - by removing unused components and updating Eli…
  • Loading branch information
@kkrug
kkrug authored Nov 7, 2024
2 parents 325365b + 701bede commit ae67c7a
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 809 deletions.
4 changes: 1 addition & 3 deletions assets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
"axios": "^0.21.2",
"chart.js": "^3.2.1",
"chokidar": "^3.3.1",
"create-react-app": "^5.0.1",
"file-loader": "^6.2.0",
"inputmask": "^5.0.5",
"jquery": "^3.7.1",
"moment": "^2.27.0",
"moment-timezone": "^0.5.31",
"node-quill-converter": "^0.3.3",
"node-sass": "^8.0.0",
"phoenix": "file:../deps/phoenix",
"phoenix_html": "file:../deps/phoenix_html",
Expand Down Expand Up @@ -59,4 +57,4 @@
"webpack": "^5.76.0",
"webpack-cli": "^4.7.0"
}
}
}
804 changes: 16 additions & 788 deletions assets/yarn.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mix.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ defmodule ChallengeGov.MixProject do
{:oban, "~> 2.3"},
{:phoenix, "~> 1.5.7"},
{:phoenix_ecto, "~> 4.0"},
{:phoenix_html, "~> 2.14.3"},
{:phoenix_html, "~> 3.1.0", override: true},
{:phoenix_live_reload, "~> 1.3", only: :dev},
{:phoenix_live_view, "~> 0.15.4", override: true},
{:phoenix_pubsub, "~> 2.0"},
Expand Down
2 changes: 1 addition & 1 deletion mix.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
"phoenix": {:hex, :phoenix, "1.5.14", "2d5db884be496eefa5157505ec0134e66187cb416c072272420c5509d67bf808", [: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", "207f1aa5520320cbb7940d7ff2dde2342162cf513875848f88249ea0ba02fef7"},
"phoenix_ecto": {:hex, :phoenix_ecto, "4.6.2", "3b83b24ab5a2eb071a20372f740d7118767c272db386831b2e77638c4dcc606d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "3f94d025f59de86be00f5f8c5dd7b5965a3298458d21ab1c328488be3b5fcd59"},
"phoenix_html": {:hex, :phoenix_html, "2.14.3", "51f720d0d543e4e157ff06b65de38e13303d5778a7919bcc696599e5934271b8", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "efd697a7fff35a13eeeb6b43db884705cba353a1a41d127d118fda5f90c8e80f"},
"phoenix_html": {:hex, :phoenix_html, "3.1.0", "0b499df05aad27160d697a9362f0e89fa0e24d3c7a9065c2bd9d38b4d1416c09", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0c0a98a2cefa63433657983a2a594c7dee5927e4391e0f1bfd3a151d1def33fc"},
"phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.3", "f2161c207fda0e4fb55165f650f7f8db23f02b29e3bff00ff7ef161d6ac1f09d", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "b4ec9cd73cb01ff1bd1cac92e045d13e7030330b74164297d1aee3907b54803c"},
"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_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
Expand Down
6 changes: 3 additions & 3 deletions test/web/controllers/challenge_controller_test.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ defmodule Web.ChallengeControllerTest do
[
60,
"p",
[[32, "class", 61, 34, "h4 mb-0", 34]],
[32, "class", 61, 34, "h4 mb-0", 34],
62,
"Challenge Removed from Queue",
60,
Expand Down Expand Up @@ -595,7 +595,7 @@ defmodule Web.ChallengeControllerTest do
safe: [
60,
"p",
[[32, "class", 61, 34, "h4 mb-0", 34]],
[32, "class", 61, 34, "h4 mb-0", 34],
62,
"Challenge updated",
60,
Expand All @@ -613,7 +613,7 @@ defmodule Web.ChallengeControllerTest do
[
60,
"a",
[[32, "href", 61, 34, "/challenges/#{challenge.id}/bulletin/new", 34]],
[32, "href", 61, 34, "/challenges/#{challenge.id}/bulletin/new", 34],
62,
"Govdelivery",
60,
Expand Down
2 changes: 1 addition & 1 deletion test/web/controllers/phase_winner_controller_test.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ defmodule Web.PhaseWinnerControllerTest do
conn = get(conn, Routes.challenge_path(conn, :show, challenge.id))

assert html_response(conn, 200) =~
"<a class=\"usa-button disabled\" href=\"#\" disabled>Add winners</a>"
"<a class=\"usa-button disabled\" disabled href=\"#\">Add winners</a>"
end

test "success: show only closed phases", %{conn: conn} do
Expand Down
14 changes: 6 additions & 8 deletions test/web/controllers/saved_challenge_controller_test.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,12 @@ defmodule Web.SavedChallengeControllerTest do
60,
"a",
[
[
32,
"href",
61,
34,
"http://localhost:4001/?challenge=#{challenge.id}",
34
]
32,
"href",
61,
34,
"http://localhost:4001/?challenge=#{challenge.id}",
34
],
62,
"here",
Expand Down
18 changes: 14 additions & 4 deletions test/web/views/message_context_view_test.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ defmodule Web.MessageContextViewTest do
[
60,
"a",
[[32, "href", 61, 34, "/challenges/#{challenge.id}", 34]],
[32, "href", 61, 34, "/challenges/#{challenge.id}", 34],
62,
"Test challenge",
60,
Expand Down Expand Up @@ -54,7 +54,7 @@ defmodule Web.MessageContextViewTest do
[
60,
"a",
[[32, "href", 61, 34, "/challenges/#{challenge.id}", 34]],
[32, "href", 61, 34, "/challenges/#{challenge.id}", 34],
62,
"Test challenge",
60,
Expand Down Expand Up @@ -223,8 +223,18 @@ defmodule Web.MessageContextViewTest do
60,
"a",
[
[32, "class", 61, 34, "usa-button me-3", 34],
[32, "href", 61, 34, "/messages/new?context=challenge", 34]
32,
"class",
61,
34,
"usa-button me-3",
34,
32,
"href",
61,
34,
"/messages/new?context=challenge",
34
],
62,
"New Message",
Expand Down

0 comments on commit ae67c7a

Please sign in to comment.