From fb205e48f4e9867e94b6d7ff8299952a319506f2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 21:01:57 +0000 Subject: [PATCH 01/14] Update dependency uwsgi to v2.0.26 --- poetry.lock | 6 +++--- pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index c7bafcf3..bc4cc27f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3595,13 +3595,13 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "uwsgi" -version = "2.0.25.1" +version = "2.0.26" description = "The uWSGI server" category = "main" optional = false python-versions = "*" files = [ - {file = "uwsgi-2.0.25.1.tar.gz", hash = "sha256:d653d2d804c194c8cbe2585fa56efa2650313ae75c686a9d7931374d4dfbfc6e"}, + {file = "uwsgi-2.0.26.tar.gz", hash = "sha256:86e6bfcd4dc20529665f5b7777193cdc48622fb2c59f0a7f1e3dc32b3882e7f9"}, ] [[package]] @@ -3827,4 +3827,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "2da741ba1e3740d4a252af89333b143c2b2d002ad19cf7aed2fd825dd68f48f5" +content-hash = "0e0ebcc59895382da9bca9d3c400e2ad6e770b064b425ef5a2176c97706cf5dd" diff --git a/pyproject.toml b/pyproject.toml index 098a849f..45c87b89 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ smart-open = "^1.5.7" structlog = "^20.1.0" structlog-sentry = "^1.2.2" urllib3 = "^1.24.2" -uwsgi = "2.0.25.1" +uwsgi = "2.0.26" [tool.poetry.group.dev.dependencies] From 987969aacba5ffb3c9c21fbc5fec8c5846f281bd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 00:13:24 +0000 Subject: [PATCH 02/14] Update dependency flow-bin to v0.237.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 85563e99..a3ded5c6 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "eslint-plugin-react": "^7.19.0", "express": "^4.17.3", "fetch-mock": "^5.12.1", - "flow-bin": "0.236.0", + "flow-bin": "0.237.1", "isomorphic-fetch": "^2.2.1", "jquery": "^3.5.0", "jsdom": "^16.7.0", diff --git a/yarn.lock b/yarn.lock index 53b244d6..dc30b4b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4511,10 +4511,10 @@ flatted@^2.0.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== -flow-bin@0.236.0: - version "0.236.0" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.236.0.tgz#758fed785ab14d9260e70a25602179d9539cac18" - integrity sha512-hlnszHNuYjTUFMkU7HqpxrMecI2BgI7+frbTzolbyoNHgzLsVcuq9RtaTwHYcUp1sKW1sqnYHCP1tYMtWHz2rQ== +flow-bin@0.237.1: + version "0.237.1" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.237.1.tgz#2a21ff0b791d1e7460223f26f1b655606ec3801d" + integrity sha512-h4BdtMaFRITRklbjDULsD8mKAxd9XhOwspWaHdyoTsRQoLGPkH9r2zkn+01B7CQqm5cNu6TUH3DHUJYskLjOwA== flush-write-stream@^1.0.0: version "1.1.1" From e71ca33d720dc712809a3ce9b8760e800d22c1ed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 04:51:37 +0000 Subject: [PATCH 03/14] Update dependency sentry-sdk to ^0.20.0 --- poetry.lock | 14 ++++++++------ pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index bc4cc27f..91da0167 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3272,14 +3272,14 @@ doc = ["Sphinx", "sphinx-rtd-theme"] [[package]] name = "sentry-sdk" -version = "0.14.4" -description = "Python client for Sentry (https://getsentry.com)" +version = "0.20.3" +description = "Python client for Sentry (https://sentry.io)" category = "main" optional = false python-versions = "*" files = [ - {file = "sentry-sdk-0.14.4.tar.gz", hash = "sha256:0e5e947d0f7a969314aa23669a94a9712be5a688ff069ff7b9fc36c66adc160c"}, - {file = "sentry_sdk-0.14.4-py2.py3-none-any.whl", hash = "sha256:799a8bf76b012e3030a881be00e97bc0b922ce35dde699c6537122b751d80e2c"}, + {file = "sentry-sdk-0.20.3.tar.gz", hash = "sha256:4ae8d1ced6c67f1c8ea51d82a16721c166c489b76876c9f2c202b8a50334b237"}, + {file = "sentry_sdk-0.20.3-py2.py3-none-any.whl", hash = "sha256:e75c8c58932bda8cd293ea8e4b242527129e1caaec91433d21b8b2f20fee030b"}, ] [package.dependencies] @@ -3288,12 +3288,14 @@ urllib3 = ">=1.10.0" [package.extras] aiohttp = ["aiohttp (>=3.5)"] -beam = ["beam (>=2.12)"] +beam = ["apache-beam (>=2.12)"] bottle = ["bottle (>=0.12.13)"] celery = ["celery (>=3)"] +chalice = ["chalice (>=1.16.0)"] django = ["django (>=1.8)"] falcon = ["falcon (>=1.4)"] flask = ["blinker (>=1.1)", "flask (>=0.11)"] +pure-eval = ["asttokens", "executing", "pure-eval"] pyspark = ["pyspark (>=2.4.4)"] rq = ["rq (>=0.6)"] sanic = ["sanic (>=0.8)"] @@ -3827,4 +3829,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "0e0ebcc59895382da9bca9d3c400e2ad6e770b064b425ef5a2176c97706cf5dd" +content-hash = "985bdeef4aadc4b9a4bcd930a59ddad0f5e2937ae063c6ae06f5de810acf1a1b" diff --git a/pyproject.toml b/pyproject.toml index 45c87b89..8936d75f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,7 @@ python-dateutil = "^2.8.1" pytz = "^2023.3" redis = "^4.4.4" requests = "^2.20.0" -sentry-sdk = "^0.14.3" +sentry-sdk = "^0.20.0" smart-open = "^1.5.7" structlog = "^20.1.0" structlog-sentry = "^1.2.2" From 9e8e8e1ce65e2df4364d0bd256ccf51858c6b15a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 07:35:14 +0000 Subject: [PATCH 04/14] Update dependency style-loader to ^0.23.0 --- package.json | 2 +- yarn.lock | 34 ++++++---------------------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index a3ded5c6..da5dfa93 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "sass-lint": "^1.10.2", "sass-loader": "^10", "sinon": "^9.0.2", - "style-loader": "^0.18.2", + "style-loader": "^0.23.0", "tar": "^6.0.0", "url-loader": "^4.1.0", "victory": "^0.25.6", diff --git a/yarn.lock b/yarn.lock index dc30b4b5..7faf56c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1239,15 +1239,6 @@ ajv@^4.7.0: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.0.0: - version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - ajv@^6.1.0, ajv@^6.5.5: version "6.10.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" @@ -4291,10 +4282,6 @@ extsprintf@1.3.0, extsprintf@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" -fast-deep-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" - fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" @@ -5972,10 +5959,6 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -8725,12 +8708,6 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -schema-utils@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" - dependencies: - ajv "^5.0.0" - schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -9370,12 +9347,13 @@ stubs@^3.0.0: resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b" integrity sha1-6NK6H6nJBXAwPAMLaQD31fiavls= -style-loader@^0.18.2: - version "0.18.2" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.2.tgz#cc31459afbcd6d80b7220ee54b291a9fd66ff5eb" +style-loader@^0.23.0: + version "0.23.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925" + integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg== dependencies: - loader-utils "^1.0.2" - schema-utils "^0.3.0" + loader-utils "^1.1.0" + schema-utils "^1.0.0" supports-color@6.0.0: version "6.0.0" From db4502112b7e853b4920e912d84617356e401562 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 09:39:07 +0000 Subject: [PATCH 05/14] Update dependency victory to ^0.27.0 --- package.json | 2 +- yarn.lock | 53 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index da5dfa93..e02c4b31 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "style-loader": "^0.23.0", "tar": "^6.0.0", "url-loader": "^4.1.0", - "victory": "^0.25.6", + "victory": "^0.27.0", "video.js": "^7.15.0", "videojs-contrib-quality-levels": "^2.0.4", "videojs-hls-quality-selector": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 7faf56c5..a583ce1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6192,7 +6192,7 @@ lodash.unescape@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" -lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@^4.7.0, lodash@~4.17.4: +lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@^4.7.0, lodash@~4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -7986,6 +7986,11 @@ react-dropbox-chooser@^0.0.5: dependencies: load-script "^1.0.0" +react-fast-compare@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9" + integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw== + react-ga@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-2.2.0.tgz#45235de1356e4d988d9b82214d615a08489c9291" @@ -9953,40 +9958,46 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -victory-chart@^25.1.1: - version "25.1.1" - resolved "https://registry.yarnpkg.com/victory-chart/-/victory-chart-25.1.1.tgz#5b5d9bde802eea774f1105af6fb723d478717532" +victory-chart@^27.1.0: + version "27.1.1" + resolved "https://registry.yarnpkg.com/victory-chart/-/victory-chart-27.1.1.tgz#db7337c0dba1353d6a08e7116df1988edea785b0" + integrity sha512-6QLtfDLQQdtzNfLkFIR5QR9SmWwkre0yLz0auanth9XnBdwKoMf+g+l06tsKvNfHxNw8ZaG0C/J+KwtU/5ChPg== dependencies: d3-voronoi "^1.1.2" - lodash "^4.17.4" - victory-core "^21.0.4" + lodash "^4.17.5" + react-fast-compare "^2.0.0" + victory-core "^24.0.0" -victory-core@^21.0.2, victory-core@^21.0.4: - version "21.0.4" - resolved "https://registry.yarnpkg.com/victory-core/-/victory-core-21.0.4.tgz#5ac6d495a43e5d95249c56973290b182ec607b4a" +victory-core@^24.0.0: + version "24.0.1" + resolved "https://registry.yarnpkg.com/victory-core/-/victory-core-24.0.1.tgz#a0b377821fe62be8dfcb0d7c35a628fee4e16616" + integrity sha512-loC+UafBR8nMnLkQ3suSkjMTVMlLsUaI7BiBmFYYFjy1eqEkPwA+Pa51Tbu0KIunR/1alpEjOxP1MBz1Vc1FFg== dependencies: d3-ease "^1.0.0" d3-interpolate "^1.1.1" d3-scale "^1.0.0" d3-shape "^1.2.0" d3-timer "^1.0.0" - lodash "^4.17.4" + lodash "^4.17.5" + react-fast-compare "^2.0.0" -victory-pie@^14.0.1: - version "14.0.1" - resolved "https://registry.yarnpkg.com/victory-pie/-/victory-pie-14.0.1.tgz#53dff9e81696253c3da00f347d908d3ac1241c66" +victory-pie@^16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/victory-pie/-/victory-pie-16.1.0.tgz#12216935bef911c427f3316c80b15b9ca6563252" + integrity sha512-OV1C2e7KGkGjrPUf7Hr68PWuDzxsFqQkdC9E/dZ2HGQKqaYZ9bdkLC0lZYEr7mKsUs6D8iPe4RTWXyEfX84nMA== dependencies: d3-shape "^1.0.0" - lodash "^4.17.4" - victory-core "^21.0.2" + lodash "^4.17.5" + victory-core "^24.0.0" -victory@^0.25.6: - version "0.25.6" - resolved "https://registry.yarnpkg.com/victory/-/victory-0.25.6.tgz#3b5b0a1d2a773caf75cc916e6ace9ad3d7d75024" +victory@^0.27.0: + version "0.27.2" + resolved "https://registry.yarnpkg.com/victory/-/victory-0.27.2.tgz#1e6cdef88b29466befea194f26788549befa0ea3" + integrity sha512-/yxEJbaxmA4OJn2Zn6n8mAxzgUoOfJDElKnGhAphgtdFg++iWUFlwXtG2IOMqBZ+8olb1gJMqNC3mPTJ/7bUkw== dependencies: - victory-chart "^25.1.1" - victory-core "^21.0.4" - victory-pie "^14.0.1" + victory-chart "^27.1.0" + victory-core "^24.0.0" + victory-pie "^16.1.0" "video.js@^5.10.1 || ^6.2.0": version "6.7.3" From ddb39037fa0dcf7bdc771fa5facfba812b13d599 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 12:31:17 +0000 Subject: [PATCH 06/14] Update dependency webpack to v4.47.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e02c4b31..6defd0ed 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "videojs-hls-quality-selector": "^1.1.0", "videojs-hotkeys": "^0.2.25", "videojs-youtube": "^2.6.0", - "webpack": "4.46.0", + "webpack": "4.47.0", "webpack-bundle-tracker": "^0.4.3", "webpack-cli": "^3.3.11", "webpack-dev-middleware": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index a583ce1f..3138bf06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10217,10 +10217,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@4.46.0: - version "4.46.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" - integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q== +webpack@4.47.0: + version "4.47.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.47.0.tgz#8b8a02152d7076aeb03b61b47dad2eeed9810ebc" + integrity sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ== dependencies: "@webassemblyjs/ast" "1.9.0" "@webassemblyjs/helper-module-context" "1.9.0" From 9b5f2ffd3a87a3656c40631126b9a05229b93ed1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 16:38:26 +0000 Subject: [PATCH 07/14] Update dependency webpack-hot-middleware to v2.26.1 --- package.json | 2 +- yarn.lock | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 6defd0ed..a71acd0a 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "webpack-bundle-tracker": "^0.4.3", "webpack-cli": "^3.3.11", "webpack-dev-middleware": "^5.0.0", - "webpack-hot-middleware": "2.25.0" + "webpack-hot-middleware": "2.26.1" }, "engines": { "node": "16.20.2", diff --git a/yarn.lock b/yarn.lock index 3138bf06..6a1c3c0f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1304,9 +1304,10 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.11.0" -ansi-html@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" +ansi-html-community@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== ansi-regex@^2.0.0: version "2.1.1" @@ -5178,9 +5179,10 @@ html-encoding-sniffer@^2.0.1: dependencies: whatwg-encoding "^1.0.5" -html-entities@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" +html-entities@^2.1.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" + integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== html-escaper@^2.0.0: version "2.0.2" @@ -7884,7 +7886,7 @@ querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" -querystring@0.2.0, querystring@^0.2.0: +querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" @@ -10199,15 +10201,14 @@ webpack-dev-middleware@^5.0.0: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-hot-middleware@2.25.0: - version "2.25.0" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706" - integrity sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA== +webpack-hot-middleware@2.26.1: + version "2.26.1" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.26.1.tgz#87214f1e3f9f3acab9271fef9e6ed7b637d719c0" + integrity sha512-khZGfAeJx6I8K9zKohEWWYN6KDlVw2DHownoe+6Vtwj1LP9WFgegXnVMSkZ/dBEBtXFwrkkydsaPFlB7f8wU2A== dependencies: - ansi-html "0.0.7" - html-entities "^1.2.0" - querystring "^0.2.0" - strip-ansi "^3.0.0" + ansi-html-community "0.0.8" + html-entities "^2.1.0" + strip-ansi "^6.0.0" webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: version "1.4.3" From 45d37fad107ea4ff4c92dde101b681e35057006b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 09:12:58 -0400 Subject: [PATCH 08/14] Update dependency ramda to ^0.30.0 (#1125) * Update dependency ramda to ^0.30.0 * replace R.contains to R.includes as Ramda contains is deprecated * Update R.proEq usage due to propEq changes in newer version --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Rachel Lougee --- package.json | 2 +- static/js/lib/collection.js | 2 +- static/js/lib/video.js | 4 ++-- yarn.lock | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index a71acd0a..ac656e91 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "postcss-loader": "^4.2.0", "prettier-eslint-cli": "^5.0.0", "prop-types": "^15.5.10", - "ramda": "^0.24.1", + "ramda": "^0.30.0", "react": "^15.6.1", "react-addons-shallow-compare": "^15.6.0", "react-document-title": "^2.0.3", diff --git a/static/js/lib/collection.js b/static/js/lib/collection.js index 554369de..c87c8b1e 100644 --- a/static/js/lib/collection.js +++ b/static/js/lib/collection.js @@ -24,7 +24,7 @@ export const getActiveCollectionDetail = (state: { null export const getVideoWithKey = (collection: Collection, key: string) => - R.compose(R.find(R.propEq("key", key)), R.defaultTo([]))(collection.videos) + R.compose(R.find(R.propEq(key, "key")), R.defaultTo([]))(collection.videos) export const getFormKey = (isNew: boolean): string => isNew ? "newCollectionForm" : "editCollectionForm" diff --git a/static/js/lib/video.js b/static/js/lib/video.js index e758af10..2fbea709 100644 --- a/static/js/lib/video.js +++ b/static/js/lib/video.js @@ -44,7 +44,7 @@ export const getHLSEncodedUrl = (video: Video): string | null => { } export const videoIsProcessing = R.compose( - R.contains(R.__, [ + R.includes(R.__, [ VIDEO_STATUS_CREATED, VIDEO_STATUS_UPLOADING, VIDEO_STATUS_TRANSCODING @@ -53,7 +53,7 @@ export const videoIsProcessing = R.compose( ) export const videoHasError = R.compose( - R.contains(R.__, [ + R.includes(R.__, [ VIDEO_STATUS_UPLOAD_FAILED, VIDEO_STATUS_TRANSCODE_FAILED_INTERNAL, VIDEO_STATUS_TRANSCODE_FAILED_VIDEO, diff --git a/yarn.lock b/yarn.lock index 6a1c3c0f..2f2577ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7919,6 +7919,11 @@ ramda@^0.27.0: resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.0.tgz#915dc29865c0800bf3f69b8fd6c279898b59de43" integrity sha512-pVzZdDpWwWqEVVLshWUHjNwuVP7SfcmPraYuqocJp1yo2U1R7P+5QAfDhdItkuoGqIBnBYrtPp7rEPqDn9HlZA== +ramda@^0.30.0: + version "0.30.0" + resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.30.0.tgz#3cc4f0ddddfa6334dad2f371bd72c33237d92cd0" + integrity sha512-13Y0iMhIQuAm/wNGBL/9HEqIfRGmNmjKnTPlKWfA9f7dnDkr8d45wQ+S7+ZLh/Pq9PdcGxkqKUEA7ySu1QSd9Q== + randexp@0.4.6: version "0.4.6" resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" From c634e4b448735f450e23de0f3c8b02a3716c7608 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Jun 2024 07:25:27 +0000 Subject: [PATCH 09/14] Update dependency flow-bin to v0.237.2 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ac656e91..a26e4301 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "eslint-plugin-react": "^7.19.0", "express": "^4.17.3", "fetch-mock": "^5.12.1", - "flow-bin": "0.237.1", + "flow-bin": "0.237.2", "isomorphic-fetch": "^2.2.1", "jquery": "^3.5.0", "jsdom": "^16.7.0", diff --git a/yarn.lock b/yarn.lock index 2f2577ca..c5b428ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4499,10 +4499,10 @@ flatted@^2.0.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== -flow-bin@0.237.1: - version "0.237.1" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.237.1.tgz#2a21ff0b791d1e7460223f26f1b655606ec3801d" - integrity sha512-h4BdtMaFRITRklbjDULsD8mKAxd9XhOwspWaHdyoTsRQoLGPkH9r2zkn+01B7CQqm5cNu6TUH3DHUJYskLjOwA== +flow-bin@0.237.2: + version "0.237.2" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.237.2.tgz#42b0be22acd7fb84c77f39f078fc2f6b7d159fdd" + integrity sha512-PlonnPvzTW4nES5YPMwZOJS+IRoaS0ABJWPjsT+5kvLDjXsPerg6A4ftWks4t4gRpPjKSl+6F1BTn9uqWP0inA== flush-write-stream@^1.0.0: version "1.1.1" From 1973120f1e5f9743371916ac13479dd4685165e8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Jun 2024 09:59:06 +0000 Subject: [PATCH 10/14] Update nginx Docker tag to v1.27.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index aed7033a..b398ed8b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - "6379" nginx: - image: nginx:1.26.0 + image: nginx:1.27.0 volumes: - ./config/nginx.conf:/etc/nginx/conf.d/web.conf - ./:/src From a37dccd142297bb6dff69e38bd1bf7fe2433bf1b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Jun 2024 12:07:48 +0000 Subject: [PATCH 11/14] Update python Docker tag to v3.12.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f359fb85..ba7672ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /src RUN yarn install --frozen-lockfile --ignore-engines --prefer-offline && \ node node_modules/webpack/bin/webpack.js --config webpack.config.prod.js --bail -FROM python:3.9.19-bullseye AS base +FROM python:3.12.4-bullseye AS base # Add package files, install updated node and pip WORKDIR /tmp From e5c3a1081da4781dddf4d05717215485de037e09 Mon Sep 17 00:00:00 2001 From: Ardiea Date: Thu, 13 Jun 2024 12:20:11 -0400 Subject: [PATCH 12/14] Revert "Update python Docker tag to v3.12.4" This reverts commit a37dccd142297bb6dff69e38bd1bf7fe2433bf1b. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ba7672ea..f359fb85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /src RUN yarn install --frozen-lockfile --ignore-engines --prefer-offline && \ node node_modules/webpack/bin/webpack.js --config webpack.config.prod.js --bail -FROM python:3.12.4-bullseye AS base +FROM python:3.9.19-bullseye AS base # Add package files, install updated node and pip WORKDIR /tmp From c8125e4fe14161360cbb32e0765b0574f516698e Mon Sep 17 00:00:00 2001 From: Tobias Macey Date: Thu, 13 Jun 2024 13:41:28 -0400 Subject: [PATCH 13/14] Fix how Ramda imports are being made based on usage >0.25 The usage instructions say that the import needs to be done as `import * as R from "ramda"` https://github.com/ramda/ramda?tab=readme-ov-file#usage --- static/js/components/VideoPlayer.js | 2 +- static/js/components/dialogs/hoc.js | 2 +- static/js/components/dialogs/hoc_test.js | 2 +- static/js/components/material/Textfield.js | 2 +- static/js/containers/CollectionDetailPage.js | 2 +- static/js/containers/CollectionListPage.js | 2 +- static/js/containers/HelpPage.js | 2 +- static/js/containers/VideoDetailPage.js | 2 +- static/js/containers/WithDrawer.js | 2 +- static/js/containers/withPagedCollections.js | 2 +- static/js/containers/withVideoAnalytics.js | 2 +- static/js/lib/collection.js | 2 +- static/js/lib/dialog.js | 2 +- static/js/lib/sanctuary.js | 2 +- static/js/lib/sanctuary_test.js | 2 +- static/js/lib/validation.js | 2 +- static/js/lib/video.js | 2 +- static/js/reducers/collections.js | 2 +- static/js/util/google_analytics.js | 2 +- static/js/util/test_utils.js | 2 +- static/js/util/util.js | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/static/js/components/VideoPlayer.js b/static/js/components/VideoPlayer.js index a2add98d..e547af1c 100644 --- a/static/js/components/VideoPlayer.js +++ b/static/js/components/VideoPlayer.js @@ -2,7 +2,7 @@ /* global videojs: true */ /* global SETTINGS: false */ import React from "react" -import R from "ramda" +import * as R from "ramda" import _ from "lodash" import type { Dispatch } from "redux" import { makeVideoSubtitleUrl } from "../lib/urls" diff --git a/static/js/components/dialogs/hoc.js b/static/js/components/dialogs/hoc.js index 8743a879..1d71a999 100644 --- a/static/js/components/dialogs/hoc.js +++ b/static/js/components/dialogs/hoc.js @@ -1,6 +1,6 @@ // @flow import React from "react" -import R from "ramda" +import * as R from "ramda" import type { Dispatch } from "redux" import * as commonUiActions from "../../actions/commonUi" diff --git a/static/js/components/dialogs/hoc_test.js b/static/js/components/dialogs/hoc_test.js index 4bd6b8fb..00dbc213 100644 --- a/static/js/components/dialogs/hoc_test.js +++ b/static/js/components/dialogs/hoc_test.js @@ -4,7 +4,7 @@ import { assert } from "chai" import { mount } from "enzyme" import { Provider } from "react-redux" import configureTestStore from "redux-asserts" -import R from "ramda" +import * as R from "ramda" import { connect } from "react-redux" import Dialog from "../material/Dialog" diff --git a/static/js/components/material/Textfield.js b/static/js/components/material/Textfield.js index 14e7036d..6c0d6a87 100644 --- a/static/js/components/material/Textfield.js +++ b/static/js/components/material/Textfield.js @@ -1,6 +1,6 @@ // @flow import React from "react" -import R from "ramda" +import * as R from "ramda" export default class Textfield extends React.Component<*, void> { props: { diff --git a/static/js/containers/CollectionDetailPage.js b/static/js/containers/CollectionDetailPage.js index 3c07e813..ff4ecad7 100644 --- a/static/js/containers/CollectionDetailPage.js +++ b/static/js/containers/CollectionDetailPage.js @@ -3,7 +3,7 @@ import React from "react" import { connect } from "react-redux" import type { Dispatch } from "redux" -import R from "ramda" +import * as R from "ramda" import _ from "lodash" import DocumentTitle from "react-document-title" diff --git a/static/js/containers/CollectionListPage.js b/static/js/containers/CollectionListPage.js index 4eb0ce43..7a04a241 100644 --- a/static/js/containers/CollectionListPage.js +++ b/static/js/containers/CollectionListPage.js @@ -2,7 +2,7 @@ /* global SETTINGS: false */ import React from "react" -import R from "ramda" +import * as R from "ramda" import { connect } from "react-redux" import type { Dispatch } from "redux" import { Link } from "react-router-dom" diff --git a/static/js/containers/HelpPage.js b/static/js/containers/HelpPage.js index bc41c167..d149a823 100644 --- a/static/js/containers/HelpPage.js +++ b/static/js/containers/HelpPage.js @@ -1,7 +1,7 @@ // @flow import React from "react" import { connect } from "react-redux" -import R from "ramda" +import * as R from "ramda" import WithDrawer from "./WithDrawer" import FAQ from "../components/FAQ" diff --git a/static/js/containers/VideoDetailPage.js b/static/js/containers/VideoDetailPage.js index 950bca83..75e1446f 100644 --- a/static/js/containers/VideoDetailPage.js +++ b/static/js/containers/VideoDetailPage.js @@ -4,7 +4,7 @@ import React from "react" import { connect } from "react-redux" import moment from "moment" import type { Dispatch } from "redux" -import R from "ramda" +import * as R from "ramda" import _ from "lodash" import DocumentTitle from "react-document-title" diff --git a/static/js/containers/WithDrawer.js b/static/js/containers/WithDrawer.js index 163b4517..a65f55e1 100644 --- a/static/js/containers/WithDrawer.js +++ b/static/js/containers/WithDrawer.js @@ -1,7 +1,7 @@ // @flow /* global SETTINGS: false */ import React from "react" -import R from "ramda" +import * as R from "ramda" import { connect } from "react-redux" import * as commonUiActions from "../actions/commonUi" diff --git a/static/js/containers/withPagedCollections.js b/static/js/containers/withPagedCollections.js index 84db2f5b..d4bce0a1 100644 --- a/static/js/containers/withPagedCollections.js +++ b/static/js/containers/withPagedCollections.js @@ -1,6 +1,6 @@ import React from "react" import _ from "lodash" -import R from "ramda" +import * as R from "ramda" import { connect } from "react-redux" import type { Dispatch } from "redux" diff --git a/static/js/containers/withVideoAnalytics.js b/static/js/containers/withVideoAnalytics.js index f9368f57..178f2a90 100644 --- a/static/js/containers/withVideoAnalytics.js +++ b/static/js/containers/withVideoAnalytics.js @@ -1,6 +1,6 @@ import React from "react" import _ from "lodash" -import R from "ramda" +import * as R from "ramda" import { connect } from "react-redux" import type { Dispatch } from "redux" diff --git a/static/js/lib/collection.js b/static/js/lib/collection.js index c87c8b1e..19cc3880 100644 --- a/static/js/lib/collection.js +++ b/static/js/lib/collection.js @@ -1,5 +1,5 @@ // @flow -import R from "ramda" +import * as R from "ramda" import _ from "lodash" import { diff --git a/static/js/lib/dialog.js b/static/js/lib/dialog.js index f6ee6981..96fd755a 100644 --- a/static/js/lib/dialog.js +++ b/static/js/lib/dialog.js @@ -1,5 +1,5 @@ // @flow -import R from "ramda" +import * as R from "ramda" export const PERM_CHOICE_NONE: string = "none" export const PERM_CHOICE_PUBLIC: string = "public" diff --git a/static/js/lib/sanctuary.js b/static/js/lib/sanctuary.js index 0e1e0b63..fc725414 100644 --- a/static/js/lib/sanctuary.js +++ b/static/js/lib/sanctuary.js @@ -1,5 +1,5 @@ // @flow -import R from "ramda" +import * as R from "ramda" import { create, env } from "sanctuary" export const S = create({ checkTypes: false, env: env }) diff --git a/static/js/lib/sanctuary_test.js b/static/js/lib/sanctuary_test.js index 4a13223f..7df22dba 100644 --- a/static/js/lib/sanctuary_test.js +++ b/static/js/lib/sanctuary_test.js @@ -1,6 +1,6 @@ // @flow import { assert } from "chai" -import R from "ramda" +import * as R from "ramda" import { S, diff --git a/static/js/lib/validation.js b/static/js/lib/validation.js index ddb6eb46..ecc206eb 100644 --- a/static/js/lib/validation.js +++ b/static/js/lib/validation.js @@ -1,5 +1,5 @@ // @flow -import R from "ramda" +import * as R from "ramda" import { S } from "./sanctuary" diff --git a/static/js/lib/video.js b/static/js/lib/video.js index 2fbea709..e70b5b17 100644 --- a/static/js/lib/video.js +++ b/static/js/lib/video.js @@ -1,6 +1,6 @@ // @flow /* global SETTINGS: false */ -import R from "ramda" +import * as R from "ramda" import { VIDEO_STATUS_CREATED, diff --git a/static/js/reducers/collections.js b/static/js/reducers/collections.js index a66e437b..5ef1f141 100644 --- a/static/js/reducers/collections.js +++ b/static/js/reducers/collections.js @@ -1,6 +1,6 @@ // @flow import { GET, PATCH, POST, INITIAL_STATE } from "redux-hammock/constants" -import R from "ramda" +import * as R from "ramda" import * as api from "../lib/api" import type { Collection, CollectionList } from "../flow/collectionTypes" diff --git a/static/js/util/google_analytics.js b/static/js/util/google_analytics.js index b0f0aa0c..22ef1170 100644 --- a/static/js/util/google_analytics.js +++ b/static/js/util/google_analytics.js @@ -1,7 +1,7 @@ // @flow /* global SETTINGS:false */ import ga from "react-ga" -import R from "ramda" +import * as R from "ramda" const makeGAEvent = (category, action, label, value) => ({ category: category, diff --git a/static/js/util/test_utils.js b/static/js/util/test_utils.js index 94d907c9..59727c07 100644 --- a/static/js/util/test_utils.js +++ b/static/js/util/test_utils.js @@ -2,7 +2,7 @@ // @flow import { assert } from "chai" import _ from "lodash" -import R from "ramda" +import * as R from "ramda" import type { Action } from "../flow/reduxTypes" import type { Store } from "redux" diff --git a/static/js/util/util.js b/static/js/util/util.js index cadd0ff3..2a76e303 100644 --- a/static/js/util/util.js +++ b/static/js/util/util.js @@ -1,6 +1,6 @@ // @flow import { PERM_CHOICE_LISTS } from "../lib/dialog" -import R from "ramda" +import * as R from "ramda" export function getDisplayName(WrappedComponent: any) { return WrappedComponent.displayName || WrappedComponent.name || "Component" From 75fde221495797b66092ff59ce7d78f5d61e7abc Mon Sep 17 00:00:00 2001 From: Doof Date: Thu, 13 Jun 2024 18:10:48 +0000 Subject: [PATCH 14/14] Release 0.76.0 --- RELEASE.rst | 17 +++++++++++++++++ odl_video/settings.py | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/RELEASE.rst b/RELEASE.rst index 9fa15b6d..cfb7feb4 100644 --- a/RELEASE.rst +++ b/RELEASE.rst @@ -1,6 +1,23 @@ Release Notes ============= +Version 0.76.0 +-------------- + +- Fix how Ramda imports are being made based on usage >0.25 +- Revert "Update python Docker tag to v3.12.4" +- Update python Docker tag to v3.12.4 +- Update nginx Docker tag to v1.27.0 +- Update dependency flow-bin to v0.237.2 +- Update dependency ramda to ^0.30.0 (#1125) +- Update dependency webpack-hot-middleware to v2.26.1 +- Update dependency webpack to v4.47.0 +- Update dependency victory to ^0.27.0 +- Update dependency style-loader to ^0.23.0 +- Update dependency sentry-sdk to ^0.20.0 +- Update dependency flow-bin to v0.237.1 +- Update dependency uwsgi to v2.0.26 + Version 0.75.1 (Released May 29, 2024) -------------- diff --git a/odl_video/settings.py b/odl_video/settings.py index d6fd1be1..6132a9dd 100644 --- a/odl_video/settings.py +++ b/odl_video/settings.py @@ -13,7 +13,7 @@ from odl_video.envs import get_any, get_bool, get_int, get_key, get_string, parse_env from odl_video.sentry import init_sentry -VERSION = "0.75.1" +VERSION = "0.76.0" ENVIRONMENT = get_string("ODL_VIDEO_ENVIRONMENT", "dev")