From 2af2b901a3e94b656f21c578ad4f178ba51c49f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:15:04 +0000 Subject: [PATCH 01/33] Bump version to 9.1.4 --- app/mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix.exs b/app/mix.exs index 353621104..04018c003 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.1.3" + @app_version "9.1.4" def project do [ From 2eee083a2fb0366425327f121022e5507841274d Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Wed, 31 Jan 2024 17:15:20 +0000 Subject: [PATCH 02/33] Use Meadow's canonical hostname for the Livebook URL --- infrastructure/deploy/ecs_services.tf | 4 ++-- infrastructure/deploy/variables.tf | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/infrastructure/deploy/ecs_services.tf b/infrastructure/deploy/ecs_services.tf index 581d1a3d7..588639690 100644 --- a/infrastructure/deploy/ecs_services.tf +++ b/infrastructure/deploy/ecs_services.tf @@ -2,11 +2,11 @@ locals { container_ports = tolist([4000, 4369, 8080, 24601]) meadow_urls = [for hostname in concat([aws_route53_record.app_hostname.fqdn], var.additional_hostnames) : "//${hostname}"] - + canonical_hostname = coalesce(var.canonical_hostname, aws_route53_record.app_hostname.fqdn) container_config = { docker_tag = terraform.workspace honeybadger_api_key = var.honeybadger_api_key - host_name = aws_route53_record.app_hostname.fqdn + host_name = local.canonical_hostname internal_host_name = "${var.stack_name}.${data.aws_service_discovery_dns_namespace.internal_dns_zone.name}" log_group = aws_cloudwatch_log_group.meadow_logs.name meadow_urls = join(",", local.meadow_urls) diff --git a/infrastructure/deploy/variables.tf b/infrastructure/deploy/variables.tf index 5da623d99..7d596d08d 100644 --- a/infrastructure/deploy/variables.tf +++ b/infrastructure/deploy/variables.tf @@ -3,6 +3,11 @@ variable "additional_hostnames" { default = [] } +variable "canonical_hostname" { + type = string + default = "" +} + variable "agentless_sso_key" { type = string } From 32bebaa3e6f8db97177f95ec4ebd808c16201e3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:39:35 +0000 Subject: [PATCH 03/33] Bump @testing-library/react from 14.1.2 to 14.2.1 in /app/assets Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 14.1.2 to 14.2.1. - [Release notes](https://github.com/testing-library/react-testing-library/releases) - [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/react-testing-library/compare/v14.1.2...v14.2.1) --- updated-dependencies: - dependency-name: "@testing-library/react" 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 b5579b2cc..f874e471a 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -76,7 +76,7 @@ "@nulib/prettier-config": "^1.2.0", "@testing-library/dom": "^9.3.4", "@testing-library/jest-dom": "^5.17.0", - "@testing-library/react": "^14.1.0", + "@testing-library/react": "^14.2.1", "@testing-library/user-event": "^14.5.2", "@types/jest": "^29.5.11", "@types/react-beautiful-dnd": "^13.1.8", @@ -7478,9 +7478,9 @@ } }, "node_modules/@testing-library/react": { - "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.1.2.tgz", - "integrity": "sha512-z4p7DVBTPjKM5qDZ0t5ZjzkpSNb+fZy1u6bzO7kk8oeGagpPCAtgh4cx1syrfp7a+QWkM021jGqjJaxJJnXAZg==", + "version": "14.2.1", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.1.tgz", + "integrity": "sha512-sGdjws32ai5TLerhvzThYFbpnF9XtL65Cjf+gB0Dhr29BGqK+mAeN7SURSdu+eqgET4ANcWoC7FQpkaiGvBr+A==", "dev": true, "dependencies": { "@babel/runtime": "^7.12.5", diff --git a/app/assets/package.json b/app/assets/package.json index 46da81fa8..dedfa84d1 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -86,7 +86,7 @@ "@nulib/prettier-config": "^1.2.0", "@testing-library/dom": "^9.3.4", "@testing-library/jest-dom": "^5.17.0", - "@testing-library/react": "^14.1.0", + "@testing-library/react": "^14.2.1", "@testing-library/user-event": "^14.5.2", "@types/jest": "^29.5.11", "@types/react-beautiful-dnd": "^13.1.8", From 77c5c9e9220c8dd7e08b6f84561764e7597ae793 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:39:45 +0000 Subject: [PATCH 04/33] Bump phoenix from 1.7.10 to 1.7.11 in /app Bumps [phoenix](https://github.com/phoenixframework/phoenix) from 1.7.10 to 1.7.11. - [Release notes](https://github.com/phoenixframework/phoenix/releases) - [Changelog](https://github.com/phoenixframework/phoenix/blob/main/CHANGELOG.md) - [Commits](https://github.com/phoenixframework/phoenix/compare/v1.7.10...v1.7.11) --- 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 60eaea460..418c47fcf 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.4", "ff4d0fb2e6411c0479b1d965a814ea6d00e51eb2f58697446e9c41a97d940b28", [:mix], [], "hexpm", "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"}, + "castore": {:hex, :castore, "1.0.5", "9eeebb394cc9a0f3ae56b813459f990abb0a3dedee1be6b27fdb50301930502f", [:mix], [], "hexpm", "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"}, "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"}, @@ -66,14 +66,14 @@ "nimble_options": {:hex, :nimble_options, "1.0.2", "92098a74df0072ff37d0c12ace58574d26880e522c22801437151a159392270e", [:mix], [], "hexpm", "fd12a8db2021036ce12a309f26f564ec367373265b53e25403f0ee697380f1b8"}, "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.10", "02189140a61b2ce85bb633a9b6fd02dff705a5f1596869547aeb2b2b95edd729", [: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.6", [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", "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"}, + "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.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"}, "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.4.1", "2aff698f5e47369decde4357ba91fc9c37c6487a512b41732818f2204a8ef1d3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"}, "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.3", "32de561eefcefa951aead30a1f94f1b5f0379bc9e340bb5c667f65f1edfa4326", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"}, + "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"}, "phoenix_view": {:hex, :phoenix_view, "2.0.3", "4d32c4817fce933693741deeb99ef1392619f942633dde834a5163124813aad3", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64"}, "plug": {:hex, :plug, "1.15.3", "712976f504418f6dff0a3e554c40d705a9bcf89a7ccef92fc6a5ef8f16a30a97", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "cc4365a3c010a56af402e0809208873d113e9c38c401cabd88027ef4f5c01fd2"}, "plug_cowboy": {:hex, :plug_cowboy, "2.7.0", "3ae9369c60641084363b08fe90267cbdd316df57e3557ea522114b30b63256ea", [:mix], [{:cowboy, "~> 2.7.0 or ~> 2.8.0 or ~> 2.9.0 or ~> 2.10.0", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d85444fb8aa1f2fc62eabe83bbe387d81510d773886774ebdcb429b3da3c1a4a"}, From 4ac8a62f0f783e50696495411e086dd6416edd33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:40:06 +0000 Subject: [PATCH 05/33] Bump phoenix from 1.7.10 to 1.7.11 in /app/assets Bumps [phoenix](https://github.com/phoenixframework/phoenix) from 1.7.10 to 1.7.11. - [Release notes](https://github.com/phoenixframework/phoenix/releases) - [Changelog](https://github.com/phoenixframework/phoenix/blob/main/CHANGELOG.md) - [Commits](https://github.com/phoenixframework/phoenix/compare/v1.7.10...v1.7.11) --- updated-dependencies: - dependency-name: phoenix 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 b5579b2cc..74a15c732 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -41,7 +41,7 @@ "js-cookie": "^3.0.5", "moment": "^2.30.1", "node-webvtt": "^1.9.4", - "phoenix": "^1.7.10", + "phoenix": "^1.7.11", "prop-types": "^15.8.1", "rc-progress": "^3.5.1", "react-beautiful-dnd": "^13.1.0", @@ -17856,9 +17856,9 @@ "dev": true }, "node_modules/phoenix": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/phoenix/-/phoenix-1.7.10.tgz", - "integrity": "sha512-akfr/QvLPFRB8sORyc8FQFY/YoGwjWhka/YRcu45sKlBOZHvA80EkLYBUsYlW63UicxgrXABZdrjDkv54LTE+g==" + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/phoenix/-/phoenix-1.7.11.tgz", + "integrity": "sha512-aeikMR/Qh6gAygY45d5p/B7srqH60h0GbCIauEAStAtRUq4hvlkzDTyDj1NJidJEV9IKFhZe7f9L+zosUJdF/g==" }, "node_modules/picocolors": { "version": "1.0.0", diff --git a/app/assets/package.json b/app/assets/package.json index 46da81fa8..a0f2160ff 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -51,7 +51,7 @@ "js-cookie": "^3.0.5", "moment": "^2.30.1", "node-webvtt": "^1.9.4", - "phoenix": "^1.7.10", + "phoenix": "^1.7.11", "prop-types": "^15.8.1", "rc-progress": "^3.5.1", "react-beautiful-dnd": "^13.1.0", From fcdfb95f552ef9933e0d86d59e178ca41a6585c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 11:40:57 +0000 Subject: [PATCH 06/33] Bump @types/jest from 29.5.11 to 29.5.12 in /app/assets Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 29.5.11 to 29.5.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) --- updated-dependencies: - dependency-name: "@types/jest" dependency-type: direct:development 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 b5579b2cc..c177774af 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -78,7 +78,7 @@ "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.1.0", "@testing-library/user-event": "^14.5.2", - "@types/jest": "^29.5.11", + "@types/jest": "^29.5.12", "@types/react-beautiful-dnd": "^13.1.8", "@types/react-router-dom": "^5.3.3", "babel-plugin-syntax-dynamic-import": "^6.18.0", @@ -7741,9 +7741,9 @@ } }, "node_modules/@types/jest": { - "version": "29.5.11", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz", - "integrity": "sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==", + "version": "29.5.12", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz", + "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==", "dev": true, "dependencies": { "expect": "^29.0.0", diff --git a/app/assets/package.json b/app/assets/package.json index 46da81fa8..b7509ee83 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -88,7 +88,7 @@ "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^14.1.0", "@testing-library/user-event": "^14.5.2", - "@types/jest": "^29.5.11", + "@types/jest": "^29.5.12", "@types/react-beautiful-dnd": "^13.1.8", "@types/react-router-dom": "^5.3.3", "babel-plugin-syntax-dynamic-import": "^6.18.0", From 32384db8cd89c76ef3ea07d4db7f67f2f77685ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 11:46:52 +0000 Subject: [PATCH 07/33] Bump @graphql-codegen/cli from 5.0.0 to 5.0.2 in /app/assets Bumps [@graphql-codegen/cli](https://github.com/dotansimha/graphql-code-generator/tree/HEAD/packages/graphql-codegen-cli) from 5.0.0 to 5.0.2. - [Release notes](https://github.com/dotansimha/graphql-code-generator/releases) - [Changelog](https://github.com/dotansimha/graphql-code-generator/blob/master/packages/graphql-codegen-cli/CHANGELOG.md) - [Commits](https://github.com/dotansimha/graphql-code-generator/commits/@graphql-codegen/cli@5.0.2/packages/graphql-codegen-cli) --- updated-dependencies: - dependency-name: "@graphql-codegen/cli" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 209 +++++++++++++---------------------- app/assets/package.json | 2 +- 2 files changed, 76 insertions(+), 135 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index b5579b2cc..1445085b6 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -69,7 +69,7 @@ "@creativebulma/bulma-divider": "^1.1.0", "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.0", - "@graphql-codegen/cli": "^5.0.0", + "@graphql-codegen/cli": "^5.0.2", "@graphql-codegen/client-preset": "^4.1.0", "@graphql-typed-document-node/core": "^3.2.0", "@nulib/dcapi-types": "^2.1.0", @@ -1208,9 +1208,9 @@ } }, "node_modules/@babel/plugin-syntax-flow": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz", - "integrity": "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz", + "integrity": "sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1670,13 +1670,13 @@ } }, "node_modules/@babel/plugin-transform-flow-strip-types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz", - "integrity": "sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz", + "integrity": "sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-flow": "^7.22.5" + "@babel/plugin-syntax-flow": "^7.23.3" }, "engines": { "node": ">=6.9.0" @@ -3255,35 +3255,30 @@ } }, "node_modules/@graphql-codegen/add": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/add/-/add-5.0.0.tgz", - "integrity": "sha512-ynWDOsK2yxtFHwcJTB9shoSkUd7YXd6ZE57f0nk7W5cu/nAgxZZpEsnTPEpZB/Mjf14YRGe2uJHQ7AfElHjqUQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/add/-/add-5.0.2.tgz", + "integrity": "sha512-ouBkSvMFUhda5VoKumo/ZvsZM9P5ZTyDsI8LW18VxSNWOjrTeLXBWHG8Gfaai0HwhflPtCYVABbriEcOmrRShQ==", "dev": true, "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", - "tslib": "~2.5.0" + "@graphql-codegen/plugin-helpers": "^5.0.3", + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/add/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, "node_modules/@graphql-codegen/cli": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-5.0.0.tgz", - "integrity": "sha512-A7J7+be/a6e+/ul2KI5sfJlpoqeqwX8EzktaKCeduyVKgOLA6W5t+NUGf6QumBDXU8PEOqXk3o3F+RAwCWOiqA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-5.0.2.tgz", + "integrity": "sha512-MBIaFqDiLKuO4ojN6xxG9/xL9wmfD3ZjZ7RsPjwQnSHBCUXnEkdKvX+JVpx87Pq29Ycn8wTJUguXnTZ7Di0Mlw==", "dev": true, "dependencies": { "@babel/generator": "^7.18.13", "@babel/template": "^7.18.10", "@babel/types": "^7.18.13", - "@graphql-codegen/core": "^4.0.0", - "@graphql-codegen/plugin-helpers": "^5.0.1", + "@graphql-codegen/client-preset": "^4.2.2", + "@graphql-codegen/core": "^4.0.2", + "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/apollo-engine-loader": "^8.0.0", "@graphql-tools/code-file-loader": "^8.0.0", "@graphql-tools/git-loader": "^8.0.0", @@ -3401,82 +3396,64 @@ } }, "node_modules/@graphql-codegen/client-preset": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.1.0.tgz", - "integrity": "sha512-/3Ymb/fjxIF1+HGmaI1YwSZbWsrZAWMSQjh3dU425eBjctjsVQ6gzGRr+l/gE5F1mtmCf+vlbTAT03heAc/QIw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.2.tgz", + "integrity": "sha512-DF9pNWj3TEdA90E9FH5SsUIqiZfr872vqaQOspLVuVXGsaDx8F/JLLzaN+7ucmoo0ff/bLW8munVXYXTmgwwEA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", "@babel/template": "^7.20.7", - "@graphql-codegen/add": "^5.0.0", - "@graphql-codegen/gql-tag-operations": "4.0.1", - "@graphql-codegen/plugin-helpers": "^5.0.1", - "@graphql-codegen/typed-document-node": "^5.0.1", - "@graphql-codegen/typescript": "^4.0.1", - "@graphql-codegen/typescript-operations": "^4.0.1", - "@graphql-codegen/visitor-plugin-common": "^4.0.1", + "@graphql-codegen/add": "^5.0.2", + "@graphql-codegen/gql-tag-operations": "4.0.4", + "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/typed-document-node": "^5.0.4", + "@graphql-codegen/typescript": "^4.0.4", + "@graphql-codegen/typescript-operations": "^4.1.2", + "@graphql-codegen/visitor-plugin-common": "^4.1.2", "@graphql-tools/documents": "^1.0.0", "@graphql-tools/utils": "^10.0.0", "@graphql-typed-document-node/core": "3.2.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/client-preset/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, "node_modules/@graphql-codegen/core": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-4.0.0.tgz", - "integrity": "sha512-JAGRn49lEtSsZVxeIlFVIRxts2lWObR+OQo7V2LHDJ7ohYYw3ilv7nJ8pf8P4GTg/w6ptcYdSdVVdkI8kUHB/Q==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-4.0.2.tgz", + "integrity": "sha512-IZbpkhwVqgizcjNiaVzNAzm/xbWT6YnGgeOLwVjm4KbJn3V2jchVtuzHH09G5/WkkLSk2wgbXNdwjM41JxO6Eg==", "dev": true, "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", + "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/schema": "^10.0.0", "@graphql-tools/utils": "^10.0.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/core/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, "node_modules/@graphql-codegen/gql-tag-operations": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.1.tgz", - "integrity": "sha512-qF6wIbBzW8BNT+wiVsBxrYOs2oYcsxQ7mRvCpfEI3HnNZMAST/uX76W8MqFEJvj4mw7NIDv7xYJAcAZIWM5LWw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.4.tgz", + "integrity": "sha512-dypul0iDLjb07yv+/cRb6qPbn42cFPcwlsJertVl9G6qkS4+3V4806WwSfUht4QVMWnvGfgDkJJqG0yUVKOHwA==", "dev": true, "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", - "@graphql-codegen/visitor-plugin-common": "4.0.1", + "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/visitor-plugin-common": "4.1.2", "@graphql-tools/utils": "^10.0.0", "auto-bind": "~4.0.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/gql-tag-operations/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, "node_modules/@graphql-codegen/plugin-helpers": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.1.tgz", - "integrity": "sha512-6L5sb9D8wptZhnhLLBcheSPU7Tg//DGWgc5tQBWX46KYTOTQHGqDpv50FxAJJOyFVJrveN9otWk9UT9/yfY4ww==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.3.tgz", + "integrity": "sha512-yZ1rpULIWKBZqCDlvGIJRSyj1B2utkEdGmXZTBT/GVayP4hyRYlkd36AJV/LfEsVD8dnsKL5rLz2VTYmRNlJ5Q==", "dev": true, "dependencies": { "@graphql-tools/utils": "^10.0.0", @@ -3484,111 +3461,81 @@ "common-tags": "1.8.2", "import-from": "4.0.0", "lodash": "~4.17.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/plugin-helpers/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, "node_modules/@graphql-codegen/schema-ast": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/schema-ast/-/schema-ast-4.0.0.tgz", - "integrity": "sha512-WIzkJFa9Gz28FITAPILbt+7A8+yzOyd1NxgwFh7ie+EmO9a5zQK6UQ3U/BviirguXCYnn+AR4dXsoDrSrtRA1g==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/schema-ast/-/schema-ast-4.0.2.tgz", + "integrity": "sha512-5mVAOQQK3Oz7EtMl/l3vOQdc2aYClUzVDHHkMvZlunc+KlGgl81j8TLa+X7ANIllqU4fUEsQU3lJmk4hXP6K7Q==", "dev": true, "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", + "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/utils": "^10.0.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/schema-ast/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, "node_modules/@graphql-codegen/typed-document-node": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.1.tgz", - "integrity": "sha512-VFkhCuJnkgtbbgzoCAwTdJe2G1H6sd3LfCrDqWUrQe53y2ukfSb5Ov1PhAIkCBStKCMQBUY9YgGz9GKR40qQ8g==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.4.tgz", + "integrity": "sha512-t66Z6erQ4Dh1j6f9pRZmc8uYtHoUI3A49tLmJAlg9/3IV0kCmwrWKJut/G8SeOefDLG8cXBTVtI/YuZOe1Te+w==", "dev": true, "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", - "@graphql-codegen/visitor-plugin-common": "4.0.1", + "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/visitor-plugin-common": "4.1.2", "auto-bind": "~4.0.0", "change-case-all": "1.0.15", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/typed-document-node/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, "node_modules/@graphql-codegen/typescript": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.1.tgz", - "integrity": "sha512-3YziQ21dCVdnHb+Us1uDb3pA6eG5Chjv0uTK+bt9dXeMlwYBU8MbtzvQTo4qvzWVC1AxSOKj0rgfNu1xCXqJyA==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.4.tgz", + "integrity": "sha512-x79CKLfP9UQCX+/I78qxQlMs2Mmq3pF1lKafZo7lAno0f/fvJ+qWUduzdgjRNz+YL+5blGeWcC0pWEDxniO7hw==", "dev": true, "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", - "@graphql-codegen/schema-ast": "^4.0.0", - "@graphql-codegen/visitor-plugin-common": "4.0.1", + "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/schema-ast": "^4.0.2", + "@graphql-codegen/visitor-plugin-common": "4.1.2", "auto-bind": "~4.0.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, "node_modules/@graphql-codegen/typescript-operations": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.0.1.tgz", - "integrity": "sha512-GpUWWdBVUec/Zqo23aFLBMrXYxN2irypHqDcKjN78JclDPdreasAEPcIpMfqf4MClvpmvDLy4ql+djVAwmkjbw==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.1.2.tgz", + "integrity": "sha512-CtCWK+gW7hS+Ely3lohr8CL1HVLswQzMcaUk3k1sxdWCWKTNq7abMsWa31rTVwRCJ+WNEkM/7S8sIBTpEG683A==", "dev": true, "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", - "@graphql-codegen/typescript": "^4.0.1", - "@graphql-codegen/visitor-plugin-common": "4.0.1", + "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/typescript": "^4.0.4", + "@graphql-codegen/visitor-plugin-common": "4.1.2", "auto-bind": "~4.0.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/typescript-operations/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, - "node_modules/@graphql-codegen/typescript/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, "node_modules/@graphql-codegen/visitor-plugin-common": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.0.1.tgz", - "integrity": "sha512-Bi/1z0nHg4QMsAqAJhds+ForyLtk7A3HQOlkrZNm3xEkY7lcBzPtiOTLBtvziwopBsXUxqeSwVjOOFPLS5Yw1Q==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.1.2.tgz", + "integrity": "sha512-yk7iEAL1kYZ2Gi/pvVjdsZhul5WsYEM4Zcgh2Ev15VicMdJmPHsMhNUsZWyVJV0CaQCYpNOFlGD/11Ea3pn4GA==", "dev": true, "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", + "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/optimize": "^2.0.0", "@graphql-tools/relay-operation-optimizer": "^7.0.0", "@graphql-tools/utils": "^10.0.0", @@ -3597,18 +3544,12 @@ "dependency-graph": "^0.11.0", "graphql-tag": "^2.11.0", "parse-filepath": "^1.0.2", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/visitor-plugin-common/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, "node_modules/@graphql-tools/apollo-engine-loader": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.0.tgz", diff --git a/app/assets/package.json b/app/assets/package.json index 46da81fa8..8947240db 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -79,7 +79,7 @@ "@creativebulma/bulma-divider": "^1.1.0", "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.0", - "@graphql-codegen/cli": "^5.0.0", + "@graphql-codegen/cli": "^5.0.2", "@graphql-codegen/client-preset": "^4.1.0", "@graphql-typed-document-node/core": "^3.2.0", "@nulib/dcapi-types": "^2.1.0", From d6f3db56e22b8a03874f45201f55be3f6ef11341 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 11:47:23 +0000 Subject: [PATCH 08/33] Bump hls.js from 1.5.3 to 1.5.4 in /app/assets Bumps [hls.js](https://github.com/video-dev/hls.js) from 1.5.3 to 1.5.4. - [Release notes](https://github.com/video-dev/hls.js/releases) - [Changelog](https://github.com/video-dev/hls.js/blob/master/docs/release-process.md) - [Commits](https://github.com/video-dev/hls.js/compare/v1.5.3...v1.5.4) --- updated-dependencies: - dependency-name: hls.js 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 b5579b2cc..d6b006709 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -35,7 +35,7 @@ "file-saver": "^2.0.5", "graphql": "^16.8.1", "graphql-tag": "^2.12.6", - "hls.js": "^1.5.3", + "hls.js": "^1.5.4", "inflection": "^3.0.0", "jest-environment-jsdom": "^29.7.0", "js-cookie": "^3.0.5", @@ -12803,9 +12803,9 @@ } }, "node_modules/hls.js": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.3.tgz", - "integrity": "sha512-gonnYpZ5bxuVdwpcbzfylUlNZ8917LjACUjpWXiaeo8zPAIDfPcMZjEQPy6CeeRSJbcg1P+aVqwxrXr2J+SeUg==" + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.4.tgz", + "integrity": "sha512-MB+e+tcBl+A/EamWvsvx7d/3m9JOLi3wbLaXyZdHlscgXkhiX5zajJxnt7lzn/w9ONxs5qaFTp/kkIMI9fD4KA==" }, "node_modules/hmac-drbg": { "version": "1.0.1", diff --git a/app/assets/package.json b/app/assets/package.json index 46da81fa8..d5b0d8502 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -45,7 +45,7 @@ "file-saver": "^2.0.5", "graphql": "^16.8.1", "graphql-tag": "^2.12.6", - "hls.js": "^1.5.3", + "hls.js": "^1.5.4", "inflection": "^3.0.0", "jest-environment-jsdom": "^29.7.0", "js-cookie": "^3.0.5", From 2f76d79fb44504bf4a1b573a4c2444404cb5f18f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:07:30 +0000 Subject: [PATCH 09/33] Bump credo from 1.7.3 to 1.7.4 in /app Bumps [credo](https://github.com/rrrene/credo) from 1.7.3 to 1.7.4. - [Changelog](https://github.com/rrrene/credo/blob/master/CHANGELOG.md) - [Commits](https://github.com/rrrene/credo/commits) --- updated-dependencies: - dependency-name: credo dependency-type: direct:development 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 60eaea460..0130aec20 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -19,7 +19,7 @@ "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"}, "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.3.1", "ebd1a1d7aff97f27c66654e78ece187abdc646992714164380d8a041eda16754", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3a6efd3366130eab84ca372cbd4a7d3c3a97bdfcfb4911233b035d117063f0af"}, "cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"}, - "credo": {:hex, :credo, "1.7.3", "05bb11eaf2f2b8db370ecaa6a6bda2ec49b2acd5e0418bc106b73b07128c0436", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "35ea675a094c934c22fb1dca3696f3c31f2728ae6ef5a53b5d648c11180a4535"}, + "credo": {:hex, :credo, "1.7.4", "68ca5cf89071511c12fd9919eb84e388d231121988f6932756596195ccf7fd35", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "9cf776d062c78bbe0f0de1ecaee183f18f2c3ec591326107989b054b7dddefc2"}, "crontab": {:hex, :crontab, "1.1.13", "3bad04f050b9f7f1c237809e42223999c150656a6b2afbbfef597d56df2144c5", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "d67441bec989640e3afb94e123f45a2bc42d76e02988c9613885dc3d01cf7085"}, "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"}, From c1c8071125185127a414286b3ec7d0f9ca727e43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:08:07 +0000 Subject: [PATCH 10/33] Bump sitemapper from 0.7.0 to 0.8.0 in /app Bumps [sitemapper](https://github.com/breakroom/sitemapper) from 0.7.0 to 0.8.0. - [Changelog](https://github.com/breakroom/sitemapper/blob/master/CHANGELOG.md) - [Commits](https://github.com/breakroom/sitemapper/compare/v0.7.0...v0.8.0) --- updated-dependencies: - dependency-name: sitemapper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/mix.exs | 2 +- app/mix.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mix.exs b/app/mix.exs index 04018c003..40df1ba16 100644 --- a/app/mix.exs +++ b/app/mix.exs @@ -100,7 +100,7 @@ defmodule Meadow.MixProject do {:quantum, "~> 3.0"}, {:retry, "~> 0.18.0"}, {:sigaws, git: "https://github.com/nulib/sigaws.git", branch: "otp-24", override: true}, - {:sitemapper, "~> 0.7.0"}, + {:sitemapper, "~> 0.8.0"}, {:sweet_xml, "~> 0.6"}, {:telemetry_metrics, "~> 0.6"}, {:telemetry_poller, "~> 0.5"}, diff --git a/app/mix.lock b/app/mix.lock index 60eaea460..8016a62e7 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -85,7 +85,7 @@ "retry": {:hex, :retry, "0.18.0", "dc58ebe22c95aa00bc2459f9e0c5400e6005541cf8539925af0aa027dc860543", [:mix], [], "hexpm", "9483959cc7bf69c9e576d9dfb2b678b71c045d3e6f39ab7c9aa1489df4492d73"}, "saxy": {:hex, :saxy, "1.5.0", "0141127f2d042856f135fb2d94e0beecda7a2306f47546dbc6411fc5b07e28bf", [:mix], [], "hexpm", "ea7bb6328fbd1f2aceffa3ec6090bfb18c85aadf0f8e5030905e84235861cf89"}, "sigaws": {:git, "https://github.com/nulib/sigaws.git", "0a754168d7f6f2f8a7bda3b8c6c2a53c0d0139a5", [branch: "otp-24"]}, - "sitemapper": {:hex, :sitemapper, "0.7.0", "4aee7930327a9a01b1c9b81d1d42f60c1a295e9f420108eb2d130c317415abd7", [:mix], [{:ex_aws_s3, "~> 2.0", [hex: :ex_aws_s3, repo: "hexpm", optional: true]}, {:xml_builder, "~> 2.1", [hex: :xml_builder, repo: "hexpm", optional: false]}], "hexpm", "60f7a684e5e9fe7f10ac5b69f48b0be2bcbba995afafcb3c143fc0c8ef1f223f"}, + "sitemapper": {:hex, :sitemapper, "0.8.0", "50c8c85ed38c013829ce700e8a8d195a2faf4aed8685659b14529dcb6f91fee0", [:mix], [{:ex_aws_s3, "~> 2.0", [hex: :ex_aws_s3, repo: "hexpm", optional: true]}, {:xml_builder, "~> 2.1", [hex: :xml_builder, repo: "hexpm", optional: false]}], "hexpm", "7cd42b454035da457151c9b6a314b688b5bbe5383add95badc65d013c25989c5"}, "sleeplocks": {:hex, :sleeplocks, "1.1.2", "d45aa1c5513da48c888715e3381211c859af34bee9b8290490e10c90bb6ff0ca", [:rebar3], [], "hexpm", "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"}, "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"}, From 52689df0f11da33e1a8df88b92f1bea238730195 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:18:09 +0000 Subject: [PATCH 11/33] Bump @apollo/client from 3.8.10 to 3.9.4 in /app/assets Bumps [@apollo/client](https://github.com/apollographql/apollo-client) from 3.8.10 to 3.9.4. - [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.8.10...v3.9.4) --- updated-dependencies: - dependency-name: "@apollo/client" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index b5579b2cc..9d58600a8 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,17 +247,19 @@ } }, "node_modules/@apollo/client": { - "version": "3.8.10", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.8.10.tgz", - "integrity": "sha512-p/22RZ8ehHyvySnC20EHPPe0gdu8Xp6ZCiXOfdEe1ZORw5cUteD/TLc66tfKv8qu8NLIfbiWoa+6s70XnKvxqg==", + "version": "3.9.4", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.9.4.tgz", + "integrity": "sha512-Ip6dxjshDT2Dp6foLASTnKBW45Fytew/5JZutZwgc78hVrrGpO9UtZA9xteHXYdap0wIgCxCfeIQwbSu1ZdQpw==", "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", + "@wry/caches": "^1.0.0", "@wry/equality": "^0.5.6", "@wry/trie": "^0.5.0", "graphql-tag": "^2.12.6", "hoist-non-react-statics": "^3.3.2", "optimism": "^0.18.0", "prop-types": "^15.7.2", + "rehackt": "0.0.4", "response-iterator": "^0.2.6", "symbol-observable": "^4.0.0", "ts-invariant": "^0.10.3", @@ -265,7 +267,7 @@ "zen-observable-ts": "^1.2.5" }, "peerDependencies": { - "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0", + "graphql": "^15.0.0 || ^16.0.0", "graphql-ws": "^5.5.5", "react": "^16.8.0 || ^17.0.0 || ^18.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", @@ -18882,6 +18884,23 @@ "jsesc": "bin/jsesc" } }, + "node_modules/rehackt": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/rehackt/-/rehackt-0.0.4.tgz", + "integrity": "sha512-xFroSGCbMEK/cTJVhq+c8l/AzIeMeojVyLqtZmr2jmIAFvePjapkCSGg9MnrcNk68HPaMxGf+Ndqozotu78ITw==", + "peerDependencies": { + "@types/react": "*", + "react": "*" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "react": { + "optional": true + } + } + }, "node_modules/relay-runtime": { "version": "12.0.0", "resolved": "https://registry.npmjs.org/relay-runtime/-/relay-runtime-12.0.0.tgz", From d25f83107e5b7ecdb765251774e65379b07c944a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:17:29 +0000 Subject: [PATCH 12/33] Bump @apollo/client from 3.9.4 to 3.9.5 in /app/assets Bumps [@apollo/client](https://github.com/apollographql/apollo-client) from 3.9.4 to 3.9.5. - [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.4...v3.9.5) --- 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index ce315328b..48ec29c71 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -247,9 +247,9 @@ } }, "node_modules/@apollo/client": { - "version": "3.9.4", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.9.4.tgz", - "integrity": "sha512-Ip6dxjshDT2Dp6foLASTnKBW45Fytew/5JZutZwgc78hVrrGpO9UtZA9xteHXYdap0wIgCxCfeIQwbSu1ZdQpw==", + "version": "3.9.5", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.9.5.tgz", + "integrity": "sha512-7y+c8MTPU+hhTwvcGVtMMGIgWduzrvG1mz5yJMRyqYbheBkkky3Lki6ADWVSBXG1lZoOtPYvB2zDgVfKb2HSsw==", "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.4", + "rehackt": "0.0.5", "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.4", - "resolved": "https://registry.npmjs.org/rehackt/-/rehackt-0.0.4.tgz", - "integrity": "sha512-xFroSGCbMEK/cTJVhq+c8l/AzIeMeojVyLqtZmr2jmIAFvePjapkCSGg9MnrcNk68HPaMxGf+Ndqozotu78ITw==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/rehackt/-/rehackt-0.0.5.tgz", + "integrity": "sha512-BI1rV+miEkaHj8zd2n+gaMgzu/fKz7BGlb4zZ6HAiY9adDmJMkaDcmuXlJFv0eyKUob+oszs3/2gdnXUrzx2Tg==", "peerDependencies": { "@types/react": "*", "react": "*" From 78a22c863b1bf5c6175ec8cf106097efa922074e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:40:24 +0000 Subject: [PATCH 13/33] Bump hls.js from 1.5.4 to 1.5.6 in /app/assets Bumps [hls.js](https://github.com/video-dev/hls.js) from 1.5.4 to 1.5.6. - [Release notes](https://github.com/video-dev/hls.js/releases) - [Changelog](https://github.com/video-dev/hls.js/blob/master/docs/release-process.md) - [Commits](https://github.com/video-dev/hls.js/compare/v1.5.4...v1.5.6) --- updated-dependencies: - dependency-name: hls.js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 10 +++++----- app/assets/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index ce315328b..8195be1f2 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": "latest", + "@apollo/client": "*", "@apollo/react-hooks": "^4.0.0", "@apollo/react-testing": "^4.0.0", "@appbaseio/reactivesearch": "3.23.1", @@ -35,7 +35,7 @@ "file-saver": "^2.0.5", "graphql": "^16.8.1", "graphql-tag": "^2.12.6", - "hls.js": "^1.5.4", + "hls.js": "^1.5.6", "inflection": "^3.0.0", "jest-environment-jsdom": "^29.7.0", "js-cookie": "^3.0.5", @@ -12746,9 +12746,9 @@ } }, "node_modules/hls.js": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.4.tgz", - "integrity": "sha512-MB+e+tcBl+A/EamWvsvx7d/3m9JOLi3wbLaXyZdHlscgXkhiX5zajJxnt7lzn/w9ONxs5qaFTp/kkIMI9fD4KA==" + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.6.tgz", + "integrity": "sha512-rmlaIEfLuSwqRtYLeTk30ebYli5qNK2urdkEcqYoBezRpV+MFHhZnMX77lHWW+EMjNlwr2sx2apfqq54E3yXnA==" }, "node_modules/hmac-drbg": { "version": "1.0.1", diff --git a/app/assets/package.json b/app/assets/package.json index 621328506..4ab5ba6e6 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -45,7 +45,7 @@ "file-saver": "^2.0.5", "graphql": "^16.8.1", "graphql-tag": "^2.12.6", - "hls.js": "^1.5.4", + "hls.js": "^1.5.6", "inflection": "^3.0.0", "jest-environment-jsdom": "^29.7.0", "js-cookie": "^3.0.5", From 3a31fa4e6a1c2bc1121833ed61e37dad5936f254 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:44:55 +0000 Subject: [PATCH 14/33] Bump aws_signature from 0.3.1 to 0.3.2 in /app Bumps [aws_signature](https://github.com/aws-beam/aws_signature) from 0.3.1 to 0.3.2. - [Release notes](https://github.com/aws-beam/aws_signature/releases) - [Changelog](https://github.com/aws-beam/aws_signature/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-beam/aws_signature/compare/v0.3.1...v0.3.2) --- updated-dependencies: - dependency-name: aws_signature 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 7f42db766..59bed0edb 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -5,7 +5,7 @@ "assertions": {:hex, :assertions, "0.19.0", "f177fcc22b55df6a41a58b151e430d189d0a1083dae3240522503dedaf8e1174", [:mix], [], "hexpm", "759bdbf977fe3e2d2b79f8a65d8674f29ac757781136a6cb4adf88f1574af1d8"}, "atomic_map": {:hex, :atomic_map, "0.9.3", "3c7f1302e0590164732d08ca999708efbb2cd768abf2911cf140280ce2dc499d", [:mix], [], "hexpm", "c237babf301bd2435bd85b96cffc973022b4cbb7721537059ee0dd3bb74938d2"}, "authoritex": {:hex, :authoritex, "1.0.3", "0380267dea5b3394c9556da17ca1ae8ee2653a9a1fa5f5917f8090dc84679054", [: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", "16035bb15b3bc1827147f7d94568bbbd54e3fd84d75a6cfd57349f336e136ed3"}, - "aws_signature": {:hex, :aws_signature, "0.3.1", "67f369094cbd55ffa2bbd8cc713ede14b195fcfb45c86665cd7c5ad010276148", [:rebar3], [], "hexpm", "50fc4dc1d1f7c2d0a8c63f455b3c66ecd74c1cf4c915c768a636f9227704a674"}, + "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"}, "broadway": {:hex, :broadway, "1.0.7", "7808f9e3eb6f53ca6d060f0f9d61012dd8feb0d7a82e62d087dd517b9b66fa53", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.3.7 or ~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e76cfb0a7d64176c387b8b1ddbfb023e2ee8a63e92f43664d78e6d5d0b1177c6"}, From 1e55c6e66c59bd20c2fbf86a6c96d17006a827e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 11:48:31 +0000 Subject: [PATCH 15/33] Bump recharts from 2.11.0 to 2.12.1 in /app/assets Bumps [recharts](https://github.com/recharts/recharts) from 2.11.0 to 2.12.1. - [Release notes](https://github.com/recharts/recharts/releases) - [Changelog](https://github.com/recharts/recharts/blob/3.x/CHANGELOG.md) - [Commits](https://github.com/recharts/recharts/compare/v2.11...v2.12.1) --- updated-dependencies: - dependency-name: recharts dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 88 ++++++++++++++++++------------------ app/assets/package.json | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index ce315328b..84d834774 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": "latest", + "@apollo/client": "*", "@apollo/react-hooks": "^4.0.0", "@apollo/react-testing": "^4.0.0", "@appbaseio/reactivesearch": "3.23.1", @@ -53,7 +53,7 @@ "react-hook-form": "^7.33.1", "react-icons": "^5.0.1", "react-json-pretty": "^2.2.0", - "recharts": "^2.11.0", + "recharts": "^2.12.1", "use-clipboard-copy": "^0.2.0" }, "devDependencies": { @@ -10839,6 +10839,20 @@ "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", "dev": true }, + "node_modules/dom-helpers": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "dependencies": { + "@babel/runtime": "^7.8.7", + "csstype": "^3.0.2" + } + }, + "node_modules/dom-helpers/node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" + }, "node_modules/dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", @@ -18390,11 +18404,6 @@ "react-dom": ">=15.0" } }, - "node_modules/react-lifecycles-compat": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" - }, "node_modules/react-redux": { "version": "7.2.9", "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", @@ -18532,40 +18541,17 @@ } }, "node_modules/react-smooth": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-2.0.5.tgz", - "integrity": "sha512-BMP2Ad42tD60h0JW6BFaib+RJuV5dsXJK9Baxiv/HlNFjvRLqA9xrNKxVWnUIZPQfzUwGXIlU/dSYLU+54YGQA==", - "dependencies": { - "fast-equals": "^5.0.0", - "react-transition-group": "2.9.0" - }, - "peerDependencies": { - "prop-types": "^15.6.0", - "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" - } - }, - "node_modules/react-smooth/node_modules/dom-helpers": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", - "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", - "dependencies": { - "@babel/runtime": "^7.1.2" - } - }, - "node_modules/react-smooth/node_modules/react-transition-group": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", - "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.0.tgz", + "integrity": "sha512-2NMXOBY1uVUQx1jBeENGA497HK20y6CPGYL1ZnJLeoQ8rrc3UfmOM82sRxtzpcoCkUMy4CS0RGylfuVhuFjBgg==", "dependencies": { - "dom-helpers": "^3.4.0", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" + "fast-equals": "^5.0.1", + "prop-types": "^15.8.1", + "react-transition-group": "^4.4.5" }, "peerDependencies": { - "react": ">=15.0.0", - "react-dom": ">=15.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, "node_modules/react-style-singleton": { @@ -18590,6 +18576,21 @@ } } }, + "node_modules/react-transition-group": { + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", + "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", + "dependencies": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + }, + "peerDependencies": { + "react": ">=16.6.0", + "react-dom": ">=16.6.0" + } + }, "node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -18624,15 +18625,15 @@ } }, "node_modules/recharts": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.11.0.tgz", - "integrity": "sha512-5s+u1m5Hwxb2nh0LABkE3TS/lFqFHyWl7FnPbQhHobbQQia4ih1t3o3+ikPYr31Ns+kYe4FASIthKeKi/YYvMg==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.12.1.tgz", + "integrity": "sha512-35vUCEBPf+pM+iVgSgVTn86faKya5pc4JO6cYJL63qOK2zDEyzDn20Tdj+CDI/3z+VcpKyQ8ZBQ9OiQ+vuAbjg==", "dependencies": { "clsx": "^2.0.0", "eventemitter3": "^4.0.1", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "react-is": "^16.10.2", - "react-smooth": "^2.0.5", + "react-smooth": "^4.0.0", "recharts-scale": "^0.4.4", "tiny-invariant": "^1.3.1", "victory-vendor": "^36.6.8" @@ -18641,7 +18642,6 @@ "node": ">=14" }, "peerDependencies": { - "prop-types": "^15.6.0", "react": "^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0" } diff --git a/app/assets/package.json b/app/assets/package.json index 621328506..6dab2888d 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -63,7 +63,7 @@ "react-hook-form": "^7.33.1", "react-icons": "^5.0.1", "react-json-pretty": "^2.2.0", - "recharts": "^2.11.0", + "recharts": "^2.12.1", "use-clipboard-copy": "^0.2.0" }, "devDependencies": { From b6a831430819b9b440e963dc5d6c971184226a7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 11:49:00 +0000 Subject: [PATCH 16/33] Bump downshift from 8.3.1 to 8.3.2 in /app/assets Bumps [downshift](https://github.com/downshift-js/downshift) from 8.3.1 to 8.3.2. - [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.3.1...v8.3.2) --- updated-dependencies: - dependency-name: downshift dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 10 +++++----- app/assets/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index ce315328b..1926f47ba 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": "latest", + "@apollo/client": "*", "@apollo/react-hooks": "^4.0.0", "@apollo/react-testing": "^4.0.0", "@appbaseio/reactivesearch": "3.23.1", @@ -28,7 +28,7 @@ "bulma-switch": "^2.0.0", "bulma-toast": "^2.4.3", "classnames": "^2.5.1", - "downshift": "^8.3.1", + "downshift": "^8.3.2", "edtf": "^4.6.0", "esbuild-plugin-svgr": "^2.1.0", "faker": "^5.5.3", @@ -10933,9 +10933,9 @@ } }, "node_modules/downshift": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/downshift/-/downshift-8.3.1.tgz", - "integrity": "sha512-djPzjGfTSEjOsfmlur4onCV3Mtd6oGI+eOQIBNwoS7oEYTjPrxk6n+sJLmndT/KKwHvUyBSh3AFb64eHIFifTQ==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/downshift/-/downshift-8.3.2.tgz", + "integrity": "sha512-kO5mnwMbWB1OIPgIO4wxK0HtSJbaPzx3XTOcnN36I6i08iVc4C2Fftye3UZYVN+W03b13o1kEmN2118G5vcgeQ==", "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 621328506..ff1f3f21f 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -38,7 +38,7 @@ "bulma-switch": "^2.0.0", "bulma-toast": "^2.4.3", "classnames": "^2.5.1", - "downshift": "^8.3.1", + "downshift": "^8.3.2", "edtf": "^4.6.0", "esbuild-plugin-svgr": "^2.1.0", "faker": "^5.5.3", From c3c7036173b5d5ed42850caaa848b3a2c11e8503 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 11:49:26 +0000 Subject: [PATCH 17/33] Bump sass from 1.70.0 to 1.71.1 in /app/assets Bumps [sass](https://github.com/sass/dart-sass) from 1.70.0 to 1.71.1. - [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.70.0...1.71.1) --- 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 | 10 +++++----- app/assets/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index ce315328b..02056e786 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": "latest", + "@apollo/client": "*", "@apollo/react-hooks": "^4.0.0", "@apollo/react-testing": "^4.0.0", "@appbaseio/reactivesearch": "3.23.1", @@ -99,7 +99,7 @@ "react-dom": "^18.2.0", "react-router-dom": "^5.3.0", "react-router-prop-types": "^1.0.5", - "sass": "^1.70.0", + "sass": "^1.71.1", "ts-node": "^10.9.2", "typescript": "^5.3.3", "use-phoenix-channel": "^1.1.1" @@ -19279,9 +19279,9 @@ } }, "node_modules/sass": { - "version": "1.70.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.70.0.tgz", - "integrity": "sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==", + "version": "1.71.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz", + "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/app/assets/package.json b/app/assets/package.json index 621328506..75134fb13 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.70.0", + "sass": "^1.71.1", "ts-node": "^10.9.2", "typescript": "^5.3.3", "use-phoenix-channel": "^1.1.1" From 7c3297155619037c1e2359376711350ad5829d16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 11:50:29 +0000 Subject: [PATCH 18/33] Bump @graphql-codegen/client-preset from 4.2.2 to 4.2.3 in /app/assets Bumps [@graphql-codegen/client-preset](https://github.com/dotansimha/graphql-code-generator/tree/HEAD/packages/presets/client) from 4.2.2 to 4.2.3. - [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.2.3/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 | 60 ++++++++++++++++++------------------ app/assets/package.json | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index ce315328b..14980a16e 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": "latest", + "@apollo/client": "*", "@apollo/react-hooks": "^4.0.0", "@apollo/react-testing": "^4.0.0", "@appbaseio/reactivesearch": "3.23.1", @@ -70,7 +70,7 @@ "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.0", "@graphql-codegen/cli": "^5.0.2", - "@graphql-codegen/client-preset": "^4.1.0", + "@graphql-codegen/client-preset": "^4.2.3", "@graphql-typed-document-node/core": "^3.2.0", "@nulib/dcapi-types": "^2.1.0", "@nulib/prettier-config": "^1.2.0", @@ -3398,20 +3398,20 @@ } }, "node_modules/@graphql-codegen/client-preset": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.2.tgz", - "integrity": "sha512-DF9pNWj3TEdA90E9FH5SsUIqiZfr872vqaQOspLVuVXGsaDx8F/JLLzaN+7ucmoo0ff/bLW8munVXYXTmgwwEA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.3.tgz", + "integrity": "sha512-ygfIKMtjoPY4iISYfNpvuVvV2e6BYAzHnC+MfDul7kZwY1pvv0P+IhezOaTHOheoTiah1BA7USFEOE5Nzp3Gdw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", "@babel/template": "^7.20.7", "@graphql-codegen/add": "^5.0.2", - "@graphql-codegen/gql-tag-operations": "4.0.4", + "@graphql-codegen/gql-tag-operations": "4.0.5", "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/typed-document-node": "^5.0.4", - "@graphql-codegen/typescript": "^4.0.4", - "@graphql-codegen/typescript-operations": "^4.1.2", - "@graphql-codegen/visitor-plugin-common": "^4.1.2", + "@graphql-codegen/typed-document-node": "^5.0.5", + "@graphql-codegen/typescript": "^4.0.5", + "@graphql-codegen/typescript-operations": "^4.1.3", + "@graphql-codegen/visitor-plugin-common": "^5.0.0", "@graphql-tools/documents": "^1.0.0", "@graphql-tools/utils": "^10.0.0", "@graphql-typed-document-node/core": "3.2.0", @@ -3437,13 +3437,13 @@ } }, "node_modules/@graphql-codegen/gql-tag-operations": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.4.tgz", - "integrity": "sha512-dypul0iDLjb07yv+/cRb6qPbn42cFPcwlsJertVl9G6qkS4+3V4806WwSfUht4QVMWnvGfgDkJJqG0yUVKOHwA==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.5.tgz", + "integrity": "sha512-FDiL1/fdP60Y10yQD+SsYoaApGLoirF4ATfi4eFklXu7GGosJzZBxni2D3+f99Qxd0iK368O3Dtbe38Z+Vd8Vg==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/visitor-plugin-common": "4.1.2", + "@graphql-codegen/visitor-plugin-common": "5.0.0", "@graphql-tools/utils": "^10.0.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" @@ -3484,13 +3484,13 @@ } }, "node_modules/@graphql-codegen/typed-document-node": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.4.tgz", - "integrity": "sha512-t66Z6erQ4Dh1j6f9pRZmc8uYtHoUI3A49tLmJAlg9/3IV0kCmwrWKJut/G8SeOefDLG8cXBTVtI/YuZOe1Te+w==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.5.tgz", + "integrity": "sha512-1bWoHYL8673zqq/yyp3L93JKTYrDNLymvibaldWn90PASI770gJ4fzH71RhkGaJDq0F43wmQk0sjz3s/RoKsLA==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/visitor-plugin-common": "4.1.2", + "@graphql-codegen/visitor-plugin-common": "5.0.0", "auto-bind": "~4.0.0", "change-case-all": "1.0.15", "tslib": "~2.6.0" @@ -3500,14 +3500,14 @@ } }, "node_modules/@graphql-codegen/typescript": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.4.tgz", - "integrity": "sha512-x79CKLfP9UQCX+/I78qxQlMs2Mmq3pF1lKafZo7lAno0f/fvJ+qWUduzdgjRNz+YL+5blGeWcC0pWEDxniO7hw==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.5.tgz", + "integrity": "sha512-PCS6LovGhyNfnmZ2AJ8rN5wGUhysWNsFwCPrZccuwBVCCvcet8/GNKStY5cHiDqG0B5Q+6g8OXVbffhxkkytLA==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-codegen/schema-ast": "^4.0.2", - "@graphql-codegen/visitor-plugin-common": "4.1.2", + "@graphql-codegen/visitor-plugin-common": "5.0.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" }, @@ -3516,14 +3516,14 @@ } }, "node_modules/@graphql-codegen/typescript-operations": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.1.2.tgz", - "integrity": "sha512-CtCWK+gW7hS+Ely3lohr8CL1HVLswQzMcaUk3k1sxdWCWKTNq7abMsWa31rTVwRCJ+WNEkM/7S8sIBTpEG683A==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.1.3.tgz", + "integrity": "sha512-Goga2ISgicr/PLgK2NH5kwyQFctoGKpV+nv4Dr9II0xjHuuNvC6cqA66y/p8zKx6eS9p2GV87/IafqxV8r6K5Q==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/typescript": "^4.0.4", - "@graphql-codegen/visitor-plugin-common": "4.1.2", + "@graphql-codegen/typescript": "^4.0.5", + "@graphql-codegen/visitor-plugin-common": "5.0.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" }, @@ -3532,9 +3532,9 @@ } }, "node_modules/@graphql-codegen/visitor-plugin-common": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.1.2.tgz", - "integrity": "sha512-yk7iEAL1kYZ2Gi/pvVjdsZhul5WsYEM4Zcgh2Ev15VicMdJmPHsMhNUsZWyVJV0CaQCYpNOFlGD/11Ea3pn4GA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.0.0.tgz", + "integrity": "sha512-qQOZZZ2MxmBEyd0Lm3lVh7zgauLXVBsg3ToucQJHmbk2WUxLMOcaf/+BOBIkrDjvWA8L+JU6COUT6uZc57DBcw==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", diff --git a/app/assets/package.json b/app/assets/package.json index 621328506..de6f93d64 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -80,7 +80,7 @@ "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.0", "@graphql-codegen/cli": "^5.0.2", - "@graphql-codegen/client-preset": "^4.1.0", + "@graphql-codegen/client-preset": "^4.2.3", "@graphql-typed-document-node/core": "^3.2.0", "@nulib/dcapi-types": "^2.1.0", "@nulib/prettier-config": "^1.2.0", From 975238a046545fb7e92e5bb1e48b7fda7c4fdd39 Mon Sep 17 00:00:00 2001 From: "Adam J. Arling" Date: Wed, 21 Feb 2024 19:56:39 +0000 Subject: [PATCH 19/33] Upgrade Clover version to support VTT Chapters in Viewer --- app/assets/package-lock.json | 10 +++++----- app/assets/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index ce315328b..12a939dc3 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.3.2", + "@samvera/clover-iiif": "2.4.0-rc.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.3.2", - "resolved": "https://registry.npmjs.org/@samvera/clover-iiif/-/clover-iiif-2.3.2.tgz", - "integrity": "sha512-gaCytUUqbKXQAl8Ms4lcmqhVBlHkZIzAQduvZ+XvneVxtAB+MFS5xlNkdB9rP61z+s0NP1OfzVv51RxRz2IEBw==", + "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==", "dependencies": { "@iiif/parser": "^1.1.2", "@iiif/vault": "^0.9.22", @@ -6816,7 +6816,7 @@ "@radix-ui/react-switch": "^1.0.3", "@radix-ui/react-tabs": "^1.0.4", "@stitches/react": "^1.2.8", - "hls.js": "^1.4.14", + "hls.js": "^1.5.3", "node-webvtt": "^1.9.4", "openseadragon": "^2.4.2", "react": "^18.2.0", diff --git a/app/assets/package.json b/app/assets/package.json index 621328506..d9edba4c1 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.3.2", + "@samvera/clover-iiif": "2.4.0-rc.0", "@samvera/image-downloader": "^1.1.1", "bulma": "^0.9.4", "bulma-checkradio": "^2.1.3", From ebd523457ec1d685c423bd23f71ba3d603c55cbd Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Thu, 22 Feb 2024 22:19:07 +0000 Subject: [PATCH 20/33] Remove ping option from sitemap generation ...as it is no longer supported by Google or Bing --- app/lib/meadow/utils/sitemap.ex | 9 ++------- app/lib/mix/tasks/sitemap.ex | 11 +---------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/app/lib/meadow/utils/sitemap.ex b/app/lib/meadow/utils/sitemap.ex index d5507591f..b8edc12b7 100644 --- a/app/lib/meadow/utils/sitemap.ex +++ b/app/lib/meadow/utils/sitemap.ex @@ -8,10 +8,9 @@ defmodule Meadow.Utils.Sitemap do require Logger @doc """ - Generate a sitemap, upload it to the configured bucket, and optionally ping - Google and Bing to tell them an update is available + Generate a sitemap, upload it to the configured bucket """ - def generate(ping \\ false) do + def generate() do with config <- config() do Repo.transaction( fn -> @@ -19,7 +18,6 @@ defmodule Meadow.Utils.Sitemap do |> Sitemapper.generate(config) |> Stream.map(fn {filename, data} -> {filename, IO.iodata_to_binary(data)} end) |> Stream.flat_map(&persist(&1, config)) - |> maybe_ping(config, ping) |> Stream.run() if Keyword.get(config, :gzip, false) do @@ -33,9 +31,6 @@ defmodule Meadow.Utils.Sitemap do end end - defp maybe_ping(stream, _, false), do: stream - defp maybe_ping(stream, config, true), do: Sitemapper.ping(stream, config) - defp persist({filename, content}, config) do log_persist(filename, byte_size(content), Enum.into(config, %{})) Sitemapper.persist([{filename, content}], config) diff --git a/app/lib/mix/tasks/sitemap.ex b/app/lib/mix/tasks/sitemap.ex index d25c3f400..9a47bccea 100644 --- a/app/lib/mix/tasks/sitemap.ex +++ b/app/lib/mix/tasks/sitemap.ex @@ -1,10 +1,6 @@ defmodule Mix.Tasks.Sitemap.Generate do @moduledoc """ Generate and upload Digital Collections sitemaps - - ## Command line options - - * `--ping` - ping Google and Bing to update after generating sitemaps (default: `false`) """ use Mix.Task alias Meadow.Utils.Sitemap @@ -16,13 +12,8 @@ defmodule Mix.Tasks.Sitemap.Generate do System.put_env("MEADOW_PROCESSES", "none") Mix.Task.run("app.start") - %{ping: ping} = - with {opts, _} <- OptionParser.parse!(args, strict: [ping: :boolean]) do - opts |> Enum.into(%{ping: false}) - end - Logger.configure(level: :info) Logger.info("Generating sitemaps") - Sitemap.generate(ping) + Sitemap.generate() end end From d19479db5652772914b93d0d1d7623de7ff45e0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 11:51:23 +0000 Subject: [PATCH 21/33] Bump credo from 1.7.4 to 1.7.5 in /app Bumps [credo](https://github.com/rrrene/credo) from 1.7.4 to 1.7.5. - [Release notes](https://github.com/rrrene/credo/releases) - [Changelog](https://github.com/rrrene/credo/blob/master/CHANGELOG.md) - [Commits](https://github.com/rrrene/credo/compare/v1.7.4...v1.7.5) --- updated-dependencies: - dependency-name: credo dependency-type: direct:development 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 59bed0edb..330caf4c3 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -19,7 +19,7 @@ "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"}, "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.3.1", "ebd1a1d7aff97f27c66654e78ece187abdc646992714164380d8a041eda16754", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3a6efd3366130eab84ca372cbd4a7d3c3a97bdfcfb4911233b035d117063f0af"}, "cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"}, - "credo": {:hex, :credo, "1.7.4", "68ca5cf89071511c12fd9919eb84e388d231121988f6932756596195ccf7fd35", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "9cf776d062c78bbe0f0de1ecaee183f18f2c3ec591326107989b054b7dddefc2"}, + "credo": {:hex, :credo, "1.7.5", "643213503b1c766ec0496d828c90c424471ea54da77c8a168c725686377b9545", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "f799e9b5cd1891577d8c773d245668aa74a2fcd15eb277f51a0131690ebfb3fd"}, "crontab": {:hex, :crontab, "1.1.13", "3bad04f050b9f7f1c237809e42223999c150656a6b2afbbfef597d56df2144c5", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "d67441bec989640e3afb94e123f45a2bc42d76e02988c9613885dc3d01cf7085"}, "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"}, From b0c7a7fd0967a8f07d28d0f73c5cc6f1ed7c5a15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 11:51:59 +0000 Subject: [PATCH 22/33] Bump @graphql-codegen/client-preset from 4.2.3 to 4.2.4 in /app/assets Bumps [@graphql-codegen/client-preset](https://github.com/dotansimha/graphql-code-generator/tree/HEAD/packages/presets/client) from 4.2.3 to 4.2.4. - [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.2.4/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 | 58 ++++++++++++++++++------------------ app/assets/package.json | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 40b0703cc..7eed64772 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -70,7 +70,7 @@ "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.0", "@graphql-codegen/cli": "^5.0.2", - "@graphql-codegen/client-preset": "^4.2.3", + "@graphql-codegen/client-preset": "^4.2.4", "@graphql-typed-document-node/core": "^3.2.0", "@nulib/dcapi-types": "^2.1.0", "@nulib/prettier-config": "^1.2.0", @@ -3398,20 +3398,20 @@ } }, "node_modules/@graphql-codegen/client-preset": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.3.tgz", - "integrity": "sha512-ygfIKMtjoPY4iISYfNpvuVvV2e6BYAzHnC+MfDul7kZwY1pvv0P+IhezOaTHOheoTiah1BA7USFEOE5Nzp3Gdw==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.4.tgz", + "integrity": "sha512-k1c8v2YxJhhITGQGxViG9asLAoop9m7X9duU7Zztqjc98ooxsUzXICfvAWsH3mLAUibXAx4Ax6BPzKsTtQmBPg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", "@babel/template": "^7.20.7", "@graphql-codegen/add": "^5.0.2", - "@graphql-codegen/gql-tag-operations": "4.0.5", + "@graphql-codegen/gql-tag-operations": "4.0.6", "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/typed-document-node": "^5.0.5", - "@graphql-codegen/typescript": "^4.0.5", - "@graphql-codegen/typescript-operations": "^4.1.3", - "@graphql-codegen/visitor-plugin-common": "^5.0.0", + "@graphql-codegen/typed-document-node": "^5.0.6", + "@graphql-codegen/typescript": "^4.0.6", + "@graphql-codegen/typescript-operations": "^4.2.0", + "@graphql-codegen/visitor-plugin-common": "^5.1.0", "@graphql-tools/documents": "^1.0.0", "@graphql-tools/utils": "^10.0.0", "@graphql-typed-document-node/core": "3.2.0", @@ -3437,13 +3437,13 @@ } }, "node_modules/@graphql-codegen/gql-tag-operations": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.5.tgz", - "integrity": "sha512-FDiL1/fdP60Y10yQD+SsYoaApGLoirF4ATfi4eFklXu7GGosJzZBxni2D3+f99Qxd0iK368O3Dtbe38Z+Vd8Vg==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.6.tgz", + "integrity": "sha512-y6iXEDpDNjwNxJw3WZqX1/Znj0QHW7+y8O+t2V8qvbTT+3kb2lr9ntc8By7vCr6ctw9tXI4XKaJgpTstJDOwFA==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/visitor-plugin-common": "5.0.0", + "@graphql-codegen/visitor-plugin-common": "5.1.0", "@graphql-tools/utils": "^10.0.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" @@ -3484,13 +3484,13 @@ } }, "node_modules/@graphql-codegen/typed-document-node": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.5.tgz", - "integrity": "sha512-1bWoHYL8673zqq/yyp3L93JKTYrDNLymvibaldWn90PASI770gJ4fzH71RhkGaJDq0F43wmQk0sjz3s/RoKsLA==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.6.tgz", + "integrity": "sha512-US0J95hOE2/W/h42w4oiY+DFKG7IetEN1mQMgXXeat1w6FAR5PlIz4JrRrEkiVfVetZ1g7K78SOwBD8/IJnDiA==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/visitor-plugin-common": "5.0.0", + "@graphql-codegen/visitor-plugin-common": "5.1.0", "auto-bind": "~4.0.0", "change-case-all": "1.0.15", "tslib": "~2.6.0" @@ -3500,14 +3500,14 @@ } }, "node_modules/@graphql-codegen/typescript": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.5.tgz", - "integrity": "sha512-PCS6LovGhyNfnmZ2AJ8rN5wGUhysWNsFwCPrZccuwBVCCvcet8/GNKStY5cHiDqG0B5Q+6g8OXVbffhxkkytLA==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.6.tgz", + "integrity": "sha512-IBG4N+Blv7KAL27bseruIoLTjORFCT3r+QYyMC3g11uY3/9TPpaUyjSdF70yBe5GIQ6dAgDU+ENUC1v7EPi0rw==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-codegen/schema-ast": "^4.0.2", - "@graphql-codegen/visitor-plugin-common": "5.0.0", + "@graphql-codegen/visitor-plugin-common": "5.1.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" }, @@ -3516,14 +3516,14 @@ } }, "node_modules/@graphql-codegen/typescript-operations": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.1.3.tgz", - "integrity": "sha512-Goga2ISgicr/PLgK2NH5kwyQFctoGKpV+nv4Dr9II0xjHuuNvC6cqA66y/p8zKx6eS9p2GV87/IafqxV8r6K5Q==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.0.tgz", + "integrity": "sha512-lmuwYb03XC7LNRS8oo9M4/vlOrq/wOKmTLBHlltK2YJ1BO/4K/Q9Jdv/jDmJpNydHVR1fmeF4wAfsIp1f9JibA==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/typescript": "^4.0.5", - "@graphql-codegen/visitor-plugin-common": "5.0.0", + "@graphql-codegen/typescript": "^4.0.6", + "@graphql-codegen/visitor-plugin-common": "5.1.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" }, @@ -3532,9 +3532,9 @@ } }, "node_modules/@graphql-codegen/visitor-plugin-common": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.0.0.tgz", - "integrity": "sha512-qQOZZZ2MxmBEyd0Lm3lVh7zgauLXVBsg3ToucQJHmbk2WUxLMOcaf/+BOBIkrDjvWA8L+JU6COUT6uZc57DBcw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.1.0.tgz", + "integrity": "sha512-eamQxtA9bjJqI2lU5eYoA1GbdMIRT2X8m8vhWYsVQVWD3qM7sx/IqJU0kx0J3Vd4/CSd36BzL6RKwksibytDIg==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", diff --git a/app/assets/package.json b/app/assets/package.json index e7d42531d..0ce49e716 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -80,7 +80,7 @@ "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.0", "@graphql-codegen/cli": "^5.0.2", - "@graphql-codegen/client-preset": "^4.2.3", + "@graphql-codegen/client-preset": "^4.2.4", "@graphql-typed-document-node/core": "^3.2.0", "@nulib/dcapi-types": "^2.1.0", "@nulib/prettier-config": "^1.2.0", From fea9708f7f888fb997defb969340baffe70c5a0b Mon Sep 17 00:00:00 2001 From: Karen Shaw Date: Fri, 23 Feb 2024 12:10:14 -0800 Subject: [PATCH 23/33] Add embeddings to Meadow's index pipeline (#3835) * Add embeddings to work mapping * Encode embedding source field * Get work indexing with embeddings * Update config to get embedding model ID from secrets manager * Warn when embedding model is missing * Update opensearch test container to v2.11 * Remove `type: "_doc"` from bulk create and count requests Opensearch v2 did away with typed documents --------- Co-authored-by: Brendan Quinn Co-authored-by: Michael B. Klein --- .github/workflows/test.yml | 2 +- app/config/config.exs | 9 ++++- app/config/test.exs | 3 +- app/lib/meadow/data/shared_links.ex | 7 +--- app/lib/meadow/indexing/v2/work.ex | 52 +++++++++++++++++++++++++ app/lib/meadow/search/config.ex | 25 ++++++++++-- app/lib/meadow/search/index.ex | 35 +++++++++++++++++ app/priv/search/v2/settings/work.json | 53 ++++++++++++++++++++------ app/test/meadow/search/config_test.exs | 21 ++++++++++ infrastructure/deploy/secrets.tf | 5 ++- infrastructure/deploy/variables.tf | 4 ++ 11 files changed, 190 insertions(+), 26 deletions(-) create mode 100644 app/test/meadow/search/config_test.exs diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 66088951a..1038e7c77 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -138,7 +138,7 @@ jobs: - 389:389 - 636:636 opensearch: - image: opensearchproject/opensearch:1.3.1 + image: opensearchproject/opensearch:2.11.1 env: bootstrap.memory_lock: true OPENSEARCH_JAVA_OPTS: "-Xms256m -Xmx256m" diff --git a/app/config/config.exs b/app/config/config.exs index 021a74b47..f9531e8ef 100644 --- a/app/config/config.exs +++ b/app/config/config.exs @@ -52,7 +52,8 @@ config :meadow, Meadow.Search.Cluster, name: prefix("dc-v2-work"), settings: "priv/search/v2/settings/work.json", version: 2, - schemas: [Meadow.Data.Schemas.Work] + schemas: [Meadow.Data.Schemas.Work], + pipeline: prefix("dc-v2-work-pipeline") }, %{ name: prefix("dc-v2-file-set"), @@ -73,7 +74,11 @@ config :meadow, Meadow.Search.Cluster, ], bulk_page_size: 200, bulk_wait_interval: 500, - json_encoder: Ecto.Jason + json_encoder: Ecto.Jason, + embedding_model_id: aws_secret("meadow", + dig: ["search", "embedding_model_id"], + default: nil + ) config :meadow, ark: %{ diff --git a/app/config/test.exs b/app/config/test.exs index cdd429361..551fc23bf 100644 --- a/app/config/test.exs +++ b/app/config/test.exs @@ -14,7 +14,8 @@ config :meadow, Meadow.Search.Cluster, default: "http://localhost:9200" ), bulk_page_size: 3, - bulk_wait_interval: 2 + bulk_wait_interval: 2, + embedding_model_id: nil config :meadow, index_interval: 1234, diff --git a/app/lib/meadow/data/shared_links.ex b/app/lib/meadow/data/shared_links.ex index a22d9843c..d44273ff4 100644 --- a/app/lib/meadow/data/shared_links.ex +++ b/app/lib/meadow/data/shared_links.ex @@ -107,10 +107,7 @@ defmodule Meadow.Data.SharedLinks do defp create_shared_link_docs([]), do: :noop defp create_shared_link_docs(payload) do - Elastix.Bulk.post(SearchConfig.cluster_url(), payload, - index: Config.shared_links_index(), - type: @type_name - ) + Elastix.Bulk.post(SearchConfig.cluster_url(), payload, index: Config.shared_links_index()) end @doc """ @@ -179,7 +176,7 @@ defmodule Meadow.Data.SharedLinks do case Elastix.Search.count( SearchConfig.cluster_url(), Config.shared_links_index(), - [@type_name], + [], %{ query: %{match_all: %{}} } diff --git a/app/lib/meadow/indexing/v2/work.ex b/app/lib/meadow/indexing/v2/work.ex index 500512a42..8d0640283 100644 --- a/app/lib/meadow/indexing/v2/work.ex +++ b/app/lib/meadow/indexing/v2/work.ex @@ -74,8 +74,60 @@ defmodule Meadow.Indexing.V2.Work do work_type: encode_label(work.work_type) } |> Meadow.Utils.Map.nillify_empty() + |> prepare_embedding_field() end + @embedding_keys [ + :abstract, + :alternate_title, + :caption, + :collection, + :contributor, + :creator, + :date_created, + :description, + :genre, + # :keywords, + :language, + :location, + :physical_description_material, + :physical_description_size, + :publisher, + :scope_and_contents, + :source, + :subject, + :style_period, + :table_of_contents, + :title, + :technique + ] + + defp prepare_embedding_field(map) do + value = + @embedding_keys + |> Enum.reduce([], fn field_name, acc -> + v = prepare_embedding_value(Map.get(map, field_name)) + [v | acc] + end) + |> List.flatten() + |> Enum.reject(fn v -> + is_nil(v) or byte_size(v) == 0 + end) + |> Enum.join("\n") + + Map.put(map, :embedding_text, value) + end + + defp prepare_embedding_value(%{label: v}), do: prepare_embedding_value(v) + + defp prepare_embedding_value([]), do: [] + + defp prepare_embedding_value([v | list]), + do: [prepare_embedding_value(v) | prepare_embedding_value(list)] + + defp prepare_embedding_value(v) when is_binary(v), do: v + defp prepare_embedding_value(_), do: nil + def api_url, do: Application.get_env(:meadow, :dc_api) |> get_in([:v2, "base_url"]) def dc_url, do: Application.get_env(:meadow, :digital_collections_url) diff --git a/app/lib/meadow/search/config.ex b/app/lib/meadow/search/config.ex index 142dc1496..eb2865c42 100644 --- a/app/lib/meadow/search/config.ex +++ b/app/lib/meadow/search/config.ex @@ -3,6 +3,8 @@ defmodule Meadow.Search.Config do Convenience methods for retrieving search-specific configuration """ + require Logger + def index_configs do Application.get_env(:meadow, Meadow.Search.Cluster) |> Keyword.get(:indexes) @@ -27,12 +29,29 @@ defmodule Meadow.Search.Config do end def settings_for(schema, version) do - case config_for(schema, version) do - %{settings: settings} -> File.read!(settings) |> Jason.decode!() - _ -> nil + case {config_for(schema, version), embedding_model_id()} do + {%{settings: settings, pipeline: pipeline}, nil} -> + Logger.warning("No embedding model id found in config, skipping pipeline: #{pipeline}") + File.read!(settings) |> Jason.decode!() + + {%{settings: settings, pipeline: pipeline}, _embedding_model_id} -> + File.read!(settings) + |> Jason.decode!() + |> put_in(["settings", "default_pipeline"], pipeline) + + {%{settings: settings}, _} -> + File.read!(settings) |> Jason.decode!() + + _ -> + nil end end + def embedding_model_id do + Application.get_env(:meadow, Meadow.Search.Cluster) + |> Keyword.get(:embedding_model_id) + end + def index_versions do index_configs() |> Enum.map(& &1.version) diff --git a/app/lib/meadow/search/index.ex b/app/lib/meadow/search/index.ex index 1b1518f1b..b20a9864b 100644 --- a/app/lib/meadow/search/index.ex +++ b/app/lib/meadow/search/index.ex @@ -21,6 +21,14 @@ defmodule Meadow.Search.Index do Returns `{:ok, {alias, index}}` """ def create(alias, settings \\ %{}) when is_binary(alias) and is_map(settings) do + case get_in(settings, ["settings", "default_pipeline"]) do + nil -> + :noop + + pipeline -> + create_vector_pipeline(pipeline, SearchConfig.embedding_model_id(), "embedding_text") + end + with timestamp <- DateTime.utc_now() |> DateTime.to_unix(:millisecond), new_index <- [alias, to_string(timestamp)] |> Enum.join("-") do case Elastix.Index.create(SearchConfig.cluster_url(), new_index, settings) do @@ -30,6 +38,33 @@ defmodule Meadow.Search.Index do end end + @doc """ + Create a vector pipeline, takes a name, model id, source field, and a target field + Returns {:ok, {}} + """ + def create_vector_pipeline(name, model_id, source_field, target_field \\ "embedding") do + pipeline = %{ + "description" => "Vector pipeline for #{name}", + "processors" => [ + %{ + "text_embedding" => %{ + "model_id" => model_id, + "field_map" => %{ + source_field => target_field + } + } + }, + %{ + "remove" => %{ + "field" => source_field + } + } + ] + } + + HTTP.put(["_ingest", "pipeline", name], pipeline) + end + @doc """ Delete an index """ diff --git a/app/priv/search/v2/settings/work.json b/app/priv/search/v2/settings/work.json index fe9363ad4..18ec6839d 100644 --- a/app/priv/search/v2/settings/work.json +++ b/app/priv/search/v2/settings/work.json @@ -1,21 +1,33 @@ { "settings": { "index": { - "max_result_window": "50000" + "max_result_window": "50000", + "knn": true }, "analysis": { "analyzer": { "full_analyzer": { "type": "custom", "tokenizer": "standard", - "char_filter": ["html_strip"], - "filter": ["lowercase", "asciifolding"] + "char_filter": [ + "html_strip" + ], + "filter": [ + "lowercase", + "asciifolding" + ] }, "stopword_analyzer": { "type": "custom", "tokenizer": "standard", - "char_filter": ["html_strip"], - "filter": ["lowercase", "asciifolding", "english_stop"] + "char_filter": [ + "html_strip" + ], + "filter": [ + "lowercase", + "asciifolding", + "english_stop" + ] } }, "filter": { @@ -46,10 +58,19 @@ "all_ids": { "type": "keyword" }, - "indexed_at": { + "create_date": { "type": "date_nanos" }, - "create_date": { + "embedding": { + "type": "knn_vector", + "dimension": 384, + "method": { + "name": "hnsw", + "space_type": "cosinesimil", + "engine": "lucene" + } + }, + "indexed_at": { "type": "date_nanos" }, "modified_date": { @@ -66,7 +87,9 @@ "analyzer": "full_analyzer", "search_analyzer": "stopword_analyzer", "search_quote_analyzer": "full_analyzer", - "copy_to": ["all_text"] + "copy_to": [ + "all_text" + ] } } }, @@ -76,7 +99,9 @@ "match_pattern": "regex", "mapping": { "type": "keyword", - "copy_to": ["all_ids"] + "copy_to": [ + "all_ids" + ] } } }, @@ -115,7 +140,9 @@ "ignore_above": 256 } }, - "copy_to": ["all_text"] + "copy_to": [ + "all_text" + ] } } }, @@ -133,10 +160,12 @@ "match_mapping_type": "string", "mapping": { "type": "keyword", - "copy_to": ["all_text"] + "copy_to": [ + "all_text" + ] } } } ] } -} +} \ No newline at end of file diff --git a/app/test/meadow/search/config_test.exs b/app/test/meadow/search/config_test.exs new file mode 100644 index 000000000..cfd4a24cd --- /dev/null +++ b/app/test/meadow/search/config_test.exs @@ -0,0 +1,21 @@ +defmodule Meadow.Search.ConfigTest do + use ExUnit.Case + + import ExUnit.CaptureLog + + alias Meadow.Data.Schemas.Work + alias Meadow.Search.Config, as: SearchConfig + + describe "Meadow.Search.Config" do + test "config_for/2" do + logged = + capture_log(fn -> + config = SearchConfig.settings_for(Work, 2) + refute config["default_pipeline"] + end) + + assert logged + |> String.contains?("No embedding model id found in config, skipping pipeline") + end + end +end diff --git a/infrastructure/deploy/secrets.tf b/infrastructure/deploy/secrets.tf index 9896c26c0..5398c7093 100644 --- a/infrastructure/deploy/secrets.tf +++ b/infrastructure/deploy/secrets.tf @@ -56,8 +56,9 @@ locals { search = { cluster_endpoint = var.elasticsearch_url - access_key_id = aws_iam_access_key.meadow_elasticsearch_access_key.id - secret_access_key = aws_iam_access_key.meadow_elasticsearch_access_key.secret + access_key_id = aws_iam_access_key.meadow_elasticsearch_access_key.id + secret_access_key = aws_iam_access_key.meadow_elasticsearch_access_key.secret + embedding_model_id = var.embedding_model_id } ldap = { diff --git a/infrastructure/deploy/variables.tf b/infrastructure/deploy/variables.tf index 7d596d08d..a21b156f3 100644 --- a/infrastructure/deploy/variables.tf +++ b/infrastructure/deploy/variables.tf @@ -45,6 +45,10 @@ variable "digital_collections_url" { type = string } +variable "embedding_model_id" { + type = string +} + variable "fixity_function" { type = string } From 1a3bdc4a8ec5e1ab84a80dbb5f38782a70384244 Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Fri, 23 Feb 2024 20:34:30 +0000 Subject: [PATCH 24/33] Add pipeline spec to work index --- app/config/releases.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/config/releases.exs b/app/config/releases.exs index 1f7e8ff8b..3c30ca57b 100644 --- a/app/config/releases.exs +++ b/app/config/releases.exs @@ -71,7 +71,8 @@ config :meadow, Meadow.Search.Cluster, name: "dc-v2-work", settings: priv_path.("search/v2/settings/work.json"), version: 2, - schemas: [Meadow.Data.Schemas.Work] + schemas: [Meadow.Data.Schemas.Work], + pipeline: prefix("dc-v2-work-pipeline") }, %{ name: "dc-v2-file-set", From 06cccd68e50888dd05c29d4df41a1f2e8a341302 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 11:40:31 +0000 Subject: [PATCH 25/33] Bump hls.js from 1.5.6 to 1.5.7 in /app/assets Bumps [hls.js](https://github.com/video-dev/hls.js) from 1.5.6 to 1.5.7. - [Release notes](https://github.com/video-dev/hls.js/releases) - [Changelog](https://github.com/video-dev/hls.js/blob/master/docs/release-process.md) - [Commits](https://github.com/video-dev/hls.js/compare/v1.5.6...v1.5.7) --- updated-dependencies: - dependency-name: hls.js 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 40b0703cc..8e88644c8 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -35,7 +35,7 @@ "file-saver": "^2.0.5", "graphql": "^16.8.1", "graphql-tag": "^2.12.6", - "hls.js": "^1.5.6", + "hls.js": "^1.5.7", "inflection": "^3.0.0", "jest-environment-jsdom": "^29.7.0", "js-cookie": "^3.0.5", @@ -12760,9 +12760,9 @@ } }, "node_modules/hls.js": { - "version": "1.5.6", - "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.6.tgz", - "integrity": "sha512-rmlaIEfLuSwqRtYLeTk30ebYli5qNK2urdkEcqYoBezRpV+MFHhZnMX77lHWW+EMjNlwr2sx2apfqq54E3yXnA==" + "version": "1.5.7", + "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.7.tgz", + "integrity": "sha512-Hnyf7ojTBtXHeOW1/t6wCBJSiK1WpoKF9yg7juxldDx8u3iswrkPt2wbOA/1NiwU4j27DSIVoIEJRAhcdMef/A==" }, "node_modules/hmac-drbg": { "version": "1.0.1", diff --git a/app/assets/package.json b/app/assets/package.json index e7d42531d..3d143a827 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -45,7 +45,7 @@ "file-saver": "^2.0.5", "graphql": "^16.8.1", "graphql-tag": "^2.12.6", - "hls.js": "^1.5.6", + "hls.js": "^1.5.7", "inflection": "^3.0.0", "jest-environment-jsdom": "^29.7.0", "js-cookie": "^3.0.5", From 5c6aeb9736e2ab309e7d9616377c20053d2d007b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 11:42:07 +0000 Subject: [PATCH 26/33] Bump quantum from 3.5.0 to 3.5.1 in /app Bumps [quantum](https://github.com/quantum-elixir/quantum-core) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/quantum-elixir/quantum-core/releases) - [Changelog](https://github.com/quantum-elixir/quantum-core/blob/main/CHANGELOG.md) - [Commits](https://github.com/quantum-elixir/quantum-core/compare/v3.5.0...v3.5.1) --- updated-dependencies: - dependency-name: quantum 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 59bed0edb..6f7f7f4b3 100644 --- a/app/mix.lock +++ b/app/mix.lock @@ -80,7 +80,7 @@ "plug_crypto": {:hex, :plug_crypto, "2.0.0", "77515cc10af06645abbfb5e6ad7a3e9714f805ae118fa1a70205f80d2d70fe73", [:mix], [], "hexpm", "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"}, "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"}, "postgrex": {:hex, :postgrex, "0.17.4", "5777781f80f53b7c431a001c8dad83ee167bcebcf3a793e3906efff680ab62b3", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "6458f7d5b70652bc81c3ea759f91736c16a31be000f306d3c64bcdfe9a18b3cc"}, - "quantum": {:hex, :quantum, "3.5.0", "8d2c5ba68c55991e8975aca368e3ab844ba01f4b87c4185a7403280e2c99cf34", [:mix], [{:crontab, "~> 1.1", [hex: :crontab, repo: "hexpm", optional: false]}, {:gen_stage, "~> 0.14 or ~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_registry, "~> 0.2", [hex: :telemetry_registry, repo: "hexpm", optional: false]}], "hexpm", "cab737d1d9779f43cb1d701f46dd05ea58146fd96238d91c9e0da662c1982bb6"}, + "quantum": {:hex, :quantum, "3.5.1", "c18e31b2cfa417849fe96e6d6a555ea5e6891797a4a8945e6c3c58df002f123c", [:mix], [{:crontab, "~> 1.1", [hex: :crontab, repo: "hexpm", optional: false]}, {:gen_stage, "~> 0.14 or ~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_registry, "~> 0.2", [hex: :telemetry_registry, repo: "hexpm", optional: false]}], "hexpm", "c184ac6eead3e3189b2a73d971ef57cd04d8ea458757b27ce90f922d252b519b"}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"}, "retry": {:hex, :retry, "0.18.0", "dc58ebe22c95aa00bc2459f9e0c5400e6005541cf8539925af0aa027dc860543", [:mix], [], "hexpm", "9483959cc7bf69c9e576d9dfb2b678b71c045d3e6f39ab7c9aa1489df4492d73"}, "saxy": {:hex, :saxy, "1.5.0", "0141127f2d042856f135fb2d94e0beecda7a2306f47546dbc6411fc5b07e28bf", [:mix], [], "hexpm", "ea7bb6328fbd1f2aceffa3ec6090bfb18c85aadf0f8e5030905e84235861cf89"}, From 3bebe6dfe5e60f66fb99cb81da413696f8653a78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:06:49 +0000 Subject: [PATCH 27/33] Bump @babel/core from 7.23.9 to 7.24.0 in /app/assets Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.23.9 to 7.24.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.0/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 62 ++++++++++++++++++------------------ app/assets/package.json | 2 +- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 40b0703cc..197335028 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -57,7 +57,7 @@ "use-clipboard-copy": "^0.2.0" }, "devDependencies": { - "@babel/core": "^7.23.9", + "@babel/core": "^7.24.0", "@babel/plugin-proposal-class-properties": "^7.17.12", "@babel/plugin-proposal-object-rest-spread": "^7.17.3", "@babel/plugin-proposal-optional-chaining": "^7.16.7", @@ -646,20 +646,20 @@ } }, "node_modules/@babel/core": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", - "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz", + "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.9", - "@babel/parser": "^7.23.9", - "@babel/template": "^7.23.9", - "@babel/traverse": "^7.23.9", - "@babel/types": "^7.23.9", + "@babel/helpers": "^7.24.0", + "@babel/parser": "^7.24.0", + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.0", + "@babel/types": "^7.24.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -983,13 +983,13 @@ } }, "node_modules/@babel/helpers": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz", - "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.0.tgz", + "integrity": "sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==", "dependencies": { - "@babel/template": "^7.23.9", - "@babel/traverse": "^7.23.9", - "@babel/types": "^7.23.9" + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -1009,9 +1009,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", - "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz", + "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==", "bin": { "parser": "bin/babel-parser.js" }, @@ -2462,22 +2462,22 @@ } }, "node_modules/@babel/template": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", - "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", "dependencies": { "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.23.9", - "@babel/types": "^7.23.9" + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", - "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz", + "integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==", "dependencies": { "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", @@ -2485,8 +2485,8 @@ "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.9", - "@babel/types": "^7.23.9", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -2495,9 +2495,9 @@ } }, "node_modules/@babel/types": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", - "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", "dependencies": { "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", diff --git a/app/assets/package.json b/app/assets/package.json index e7d42531d..4cf8adbe9 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -67,7 +67,7 @@ "use-clipboard-copy": "^0.2.0" }, "devDependencies": { - "@babel/core": "^7.23.9", + "@babel/core": "^7.24.0", "@babel/plugin-proposal-class-properties": "^7.17.12", "@babel/plugin-proposal-object-rest-spread": "^7.17.3", "@babel/plugin-proposal-optional-chaining": "^7.16.7", From 8a795c5f6510bb869789ac190c1e390bbd74bb8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:07:33 +0000 Subject: [PATCH 28/33] Bump @babel/preset-env from 7.23.9 to 7.24.0 in /app/assets Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.23.9 to 7.24.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.0/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/assets/package-lock.json | 30 +++++++++++++++--------------- app/assets/package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 40b0703cc..1423d4769 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -62,7 +62,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.17.3", "@babel/plugin-proposal-optional-chaining": "^7.16.7", "@babel/plugin-transform-async-to-generator": "^7.22.5", - "@babel/preset-env": "^7.23.9", + "@babel/preset-env": "^7.24.0", "@babel/preset-react": "^7.23.3", "@babel/preset-typescript": "^7.23.3", "@babel/runtime": "^7.23.9", @@ -868,9 +868,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", + "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", "dev": true, "engines": { "node": ">=6.9.0" @@ -1913,14 +1913,14 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.23.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz", - "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.0.tgz", + "integrity": "sha512-y/yKMm7buHpFFXfxVFS4Vk1ToRJDilIa6fKRioB9Vjichv58TDGXTvqV0dN7plobAmTW5eSEGXDngE+Mm+uO+w==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.23.3", - "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/compat-data": "^7.23.5", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-transform-parameters": "^7.23.3" }, @@ -2298,14 +2298,14 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.9.tgz", - "integrity": "sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz", + "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==", "dev": true, "dependencies": { "@babel/compat-data": "^7.23.5", "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-validator-option": "^7.23.5", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", @@ -2358,7 +2358,7 @@ "@babel/plugin-transform-new-target": "^7.23.3", "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4", "@babel/plugin-transform-numeric-separator": "^7.23.4", - "@babel/plugin-transform-object-rest-spread": "^7.23.4", + "@babel/plugin-transform-object-rest-spread": "^7.24.0", "@babel/plugin-transform-object-super": "^7.23.3", "@babel/plugin-transform-optional-catch-binding": "^7.23.4", "@babel/plugin-transform-optional-chaining": "^7.23.4", diff --git a/app/assets/package.json b/app/assets/package.json index e7d42531d..cae00633e 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -72,7 +72,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.17.3", "@babel/plugin-proposal-optional-chaining": "^7.16.7", "@babel/plugin-transform-async-to-generator": "^7.22.5", - "@babel/preset-env": "^7.23.9", + "@babel/preset-env": "^7.24.0", "@babel/preset-react": "^7.23.3", "@babel/preset-typescript": "^7.23.3", "@babel/runtime": "^7.23.9", From d43ce0b735dd6a95ef628c00f9ab2d1e1712fff6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:08:10 +0000 Subject: [PATCH 29/33] Bump @emotion/react from 11.11.3 to 11.11.4 in /app/assets Bumps [@emotion/react](https://github.com/emotion-js/emotion) from 11.11.3 to 11.11.4. - [Release notes](https://github.com/emotion-js/emotion/releases) - [Changelog](https://github.com/emotion-js/emotion/blob/main/CHANGELOG.md) - [Commits](https://github.com/emotion-js/emotion/compare/@emotion/react@11.11.3...@emotion/react@11.11.4) --- updated-dependencies: - dependency-name: "@emotion/react" 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 40b0703cc..4dc24a898 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -11,7 +11,7 @@ "@apollo/react-hooks": "^4.0.0", "@apollo/react-testing": "^4.0.0", "@appbaseio/reactivesearch": "3.23.1", - "@emotion/react": "^11.11.3", + "@emotion/react": "^11.11.4", "@fortawesome/fontawesome-svg-core": "^6.5.1", "@fortawesome/free-brands-svg-icons": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", @@ -2669,9 +2669,9 @@ "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" }, "node_modules/@emotion/react": { - "version": "11.11.3", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.3.tgz", - "integrity": "sha512-Cnn0kuq4DoONOMcnoVsTOR8E+AdnKFf//6kUWc4LCdnxj31pZWn7rIULd6Y7/Js1PiPHzn7SKCM9vB/jBni8eA==", + "version": "11.11.4", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz", + "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==", "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.11.0", diff --git a/app/assets/package.json b/app/assets/package.json index e7d42531d..5bf042605 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -21,7 +21,7 @@ "@apollo/react-hooks": "^4.0.0", "@apollo/react-testing": "^4.0.0", "@appbaseio/reactivesearch": "3.23.1", - "@emotion/react": "^11.11.3", + "@emotion/react": "^11.11.4", "@fortawesome/fontawesome-svg-core": "^6.5.1", "@fortawesome/free-brands-svg-icons": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", From bd7f12804c756bc81d735fa0d2107ac964390e83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:08:56 +0000 Subject: [PATCH 30/33] Bump @babel/runtime from 7.23.9 to 7.24.0 in /app/assets Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.23.9 to 7.24.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.0/packages/babel-runtime) --- updated-dependencies: - dependency-name: "@babel/runtime" 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 40b0703cc..76be62f1a 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -65,7 +65,7 @@ "@babel/preset-env": "^7.23.9", "@babel/preset-react": "^7.23.3", "@babel/preset-typescript": "^7.23.3", - "@babel/runtime": "^7.23.9", + "@babel/runtime": "^7.24.0", "@creativebulma/bulma-divider": "^1.1.0", "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.0", @@ -2451,9 +2451,9 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz", - "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", + "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", "dependencies": { "regenerator-runtime": "^0.14.0" }, diff --git a/app/assets/package.json b/app/assets/package.json index e7d42531d..56ce9992b 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -75,7 +75,7 @@ "@babel/preset-env": "^7.23.9", "@babel/preset-react": "^7.23.3", "@babel/preset-typescript": "^7.23.3", - "@babel/runtime": "^7.23.9", + "@babel/runtime": "^7.24.0", "@creativebulma/bulma-divider": "^1.1.0", "@creativebulma/bulma-tooltip": "^1.2.0", "@elastic/elasticsearch-mock": "^2.0.0", From 9f598443e84aa877831bf622228896c93f072cca Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Wed, 28 Feb 2024 17:08:32 +0000 Subject: [PATCH 31/33] Warn and leave old alias if reindexed doc count doesn't match --- app/lib/meadow/data/indexer.ex | 15 +++++++++++++++ app/lib/meadow/search/client.ex | 10 +++++++++- app/lib/meadow/utils/sitemap.ex | 2 +- app/lib/mix/tasks/sitemap.ex | 2 +- app/test/meadow/search/client_test.exs | 12 ++++++++++++ 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/app/lib/meadow/data/indexer.ex b/app/lib/meadow/data/indexer.ex index 1ff2be4b3..28f897cb2 100644 --- a/app/lib/meadow/data/indexer.ex +++ b/app/lib/meadow/data/indexer.ex @@ -35,9 +35,24 @@ defmodule Meadow.Data.Indexer do def reindex_all(version, schema) do SearchClient.hot_swap(schema, version, fn index -> synchronize_schema(schema, version, index, :all) + |> check_synchronize_result(schema, index) end) end + def check_synchronize_result(:ok, schema, index) do + expected = Repo.aggregate(schema, :count) + actual = SearchClient.indexed_doc_count(index) + + if actual < expected * 0.9 do + error = Meadow.IndexerError.exception("Indexed #{actual} docs; expected #{expected}") + {:incomplete, error} + else + :ok + end + end + + def check_synchronize_result(other, _, _), do: other + def synchronize_index do SearchConfig.index_versions() |> Enum.each(&synchronize_index/1) diff --git a/app/lib/meadow/search/client.ex b/app/lib/meadow/search/client.ex index 9a7247d50..3479b8e18 100644 --- a/app/lib/meadow/search/client.ex +++ b/app/lib/meadow/search/client.ex @@ -54,11 +54,19 @@ defmodule Meadow.Search.Client do {:ok, _} -> SearchAlias.update(alias, index) + {:incomplete, reason} -> + Error.log_and_report( + "Incomplete hot swap on #{alias}. Alias left unchanged.", + reason, + __MODULE__, + [] + ) + {:error, reason} -> SearchIndex.delete(index) Error.log_and_report( - "Problem performing hot swap", + "Problem performing hot swap on #{alias}", reason, __MODULE__, [] diff --git a/app/lib/meadow/utils/sitemap.ex b/app/lib/meadow/utils/sitemap.ex index b8edc12b7..72ec49d30 100644 --- a/app/lib/meadow/utils/sitemap.ex +++ b/app/lib/meadow/utils/sitemap.ex @@ -10,7 +10,7 @@ defmodule Meadow.Utils.Sitemap do @doc """ Generate a sitemap, upload it to the configured bucket """ - def generate() do + def generate do with config <- config() do Repo.transaction( fn -> diff --git a/app/lib/mix/tasks/sitemap.ex b/app/lib/mix/tasks/sitemap.ex index 9a47bccea..60eb3e83c 100644 --- a/app/lib/mix/tasks/sitemap.ex +++ b/app/lib/mix/tasks/sitemap.ex @@ -8,7 +8,7 @@ defmodule Mix.Tasks.Sitemap.Generate do require Logger @shortdoc @moduledoc - def run(args) do + def run(_args) do System.put_env("MEADOW_PROCESSES", "none") Mix.Task.run("app.start") diff --git a/app/test/meadow/search/client_test.exs b/app/test/meadow/search/client_test.exs index 9beadb106..f532812f6 100644 --- a/app/test/meadow/search/client_test.exs +++ b/app/test/meadow/search/client_test.exs @@ -80,6 +80,18 @@ defmodule Meadow.Search.ClientTest do assert log =~ ~r/Problem performing hot swap/ assert log =~ ~r/Whoa, reindexing .+ blew up/ end + + test "doesn't swap alias if hot swap is incomplete" do + log = + capture_log(fn -> + Client.hot_swap(Work, 2, fn _index -> + {:incomplete, "Some documents are missing"} + end) + end) + + assert log =~ ~r/Incomplete hot swap/ + assert log =~ ~r/Some documents are missing/ + end end test "most_recent/2" do From 8f48cdb78e10024b8e31f326ab29809331ad7cfa Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Wed, 28 Feb 2024 17:47:53 +0000 Subject: [PATCH 32/33] Minor version bump --- app/mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix.exs b/app/mix.exs index 40df1ba16..b59e55eb9 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.1.4" + @app_version "9.2.0" def project do [ From afb81a2225331c36da315edccbc38bb7fbd84857 Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Thu, 29 Feb 2024 18:03:11 +0000 Subject: [PATCH 33/33] Ignore text embedding failures in OpenSearch --- app/lib/meadow/search/index.ex | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/lib/meadow/search/index.ex b/app/lib/meadow/search/index.ex index b20a9864b..4d0ba6e8a 100644 --- a/app/lib/meadow/search/index.ex +++ b/app/lib/meadow/search/index.ex @@ -51,12 +51,14 @@ defmodule Meadow.Search.Index do "model_id" => model_id, "field_map" => %{ source_field => target_field - } + }, + "ignore_failure" => true } }, %{ "remove" => %{ - "field" => source_field + "field" => source_field, + "ignore_failure" => true } } ]