From 6d044d0297b1a2ec1bcb67f0b978edaa5230a009 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:32:22 +0000 Subject: [PATCH 01/15] Bump version to 9.2.2 --- app/mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix.exs b/app/mix.exs index d48fc3aa1..0a2ed7c2c 100644 --- a/app/mix.exs +++ b/app/mix.exs @@ -3,7 +3,7 @@ Code.require_file("lib/env.ex") defmodule Meadow.MixProject do use Mix.Project - @app_version "9.2.1" + @app_version "9.2.2" def project do [ From 15afac086c256ab9cc471e93693edafcf18b8e87 Mon Sep 17 00:00:00 2001 From: Brendan Quinn Date: Thu, 7 Mar 2024 03:03:26 +0000 Subject: [PATCH 02/15] Create a search pipeline on hot swap, enabling hybrid search --- app/lib/meadow/search/index.ex | 46 ++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/app/lib/meadow/search/index.ex b/app/lib/meadow/search/index.ex index 2feb59f65..59fdb1417 100644 --- a/app/lib/meadow/search/index.ex +++ b/app/lib/meadow/search/index.ex @@ -26,7 +26,9 @@ defmodule Meadow.Search.Index do :noop pipeline -> - create_vector_pipeline(pipeline, SearchConfig.embedding_model_id(), "embedding_text") + pipeline + |> create_ingest_pipeline(SearchConfig.embedding_model_id(), "embedding_text") + |> create_search_pipeline() end with timestamp <- DateTime.utc_now() |> DateTime.to_unix(:millisecond), @@ -39,14 +41,47 @@ defmodule Meadow.Search.Index do end @doc """ - Create a vector pipeline, takes a name, model id, source field, and a target field - Returns {:ok, {}} + Create a search pipeline, takes a name, normalization_technique, combination_technique, and a weight field + Returns name """ - def create_vector_pipeline(name, model_id, source_field, target_field \\ "embedding") do + def create_search_pipeline( + name, + normalization_technique \\ "l2", + combination_technique \\ "arithmetic_mean", + weights \\ [0.3, 0.7] + ) do + pipeline = %{ + "description" => "Search pipeline for #{name}", + "phase_results_processors" => [ + %{ + "normalization-processor" => %{ + "normalization" => %{ + "technique" => normalization_technique + }, + "combination" => %{ + "technique" => combination_technique, + "parameters" => %{ + "weights" => weights + } + } + } + } + ] + } + + HTTP.put(["_search", "pipeline", name], pipeline) + name + end + + @doc """ + Create a ingest pipeline, takes a name, model id, source field, and a target field + Returns name + """ + def create_ingest_pipeline(name, model_id, source_field, target_field \\ "embedding") do model_name = embedding_model_name(model_id) pipeline = %{ - "description" => "Vector pipeline for #{name}", + "description" => "Ingest pipeline for #{name}", "processors" => [ %{ "text_embedding" => %{ @@ -74,6 +109,7 @@ defmodule Meadow.Search.Index do } HTTP.put(["_ingest", "pipeline", name], pipeline) + name end defp embedding_model_name(model_id) do From 5ba3452f6b744363e3e5337a9aedb355831a86e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 11:45:58 +0000 Subject: [PATCH 03/15] Bump typescript from 5.3.3 to 5.4.2 in /app/assets Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.3.3 to 5.4.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.3...v5.4.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 8 ++++---- app/assets/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 8a9398370..cd1ab647c 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -101,7 +101,7 @@ "react-router-prop-types": "^1.0.5", "sass": "^1.71.1", "ts-node": "^10.9.2", - "typescript": "^5.3.3", + "typescript": "^5.4.2", "use-phoenix-channel": "^1.1.1" } }, @@ -20704,9 +20704,9 @@ } }, "node_modules/typescript": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz", + "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==", "devOptional": true, "bin": { "tsc": "bin/tsc", diff --git a/app/assets/package.json b/app/assets/package.json index f526c7165..7d80bbfcf 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -111,7 +111,7 @@ "react-router-prop-types": "^1.0.5", "sass": "^1.71.1", "ts-node": "^10.9.2", - "typescript": "^5.3.3", + "typescript": "^5.4.2", "use-phoenix-channel": "^1.1.1" } } From b30c82c50bd5f920bb9d3a757f82636821f55a8e Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Thu, 7 Mar 2024 18:22:01 +0000 Subject: [PATCH 04/15] Make it possible to use Meadow's livebook integration in dev --- README.md | 6 ++++++ bin/meadow-livebook | 36 +++++++++++++++++++++++++++++++ livebook/meadow_livebook_auth.exs | 17 +++++++++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100755 bin/meadow-livebook diff --git a/README.md b/README.md index 501105a92..9211dde9c 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,12 @@ If you would like to interact directly with the database You can visit the GraphiQL interface at: [`https://[YOURENV].dev.rdc.library.northwestern.edu:3001/api/graphiql`](https:/[YOURENV].dev.rdc.library.northwestern.edu:3001/api/graphiql) +### Livebook Integration + +To start meadow with superuser Livebook integration, run: `MEADOW_ROOT/bin/meadow-livebook [iex arguments]` + +For example, from Meadow's root directory: `./bin/meadow-livebook phx.server` + ### Opensearch Dashboard - To start: `es-proxy start` diff --git a/bin/meadow-livebook b/bin/meadow-livebook new file mode 100755 index 000000000..0fa394475 --- /dev/null +++ b/bin/meadow-livebook @@ -0,0 +1,36 @@ +#!/bin/bash + +ROOT=$(realpath $(dirname $0)/..) +COOKIE=$(openssl rand -hex 32) +HOST=$(hostname) +MEADOW_HOSTNAME=${DEV_PREFIX}.dev.rdc.library.northwestern.edu +LIVEBOOK_URL=https://${MEADOW_HOSTNAME}:8082/ +mkdir -p ${HOME}/.meadow_livebooks + +echo -n " Opening ports..." +sg open all 8080 3001 > /dev/null 2>&1 +echo -e "\r✅" + +echo -n " Starting Livebook..." +docker buildx build -t nulib/meadow:livebook $ROOT/livebook > /dev/null 2>&1 +LIVEBOOK_CONTAINER=$(docker run --rm -d --network host \ + -v ${HOME}/.meadow_livebooks:/data/books \ + -e LB_MEADOW_COOKIE=${COOKIE} \ + -e LB_MEADOW_NODE=meadow@${HOST} \ + -e LIVEBOOK_NODE=livebook@${HOST} \ + -e LIVEBOOK_DISTRIBUTION=name \ + -e LIVEBOOK_COOKIE=${COOKIE} \ + -e MEADOW_URL=https://${MEADOW_HOSTNAME}:3001/ \ + nulib/meadow:livebook) +https-proxy start 8082 8080 > /dev/null 2>&1 +echo -e "\r✅" + +OLDDIR=$PWD +cd $ROOT/app +iex --name meadow@${HOST} --cookie ${COOKIE} -S mix $@ +cd $OLDDIR + +echo -n " Stopping Livebook..." +https-proxy stop 8082 > /dev/null 2>&1 +docker stop ${LIVEBOOK_CONTAINER} > /dev/null 2>&1 +echo -e "\r✅" diff --git a/livebook/meadow_livebook_auth.exs b/livebook/meadow_livebook_auth.exs index 8e978cf1b..1a4aa84c6 100644 --- a/livebook/meadow_livebook_auth.exs +++ b/livebook/meadow_livebook_auth.exs @@ -23,13 +23,26 @@ defmodule MeadowLivebookAuth do @spec authenticate(GenServer.server(), Plug.Conn.t(), keyword()) :: {Plug.Conn.t(), map() | nil} def authenticate(server, conn, _) do - with [_ | [host | _]] <- Node.self() |> to_string() |> String.split("@"), - url <- "http://#{host}:4000/api/graphql" do + with url <- get_meadow_url() do set_state(server, :auth_url, url) {conn, meadow_auth(url, conn)} end end + defp get_meadow_url do + with base <- System.get_env("MEADOW_URL") |> get_meadow_url() do + Path.join(base, "api/graphql") + end + end + + defp get_meadow_url(nil) do + with [_ | [host | _]] <- Node.self() |> to_string() |> String.split("@") do + "http://#{host}:4000/" + end + end + + defp get_meadow_url(url), do: url + defp meadow_auth(nil, _), do: nil defp meadow_auth(url, conn) do From 5d069887fd315d298642203194f6e25dcf86a26e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 18:49:10 +0000 Subject: [PATCH 05/15] Bump jose from 4.15.1 to 4.15.5 in /app/assets Bumps [jose](https://github.com/panva/jose) from 4.15.1 to 4.15.5. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v4.15.5/CHANGELOG.md) - [Commits](https://github.com/panva/jose/compare/v4.15.1...v4.15.5) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 8a9398370..54bd6ee46 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -15809,9 +15809,9 @@ } }, "node_modules/jose": { - "version": "4.15.1", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.1.tgz", - "integrity": "sha512-CinpaEMmwb/59YG0N6SC3DY1imdTU5iNl08HPWR7NdyxACPeFuQbqjaocEjCDGq04KbnxSqQu702vL3ZTvKe5w==", + "version": "4.15.5", + "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.5.tgz", + "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==", "dev": true, "funding": { "url": "https://github.com/sponsors/panva" From d494de297889f56dc681692db1742c249b141fb7 Mon Sep 17 00:00:00 2001 From: Brendan Quinn Date: Thu, 7 Mar 2024 21:45:54 +0000 Subject: [PATCH 06/15] Adds a preprocessor to the search pipeline that restricts requests to 'public' and 'authenticated' works Co-authored-by: Michael B. Klein --- app/lib/meadow/search/index.ex | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/lib/meadow/search/index.ex b/app/lib/meadow/search/index.ex index 59fdb1417..873f55f15 100644 --- a/app/lib/meadow/search/index.ex +++ b/app/lib/meadow/search/index.ex @@ -52,6 +52,18 @@ defmodule Meadow.Search.Index do ) do pipeline = %{ "description" => "Search pipeline for #{name}", + "request_processors" => [ + %{ + "filter_query" => %{ + "description" => "Restricts requests to publicly visible documents", + "query" => %{ + "terms" => %{ + "visibility" => ["public", "authenticated"] + } + } + } + } + ], "phase_results_processors" => [ %{ "normalization-processor" => %{ From 8e8fbbd840c73da44ef332005331b6faf5df353c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:54:10 +0000 Subject: [PATCH 07/15] Bump phoenix_ecto from 4.5.0 to 4.5.1 in /app Bumps [phoenix_ecto](https://github.com/phoenixframework/phoenix_ecto) from 4.5.0 to 4.5.1. - [Changelog](https://github.com/phoenixframework/phoenix_ecto/blob/main/CHANGELOG.md) - [Commits](https://github.com/phoenixframework/phoenix_ecto/compare/v4.5.0...v4.5.1) --- updated-dependencies: - dependency-name: phoenix_ecto 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 dfb63a9a5..4d99fcd58 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -24,7 +24,7 @@ "dataloader": {:hex, :dataloader, "1.0.11", "49bbfc7dd8a1990423c51000b869b1fecaab9e3ccd6b29eab51616ae8ad0a2f5", [:mix], [{:ecto, ">= 3.4.3 and < 4.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ba0b0ec532ec68e9d033d03553561d693129bd7cbd5c649dc7903f07ffba08fe"}, "db_connection": {:hex, :db_connection, "2.6.0", "77d835c472b5b67fc4f29556dee74bf511bbafecdcaf98c27d27fa5918152086", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"}, "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"}, - "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [: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", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"}, + "ecto": {:hex, :ecto, "3.11.2", "e1d26be989db350a633667c5cda9c3d115ae779b66da567c68c80cfb26a8c9ee", [: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", "3c38bca2c6f8d8023f2145326cc8a80100c3ffe4dcbd9842ff867f7fc6156c65"}, "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.7.15", "0fc29dbae0e444a29bd6abeee4cf3c4c037e692a272478a234a1cc765077dbb1", [:mix], [{:ecto_sql, "~> 3.7", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1 or ~> 4.0.0", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "b6127f3a5c6fc3d84895e4768cc7c199f22b48b67d6c99b13fbf4a374e73f039"}, "ecto_ranked": {:hex, :ecto_ranked, "0.5.0", "0e428901fe4586f6561b039b90b44940383e90da534b1842a728b56b076fdd68", [:mix], [{:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "7f9e119539aca2cf6d98916409e592c884f89069014b7731db1f42483da7e192"}, @@ -67,7 +67,7 @@ "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.11", "1d88fc6b05ab0c735b250932c4e6e33bfa1c186f76dcf623d8dd52f07d6379c7", [: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", "b1ec57f2e40316b306708fe59b92a16b9f6f4bf50ccfa41aa8c7feb79e0ec02a"}, - "phoenix_ecto": {:hex, :phoenix_ecto, "4.5.0", "1a1f841ccda19b15f1d82968840a5b895c5f687b6734e430e4b2dbe035ca1837", [: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]}], "hexpm", "13990570fde09e16959ef214501fe2813e1192d62ca753ec8798980580436f94"}, + "phoenix_ecto": {:hex, :phoenix_ecto, "4.5.1", "6fdbc334ea53620e71655664df6f33f670747b3a7a6c4041cdda3e2c32df6257", [: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]}], "hexpm", "ebe43aa580db129e54408e719fb9659b7f9e0d52b965c5be26cdca416ecead28"}, "phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"}, "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"}, "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.1", "6ab463cf43938ee9906067b33c8d66782343de4280a70084cd5617accc6345a8", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "e8467d308b61f294f68afe12c81bf585584c7ceed40ec8adde88ec176d480a78"}, From 1a530285a798242dc049eb93673759cda7942ede Mon Sep 17 00:00:00 2001 From: Brendan Quinn Date: Fri, 8 Mar 2024 15:17:50 +0000 Subject: [PATCH 08/15] Update the search processor to filter out unpublished works --- app/lib/meadow/search/index.ex | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/lib/meadow/search/index.ex b/app/lib/meadow/search/index.ex index 873f55f15..6ce5be6e7 100644 --- a/app/lib/meadow/search/index.ex +++ b/app/lib/meadow/search/index.ex @@ -57,8 +57,19 @@ defmodule Meadow.Search.Index do "filter_query" => %{ "description" => "Restricts requests to publicly visible documents", "query" => %{ - "terms" => %{ - "visibility" => ["public", "authenticated"] + "bool" => %{ + "must" => [ + %{ + "terms" => %{ + "visibility" => ["Public", "Institution"] + } + }, + %{ + "term" => %{ + "published" => true + } + } + ] } } } From 26423aa50129ef06a8d79f73b8e0e2315941a4b5 Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Mon, 11 Mar 2024 21:02:42 +0000 Subject: [PATCH 09/15] Don't start index pipeline name with "-" in release --- app/lib/env.ex | 15 +++++++--- app/test/env_test.exs | 67 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 app/test/env_test.exs diff --git a/app/lib/env.ex b/app/lib/env.ex index aab614eda..8bd91fc6b 100644 --- a/app/lib/env.ex +++ b/app/lib/env.ex @@ -6,12 +6,17 @@ if !function_exported?(:Env, :prefix, 0) do alias Hush.Provider.{AwsSecretsManager, SystemEnvironment} def prefix do - with env <- if(function_exported?(Mix, :env, 0), do: Mix.env(), else: nil) do - [System.get_env("DEV_PREFIX"), env] |> Enum.reject(&is_nil/1) |> Enum.join("-") - end + env = + cond do + System.get_env("RELEASE_NAME") -> nil + function_exported?(Mix, :env, 0) -> Mix.env() + true -> nil + end + + [System.get_env("DEV_PREFIX"), env] |> Enum.reject(&is_nil/1) |> Enum.join("-") end - def prefix(val), do: [prefix(), to_string(val)] |> Enum.reject(&is_nil/1) |> Enum.join("-") + def prefix(val), do: [prefix(), to_string(val)] |> reject_empty() |> Enum.join("-") def atom_prefix(val), do: prefix(val) |> String.to_atom() def aws_secret(name, opts \\ []), @@ -23,5 +28,7 @@ if !function_exported?(:Env, :prefix, 0) do defp hush_secret(provider, name, opts), do: {:hush, provider, name, opts} defp secrets_path, do: System.get_env("SECRETS_PATH", "config") + + defp reject_empty(list), do: Enum.reject(list, &(is_nil(&1) or &1 == "")) end end diff --git a/app/test/env_test.exs b/app/test/env_test.exs new file mode 100644 index 000000000..6e7563aa6 --- /dev/null +++ b/app/test/env_test.exs @@ -0,0 +1,67 @@ +defmodule EnvTest do + use ExUnit.Case + + import Env + + setup %{environment: environment} do + set_env = fn + {key, nil} -> System.delete_env(key) + {key, value} -> System.put_env(key, value) + end + + saved = Enum.map(environment, fn {key, _} -> {key, System.get_env(key)} end) + Enum.each(environment, set_env) + on_exit(fn -> Enum.each(saved, set_env) end) + end + + describe "hush" do + @describetag environment: [{"SECRETS_PATH", "foo/config"}] + + test "aws_secret/2" do + assert aws_secret("meadow", test: :value) == + {:hush, Hush.Provider.AwsSecretsManager, "foo/config/meadow", [test: :value]} + end + + test "meadow_secret/2" do + assert meadow_secret(test: :value) == + {:hush, Hush.Provider.AwsSecretsManager, "foo/config/meadow", [test: :value]} + end + + test "environment_secret/2" do + assert environment_secret("DEV_PREFIX", test: :value) == + {:hush, Hush.Provider.SystemEnvironment, "DEV_PREFIX", [test: :value]} + end + end + + describe "dev environment" do + @describetag environment: [{"DEV_PREFIX", "env"}] + + test "prefix/0" do + assert prefix() == "env-test" + end + + test "prefix/1" do + assert prefix("database") == "env-test-database" + end + + test "atom_prefix/1" do + assert atom_prefix("database") == :"env-test-database" + end + end + + describe "release environment" do + @describetag environment: [{"DEV_PREFIX", nil}, {"RELEASE_NAME", "meadow"}] + + test "prefix/0" do + assert prefix() == "" + end + + test "prefix/1" do + assert prefix("database") == "database" + end + + test "atom_prefix/1" do + assert atom_prefix("database") == :database + end + end +end From 8c1d6e43b34d789b15d372469fd0434a44a156e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:51:32 +0000 Subject: [PATCH 10/15] Bump phoenix_live_reload from 1.5.1 to 1.5.2 in /app Bumps [phoenix_live_reload](https://github.com/phoenixframework/phoenix_live_reload) from 1.5.1 to 1.5.2. - [Changelog](https://github.com/phoenixframework/phoenix_live_reload/blob/main/CHANGELOG.md) - [Commits](https://github.com/phoenixframework/phoenix_live_reload/compare/v1.5.1...v1.5.2) --- updated-dependencies: - dependency-name: phoenix_live_reload dependency-type: direct:development 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 dfb63a9a5..d37c3b6c0 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -13,7 +13,7 @@ "broadway_sqs": {:hex, :broadway_sqs, "0.7.3", "b7b99cf4d21e9d87a64853c4c502690ece01897a3a08bfc6df01ad8999e19da3", [: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", "0a9f02d4a32ba65feebb0cd247c466342d4eb1803ee7db993f2886810dfc1d3a"}, "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"}, "cachex": {:hex, :cachex, "3.6.0", "14a1bfbeee060dd9bec25a5b6f4e4691e3670ebda28c8ba2884b12fe30b36bf8", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, 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", "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"}, - "castore": {:hex, :castore, "1.0.5", "9eeebb394cc9a0f3ae56b813459f990abb0a3dedee1be6b27fdb50301930502f", [:mix], [], "hexpm", "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"}, + "castore": {:hex, :castore, "1.0.6", "ffc42f110ebfdafab0ea159cd43d31365fa0af0ce4a02ecebf1707ae619ee727", [:mix], [], "hexpm", "374c6e7ca752296be3d6780a6d5b922854ffcc74123da90f2f328996b962d33a"}, "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.10.0", "ff9ffeff91dae4ae270dd975642997afe2a1179d94b1887863e43f681a203e26", [:make, :rebar3], [{:cowlib, "2.12.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"}, @@ -70,7 +70,7 @@ "phoenix_ecto": {:hex, :phoenix_ecto, "4.5.0", "1a1f841ccda19b15f1d82968840a5b895c5f687b6734e430e4b2dbe035ca1837", [: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]}], "hexpm", "13990570fde09e16959ef214501fe2813e1192d62ca753ec8798980580436f94"}, "phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"}, "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"}, - "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.1", "6ab463cf43938ee9906067b33c8d66782343de4280a70084cd5617accc6345a8", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "e8467d308b61f294f68afe12c81bf585584c7ceed40ec8adde88ec176d480a78"}, + "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.2", "354460993a480656b71c3887f5565f612b3bdbdd8688c83f9e6f512307067dd4", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "2bb3722f327e14a7aa47b1acf27ed633c8cd27b167e18b8237954b9b4804af39"}, "phoenix_live_view": {:hex, :phoenix_live_view, "0.18.18", "1f38fbd7c363723f19aad1a04b5490ff3a178e37daaf6999594d5f34796c47fc", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3", [hex: :phoenix_html, 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]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a5810d0472f3189ede6d2a95bda7f31c6113156b91784a3426cb0ab6a6d85214"}, "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"}, "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"}, From b301e007f160f1fd42f665180380008d11e223ee Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Tue, 12 Mar 2024 15:39:13 +0000 Subject: [PATCH 11/15] Swap order of weights in hybrid search pipeline --- app/lib/meadow/search/index.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/meadow/search/index.ex b/app/lib/meadow/search/index.ex index 6ce5be6e7..0aedc9b6a 100644 --- a/app/lib/meadow/search/index.ex +++ b/app/lib/meadow/search/index.ex @@ -48,7 +48,7 @@ defmodule Meadow.Search.Index do name, normalization_technique \\ "l2", combination_technique \\ "arithmetic_mean", - weights \\ [0.3, 0.7] + weights \\ [0.7, 0.3] ) do pipeline = %{ "description" => "Search pipeline for #{name}", From d9bb8659e3839f3e3611c7207091b74ad455cb18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 11:09:07 +0000 Subject: [PATCH 12/15] Bump @samvera/clover-iiif from 2.4.0-rc.0 to 2.4.0 in /app/assets Bumps [@samvera/clover-iiif](https://github.com/samvera-labs/clover-iiif) from 2.4.0-rc.0 to 2.4.0. - [Release notes](https://github.com/samvera-labs/clover-iiif/releases) - [Commits](https://github.com/samvera-labs/clover-iiif/commits) --- updated-dependencies: - dependency-name: "@samvera/clover-iiif" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 8 ++++---- app/assets/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 8a9398370..9d3b3666f 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -20,7 +20,7 @@ "@honeybadger-io/react": "^6.1.7", "@nulib/design-system": "^1.5.1", "@radix-ui/react-dialog": "^1.0.5", - "@samvera/clover-iiif": "2.4.0-rc.0", + "@samvera/clover-iiif": "2.4.0", "@samvera/image-downloader": "^1.1.1", "bulma": "^0.9.4", "bulma-checkradio": "^2.1.3", @@ -6800,9 +6800,9 @@ "dev": true }, "node_modules/@samvera/clover-iiif": { - "version": "2.4.0-rc.0", - "resolved": "https://registry.npmjs.org/@samvera/clover-iiif/-/clover-iiif-2.4.0-rc.0.tgz", - "integrity": "sha512-DRVlLAG40NpevgVuxpLHwP/COayf72Nac7WJQDvuvX/8CnNMHN9BMUW59efGXWfvXfheCWRXCw9KM1KHy1oSJA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@samvera/clover-iiif/-/clover-iiif-2.4.0.tgz", + "integrity": "sha512-RwzvbtsbT3RsISyIl4/7MMTM+diRhte2ANiQQ//sAJOz5ahBS8No/fmtBHxwSgvTR/LZWSLoSwEA77zr7IypXQ==", "dependencies": { "@iiif/parser": "^1.1.2", "@iiif/vault": "^0.9.22", diff --git a/app/assets/package.json b/app/assets/package.json index f526c7165..4caa6b376 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -30,7 +30,7 @@ "@honeybadger-io/react": "^6.1.7", "@nulib/design-system": "^1.5.1", "@radix-ui/react-dialog": "^1.0.5", - "@samvera/clover-iiif": "2.4.0-rc.0", + "@samvera/clover-iiif": "2.4.0", "@samvera/image-downloader": "^1.1.1", "bulma": "^0.9.4", "bulma-checkradio": "^2.1.3", From 807e5711b6b5430a1350b1cec5e367448efd6fa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 11:09:51 +0000 Subject: [PATCH 13/15] Bump downshift from 8.4.0 to 8.5.0 in /app/assets Bumps [downshift](https://github.com/downshift-js/downshift) from 8.4.0 to 8.5.0. - [Release notes](https://github.com/downshift-js/downshift/releases) - [Changelog](https://github.com/downshift-js/downshift/blob/master/CHANGELOG.md) - [Commits](https://github.com/downshift-js/downshift/compare/v8.4.0...v8.5.0) --- updated-dependencies: - dependency-name: downshift dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 8 ++++---- app/assets/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 8a9398370..35d888142 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -28,7 +28,7 @@ "bulma-switch": "^2.0.0", "bulma-toast": "^2.4.4", "classnames": "^2.5.1", - "downshift": "^8.4.0", + "downshift": "^8.5.0", "edtf": "^4.6.0", "esbuild-plugin-svgr": "^2.1.0", "faker": "^5.5.3", @@ -10947,9 +10947,9 @@ } }, "node_modules/downshift": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/downshift/-/downshift-8.4.0.tgz", - "integrity": "sha512-feeqAR0s53NTIKaHxyFhdLo9UCHUwge4q/j+heIz7X8AaURgdcANOnMGLWffWQCoX9l4Vpw87nOrlX6uJceqjA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/downshift/-/downshift-8.5.0.tgz", + "integrity": "sha512-BAr/KAZX8GGARwWl4aER6ABv8aAaRXZcVKP0m1oFPKpSIXCGuoqnhi6nRf87glHhYDd/CCPp9RVUK27JKJD/Fw==", "dependencies": { "@babel/runtime": "^7.22.15", "compute-scroll-into-view": "^3.0.3", diff --git a/app/assets/package.json b/app/assets/package.json index f526c7165..8c1abab41 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -38,7 +38,7 @@ "bulma-switch": "^2.0.0", "bulma-toast": "^2.4.4", "classnames": "^2.5.1", - "downshift": "^8.4.0", + "downshift": "^8.5.0", "edtf": "^4.6.0", "esbuild-plugin-svgr": "^2.1.0", "faker": "^5.5.3", From e13959aac19099ff0a436bf8bb91cc801561da97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 12:34:42 +0000 Subject: [PATCH 14/15] Bump @apollo/client from 3.9.5 to 3.9.7 in /app/assets Bumps [@apollo/client](https://github.com/apollographql/apollo-client) from 3.9.5 to 3.9.7. - [Release notes](https://github.com/apollographql/apollo-client/releases) - [Changelog](https://github.com/apollographql/apollo-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-client/compare/v3.9.5...v3.9.7) --- updated-dependencies: - dependency-name: "@apollo/client" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 8a9398370..ae942bd65 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -7,7 +7,7 @@ "license": "MIT", "dependencies": { "@absinthe/socket-apollo-link": "^0.2.1", - "@apollo/client": "*", + "@apollo/client": "latest", "@apollo/react-hooks": "^4.0.0", "@apollo/react-testing": "^4.0.0", "@appbaseio/reactivesearch": "3.23.1", @@ -247,9 +247,9 @@ } }, "node_modules/@apollo/client": { - "version": "3.9.5", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.9.5.tgz", - "integrity": "sha512-7y+c8MTPU+hhTwvcGVtMMGIgWduzrvG1mz5yJMRyqYbheBkkky3Lki6ADWVSBXG1lZoOtPYvB2zDgVfKb2HSsw==", + "version": "3.9.7", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.9.7.tgz", + "integrity": "sha512-OEEwt55bkFhqihCT5d75KUxZt50JZ9MuIYwG7VZlyPPIAb9K+qzVWlXWlf3tB5DaV43yXkUSLQfNpdIBFOB55Q==", "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "@wry/caches": "^1.0.0", @@ -259,7 +259,7 @@ "hoist-non-react-statics": "^3.3.2", "optimism": "^0.18.0", "prop-types": "^15.7.2", - "rehackt": "0.0.5", + "rehackt": "0.0.6", "response-iterator": "^0.2.6", "symbol-observable": "^4.0.0", "ts-invariant": "^0.10.3", @@ -18826,9 +18826,9 @@ } }, "node_modules/rehackt": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/rehackt/-/rehackt-0.0.5.tgz", - "integrity": "sha512-BI1rV+miEkaHj8zd2n+gaMgzu/fKz7BGlb4zZ6HAiY9adDmJMkaDcmuXlJFv0eyKUob+oszs3/2gdnXUrzx2Tg==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/rehackt/-/rehackt-0.0.6.tgz", + "integrity": "sha512-l3WEzkt4ntlEc/IB3/mF6SRgNHA6zfQR7BlGOgBTOmx7IJJXojDASav+NsgXHFjHn+6RmwqsGPFgZpabWpeOdw==", "peerDependencies": { "@types/react": "*", "react": "*" From f78759ace37423e8baca2f5f943193d80fb5c9ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 12:35:09 +0000 Subject: [PATCH 15/15] Bump sass from 1.71.1 to 1.72.0 in /app/assets Bumps [sass](https://github.com/sass/dart-sass) from 1.71.1 to 1.72.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.71.1...1.72.0) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 8 ++++---- app/assets/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 8a9398370..b1ecf5dfe 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -99,7 +99,7 @@ "react-dom": "^18.2.0", "react-router-dom": "^5.3.0", "react-router-prop-types": "^1.0.5", - "sass": "^1.71.1", + "sass": "^1.72.0", "ts-node": "^10.9.2", "typescript": "^5.3.3", "use-phoenix-channel": "^1.1.1" @@ -19279,9 +19279,9 @@ } }, "node_modules/sass": { - "version": "1.71.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz", - "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==", + "version": "1.72.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", + "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/app/assets/package.json b/app/assets/package.json index f526c7165..a277f8f03 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -109,7 +109,7 @@ "react-dom": "^18.2.0", "react-router-dom": "^5.3.0", "react-router-prop-types": "^1.0.5", - "sass": "^1.71.1", + "sass": "^1.72.0", "ts-node": "^10.9.2", "typescript": "^5.3.3", "use-phoenix-channel": "^1.1.1"