From e75022c744041a6ecccaab704b98ab28b13856b2 Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Tue, 8 Oct 2024 15:50:30 +0000 Subject: [PATCH 01/14] Remove EDTF.js shim in favor of EDTF hex package --- app/lib/edtf.ex | 89 -------- app/lib/edtf/humanize.ex | 35 --- app/lib/edtf/humanize/date.ex | 85 -------- app/lib/edtf/humanize/list.ex | 86 -------- app/lib/meadow/application.ex | 1 - app/mix.exs | 1 + app/mix.lock | 1 + app/priv/nodejs/edtf/.docker-npm | 1 - app/priv/nodejs/edtf/index.js | 28 --- app/priv/nodejs/edtf/package-lock.json | 201 ------------------ app/priv/nodejs/edtf/package.json | 11 - app/priv/nodejs/edtf/portlog.js | 5 - app/test/edtf_test.exs | 166 --------------- app/test/meadow/batches_test.exs | 2 +- app/test/meadow/config_test.exs | 17 +- .../data/csv/metadata_update_jobs_test.exs | 2 +- 16 files changed, 9 insertions(+), 722 deletions(-) delete mode 100644 app/lib/edtf.ex delete mode 100644 app/lib/edtf/humanize.ex delete mode 100644 app/lib/edtf/humanize/date.ex delete mode 100644 app/lib/edtf/humanize/list.ex delete mode 100644 app/priv/nodejs/edtf/.docker-npm delete mode 100755 app/priv/nodejs/edtf/index.js delete mode 100644 app/priv/nodejs/edtf/package-lock.json delete mode 100644 app/priv/nodejs/edtf/package.json delete mode 100644 app/priv/nodejs/edtf/portlog.js delete mode 100644 app/test/edtf_test.exs diff --git a/app/lib/edtf.ex b/app/lib/edtf.ex deleted file mode 100644 index f423565cb..000000000 --- a/app/lib/edtf.ex +++ /dev/null @@ -1,89 +0,0 @@ -defmodule EDTF do - @moduledoc """ - EDTF Parsing GenServer - """ - - use GenServer - - alias Meadow.Config - alias Meadow.Utils.Lambda - - import Meadow.Utils.Atoms - - require Logger - - @timeout 1000 - - @doc """ - Parse an EDTF date string - - Example: - iex> parse("1999-06-10") - {:ok, %{level: 0, type: "Date", values: [1999, 5, 10]}} - - iex> parse("bad date!") - {:error, "Invalid EDTF input: bad date!"} - """ - def parse(value) do - case GenServer.call(__MODULE__, {:parse, value}) do - {:ok, result} -> {:ok, atomize(result)} - other -> other - end - end - - @doc """ - Validate an EDTF date string - - Example: - iex> validate("1999-06-10") - {:ok, "1999-06-10"} - - iex> validate("bad date!") - {:error, "Invalid EDTF input: bad date!"} - """ - def validate(value), - do: GenServer.call(__MODULE__, {:validate, value}) - - @doc """ - Humanize an EDTF date string - - Example: - iex> humanize("1999-06-10") - "June 10, 1999" - - iex> humanize("bad date!") - {:error, "Invalid EDTF input: bad date!"} - """ - def humanize(value) do - case value |> parse() |> EDTF.Humanize.humanize() do - :original -> value - other -> other - end - end - - def child_spec(opts) do - %{ - id: __MODULE__, - start: {__MODULE__, :start_link, [opts]} - } - end - - def start_link(args \\ []) do - GenServer.start_link(__MODULE__, args, name: __MODULE__) - end - - def init(_args) do - Logger.info("Starting EDTF Parser") - - case script_config() |> Lambda.init() do - {_, port} -> {:ok, port} - other -> other - end - end - - def handle_call({command, data}, _from, port) do - {:reply, script_config() |> Lambda.invoke(%{function: command, value: data}, @timeout), port} - end - - defp script_config, do: {:local, {Config.priv_path("nodejs/edtf/index.js"), "handler"}} -end diff --git a/app/lib/edtf/humanize.ex b/app/lib/edtf/humanize.ex deleted file mode 100644 index 32e0dda45..000000000 --- a/app/lib/edtf/humanize.ex +++ /dev/null @@ -1,35 +0,0 @@ -defmodule EDTF.Humanize do - @moduledoc """ - Convert EDTF dates to human readable form - """ - - alias EDTF.Humanize - - def humanize({:ok, value}), do: humanize(value) - def humanize({:error, _} = arg), do: arg - - def humanize(nil), do: "Unknown" - - def humanize([%{type: _} | [%{type: _}]] = values), - do: humanize(%{type: "Interval", values: values}) - - def humanize(%{type: "Interval", values: values}) do - case values do - [value | [%{type: "Infinity"}]] -> "from #{humanize(value)}" - [%{type: "Infinity"} | [value]] -> "before #{humanize(value)}" - _ -> values |> Enum.map_join(" to ", &humanize/1) - end - end - - def humanize(%{type: "Date"} = input), do: Humanize.Date.humanize(input) - def humanize(%{type: "Season"} = input), do: Humanize.Date.humanize(input) - def humanize(%{type: "Year"} = input), do: Humanize.Date.humanize(input) - def humanize(%{type: "Decade"} = input), do: Humanize.Date.humanize(input) - def humanize(%{type: "Century"} = input), do: Humanize.Date.humanize(input) - def humanize(%{type: "List"} = input), do: Humanize.List.humanize(input) - def humanize(%{type: "Set"} = input), do: Humanize.List.humanize(input) - def humanize(%{type: "Continuation"} = input), do: Humanize.List.humanize(input) - - def humanize(input) when is_map(input) and not is_map_key(input, :type), - do: input |> Map.put(:type, "Date") |> humanize() -end diff --git a/app/lib/edtf/humanize/date.ex b/app/lib/edtf/humanize/date.ex deleted file mode 100644 index 6442caf6e..000000000 --- a/app/lib/edtf/humanize/date.ex +++ /dev/null @@ -1,85 +0,0 @@ -defmodule EDTF.Humanize.Date do - @moduledoc """ - Humanize EDTF Date, Year, Decade, Century, and Season types - """ - - @bce_suffix " BCE" - @months ~w(January February March April May June July August September October November December) - @seasons %{ - 21 => "Spring", - 22 => "Summer", - 23 => "Autumn", - 24 => "Winter", - 25 => "Spring (Northern Hemisphere)", - 26 => "Summer (Northern Hemisphere)", - 27 => "Autumn (Northern Hemisphere)", - 28 => "Winter (Northern Hemisphere)", - 29 => "Spring (Southern Hemisphere)", - 30 => "Summer (Southern Hemisphere)", - 31 => "Autumn (Southern Hemisphere)", - 32 => "Winter (Southern Hemisphere)", - 33 => "Quarter 1", - 34 => "Quarter 2", - 35 => "Quarter 3", - 36 => "Quarter 4", - 37 => "Quadrimester 1", - 38 => "Quadrimester 2", - 39 => "Quadrimester 3", - 40 => "Semestral 1", - 41 => "Semestral 2" - } - - def humanize(%{type: "Date", approximate: _v, values: _values} = input) do - "circa " <> (input |> Map.delete(:approximate) |> humanize()) - end - - def humanize(%{type: "Date", unspecified: 15, values: values}) - when length(values) == 1, - do: "Unknown" - - def humanize(%{type: "Date", unspecified: unspecified, values: values} = input) - when unspecified in [8, 12, 14] and length(values) == 1 do - input - |> Map.delete(:unspecified) - |> humanize() - |> String.replace(~r/(\d+)/, "\\0s") - end - - def humanize(%{type: "Date", unspecified: _unspecified, values: _values}) do - :original - end - - def humanize(%{type: "Date", uncertain: _v, values: _values} = input) do - (input |> Map.delete(:uncertain) |> humanize()) <> "?" - end - - def humanize(%{type: "Date", values: values}) do - case values do - [year | [month | [day]]] -> "#{Enum.at(@months, month)} #{day}, #{set_era(year)}" - [year | [month]] -> "#{Enum.at(@months, month)} #{set_era(year)}" - [year] -> "#{set_era(year)}" - end - end - - def humanize(%{type: "Season", values: [year | [season]]}) when year < 0, - do: Map.get(@seasons, season) <> " #{-year}#{@bce_suffix}" - - def humanize(%{type: "Season", values: [year | [season]]}), - do: Map.get(@seasons, season) <> " #{year}" - - def humanize(%{type: "Year", values: [value]}), do: set_era(value) - - def humanize(%{type: "Decade", values: [value]}) when value < 0, - do: "#{-value * 10}s#{@bce_suffix}" - - def humanize(%{type: "Decade", values: [value]}), do: "#{value * 10}s" - - def humanize(%{type: "Century", values: [value]}) when value < 0, - do: "#{Inflex.ordinalize(-value)} Century#{@bce_suffix}" - - def humanize(%{type: "Century", values: [value]}), do: "#{Inflex.ordinalize(value)} Century" - - defp set_era(year) do - if year < 0, do: "#{-year}#{@bce_suffix}", else: to_string(year) - end -end diff --git a/app/lib/edtf/humanize/list.ex b/app/lib/edtf/humanize/list.ex deleted file mode 100644 index f7563b799..000000000 --- a/app/lib/edtf/humanize/list.ex +++ /dev/null @@ -1,86 +0,0 @@ -defmodule EDTF.Humanize.List do - @moduledoc """ - Humanize EDTF Set and List types - """ - - alias EDTF.Humanize - - @units [nil, "year", "month", "date"] - - def humanize(%{type: "Set"} = input) do - input - |> humanize_list_or_set_values() - |> make_list("or") - end - - def humanize(%{type: "List"} = input) do - input - |> humanize_list_or_set_values() - |> make_list("and") - end - - def humanize(%{type: "Continuation", subtype: "Set", position: :earlier, value: value}) do - with {human, time_unit} <- humanize_with_unit(value) do - "some #{time_unit} before #{human}" - end - end - - def humanize(%{type: "Continuation", subtype: "Set", position: :later, value: value}) do - with {human, time_unit} <- humanize_with_unit(value) do - "some #{time_unit} after #{human}" - end - end - - def humanize(%{type: "Continuation", subtype: "List", position: :earlier, value: value}) do - with {human, time_unit} <- humanize_with_unit(value) do - "all #{Inflex.pluralize(time_unit)} before #{human}" - end - end - - def humanize(%{type: "Continuation", subtype: "List", position: :later, value: value}) do - with {human, time_unit} <- humanize_with_unit(value) do - "all #{Inflex.pluralize(time_unit)} after #{human}" - end - end - - defp continuation(type, position, value), - do: %{type: "Continuation", subtype: type, position: position, value: value} - - defp humanize_list_or_set_values(%{type: type, values: values} = input) do - first_value = List.first(values) - last_value = List.last(values) - - case input do - %{earlier: true, later: true} -> - [continuation(type, :earlier, first_value) | values] ++ - [continuation(type, :later, last_value)] - - %{earlier: true} -> - [continuation(type, :earlier, first_value) | values] - - %{later: true} -> - values ++ [continuation(type, :later, last_value)] - - _ -> - values - end - |> Enum.map(&Humanize.humanize/1) - end - - defp humanize_with_unit(value) do - {Humanize.humanize(value), precision(value)} - end - - defp precision(value), do: Enum.at(@units, length(value.values)) - - defp make_list([item], _trailing_join), do: item - - defp make_list(items, trailing_join) when length(items) == 2 do - Enum.join(items, " #{trailing_join} ") - end - - defp make_list(items, trailing_join) do - [Enum.slice(items, 0..-2) |> Enum.join(", "), List.last(items)] - |> Enum.join(", #{trailing_join} ") - end -end diff --git a/app/lib/meadow/application.ex b/app/lib/meadow/application.ex index 1a1e02214..38f90f2e8 100644 --- a/app/lib/meadow/application.ex +++ b/app/lib/meadow/application.ex @@ -25,7 +25,6 @@ defmodule Meadow.Application do end base_children = [ - EDTF, {Phoenix.PubSub, [name: Meadow.PubSub, adapter: Phoenix.PubSub.PG2]}, Meadow.Telemetry, {Registry, keys: :unique, name: Meadow.TaskRegistry} diff --git a/app/mix.exs b/app/mix.exs index 344164592..03b382d04 100644 --- a/app/mix.exs +++ b/app/mix.exs @@ -64,6 +64,7 @@ defmodule Meadow.MixProject do {:ecto_psql_extras, "~> 0.2"}, {:ecto_ranked, "~> 0.5"}, {:ecto_sql, "~> 3.0 and >= 3.4.4"}, + {:edtf, "~> 1.0"}, {:elastix, "~> 0.10.0"}, {:ets, "~> 0.9.0"}, {:ex_aws, "~> 2.5.0"}, diff --git a/app/mix.lock b/app/mix.lock index aa7c188f6..44d3dcf02 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -29,6 +29,7 @@ "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.8.2", "79350a53246ac5ec27326d208496aebceb77fa82a91744f66a9154560f0759d3", [:mix], [{:ecto_sql, "~> 3.7", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "> 0.16.0 and < 0.20.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1 or ~> 4.0.0", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "6149c1c4a5ba6602a76cb09ee7a269eb60dab9694a1dbbb797f032555212de75"}, "ecto_ranked": {:hex, :ecto_ranked, "0.6.0", "c3bc7925610244d3f0be01befb02991670c00f32890174392f2701f760124b26", [:mix], [{:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "735dd6e02096445f4084e0f76e1d0e100cdcf5386d40d6d4cb7e54f2d437fb27"}, "ecto_sql": {:hex, :ecto_sql, "3.12.1", "c0d0d60e85d9ff4631f12bafa454bc392ce8b9ec83531a412c12a0d415a3a4d0", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "aff5b958a899762c5f09028c847569f7dfb9cc9d63bdb8133bff8a5546de6bf5"}, + "edtf": {:hex, :edtf, "1.2.0", "debb74f77b58b3d922e31b3b574a77a147622c09697636115a6f977eb7301e56", [:mix], [{:inflex, "~> 2.1", [hex: :inflex, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "745e3829b1fb24b78eaf51b5a1106a32eb5a36703475cdc6627c908e766718e8"}, "elastix": {:hex, :elastix, "0.10.0", "7567da885677ba9deffc20063db5f3ca8cd10f23cff1ab3ed9c52b7063b7e340", [:mix], [{:httpoison, "~> 1.4", [hex: :httpoison, repo: "hexpm", optional: false]}, {:poison, "~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}, {:retry, "~> 0.8", [hex: :retry, repo: "hexpm", optional: false]}], "hexpm", "5fb342ce068b20f7845f5dd198c2dc80d967deafaa940a6e51b846db82696d1d"}, "eternal": {:hex, :eternal, "1.2.2", "d1641c86368de99375b98d183042dd6c2b234262b8d08dfd72b9eeaafc2a1abd", [:mix], [], "hexpm", "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"}, "ets": {:hex, :ets, "0.9.0", "79c6a6c205436780486f72d84230c6cba2f8a9920456750ddd1e47389107d5fd", [:mix], [], "hexpm", "2861fdfb04bcaeff370f1a5904eec864f0a56dcfebe5921ea9aadf2a481c822b"}, diff --git a/app/priv/nodejs/edtf/.docker-npm b/app/priv/nodejs/edtf/.docker-npm deleted file mode 100644 index e58f02dce..000000000 --- a/app/priv/nodejs/edtf/.docker-npm +++ /dev/null @@ -1 +0,0 @@ -Build on Docker Release diff --git a/app/priv/nodejs/edtf/index.js b/app/priv/nodejs/edtf/index.js deleted file mode 100755 index 54d72f0bb..000000000 --- a/app/priv/nodejs/edtf/index.js +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env node - -const edtf = require("edtf"); -edtf.defaults.level = 3; - -const functions = { - validate: async (value) => await edtf(value).edtf, - parse: async (value) => { - const replacer = (_key, value) => value === Infinity ? {"type": "Infinity"} : value; - let result = await edtf.parse(value); - return JSON.parse(JSON.stringify(result, replacer)) - } -}; - -const handler = (event, _context, _callback) => { - return new Promise((resolve, reject) => { - let func = functions[event.function]; - if (typeof func == "function") { - func(event.value) - .catch(_err => reject(`Invalid EDTF input: ${event.value}`)) - .then(data => resolve(data)); - } else { - reject(`Unknown function: ${event.function}`); - } - }); -} - -module.exports = {handler}; \ No newline at end of file diff --git a/app/priv/nodejs/edtf/package-lock.json b/app/priv/nodejs/edtf/package-lock.json deleted file mode 100644 index a7fae48a2..000000000 --- a/app/priv/nodejs/edtf/package-lock.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "name": "edtf", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "edtf", - "version": "0.1.0", - "license": "Apache-2.0", - "dependencies": { - "edtf": "^3.1.0" - } - }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "node_modules/discontinuous-range": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz", - "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=" - }, - "node_modules/drange": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/drange/-/drange-1.1.1.tgz", - "integrity": "sha512-pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA==", - "optional": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/edtf": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/edtf/-/edtf-3.1.0.tgz", - "integrity": "sha512-m9pPUyBb/REAYraG/+l+D7HRHpCwK+8jaZyBrO0BP0elRSRxt0O+4ttbpY5SyctkLL/hF/AMEaco36m74ZxQIw==", - "dependencies": { - "nearley": "^2.19.7" - }, - "optionalDependencies": { - "randexp": "^0.5.3" - } - }, - "node_modules/moo": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz", - "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==" - }, - "node_modules/nearley": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz", - "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==", - "dependencies": { - "commander": "^2.19.0", - "moo": "^0.5.0", - "railroad-diagrams": "^1.0.0", - "randexp": "0.4.6" - }, - "bin": { - "nearley-railroad": "bin/nearley-railroad.js", - "nearley-test": "bin/nearley-test.js", - "nearley-unparse": "bin/nearley-unparse.js", - "nearleyc": "bin/nearleyc.js" - }, - "funding": { - "type": "individual", - "url": "https://nearley.js.org/#give-to-nearley" - } - }, - "node_modules/nearley/node_modules/randexp": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz", - "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==", - "dependencies": { - "discontinuous-range": "1.0.0", - "ret": "~0.1.10" - }, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/railroad-diagrams": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz", - "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=" - }, - "node_modules/randexp": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.5.3.tgz", - "integrity": "sha512-U+5l2KrcMNOUPYvazA3h5ekF80FHTUG+87SEAmHZmolh1M+i/WyTCxVzmi+tidIa1tM4BSe8g2Y/D3loWDjj+w==", - "optional": true, - "dependencies": { - "drange": "^1.0.2", - "ret": "^0.2.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/randexp/node_modules/ret": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.2.2.tgz", - "integrity": "sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ==", - "optional": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "engines": { - "node": ">=0.12" - } - } - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "discontinuous-range": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz", - "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=" - }, - "drange": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/drange/-/drange-1.1.1.tgz", - "integrity": "sha512-pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA==", - "optional": true - }, - "edtf": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/edtf/-/edtf-3.1.0.tgz", - "integrity": "sha512-m9pPUyBb/REAYraG/+l+D7HRHpCwK+8jaZyBrO0BP0elRSRxt0O+4ttbpY5SyctkLL/hF/AMEaco36m74ZxQIw==", - "requires": { - "nearley": "^2.19.7", - "randexp": "^0.5.3" - } - }, - "moo": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz", - "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==" - }, - "nearley": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz", - "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==", - "requires": { - "commander": "^2.19.0", - "moo": "^0.5.0", - "railroad-diagrams": "^1.0.0", - "randexp": "0.4.6" - }, - "dependencies": { - "randexp": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz", - "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==", - "requires": { - "discontinuous-range": "1.0.0", - "ret": "~0.1.10" - } - } - } - }, - "railroad-diagrams": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz", - "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=" - }, - "randexp": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.5.3.tgz", - "integrity": "sha512-U+5l2KrcMNOUPYvazA3h5ekF80FHTUG+87SEAmHZmolh1M+i/WyTCxVzmi+tidIa1tM4BSe8g2Y/D3loWDjj+w==", - "optional": true, - "requires": { - "drange": "^1.0.2", - "ret": "^0.2.0" - }, - "dependencies": { - "ret": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.2.2.tgz", - "integrity": "sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ==", - "optional": true - } - } - }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" - } - } -} diff --git a/app/priv/nodejs/edtf/package.json b/app/priv/nodejs/edtf/package.json deleted file mode 100644 index aa9833a02..000000000 --- a/app/priv/nodejs/edtf/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "edtf", - "version": "0.1.0", - "description": "Date parsing and validation using EDTF.js", - "main": "cli.js", - "author": "bmquinn", - "license": "Apache-2.0", - "dependencies": { - "edtf": "^3.1.0" - } -} diff --git a/app/priv/nodejs/edtf/portlog.js b/app/priv/nodejs/edtf/portlog.js deleted file mode 100644 index 8f2cf6bbc..000000000 --- a/app/priv/nodejs/edtf/portlog.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = (level, message) => { - const output = [`[${level}]`, message].filter(e => e != null).join(" ") + "\n"; - process.stdout.write(output); -} - diff --git a/app/test/edtf_test.exs b/app/test/edtf_test.exs deleted file mode 100644 index 8931d9582..000000000 --- a/app/test/edtf_test.exs +++ /dev/null @@ -1,166 +0,0 @@ -defmodule EDTFTest do - use ExUnit.Case - - import ExUnit.DocTest - - doctest EDTF, import: true - - test "validate/1" do - assert EDTF.validate("2020") == {:ok, "2020"} - assert EDTF.validate("bad date!") == {:error, "Invalid EDTF input: bad date!"} - end - - test "parse/1" do - assert EDTF.parse("2020") == {:ok, %{level: 0, type: "Date", values: [2020]}} - assert EDTF.parse("bad date!") == {:error, "Invalid EDTF input: bad date!"} - end - - describe "humanize/1" do - test "invalid date" do - assert EDTF.humanize("bad date!") == {:error, "Invalid EDTF input: bad date!"} - end - - test "simple date" do - assert EDTF.humanize("2020-06-10") == "June 10, 2020" - assert EDTF.humanize("2020-06") == "June 2020" - assert EDTF.humanize("2020") == "2020" - assert EDTF.humanize("-2020-06") == "June 2020 BCE" - end - - test "approximate date" do - assert EDTF.humanize("2020-06-10~") == "circa June 10, 2020" - assert EDTF.humanize("2020-06~") == "circa June 2020" - assert EDTF.humanize("2020~") == "circa 2020" - assert EDTF.humanize("-2020-06~") == "circa June 2020 BCE" - end - - test "uncertain date" do - assert EDTF.humanize("2020-06-10?") == "June 10, 2020?" - assert EDTF.humanize("2020-06?") == "June 2020?" - assert EDTF.humanize("2020?") == "2020?" - assert EDTF.humanize("-2020-06?") == "June 2020 BCE?" - end - - test "approximate and uncertain date" do - assert EDTF.humanize("2020-06-10%") == "circa June 10, 2020?" - assert EDTF.humanize("2020-06%") == "circa June 2020?" - assert EDTF.humanize("2020%") == "circa 2020?" - assert EDTF.humanize("-2020-06%") == "circa June 2020 BCE?" - end - - test "dates with unspecified digits from the right" do - assert EDTF.humanize("192X") == "1920s" - assert EDTF.humanize("19XX") == "1900s" - assert EDTF.humanize("1XXX") == "1000s" - - assert EDTF.humanize("-192X") == "1920s BCE" - assert EDTF.humanize("-19XX") == "1900s BCE" - assert EDTF.humanize("-1XXX") == "1000s BCE" - end - - test "intervals with unspecified digits from the right" do - assert EDTF.humanize("192X/193X") == "1920s to 1930s" - assert EDTF.humanize("-192X/192X") == "1920s BCE to 1920s" - end - - test "dates with other unspecified digits" do - assert EDTF.humanize("X9X2") == "X9X2" - assert EDTF.humanize("1999-XX") == "1999-XX" - assert EDTF.humanize("1999-12-XX") == "1999-12-XX" - assert EDTF.humanize("-19X9-12-XX") == "-19X9-12-XX" - end - - test "prefixed and exponential years" do - assert EDTF.humanize("Y20020") == "20020" - assert EDTF.humanize("Y-20020") == "20020 BCE" - assert EDTF.humanize("Y17E7") == "170000000" - assert EDTF.humanize("Y-17E7") == "170000000 BCE" - end - - test "decade" do - assert EDTF.humanize("201") == "2010s" - assert EDTF.humanize("-201") == "2010s BCE" - end - - test "century" do - assert EDTF.humanize("20") == "20th Century" - assert EDTF.humanize("21") == "21st Century" - assert EDTF.humanize("-20") == "20th Century BCE" - assert EDTF.humanize("-21") == "21st Century BCE" - end - - test "date interval" do - assert EDTF.humanize("2019-06~/2020") == "circa June 2019 to 2020" - end - - test "unbounded interval" do - assert EDTF.humanize("2019-06~/..") == "from circa June 2019" - assert EDTF.humanize("../2019-06-10~") == "before circa June 10, 2019" - end - - test "interval with unknown bound" do - assert EDTF.humanize("2019-06~/") == "circa June 2019 to Unknown" - assert EDTF.humanize("/2019-06-10~") == "Unknown to circa June 10, 2019" - end - - test "set" do - assert EDTF.humanize("[2019-06]") == "June 2019" - assert EDTF.humanize("[2019-06, 2020-06]") == "June 2019 or June 2020" - assert EDTF.humanize("[2019-06, 2020-06, 2021-06]") == "June 2019, June 2020, or June 2021" - - assert EDTF.humanize("[2019-06, 2020-06, 2021-06..2021-07]") == - "June 2019, June 2020, or June 2021 to July 2021" - - assert EDTF.humanize("[..2020]") == "some year before 2020 or 2020" - assert EDTF.humanize("[..2020-06]") == "some month before June 2020 or June 2020" - assert EDTF.humanize("[..2020-06-10]") == "some date before June 10, 2020 or June 10, 2020" - assert EDTF.humanize("[2020..]") == "2020 or some year after 2020" - assert EDTF.humanize("[2020-06..]") == "June 2020 or some month after June 2020" - assert EDTF.humanize("[2020-06-10..]") == "June 10, 2020 or some date after June 10, 2020" - - assert EDTF.humanize("[..2018, 2020-06-10..]") == - "some year before 2018, 2018, June 10, 2020, or some date after June 10, 2020" - end - - test "list" do - assert EDTF.humanize("{2019-06}") == "June 2019" - assert EDTF.humanize("{2019-06, 2020-06}") == "June 2019 and June 2020" - assert EDTF.humanize("{2019-06, 2020-06, 2021-06}") == "June 2019, June 2020, and June 2021" - - assert EDTF.humanize("{2019-06, 2020-06, 2021-06..2021-07}") == - "June 2019, June 2020, and June 2021 to July 2021" - - assert EDTF.humanize("{..1984}") == "all years before 1984 and 1984" - assert EDTF.humanize("{1984..}") == "1984 and all years after 1984" - end - - test "season" do - assert EDTF.humanize("2020-21") == "Spring 2020" - assert EDTF.humanize("2020-22") == "Summer 2020" - assert EDTF.humanize("2020-23") == "Autumn 2020" - assert EDTF.humanize("2020-24") == "Winter 2020" - assert EDTF.humanize("2020-25") == "Spring (Northern Hemisphere) 2020" - assert EDTF.humanize("2020-26") == "Summer (Northern Hemisphere) 2020" - assert EDTF.humanize("2020-27") == "Autumn (Northern Hemisphere) 2020" - assert EDTF.humanize("2020-28") == "Winter (Northern Hemisphere) 2020" - assert EDTF.humanize("2020-29") == "Spring (Southern Hemisphere) 2020" - assert EDTF.humanize("2020-30") == "Summer (Southern Hemisphere) 2020" - assert EDTF.humanize("2020-31") == "Autumn (Southern Hemisphere) 2020" - assert EDTF.humanize("2020-32") == "Winter (Southern Hemisphere) 2020" - assert EDTF.humanize("2020-33") == "Quarter 1 2020" - assert EDTF.humanize("2020-34") == "Quarter 2 2020" - assert EDTF.humanize("2020-35") == "Quarter 3 2020" - assert EDTF.humanize("2020-36") == "Quarter 4 2020" - assert EDTF.humanize("2020-37") == "Quadrimester 1 2020" - assert EDTF.humanize("2020-38") == "Quadrimester 2 2020" - assert EDTF.humanize("2020-39") == "Quadrimester 3 2020" - assert EDTF.humanize("2020-40") == "Semestral 1 2020" - assert EDTF.humanize("2020-41") == "Semestral 2 2020" - end - - test "intervals with seasons" do - assert EDTF.humanize("1995-24/1996-22") == "Winter 1995 to Summer 1996" - assert EDTF.humanize("-1995-24/1996-22") == "Winter 1995 BCE to Summer 1996" - end - end -end diff --git a/app/test/meadow/batches_test.exs b/app/test/meadow/batches_test.exs index 804d845cf..46d497b6d 100644 --- a/app/test/meadow/batches_test.exs +++ b/app/test/meadow/batches_test.exs @@ -177,7 +177,7 @@ defmodule Meadow.BatchesTest do add = %{ descriptive_metadata: %{ box_name: ["His Airness"], - date_created: [%{edtf: "1009"}, %{edtf: "100X"}, %{edtf: "~1968"}] + date_created: [%{edtf: "1009"}, %{edtf: "100X"}, %{edtf: "~1968?"}] } } diff --git a/app/test/meadow/config_test.exs b/app/test/meadow/config_test.exs index c1df81aed..f1286f28e 100644 --- a/app/test/meadow/config_test.exs +++ b/app/test/meadow/config_test.exs @@ -61,13 +61,13 @@ defmodule Meadow.ConfigTest do test "aws_environment/0" do with env <- Config.aws_environment() |> Enum.into(%{}) do - assert env |> Map.has_key?('TMPDIR') + assert env |> Map.has_key?(~c"TMPDIR") if Application.get_env(:ex_aws, :s3) do - assert env |> Map.get('AWS_REGION') == 'us-east-1' - assert env |> Map.get('AWS_SECRET_ACCESS_KEY') == 'fake' - assert env |> Map.get('AWS_ACCESS_KEY_ID') == 'fake' - assert env |> Map.get('AWS_S3_ENDPOINT') |> Enum.slice(0..15) == 'http://localhost' + assert env |> Map.get(~c"AWS_REGION") == ~c"us-east-1" + assert env |> Map.get(~c"AWS_SECRET_ACCESS_KEY") == ~c"fake" + assert env |> Map.get(~c"AWS_ACCESS_KEY_ID") == ~c"fake" + assert env |> Map.get(~c"AWS_S3_ENDPOINT") |> Enum.slice(0..15) == ~c"http://localhost" end end end @@ -103,12 +103,5 @@ defmodule Meadow.ConfigTest do assert Config.iiif_manifest_url_deprecated() == "http://no-slash-test/minio/test-pyramids/public/" end - - test "validate release config" do - System.put_env("__COMPILE_CHECK__", "TRUE") - assert ConfigReader.read!("config/releases.exs") |> is_list() - after - System.delete_env("__COMPILE_CHECK__") - end end end diff --git a/app/test/meadow/data/csv/metadata_update_jobs_test.exs b/app/test/meadow/data/csv/metadata_update_jobs_test.exs index fdc0839ae..fb533107d 100644 --- a/app/test/meadow/data/csv/metadata_update_jobs_test.exs +++ b/app/test/meadow/data/csv/metadata_update_jobs_test.exs @@ -66,7 +66,7 @@ defmodule Meadow.Data.CSV.MetadataUpdateJobsTest do assert work.visibility.id == "AUTHENTICATED" assert work.descriptive_metadata.date_created == [ - %{edtf: "~1899", humanized: "circa 1899?"} + %{edtf: "~1899", humanized: "circa 1899"} ] assert work.administrative_metadata.project_proposer == [ From a0852efe61787c35a0bb87be30247b58e1a23e2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:59:15 +0000 Subject: [PATCH 02/14] Bump @graphql-codegen/client-preset from 4.5.0 to 4.5.1 in /app/assets Bumps [@graphql-codegen/client-preset](https://github.com/dotansimha/graphql-code-generator/tree/HEAD/packages/presets/client) from 4.5.0 to 4.5.1. - [Release notes](https://github.com/dotansimha/graphql-code-generator/releases) - [Changelog](https://github.com/dotansimha/graphql-code-generator/blob/master/packages/presets/client/CHANGELOG.md) - [Commits](https://github.com/dotansimha/graphql-code-generator/commits/@graphql-codegen/client-preset@4.5.1/packages/presets/client) --- updated-dependencies: - dependency-name: "@graphql-codegen/client-preset" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 72 ++++++++++++++++++------------------ app/assets/package.json | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 643ddb6f9..9223b6722 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -73,7 +73,7 @@ "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.1", "@graphql-codegen/cli": "^5.0.3", - "@graphql-codegen/client-preset": "^4.4.0", + "@graphql-codegen/client-preset": "^4.5.1", "@graphql-typed-document-node/core": "^3.2.0", "@nulib/dcapi-types": "^2.6.0", "@nulib/prettier-config": "^1.2.0", @@ -3676,20 +3676,20 @@ } }, "node_modules/@graphql-codegen/client-preset": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.5.0.tgz", - "integrity": "sha512-0fFGSjpDhB7Jp6v+FQWDIeNJhL8VEiy3zeazyus3mGUELPaRQsoos2NczkDWnyMjSB1NHn4GrI53DB4TXkTAog==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.5.1.tgz", + "integrity": "sha512-UE2/Kz2eaxv35HIXFwlm2QwoUH77am6+qp54aeEWYq+T+WPwmIc6+YzqtGiT/VcaXgoOUSgidREGm9R6jKcf9g==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", "@babel/template": "^7.20.7", "@graphql-codegen/add": "^5.0.3", - "@graphql-codegen/gql-tag-operations": "4.0.11", + "@graphql-codegen/gql-tag-operations": "4.0.12", "@graphql-codegen/plugin-helpers": "^5.1.0", - "@graphql-codegen/typed-document-node": "^5.0.11", - "@graphql-codegen/typescript": "^4.1.1", - "@graphql-codegen/typescript-operations": "^4.3.1", - "@graphql-codegen/visitor-plugin-common": "^5.5.0", + "@graphql-codegen/typed-document-node": "^5.0.12", + "@graphql-codegen/typescript": "^4.1.2", + "@graphql-codegen/typescript-operations": "^4.4.0", + "@graphql-codegen/visitor-plugin-common": "^5.6.0", "@graphql-tools/documents": "^1.0.0", "@graphql-tools/utils": "^10.0.0", "@graphql-typed-document-node/core": "3.2.0", @@ -3717,13 +3717,13 @@ } }, "node_modules/@graphql-codegen/gql-tag-operations": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.11.tgz", - "integrity": "sha512-EUQuBsYB5RtNlzBb/O0nJvbWC8HvPRWwVTHRf0ElOoQlJfRgfDom2GWmEM5hXa2afzMqB7AWxOH24ibOqiYnMQ==", + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.12.tgz", + "integrity": "sha512-v279i49FJ5dMmQXIGUgm6FtnnkxtJjVJWDNYh9JK4ppvOixdHp+PmEzW227DkLN6avhVxNnYdp/1gdRBwdWypw==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.1.0", - "@graphql-codegen/visitor-plugin-common": "5.5.0", + "@graphql-codegen/visitor-plugin-common": "5.6.0", "@graphql-tools/utils": "^10.0.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" @@ -3770,13 +3770,13 @@ } }, "node_modules/@graphql-codegen/typed-document-node": { - "version": "5.0.11", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.11.tgz", - "integrity": "sha512-btENKrSIUZ5UllS8sFhVZ+Y91VL0knK9gHxW/6/WzaCTxBQ+wOk07vQNeoWlvMrkl0QeUsGt6YvSo0SoPtsKdA==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.12.tgz", + "integrity": "sha512-Wsbc1AqC+MFp3maWPzrmmyHLuWCPB63qBBFLTKtO6KSsnn0KnLocBp475wkfBZnFISFvzwpJ0e6LV71gKfTofQ==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.1.0", - "@graphql-codegen/visitor-plugin-common": "5.5.0", + "@graphql-codegen/visitor-plugin-common": "5.6.0", "auto-bind": "~4.0.0", "change-case-all": "1.0.15", "tslib": "~2.6.0" @@ -3789,14 +3789,14 @@ } }, "node_modules/@graphql-codegen/typescript": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.1.1.tgz", - "integrity": "sha512-+o5LOT71K9hdO4lDVnRGkkET5RdlKvxlQGug8dZgRGrhE2/xoPBsKfLhg9AoJGYMauNZxKj3blABQxHOKEku6Q==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.1.2.tgz", + "integrity": "sha512-GhPgfxgWEkBrvKR2y77OThus3K8B6U3ESo68l7+sHH1XiL2WapK5DdClViblJWKQerJRjfJu8tcaxQ8Wpk6Ogw==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.1.0", "@graphql-codegen/schema-ast": "^4.0.2", - "@graphql-codegen/visitor-plugin-common": "5.5.0", + "@graphql-codegen/visitor-plugin-common": "5.6.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" }, @@ -3808,14 +3808,14 @@ } }, "node_modules/@graphql-codegen/typescript-operations": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.3.1.tgz", - "integrity": "sha512-yW5Iia6IK1VKiPm3oeukYMQN5pEBLwRlG8ZzQA9beeLQ8PskKyz6mjar6U7dJ2hc8pv/qT4R8kcJOQ2RloniAQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.4.0.tgz", + "integrity": "sha512-oVlos2ySx8xIbbe8r5ZI6mOpI+OTeP14RmS2MchBJ6DL+S9G16O6+9V3Y8V22fTnmBTZkTfAAaBv4HYhhDGWVA==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.1.0", - "@graphql-codegen/typescript": "^4.1.1", - "@graphql-codegen/visitor-plugin-common": "5.5.0", + "@graphql-codegen/typescript": "^4.1.2", + "@graphql-codegen/visitor-plugin-common": "5.6.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" }, @@ -3827,9 +3827,9 @@ } }, "node_modules/@graphql-codegen/visitor-plugin-common": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.5.0.tgz", - "integrity": "sha512-FSkxe/o4qKbpK+ipIT/jxZLYH0+3+XdIrJWsKlCW9wwJMF9mEJLJtzZNcxHSjz7+Eny6SUElAT2dqZ5XByxkog==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.6.0.tgz", + "integrity": "sha512-PowcVPJbUqMC9xTJ/ZRX1p/fsdMZREc+69CM1YY+AlFng2lL0zsdBskFJSRoviQk2Ch9IPhKGyHxlJCy9X22tg==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.1.0", @@ -4206,13 +4206,13 @@ } }, "node_modules/@graphql-tools/relay-operation-optimizer": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.3.tgz", - "integrity": "sha512-CqtzgLkFQaDCDePVoC9myPLcp2kCDQQCdyliR1Q0YOa6tbBUNl7q82n7qznrzrJVH3Y+Is59ASz3FhjOolUy4g==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.4.tgz", + "integrity": "sha512-LU4FMvzfXCA+ATEr08rEqlkKEGEErk/yYpeoMgKu94ARF9qg8EEm+UUIDw00PTr3Y9m4dfNLAL4lOvNcDTLv9A==", "dev": true, "dependencies": { "@ardatan/relay-compiler": "12.0.0", - "@graphql-tools/utils": "^10.5.6", + "@graphql-tools/utils": "^10.6.0", "tslib": "^2.4.0" }, "engines": { @@ -4267,9 +4267,9 @@ } }, "node_modules/@graphql-tools/utils": { - "version": "10.5.6", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.5.6.tgz", - "integrity": "sha512-JAC44rhbLzXUHiltceyEpWkxmX4e45Dfg19wRFoA9EbDxQVbOzVNF76eEECdg0J1owFsJwfLqCwz7/6xzrovOw==", + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.6.0.tgz", + "integrity": "sha512-bqSn2ekSNwFVZprY6YsrHkqPA7cPLNKxiPlEzS1djhfvx4q9tx7Uwc5dnLp3SSnKinJ8dJk9FA5sxNcKjCM44w==", "dev": true, "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", diff --git a/app/assets/package.json b/app/assets/package.json index 2032df645..d6a4237c5 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -83,7 +83,7 @@ "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.1", "@graphql-codegen/cli": "^5.0.3", - "@graphql-codegen/client-preset": "^4.4.0", + "@graphql-codegen/client-preset": "^4.5.1", "@graphql-typed-document-node/core": "^3.2.0", "@nulib/dcapi-types": "^2.6.0", "@nulib/prettier-config": "^1.2.0", From 1ada4c37ded2c0f40c9192cf6f5e1e4f411a4fa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:08:34 +0000 Subject: [PATCH 03/14] Bump esbuild from 0.19.12 to 0.24.0 in /app/assets Bumps [esbuild](https://github.com/evanw/esbuild) from 0.19.12 to 0.24.0. - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md) - [Commits](https://github.com/evanw/esbuild/compare/v0.19.12...v0.24.0) --- updated-dependencies: - dependency-name: esbuild dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 429 ++++++++++++++++++++++++++++++++--- app/assets/package.json | 2 +- 2 files changed, 402 insertions(+), 29 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 643ddb6f9..1fe4f8c16 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -86,7 +86,7 @@ "@types/react-router-dom": "^5.3.3", "babel-plugin-syntax-dynamic-import": "^6.18.0", "coveralls": "^3.1.1", - "esbuild": "^0.19.12", + "esbuild": "^0.24.0", "esbuild-plugin-copy": "^2.1.1", "esbuild-plugin-path-alias": "^1.0.7", "esbuild-sass-plugin": "^2.16.1", @@ -3450,8 +3450,74 @@ "version": "0.2.5", "license": "MIT" }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz", + "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==", + "cpu": [ + "ppc64" + ], + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz", + "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz", + "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz", + "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.19.12", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz", + "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==", "cpu": [ "arm64" ], @@ -3461,7 +3527,311 @@ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz", + "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz", + "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz", + "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz", + "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz", + "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz", + "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz", + "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==", + "cpu": [ + "loong64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz", + "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==", + "cpu": [ + "mips64el" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz", + "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==", + "cpu": [ + "ppc64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz", + "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==", + "cpu": [ + "riscv64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz", + "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==", + "cpu": [ + "s390x" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz", + "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz", + "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz", + "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz", + "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz", + "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz", + "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz", + "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz", + "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" } }, "node_modules/@floating-ui/core": { @@ -12633,39 +13003,42 @@ } }, "node_modules/esbuild": { - "version": "0.19.12", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz", + "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==", "hasInstallScript": true, "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, "engines": { - "node": ">=12" + "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.12", - "@esbuild/android-arm": "0.19.12", - "@esbuild/android-arm64": "0.19.12", - "@esbuild/android-x64": "0.19.12", - "@esbuild/darwin-arm64": "0.19.12", - "@esbuild/darwin-x64": "0.19.12", - "@esbuild/freebsd-arm64": "0.19.12", - "@esbuild/freebsd-x64": "0.19.12", - "@esbuild/linux-arm": "0.19.12", - "@esbuild/linux-arm64": "0.19.12", - "@esbuild/linux-ia32": "0.19.12", - "@esbuild/linux-loong64": "0.19.12", - "@esbuild/linux-mips64el": "0.19.12", - "@esbuild/linux-ppc64": "0.19.12", - "@esbuild/linux-riscv64": "0.19.12", - "@esbuild/linux-s390x": "0.19.12", - "@esbuild/linux-x64": "0.19.12", - "@esbuild/netbsd-x64": "0.19.12", - "@esbuild/openbsd-x64": "0.19.12", - "@esbuild/sunos-x64": "0.19.12", - "@esbuild/win32-arm64": "0.19.12", - "@esbuild/win32-ia32": "0.19.12", - "@esbuild/win32-x64": "0.19.12" + "@esbuild/aix-ppc64": "0.24.0", + "@esbuild/android-arm": "0.24.0", + "@esbuild/android-arm64": "0.24.0", + "@esbuild/android-x64": "0.24.0", + "@esbuild/darwin-arm64": "0.24.0", + "@esbuild/darwin-x64": "0.24.0", + "@esbuild/freebsd-arm64": "0.24.0", + "@esbuild/freebsd-x64": "0.24.0", + "@esbuild/linux-arm": "0.24.0", + "@esbuild/linux-arm64": "0.24.0", + "@esbuild/linux-ia32": "0.24.0", + "@esbuild/linux-loong64": "0.24.0", + "@esbuild/linux-mips64el": "0.24.0", + "@esbuild/linux-ppc64": "0.24.0", + "@esbuild/linux-riscv64": "0.24.0", + "@esbuild/linux-s390x": "0.24.0", + "@esbuild/linux-x64": "0.24.0", + "@esbuild/netbsd-x64": "0.24.0", + "@esbuild/openbsd-arm64": "0.24.0", + "@esbuild/openbsd-x64": "0.24.0", + "@esbuild/sunos-x64": "0.24.0", + "@esbuild/win32-arm64": "0.24.0", + "@esbuild/win32-ia32": "0.24.0", + "@esbuild/win32-x64": "0.24.0" } }, "node_modules/esbuild-plugin-copy": { diff --git a/app/assets/package.json b/app/assets/package.json index 2032df645..1db0e12f4 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -96,7 +96,7 @@ "@types/react-router-dom": "^5.3.3", "babel-plugin-syntax-dynamic-import": "^6.18.0", "coveralls": "^3.1.1", - "esbuild": "^0.19.12", + "esbuild": "^0.24.0", "esbuild-plugin-copy": "^2.1.1", "esbuild-plugin-path-alias": "^1.0.7", "esbuild-sass-plugin": "^2.16.1", From b59980835dbdec80c979f8868d527ef80ab9641b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:09:56 +0000 Subject: [PATCH 04/14] Bump esbuild-sass-plugin from 2.16.1 to 3.3.1 in /app/assets Bumps [esbuild-sass-plugin](https://github.com/glromeo/esbuild-sass-plugin) from 2.16.1 to 3.3.1. - [Release notes](https://github.com/glromeo/esbuild-sass-plugin/releases) - [Commits](https://github.com/glromeo/esbuild-sass-plugin/compare/v2.16.1...v3.3.1) --- updated-dependencies: - dependency-name: esbuild-sass-plugin dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 520 ++++++++++++++++++++++++++++++++++- app/assets/package.json | 2 +- 2 files changed, 516 insertions(+), 6 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 643ddb6f9..618d1c65d 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -89,7 +89,7 @@ "esbuild": "^0.19.12", "esbuild-plugin-copy": "^2.1.1", "esbuild-plugin-path-alias": "^1.0.7", - "esbuild-sass-plugin": "^2.16.1", + "esbuild-sass-plugin": "^3.3.1", "glob": "^11.0.0", "jest": "^29.7.0", "jest-localstorage-mock": "^2.4.21", @@ -3161,6 +3161,14 @@ "dev": true, "license": "MIT" }, + "node_modules/@bufbuild/protobuf": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.2.2.tgz", + "integrity": "sha512-UNtPCbrwrenpmrXuRwn9jYpPoweNXj8X5sMvYgsqYyaH8jQ6LfUJSk3dJLnBK+6sfYPrF4iAIo5sd5HQ+tg75A==", + "dev": true, + "license": "(Apache-2.0 AND BSD-3-Clause)", + "peer": true + }, "node_modules/@creativebulma/bulma-divider": { "version": "1.1.0", "dev": true, @@ -10628,6 +10636,14 @@ "ieee754": "^1.1.13" } }, + "node_modules/buffer-builder": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz", + "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==", + "dev": true, + "license": "MIT/X11", + "peer": true + }, "node_modules/buffer-from": { "version": "1.1.2", "dev": true, @@ -11534,6 +11550,14 @@ "dev": true, "license": "MIT" }, + "node_modules/colorjs.io": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz", + "integrity": "sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/combined-stream": { "version": "1.0.8", "license": "MIT", @@ -12702,15 +12726,19 @@ } }, "node_modules/esbuild-sass-plugin": { - "version": "2.16.1", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/esbuild-sass-plugin/-/esbuild-sass-plugin-3.3.1.tgz", + "integrity": "sha512-SnO1ls+d52n6j8gRRpjexXI8MsHEaumS0IdDHaYM29Y6gakzZYMls6i9ql9+AWMSQk/eryndmUpXEgT34QrX1A==", "dev": true, "license": "MIT", "dependencies": { - "resolve": "^1.22.6", - "sass": "^1.7.3" + "resolve": "^1.22.8", + "safe-identifier": "^0.4.2", + "sass": "^1.71.1" }, "peerDependencies": { - "esbuild": "^0.19.4" + "esbuild": ">=0.20.1", + "sass-embedded": "^1.71.1" } }, "node_modules/escalade": { @@ -19714,6 +19742,13 @@ "dev": true, "license": "MIT" }, + "node_modules/safe-identifier": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz", + "integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==", + "dev": true, + "license": "ISC" + }, "node_modules/safe-regex": { "version": "1.1.0", "dev": true, @@ -19785,6 +19820,448 @@ "@parcel/watcher": "^2.4.1" } }, + "node_modules/sass-embedded": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.81.0.tgz", + "integrity": "sha512-uZQ2Faxb1oWBHpeSSzjxnhClbMb3QadN0ql0ZFNuqWOLUxwaVhrMlMhPq6TDPbbfDUjihuwrMCuy695Bgna5RA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@bufbuild/protobuf": "^2.0.0", + "buffer-builder": "^0.2.0", + "colorjs.io": "^0.5.0", + "immutable": "^5.0.2", + "rxjs": "^7.4.0", + "supports-color": "^8.1.1", + "sync-child-process": "^1.0.2", + "varint": "^6.0.0" + }, + "bin": { + "sass": "dist/bin/sass.js" + }, + "engines": { + "node": ">=16.0.0" + }, + "optionalDependencies": { + "sass-embedded-android-arm": "1.81.0", + "sass-embedded-android-arm64": "1.81.0", + "sass-embedded-android-ia32": "1.81.0", + "sass-embedded-android-riscv64": "1.81.0", + "sass-embedded-android-x64": "1.81.0", + "sass-embedded-darwin-arm64": "1.81.0", + "sass-embedded-darwin-x64": "1.81.0", + "sass-embedded-linux-arm": "1.81.0", + "sass-embedded-linux-arm64": "1.81.0", + "sass-embedded-linux-ia32": "1.81.0", + "sass-embedded-linux-musl-arm": "1.81.0", + "sass-embedded-linux-musl-arm64": "1.81.0", + "sass-embedded-linux-musl-ia32": "1.81.0", + "sass-embedded-linux-musl-riscv64": "1.81.0", + "sass-embedded-linux-musl-x64": "1.81.0", + "sass-embedded-linux-riscv64": "1.81.0", + "sass-embedded-linux-x64": "1.81.0", + "sass-embedded-win32-arm64": "1.81.0", + "sass-embedded-win32-ia32": "1.81.0", + "sass-embedded-win32-x64": "1.81.0" + } + }, + "node_modules/sass-embedded-android-arm": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.81.0.tgz", + "integrity": "sha512-NWEmIuaIEsGFNsIRa+5JpIpPJyZ32H15E85CNZqEIhhwWlk9UNw7vlOCmTH8MtabtnACwC/2NG8VyNa3nxKzUQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-android-arm64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.81.0.tgz", + "integrity": "sha512-I36P77/PKAHx6sqOmexO2iEY5kpsmQ1VxcgITZSOxPMQhdB6m4t3bTabfDuWQQmCrqqiNFtLQHeytB65bUqwiw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-android-ia32": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.81.0.tgz", + "integrity": "sha512-k8V1usXw30w1GVxvrteG1RzgYJzYQ9PfL2aeOqGdroBN7zYTD9VGJXTGcxA4IeeRxmRd7szVW2mKXXS472fh8g==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-android-riscv64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.81.0.tgz", + "integrity": "sha512-RXlanyLXEpN/DEehXgLuKPsqT//GYlsGFxKXgRiCc8hIPAueFLQXKJmLWlL3BEtHgmFdbsStIu4aZCcb1hOFlQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-android-x64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.81.0.tgz", + "integrity": "sha512-RQG0FxGQ1DERNyUDED8+BDVaLIjI+BNg8lVcyqlLZUrWY6NhzjwYEeiN/DNZmMmHtqDucAPNDcsdVUNQqsBy2A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-darwin-arm64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.81.0.tgz", + "integrity": "sha512-gLKbsfII9Ppua76N41ODFnKGutla9qv0OGAas8gxe0jYBeAQFi/1iKQYdNtQtKi4mA9n5TQTqz+HHCKszZCoyA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-darwin-x64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.81.0.tgz", + "integrity": "sha512-7uMOlT9hD2KUJCbTN2XcfghDxt/rc50ujjfSjSHjX1SYj7mGplkINUXvVbbvvaV2wt6t9vkGkCo5qNbeBhfwBg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-arm": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.81.0.tgz", + "integrity": "sha512-REqR9qM4RchCE3cKqzRy9Q4zigIV82SbSpCi/O4O3oK3pg2I1z7vkb3TiJsivusG/li7aqKZGmYOtAXjruGQDA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-arm64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.81.0.tgz", + "integrity": "sha512-jy4bvhdUmqbyw1jv1f3Uxl+MF8EU/Y/GDx4w6XPJm4Ds+mwH/TwnyAwsxxoBhWfnBnW8q2ADy039DlS5p+9csQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-ia32": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.81.0.tgz", + "integrity": "sha512-ga/Jk4q5Bn1aC+iHJteDZuLSKnmBUiS3dEg1fnl/Z7GaHIChceKDJOw0zNaILRXI0qT2E1at9MwzoRaRA5Nn/g==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-musl-arm": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.81.0.tgz", + "integrity": "sha512-oWVUvQ4d5Kx1Md75YXZl5z1WBjc+uOhfRRqzkJ3nWc8tjszxJN+y/5EOJavhsNI3/2yoTt6eMXRTqDD9b0tWSQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-musl-arm64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.81.0.tgz", + "integrity": "sha512-hpntWf5kjkoxncA1Vh8vhsUOquZ8AROZKx0rQh7ZjSRs4JrYZASz1cfevPKaEM3wIim/nYa6TJqm0VqWsrERlA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-musl-ia32": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.81.0.tgz", + "integrity": "sha512-UEXUYkBuqTSwg5JNWiNlfMZ1Jx6SJkaEdx+fsL3Tk099L8cKSoJWH2EPz4ZJjNbyIMymrSdVfymheTeZ8u24xA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-musl-riscv64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.81.0.tgz", + "integrity": "sha512-1D7OznytbIhx2XDHWi1nuQ8d/uCVR7FGGzELgaU//T8A9DapVTUgPKvB70AF1k4GzChR9IXU/WvFZs2hDTbaJg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-musl-x64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.81.0.tgz", + "integrity": "sha512-ia6VCTeVDQtBSMktXRFza1AZCt8/6aUoujot6Ugf4KmdytQqPJIHxkHaGftm5xwi9WdrMGYS7zgolToPijR11A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-riscv64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.81.0.tgz", + "integrity": "sha512-KbxSsqu4tT1XbhZfJV/5NfW0VtJIGlD58RjqJqJBi8Rnjrx29/upBsuwoDWtsPV/LhoGwwU1XkSa9Q1ifCz4fQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-x64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.81.0.tgz", + "integrity": "sha512-AMDeVY2T9WAnSFkuQcsOn5c29GRs/TuqnCiblKeXfxCSKym5uKdBl/N7GnTV6OjzoxiJBbkYKdVIaS5By7Gj4g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-win32-arm64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.81.0.tgz", + "integrity": "sha512-YOmBRYnygwWUmCoH14QbMRHjcvCJufeJBAp0m61tOJXIQh64ziwV4mjdqjS/Rx3zhTT4T+nulDUw4d3kLiMncA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-win32-ia32": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.81.0.tgz", + "integrity": "sha512-HFfr/C+uLJGGTENdnssuNTmXI/xnIasUuEHEKqI+2J0FHCWT5cpz3PGAOHymPyJcZVYGUG/7gIxIx/d7t0LFYw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-win32-x64": { + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.81.0.tgz", + "integrity": "sha512-wxj52jDcIAwWcXb7ShZ7vQYKcVUkJ+04YM9l46jDY+qwHzliGuorAUyujLyKTE9heGD3gShJ3wPPC1lXzq6v9A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/sass-embedded/node_modules/immutable": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz", + "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/sass-embedded/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/sass/node_modules/chokidar": { "version": "4.0.1", "dev": true, @@ -20630,6 +21107,31 @@ "version": "3.2.4", "license": "MIT" }, + "node_modules/sync-child-process": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz", + "integrity": "sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "sync-message-port": "^1.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/sync-message-port": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.1.3.tgz", + "integrity": "sha512-GTt8rSKje5FilG+wEdfCkOcLL7LWqpMlr2c3LRuKt/YXxcJ52aGSbGBAdI4L3aaqfrBt6y711El53ItyH1NWzg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/tapable": { "version": "1.1.3", "dev": true, @@ -21648,6 +22150,14 @@ "node": ">=12" } }, + "node_modules/varint": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", + "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/verror": { "version": "1.10.0", "dev": true, diff --git a/app/assets/package.json b/app/assets/package.json index 2032df645..1110529d8 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -99,7 +99,7 @@ "esbuild": "^0.19.12", "esbuild-plugin-copy": "^2.1.1", "esbuild-plugin-path-alias": "^1.0.7", - "esbuild-sass-plugin": "^2.16.1", + "esbuild-sass-plugin": "^3.3.1", "glob": "^11.0.0", "jest": "^29.7.0", "jest-localstorage-mock": "^2.4.21", From 12ee4d375bec1f03e8474a5089c312fb58eaf71b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:10:09 +0000 Subject: [PATCH 05/14] Bump esbuild-plugin-svgr from 2.1.0 to 3.1.0 in /app/assets Bumps [esbuild-plugin-svgr](https://github.com/kazijawad/esbuild-plugin-svgr) from 2.1.0 to 3.1.0. - [Commits](https://github.com/kazijawad/esbuild-plugin-svgr/commits) --- updated-dependencies: - dependency-name: esbuild-plugin-svgr dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 12 +++++++----- app/assets/package.json | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 643ddb6f9..b9415dc1b 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -33,7 +33,7 @@ "classnames": "^2.5.1", "downshift": "^9.0.8", "edtf": "^4.6.0", - "esbuild-plugin-svgr": "^2.1.0", + "esbuild-plugin-svgr": "^3.1.0", "faker": "^5.5.3", "file-saver": "^2.0.5", "graphql": "^16.9.0", @@ -12691,14 +12691,16 @@ } }, "node_modules/esbuild-plugin-svgr": { - "version": "2.1.0", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-svgr/-/esbuild-plugin-svgr-3.1.0.tgz", + "integrity": "sha512-SOfjehS9effRn8W/+T05GiXAbT6QHivr2uAUwzbXnqLnezKA4QIjvEt3VCzpzZU9J6oP21GZBB8tbDsJWYXPlw==", "license": "MIT", "dependencies": { - "@svgr/core": "^8.0.0", - "@svgr/plugin-jsx": "^8.0.1" + "@svgr/core": "^8.1.0", + "@svgr/plugin-jsx": "^8.1.0" }, "peerDependencies": { - "esbuild": "^0.19.1" + "esbuild": "^0.23.0" } }, "node_modules/esbuild-sass-plugin": { diff --git a/app/assets/package.json b/app/assets/package.json index 2032df645..4899cc118 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -43,7 +43,7 @@ "classnames": "^2.5.1", "downshift": "^9.0.8", "edtf": "^4.6.0", - "esbuild-plugin-svgr": "^2.1.0", + "esbuild-plugin-svgr": "^3.1.0", "faker": "^5.5.3", "file-saver": "^2.0.5", "graphql": "^16.9.0", From 0fafb7edda231536f9614163c4dc607b81ec5db9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:32:35 +0000 Subject: [PATCH 06/14] Bump prettier from 3.3.3 to 3.4.2 in /app/assets Bumps [prettier](https://github.com/prettier/prettier) from 3.3.3 to 3.4.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.3.3...3.4.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 6 ++++-- app/assets/package.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 643ddb6f9..fb4cd3d2d 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -97,7 +97,7 @@ "lodash.isnull": "^3.0.0", "lodash.isundefined": "3.0.1", "node-fetch": "^2.6.1", - "prettier": "^3.3.3", + "prettier": "^3.4.2", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^5.3.0", @@ -18355,7 +18355,9 @@ "license": "MIT" }, "node_modules/prettier": { - "version": "3.3.3", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", + "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", "dev": true, "license": "MIT", "bin": { diff --git a/app/assets/package.json b/app/assets/package.json index 2032df645..0bf6e0947 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -107,7 +107,7 @@ "lodash.isnull": "^3.0.0", "lodash.isundefined": "3.0.1", "node-fetch": "^2.6.1", - "prettier": "^3.3.3", + "prettier": "^3.4.2", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^5.3.0", From c4b4ce31ab8b10027eecbd85c2ef3108e48f4eff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:47:05 +0000 Subject: [PATCH 07/14] Bump ecto_psql_extras from 0.8.2 to 0.8.3 in /app Bumps [ecto_psql_extras](https://github.com/pawurb/ecto_psql_extras) from 0.8.2 to 0.8.3. - [Commits](https://github.com/pawurb/ecto_psql_extras/commits) --- updated-dependencies: - dependency-name: ecto_psql_extras dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/mix.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mix.lock b/app/mix.lock index 3c3b452e8..fb5f80a1a 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -24,9 +24,9 @@ "dataloader": {:hex, :dataloader, "1.0.11", "49bbfc7dd8a1990423c51000b869b1fecaab9e3ccd6b29eab51616ae8ad0a2f5", [:mix], [{:ecto, ">= 3.4.3 and < 4.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ba0b0ec532ec68e9d033d03553561d693129bd7cbd5c649dc7903f07ffba08fe"}, "db_connection": {:hex, :db_connection, "2.7.0", "b99faa9291bb09892c7da373bb82cba59aefa9b36300f6145c5f201c7adf48ec", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dcf08f31b2701f857dfc787fbad78223d61a32204f217f15e881dd93e4bdd3ff"}, "decimal": {:hex, :decimal, "2.2.0", "df3d06bb9517e302b1bd265c1e7f16cda51547ad9d99892049340841f3e15836", [:mix], [], "hexpm", "af8daf87384b51b7e611fb1a1f2c4d4876b65ef968fa8bd3adf44cff401c7f21"}, - "ecto": {:hex, :ecto, "3.12.4", "267c94d9f2969e6acc4dd5e3e3af5b05cdae89a4d549925f3008b2b7eb0b93c3", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ef04e4101688a67d061e1b10d7bc1fbf00d1d13c17eef08b71d070ff9188f747"}, + "ecto": {:hex, :ecto, "3.12.5", "4a312960ce612e17337e7cefcf9be45b95a3be6b36b6f94dfb3d8c361d631866", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6eb18e80bef8bb57e17f5a7f068a1719fbda384d40fc37acb8eb8aeca493b6ea"}, "ecto_enum": {:hex, :ecto_enum, "1.4.0", "d14b00e04b974afc69c251632d1e49594d899067ee2b376277efd8233027aec8", [:mix], [{:ecto, ">= 3.0.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "> 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:mariaex, ">= 0.0.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"}, - "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.8.2", "79350a53246ac5ec27326d208496aebceb77fa82a91744f66a9154560f0759d3", [:mix], [{:ecto_sql, "~> 3.7", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "> 0.16.0 and < 0.20.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1 or ~> 4.0.0", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "6149c1c4a5ba6602a76cb09ee7a269eb60dab9694a1dbbb797f032555212de75"}, + "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.8.3", "0c1df205bd051eaf599b3671e75356b121aa71eac09b63ecf921cb1a080c072e", [:mix], [{:ecto_sql, "~> 3.7", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "> 0.16.0 and < 0.20.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1 or ~> 4.0.0", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "d0e35ea160359e759a2993a00c3a5389a9ca7ece6df5d0753fa927f988c7351a"}, "ecto_ranked": {:hex, :ecto_ranked, "0.6.0", "c3bc7925610244d3f0be01befb02991670c00f32890174392f2701f760124b26", [:mix], [{:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "735dd6e02096445f4084e0f76e1d0e100cdcf5386d40d6d4cb7e54f2d437fb27"}, "ecto_sql": {:hex, :ecto_sql, "3.12.1", "c0d0d60e85d9ff4631f12bafa454bc392ce8b9ec83531a412c12a0d415a3a4d0", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "aff5b958a899762c5f09028c847569f7dfb9cc9d63bdb8133bff8a5546de6bf5"}, "elastix": {:hex, :elastix, "0.10.0", "7567da885677ba9deffc20063db5f3ca8cd10f23cff1ab3ed9c52b7063b7e340", [:mix], [{:httpoison, "~> 1.4", [hex: :httpoison, repo: "hexpm", optional: false]}, {:poison, "~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}, {:retry, "~> 0.8", [hex: :retry, repo: "hexpm", optional: false]}], "hexpm", "5fb342ce068b20f7845f5dd198c2dc80d967deafaa940a6e51b846db82696d1d"}, From bd6c790273212dd9bdfed8b4867670b9ff11f4e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 16:47:20 +0000 Subject: [PATCH 08/14] Bump version to 9.6.2 --- app/mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix.exs b/app/mix.exs index e2a75f019..6fe3fc3f4 100644 --- a/app/mix.exs +++ b/app/mix.exs @@ -1,7 +1,7 @@ defmodule Meadow.MixProject do use Mix.Project - @app_version "9.6.1" + @app_version "9.6.2" def project do [ From 2167146dacaa8666d653a6da27f053e1ab490ddf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:59:50 +0000 Subject: [PATCH 09/14] Bump phoenix from 1.7.14 to 1.7.18 in /app Bumps [phoenix](https://github.com/phoenixframework/phoenix) from 1.7.14 to 1.7.18. - [Release notes](https://github.com/phoenixframework/phoenix/releases) - [Changelog](https://github.com/phoenixframework/phoenix/blob/v1.7.18/CHANGELOG.md) - [Commits](https://github.com/phoenixframework/phoenix/compare/v1.7.14...v1.7.18) --- updated-dependencies: - dependency-name: phoenix dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/mix.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/mix.lock b/app/mix.lock index 3c3b452e8..042d8ed21 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -13,7 +13,7 @@ "broadway_sqs": {:hex, :broadway_sqs, "0.7.4", "ab89b298f9253adb8534f92095b56d4879e35fe2f5a0730256f7e824572c637f", [:mix], [{:broadway, "~> 1.0", [hex: :broadway, repo: "hexpm", optional: false]}, {:ex_aws_sqs, "~> 3.2.1 or ~> 3.3", [hex: :ex_aws_sqs, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.3.7 or ~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:saxy, "~> 1.1", [hex: :saxy, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7140085c4f7c4b27886b3a8f3d0942976f39f195fdbc2f652c5d7b157f93ae28"}, "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"}, "cachex": {:hex, :cachex, "4.0.2", "120f9c27b0a453c7cb3319d9dc6c61c050a480e5299fc1f8bded1e2e334992ab", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:ex_hash_ring, "~> 6.0", [hex: :ex_hash_ring, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "4f4890122bddd979f6c217d5e300d0c0d3eb858a976cbe1f65a94e6322bc5825"}, - "castore": {:hex, :castore, "1.0.9", "5cc77474afadf02c7c017823f460a17daa7908e991b0cc917febc90e466a375c", [:mix], [], "hexpm", "5ea956504f1ba6f2b4eb707061d8e17870de2bee95fb59d512872c2ef06925e7"}, + "castore": {:hex, :castore, "1.0.10", "43bbeeac820f16c89f79721af1b3e092399b3a1ecc8df1a472738fd853574911", [:mix], [], "hexpm", "1b0b7ea14d889d9ea21202c43a4fa015eb913021cb535e8ed91946f4b77a8848"}, "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"}, "configparser_ex": {:hex, :configparser_ex, "4.0.0", "17e2b831cfa33a08c56effc610339b2986f0d82a9caa0ed18880a07658292ab6", [:mix], [], "hexpm", "02e6d1a559361a063cba7b75bc3eb2d6ad7e62730c551cc4703541fd11e65e5b"}, "cowboy": {:hex, :cowboy, "2.12.0", "f276d521a1ff88b2b9b4c54d0e753da6c66dd7be6c9fca3d9418b561828a3731", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "8a7abe6d183372ceb21caa2709bec928ab2b72e18a3911aa1771639bef82651e"}, @@ -67,7 +67,7 @@ "nimble_ownership": {:hex, :nimble_ownership, "1.0.0", "3f87744d42c21b2042a0aa1d48c83c77e6dd9dd357e425a038dd4b49ba8b79a1", [:mix], [], "hexpm", "7c16cc74f4e952464220a73055b557a273e8b1b7ace8489ec9d86e9ad56cb2cc"}, "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"}, "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"}, - "phoenix": {:hex, :phoenix, "1.7.14", "a7d0b3f1bc95987044ddada111e77bd7f75646a08518942c72a8440278ae7825", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"}, + "phoenix": {:hex, :phoenix, "1.7.18", "5310c21443514be44ed93c422e15870aef254cf1b3619e4f91538e7529d2b2e4", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "1797fcc82108442a66f2c77a643a62980f342bfeb63d6c9a515ab8294870004e"}, "phoenix_ecto": {:hex, :phoenix_ecto, "4.6.3", "f686701b0499a07f2e3b122d84d52ff8a31f5def386e03706c916f6feddf69ef", [: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", "909502956916a657a197f94cc1206d9a65247538de8a5e186f7537c895d95764"}, "phoenix_html": {:hex, :phoenix_html, "3.3.4", "42a09fc443bbc1da37e372a5c8e6755d046f22b9b11343bf885067357da21cb3", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0249d3abec3714aff3415e7ee3d9786cb325be3151e6c4b3021502c585bf53fb"}, "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.7.2", "97cc4ff2dba1ebe504db72cb45098cb8e91f11160528b980bd282cc45c73b29c", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.18.3", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "0e5fdf063c7a3b620c566a30fcf68b7ee02e5e46fe48ee46a6ec3ba382dc05b7"}, @@ -102,7 +102,7 @@ "unsafe": {:hex, :unsafe, "1.0.2", "23c6be12f6c1605364801f4b47007c0c159497d0446ad378b5cf05f1855c0581", [:mix], [], "hexpm", "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"}, "wait_for_it": {:hex, :wait_for_it, "2.1.2", "6fab134097dd4446f1590f4b5409247be6c0eeab9d24569f665b5bf0b57cb1b7", [:mix], [], "hexpm", "c47be5ad9db9c24ef28d24dc27977243b8bc7ca366bf3e36d56af0093ef257d1"}, "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"}, - "websock_adapter": {:hex, :websock_adapter, "0.5.7", "65fa74042530064ef0570b75b43f5c49bb8b235d6515671b3d250022cb8a1f9e", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "d0f478ee64deddfec64b800673fd6e0c8888b079d9f3444dd96d2a98383bdbd1"}, + "websock_adapter": {:hex, :websock_adapter, "0.5.8", "3b97dc94e407e2d1fc666b2fb9acf6be81a1798a2602294aac000260a7c4a47d", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "315b9a1865552212b5f35140ad194e67ce31af45bcee443d4ecb96b5fd3f3782"}, "wormwood": {:hex, :wormwood, "0.1.3", "7dfd322ea33f74526f9c904693276a387b48daf6931020e02b9ca7cadeadc821", [:mix], [{:absinthe, "~> 1.4", [hex: :absinthe, repo: "hexpm", optional: false]}], "hexpm", "dcd8ca257b70065edaa4788a4ce006347dfa65d3a28adfcb99a7f71acacc265b"}, "xml_builder": {:hex, :xml_builder, "2.3.0", "69d214c6ad41ae1300b36acff4367551cdfd9dc1b860affc16e103c6b1589053", [:mix], [], "hexpm", "972ec33346a225cd5acd14ab23d4e79042bd37cb904e07e24cd06992dde1a0ed"}, } From a8380ae0c2535bc72242d2b297ff4027d4b01799 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:36:28 +0000 Subject: [PATCH 10/14] Bump authoritex from 1.1.1 to 1.1.2 in /app Bumps [authoritex](https://github.com/nulib/authoritex) from 1.1.1 to 1.1.2. - [Commits](https://github.com/nulib/authoritex/compare/v1.1.1...v1.1.2) --- updated-dependencies: - dependency-name: authoritex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/mix.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix.lock b/app/mix.lock index 3c3b452e8..f78b2527a 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -4,7 +4,7 @@ "absinthe_plug": {:hex, :absinthe_plug, "1.5.8", "38d230641ba9dca8f72f1fed2dfc8abd53b3907d1996363da32434ab6ee5d6ab", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:plug, "~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "bbb04176647b735828861e7b2705465e53e2cf54ccf5a73ddd1ebd855f996e5a"}, "assertions": {:hex, :assertions, "0.20.1", "e6bfcefbf199bc760d273d5a204ad9ef8a4f6c2b4725fc51d10610d73062e57b", [:mix], [], "hexpm", "848284fbde52f752232d73b8f77060ad191e1a98c177873c4b8dc56c4958defd"}, "atomic_map": {:hex, :atomic_map, "0.9.3", "3c7f1302e0590164732d08ca999708efbb2cd768abf2911cf140280ce2dc499d", [:mix], [], "hexpm", "c237babf301bd2435bd85b96cffc973022b4cbb7721537059ee0dd3bb74938d2"}, - "authoritex": {:hex, :authoritex, "1.1.1", "10e702bfb1516f5a978edf8feac0fac456f48ffd8a30a8d4f5a3f8f992095f1f", [:mix], [{:httpoison, "~> 1.8.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:httpoison_retry, "~> 1.1.0", [hex: :httpoison_retry, repo: "hexpm", optional: false]}, {:jason, "~> 1.4.0", [hex: :jason, repo: "hexpm", optional: false]}, {:sweet_xml, "~> 0.6", [hex: :sweet_xml, repo: "hexpm", optional: false]}], "hexpm", "40d9ae62af3c72096130d60386125a29995f9b166ab8b1972e5a37be63565c50"}, + "authoritex": {:hex, :authoritex, "1.1.2", "196ab7fd6f12e92f3cb7e4640a1a0a8733fb418304e27a84aff04ef16affae21", [:mix], [{:httpoison, "~> 1.8.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:httpoison_retry, "~> 1.1.0", [hex: :httpoison_retry, repo: "hexpm", optional: false]}, {:jason, "~> 1.4.0", [hex: :jason, repo: "hexpm", optional: false]}, {:sweet_xml, "~> 0.6", [hex: :sweet_xml, repo: "hexpm", optional: false]}], "hexpm", "b9d3f798519f5eb306f34b978c0850361a5a84214b8810f00ca9c0e414ad61a7"}, "aws_signature": {:hex, :aws_signature, "0.3.2", "adf33bc4af00b2089b7708bf20e3246f09c639a905a619b3689f0a0a22c3ef8f", [:rebar3], [], "hexpm", "b0daf61feb4250a8ab0adea60db3e336af732ff71dd3fb22e45ae3dcbd071e44"}, "base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], [], "hexpm", "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9"}, "briefly": {:hex, :briefly, "0.5.1", "ee10d48da7f79ed2aebdc3e536d5f9a0c3e36ff76c0ad0d4254653a152b13a8a", [:mix], [], "hexpm", "bd684aa92ad8b7b4e0d92c31200993c4bc1469fc68cd6d5f15144041bd15cb57"}, From 9b3401581e27f0a8fc06b7076a6cd15a34530d94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:37:08 +0000 Subject: [PATCH 11/14] Bump ex_aws_s3 from 2.5.5 to 2.5.6 in /app Bumps [ex_aws_s3](https://github.com/ex-aws/ex_aws_s3) from 2.5.5 to 2.5.6. - [Changelog](https://github.com/ex-aws/ex_aws_s3/blob/main/CHANGELOG.md) - [Commits](https://github.com/ex-aws/ex_aws_s3/compare/v2.5.5...v2.5.6) --- updated-dependencies: - dependency-name: ex_aws_s3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/mix.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mix.lock b/app/mix.lock index 3c3b452e8..fc2978c68 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -32,9 +32,9 @@ "elastix": {:hex, :elastix, "0.10.0", "7567da885677ba9deffc20063db5f3ca8cd10f23cff1ab3ed9c52b7063b7e340", [:mix], [{:httpoison, "~> 1.4", [hex: :httpoison, repo: "hexpm", optional: false]}, {:poison, "~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}, {:retry, "~> 0.8", [hex: :retry, repo: "hexpm", optional: false]}], "hexpm", "5fb342ce068b20f7845f5dd198c2dc80d967deafaa940a6e51b846db82696d1d"}, "eternal": {:hex, :eternal, "1.2.2", "d1641c86368de99375b98d183042dd6c2b234262b8d08dfd72b9eeaafc2a1abd", [:mix], [], "hexpm", "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"}, "ets": {:hex, :ets, "0.9.0", "79c6a6c205436780486f72d84230c6cba2f8a9920456750ddd1e47389107d5fd", [:mix], [], "hexpm", "2861fdfb04bcaeff370f1a5904eec864f0a56dcfebe5921ea9aadf2a481c822b"}, - "ex_aws": {:hex, :ex_aws, "2.5.7", "dbcda183903cded392742129bd5c67ccf59caed4ded604d5e68b96e75570d743", [:mix], [{:configparser_ex, "~> 4.0", [hex: :configparser_ex, repo: "hexpm", optional: true]}, {:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:jsx, "~> 2.8 or ~> 3.0", [hex: :jsx, repo: "hexpm", optional: true]}, {:mime, "~> 1.2 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:req, "~> 0.3", [hex: :req, repo: "hexpm", optional: true]}, {:sweet_xml, "~> 0.7", [hex: :sweet_xml, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "2c3c577550bfc4d0899e9fed9aeef91bc6a2aedd0177b1faa726c9b20d005074"}, + "ex_aws": {:hex, :ex_aws, "2.5.8", "0393cfbc5e4a9e7017845451a015d836a670397100aa4c86901980e2a2c5f7d4", [:mix], [{:configparser_ex, "~> 4.0", [hex: :configparser_ex, repo: "hexpm", optional: true]}, {:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:jsx, "~> 2.8 or ~> 3.0", [hex: :jsx, repo: "hexpm", optional: true]}, {:mime, "~> 1.2 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:req, "~> 0.3", [hex: :req, repo: "hexpm", optional: true]}, {:sweet_xml, "~> 0.7", [hex: :sweet_xml, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8f79777b7932168956c8cc3a6db41f5783aa816eb50de356aed3165a71e5f8c3"}, "ex_aws_lambda": {:hex, :ex_aws_lambda, "2.1.0", "f28bffae6dde34ba17ef815ef50a82a1e7f3af26d36fe31dbda3a7657e0de449", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}], "hexpm", "25608630b8b45fe22b0237696662f88be724bc89f77ee42708a5871511f531a0"}, - "ex_aws_s3": {:hex, :ex_aws_s3, "2.5.5", "d718e90e0e4803c5605ca1a7cebf44236f7439f6706151ca4485fc2dffd08bc1", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm", "ac34af1e9b3974168dda798d2fded5d12d52a1b5cf52abfeffed2a63d2eb5443"}, + "ex_aws_s3": {:hex, :ex_aws_s3, "2.5.6", "d135983bbd8b6df6350dfd83999437725527c1bea151e5055760bfc9b2d17c20", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm", "9874e12847e469ca2f13a5689be04e546c16f63caf6380870b7f25bf7cb98875"}, "ex_aws_secretsmanager": {:hex, :ex_aws_secretsmanager, "2.0.0", "deff8c12335f0160882afeb9687e55a97fddcd7d9a82fc3a6fbb270797374773", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}], "hexpm", "8b2838af536c32263ff797012b29e87bad73ef34f43cfa60ebca8e84576f6d45"}, "ex_aws_sqs": {:hex, :ex_aws_sqs, "3.4.0", "f7c4d0177c1c954776363d3dc05e5dfd37ddf0e2c65ec3f047e5c9c7dd1b71ac", [:mix], [{:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:saxy, "~> 1.1", [hex: :saxy, repo: "hexpm", optional: true]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm", "b504482206ccaf767b714888e9d41a1cfcdcb241577985517114191c812f155a"}, "ex_aws_ssm": {:hex, :ex_aws_ssm, "2.1.0", "548b3d085d2916f54a5b5c5b273673175a46b04ff637624dab582957649eb680", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}], "hexpm", "a91a183dc131a780e74aad10d7866533ca6018a6c2bf0345d52fe3f3c494f9f7"}, From 93a97ae64c38d817037b63f4bd5e7dd3d0cfae05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:52:53 +0000 Subject: [PATCH 12/14] Bump @samvera/clover-iiif from 2.11.2 to 2.12.0 in /app/assets Bumps [@samvera/clover-iiif](https://github.com/samvera-labs/clover-iiif) from 2.11.2 to 2.12.0. - [Release notes](https://github.com/samvera-labs/clover-iiif/releases) - [Commits](https://github.com/samvera-labs/clover-iiif/compare/v2.11.2...v2.12.0) --- updated-dependencies: - dependency-name: "@samvera/clover-iiif" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 185 +++++++++++++++++++++++++++++++++-- app/assets/package.json | 2 +- 2 files changed, 180 insertions(+), 7 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 643ddb6f9..7bee4120e 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -21,7 +21,7 @@ "@honeybadger-io/react": "^6.1.7", "@nulib/design-system": "^1.5.1", "@radix-ui/react-dialog": "^1.1.2", - "@samvera/clover-iiif": "^2.11.2", + "@samvera/clover-iiif": "^2.12.0", "@samvera/image-downloader": "^1.1.1", "bulma": "^0.9.4", "bulma-checkradio": "^2.1.3", @@ -5483,6 +5483,161 @@ } } }, + "node_modules/@radix-ui/react-checkbox": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.3.tgz", + "integrity": "sha512-HD7/ocp8f1B3e6OHygH0n7ZKjONkhciy1Nh0yuBgObqThc3oyx+vuMfFHKAknXRHHWVE9XvXStxJFyjUmB8PIw==", + "dependencies": { + "@radix-ui/primitive": "1.1.1", + "@radix-ui/react-compose-refs": "1.1.1", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-presence": "1.1.2", + "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/react-use-previous": "1.1.0", + "@radix-ui/react-use-size": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz", + "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==" + }, + "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/react-compose-refs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz", + "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/react-context": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz", + "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/react-presence": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz", + "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.1", + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/react-primitive": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.1.tgz", + "integrity": "sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==", + "dependencies": { + "@radix-ui/react-slot": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/react-slot": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.1.tgz", + "integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/react-use-layout-effect": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz", + "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-checkbox/node_modules/@radix-ui/react-use-size": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz", + "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-collapsible": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.1.tgz", @@ -7629,14 +7784,15 @@ "license": "MIT" }, "node_modules/@samvera/clover-iiif": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/@samvera/clover-iiif/-/clover-iiif-2.11.2.tgz", - "integrity": "sha512-AblW+gBqQh/lhrQv6R9AY+eFlVHALCXcOrtf9WtweHnHM6SQD6yg4Se9TgTicwEaJMOhiDCPkHLPwh4JuzCQ8A==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/@samvera/clover-iiif/-/clover-iiif-2.12.0.tgz", + "integrity": "sha512-jTf4forVT3faUNZY8rt46YJpxD1KmM/hD+Or4EcZi1KcE//+eUzImuzatoW0rNUY7HLHNixnRUCj44ZDb7sh0w==", "dependencies": { "@iiif/helpers": "^1.2.19", "@iiif/parser": "^2.1.4", "@nulib/use-markdown": "^0.2.2", "@radix-ui/react-aspect-ratio": "^1.1.0", + "@radix-ui/react-checkbox": "^1.1.2", "@radix-ui/react-collapsible": "^1.1.1", "@radix-ui/react-form": "^0.0.3", "@radix-ui/react-popover": "^1.1.2", @@ -7655,8 +7811,9 @@ "react-dom": "^18.3.1", "react-error-boundary": "^4.1.2", "react-i18next": "^15.1.1", + "react-lazy-load-image-component": "^1.6.2", "sanitize-html": "^2.13.1", - "swiper": "^9.4.1", + "swiper": "^9.0.0", "uuid": "^9.0.1" }, "peerDependencies": { @@ -16254,7 +16411,6 @@ }, "node_modules/lodash.debounce": { "version": "4.0.8", - "dev": true, "license": "MIT" }, "node_modules/lodash.isnull": { @@ -16273,6 +16429,11 @@ "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", "dev": true }, + "node_modules/lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==" + }, "node_modules/log-driver": { "version": "1.2.7", "dev": true, @@ -18849,6 +19010,18 @@ "version": "0.7.1", "license": "MIT" }, + "node_modules/react-lazy-load-image-component": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/react-lazy-load-image-component/-/react-lazy-load-image-component-1.6.3.tgz", + "integrity": "sha512-kdQYUDbuISF3T9El0sBLNoWrmPohqlytcG4ognLtHYjY8bZAsJ0/Ez+VaV+0QlVyUY3K6dDXkuQAz3GpvdjBkw==", + "dependencies": { + "lodash.debounce": "^4.0.8", + "lodash.throttle": "^4.1.1" + }, + "peerDependencies": { + "react": "^15.x.x || ^16.x.x || ^17.x.x || ^18.x.x || ^19.x.x" + } + }, "node_modules/react-redux": { "version": "7.2.9", "license": "MIT", diff --git a/app/assets/package.json b/app/assets/package.json index 2032df645..aa601c4b3 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -31,7 +31,7 @@ "@honeybadger-io/react": "^6.1.7", "@nulib/design-system": "^1.5.1", "@radix-ui/react-dialog": "^1.1.2", - "@samvera/clover-iiif": "^2.11.2", + "@samvera/clover-iiif": "^2.12.0", "@samvera/image-downloader": "^1.1.1", "bulma": "^0.9.4", "bulma-checkradio": "^2.1.3", From bf7db78cec655c44f859dedc0a26e9ee77ed7048 Mon Sep 17 00:00:00 2001 From: Karen Shaw Date: Tue, 17 Dec 2024 21:52:57 +0000 Subject: [PATCH 13/14] Automatically scale Meadow tasks based on set schedule --- infrastructure/deploy/ecs_services.tf | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/infrastructure/deploy/ecs_services.tf b/infrastructure/deploy/ecs_services.tf index 8056e3004..7fe32f9f4 100644 --- a/infrastructure/deploy/ecs_services.tf +++ b/infrastructure/deploy/ecs_services.tf @@ -90,3 +90,44 @@ resource "aws_ecs_service" "meadow_all" { tags = var.tags } + +resource "aws_appautoscaling_target" "ecs_target" { + count = var.environment == "p" ? 1 : 0 + max_capacity = 2 + min_capacity = 1 + resource_id = "service/${aws_ecs_cluster.meadow.name}/${aws_ecs_service.meadow_all.name}" + scalable_dimension = "ecs:service:DesiredCount" + service_namespace = "ecs" +} + +# Scheduled action to scale UP at 7:15 AM Central +resource "aws_appautoscaling_scheduled_action" "scale_up" { + count = var.environment == "p" ? 1 : 0 + name = "scale-up-to-2-tasks" + service_namespace = aws_appautoscaling_target.ecs_target[0].service_namespace + resource_id = aws_appautoscaling_target.ecs_target[0].resource_id + scalable_dimension = aws_appautoscaling_target.ecs_target[0].scalable_dimension + timezone = "America/Chicago" + schedule = "cron(15 7 ? * MON-FRI *)" + + scalable_target_action { + min_capacity = 2 + max_capacity = 2 + } +} + +# Scheduled action to scale DOWN at 6:00 PM Central +resource "aws_appautoscaling_scheduled_action" "scale_down" { + count = var.environment == "p" ? 1 : 0 + name = "scale-down-to-1-task" + service_namespace = aws_appautoscaling_target.ecs_target[0].service_namespace + resource_id = aws_appautoscaling_target.ecs_target[0].resource_id + scalable_dimension = aws_appautoscaling_target.ecs_target[0].scalable_dimension + timezone = "America/Chicago" + schedule = "cron(0 18 ? * MON-FRI *)" + + scalable_target_action { + min_capacity = 1 + max_capacity = 1 + } +} From 2583625ebee8b3bd6b30caf4065f1ce075713c4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 11:34:14 +0000 Subject: [PATCH 14/14] Bump sweet_xml from 0.7.4 to 0.7.5 in /app Bumps [sweet_xml](https://github.com/kbrw/sweet_xml) from 0.7.4 to 0.7.5. - [Changelog](https://github.com/kbrw/sweet_xml/blob/master/CHANGELOG.md) - [Commits](https://github.com/kbrw/sweet_xml/compare/v0.7.4...v0.7.5) --- updated-dependencies: - dependency-name: sweet_xml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/mix.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix.lock b/app/mix.lock index bbc2c80eb..7ae1adfcf 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -90,7 +90,7 @@ "sitemapper": {:hex, :sitemapper, "0.9.0", "bdf91162e2dc9e1ca06438a514f21baa6b023e48bccc7a2ca396f648561e083d", [:mix], [{:ex_aws_s3, "~> 2.0", [hex: :ex_aws_s3, repo: "hexpm", optional: true]}, {:google_api_storage, "~> 0.34", [hex: :google_api_storage, repo: "hexpm", optional: true]}, {:xml_builder, "~> 2.1", [hex: :xml_builder, repo: "hexpm", optional: false]}], "hexpm", "4257fd51381ab9d3b967568eb154a3441bb499a6cd06ad87a06555ff64dff2fd"}, "sleeplocks": {:hex, :sleeplocks, "1.1.3", "96a86460cc33b435c7310dbd27ec82ca2c1f24ae38e34f8edde97f756503441a", [:rebar3], [], "hexpm", "d3b3958552e6eb16f463921e70ae7c767519ef8f5be46d7696cc1ed649421321"}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"}, - "sweet_xml": {:hex, :sweet_xml, "0.7.4", "a8b7e1ce7ecd775c7e8a65d501bc2cd933bff3a9c41ab763f5105688ef485d08", [:mix], [], "hexpm", "e7c4b0bdbf460c928234951def54fe87edf1a170f6896675443279e2dbeba167"}, + "sweet_xml": {:hex, :sweet_xml, "0.7.5", "803a563113981aaac202a1dbd39771562d0ad31004ddbfc9b5090bdcd5605277", [:mix], [], "hexpm", "193b28a9b12891cae351d81a0cead165ffe67df1b73fe5866d10629f4faefb12"}, "table_rex": {:hex, :table_rex, "4.0.0", "3c613a68ebdc6d4d1e731bc973c233500974ec3993c99fcdabb210407b90959b", [:mix], [], "hexpm", "c35c4d5612ca49ebb0344ea10387da4d2afe278387d4019e4d8111e815df8f55"}, "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"}, "telemetry_metrics": {:hex, :telemetry_metrics, "1.0.0", "29f5f84991ca98b8eb02fc208b2e6de7c95f8bb2294ef244a176675adc7775df", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f23713b3847286a534e005126d4c959ebcca68ae9582118ce436b521d1d47d5d"},