From e3f775bb39d0a7c5f8c4593fbebcf61b715975bf Mon Sep 17 00:00:00 2001 From: Carlo Beltrame Date: Mon, 6 May 2024 14:21:37 +0200 Subject: [PATCH 01/14] More intelligent proposed times when adding more schedule entries --- .../program/FormScheduleEntryList.vue | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/program/FormScheduleEntryList.vue b/frontend/src/components/program/FormScheduleEntryList.vue index d8144ac3f5..537e317fbf 100644 --- a/frontend/src/components/program/FormScheduleEntryList.vue +++ b/frontend/src/components/program/FormScheduleEntryList.vue @@ -68,13 +68,32 @@ export default { scheduleEntriesWithoutDeleted() { return this.scheduleEntries.filter((entry) => !entry.deleted) }, + lastScheduleEntry() { + return this.localScheduleEntries[this.localScheduleEntries.length - 1] + }, + lastScheduleEntryStart() { + return dayjs.utc(this.lastScheduleEntry.start) + }, + lastScheduleEntryEnd() { + return dayjs.utc(this.lastScheduleEntry.end) + }, + lastScheduleEntryDuration() { + return this.lastScheduleEntryEnd.diff(this.lastScheduleEntryStart) + }, }, methods: { addScheduleEntry() { + const proposedStart = this.lastScheduleEntryStart.add(1, 'day') + const proposedEnd = proposedStart.add(this.lastScheduleEntryDuration) + const periodEnd = dayjs.utc(this.period.end).add(24, 'hour') + const start = proposedEnd.isSameOrBefore(periodEnd) + ? proposedStart + : dayjs.utc(this.period.start).add(7, 'hour') + const end = start.add(this.lastScheduleEntryDuration) this.localScheduleEntries.push({ period: () => this.period, - start: dayjs.utc(this.period.start).add(7, 'hour').format(), - end: dayjs.utc(this.period.start).add(8, 'hour').format(), + start: start.format(), + end: end.format(), key: uniqueId(), deleted: false, }) From 64e4dfb4e93ce4b6ea9f70f62f8217bfd872d7c0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 16:59:05 +0000 Subject: [PATCH 02/14] chore(deps): update pulumi/pulumi-nodejs docker tag to v3.116.1 --- .ops/aws-setup/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ops/aws-setup/docker-compose.yml b/.ops/aws-setup/docker-compose.yml index 41b6149cac..fa6ae271b8 100644 --- a/.ops/aws-setup/docker-compose.yml +++ b/.ops/aws-setup/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.9" services: aws-setup: - image: pulumi/pulumi-nodejs:3.115.2 + image: pulumi/pulumi-nodejs:3.116.1 container_name: 'ecamp3-aws-setup' volumes: - ../../.prettierrc:/.prettierrc:delegated From b3827a380fe915214a6f91419e09f501a97d75fe Mon Sep 17 00:00:00 2001 From: BacLuc Date: Tue, 23 Apr 2024 21:20:01 +0200 Subject: [PATCH 03/14] .ops: add ecamp3-logging This adds the EFFK (Elasticsearch, fluentbit, fluentd, Kibana) stack to the ops folder. Kibana and Elasticsearch taken from https://www.digitalocean.com/community/tutorials/how-to-set-up-an-elasticsearch-fluentd-and-kibana-efk-logging-stack-on-kubernetes --- .ops/ecamp3-logging/.gitignore | 1 + .ops/ecamp3-logging/.helmignore | 1 + .ops/ecamp3-logging/Chart.lock | 6 + .ops/ecamp3-logging/Chart.yaml | 29 ++++ .ops/ecamp3-logging/README.md | 34 ++++ .ops/ecamp3-logging/deploy.sh | 8 + .../files/kibana/dump-kibana-objects.sh | 23 +++ .../files/kibana/kibana-objects.ndjson | 146 ++++++++++++++++++ .../files/kibana/restore-kibana-objects.sh | 13 ++ .ops/ecamp3-logging/templates/_helpers.tpl | 20 +++ .../elasticsearch/elasticsearch_service.yaml | 19 +++ .../elasticsearch_stateful_set.yaml | 88 +++++++++++ .../fluentd/fluentd_clusterfilter.yaml | 50 ++++++ .../fluentd/fluentd_output_elasticsearch.yaml | 24 +++ .../templates/kibana/kibana_deployment.yaml | 32 ++++ .../templates/kibana/kibana_service.yaml | 15 ++ .ops/ecamp3-logging/values.yaml | 57 +++++++ 17 files changed, 566 insertions(+) create mode 100644 .ops/ecamp3-logging/.gitignore create mode 100644 .ops/ecamp3-logging/.helmignore create mode 100644 .ops/ecamp3-logging/Chart.lock create mode 100644 .ops/ecamp3-logging/Chart.yaml create mode 100644 .ops/ecamp3-logging/README.md create mode 100755 .ops/ecamp3-logging/deploy.sh create mode 100755 .ops/ecamp3-logging/files/kibana/dump-kibana-objects.sh create mode 100644 .ops/ecamp3-logging/files/kibana/kibana-objects.ndjson create mode 100755 .ops/ecamp3-logging/files/kibana/restore-kibana-objects.sh create mode 100644 .ops/ecamp3-logging/templates/_helpers.tpl create mode 100644 .ops/ecamp3-logging/templates/elasticsearch/elasticsearch_service.yaml create mode 100644 .ops/ecamp3-logging/templates/elasticsearch/elasticsearch_stateful_set.yaml create mode 100644 .ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml create mode 100644 .ops/ecamp3-logging/templates/fluentd/fluentd_output_elasticsearch.yaml create mode 100644 .ops/ecamp3-logging/templates/kibana/kibana_deployment.yaml create mode 100644 .ops/ecamp3-logging/templates/kibana/kibana_service.yaml create mode 100644 .ops/ecamp3-logging/values.yaml diff --git a/.ops/ecamp3-logging/.gitignore b/.ops/ecamp3-logging/.gitignore new file mode 100644 index 0000000000..413d4a36b1 --- /dev/null +++ b/.ops/ecamp3-logging/.gitignore @@ -0,0 +1 @@ +/charts diff --git a/.ops/ecamp3-logging/.helmignore b/.ops/ecamp3-logging/.helmignore new file mode 100644 index 0000000000..78b6b3690b --- /dev/null +++ b/.ops/ecamp3-logging/.helmignore @@ -0,0 +1 @@ +/deploy.sh diff --git a/.ops/ecamp3-logging/Chart.lock b/.ops/ecamp3-logging/Chart.lock new file mode 100644 index 0000000000..2d79e34bc6 --- /dev/null +++ b/.ops/ecamp3-logging/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: fluent-operator + repository: https://fluent.github.io/helm-charts + version: 2.7.0 +digest: sha256:5b2fd2ab5e6e313924a47c8825f2c15a6d288b7125d58c2202a897ee2981213b +generated: "2024-04-13T23:13:02.185555289+02:00" diff --git a/.ops/ecamp3-logging/Chart.yaml b/.ops/ecamp3-logging/Chart.yaml new file mode 100644 index 0000000000..5bf0c5c5ad --- /dev/null +++ b/.ops/ecamp3-logging/Chart.yaml @@ -0,0 +1,29 @@ +apiVersion: v2 +name: ecamp3-logging +description: Helm chart for deploying ecamp3-logging on Kubernetes +home: https://github.com/ecamp/ecamp3 + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: 0.1.0 + +dependencies: + - name: fluent-operator + version: 2.7.0 + repository: https://fluent.github.io/helm-charts diff --git a/.ops/ecamp3-logging/README.md b/.ops/ecamp3-logging/README.md new file mode 100644 index 0000000000..53026bea23 --- /dev/null +++ b/.ops/ecamp3-logging/README.md @@ -0,0 +1,34 @@ +# ecamp3-logging + +This is a helm chart to deploy an EFFK Stack (Elasticsearch, fluentbit, fluentd, Kibana) to a cluster where +ecamp3 is running. + +## Prerequisites + +You need to add the fluent helm repository: + +```shell +helm repo add fluent https://fluent.github.io/helm-charts +helm repo update +``` + +## Provisioning of Kibana Configuration + +There are 2 scripts to help create a consistent configuration between +different clusters. You need [curl](https://github.com/curl/curl) and [jq](https://github.com/jqlang/jq) for the scripts +to work. + +To store the current dashboard, index-pattern and search in [kibana-objects.ndjson](files%2Fkibana%2Fkibana-objects.ndjson), +you can do the following: + +```shell +kubectl -n ecamp3-logging port-forward services/kibana 5601:5601 +sh files/kibana/dump-kibana-objects.sh +``` + +To restore [kibana-objects.ndjson](files%2Fkibana%2Fkibana-objects.ndjson) to a cluster, you can do the follwing: + +```shell +kubectl -n ecamp3-logging port-forward services/kibana 5601:5601 +sh files/kibana/restore-kibana-objects.sh +``` diff --git a/.ops/ecamp3-logging/deploy.sh b/.ops/ecamp3-logging/deploy.sh new file mode 100755 index 0000000000..bd272d7ae3 --- /dev/null +++ b/.ops/ecamp3-logging/deploy.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +SCRIPT_DIR=$(realpath "$(dirname "$0")") +cd $SCRIPT_DIR +# to debug: --dry-run --debug +helm dep build && helm upgrade --install ecamp3-logging --namespace=ecamp3-logging --create-namespace $SCRIPT_DIR diff --git a/.ops/ecamp3-logging/files/kibana/dump-kibana-objects.sh b/.ops/ecamp3-logging/files/kibana/dump-kibana-objects.sh new file mode 100755 index 0000000000..974670df2e --- /dev/null +++ b/.ops/ecamp3-logging/files/kibana/dump-kibana-objects.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +set -e + +SCRIPT_DIR=$(realpath "$(dirname "$0")") + +KIBANA_HOST=${KIBANA_HOST:-localhost:5601} + +curl -X POST $KIBANA_HOST/api/saved_objects/_export \ + -H 'kbn-xsrf: true' \ + -H 'Content-Type: application/json' \ + -d ' + { + "type": [ + "dashboard", + "index-pattern", + "search" + ], + "excludeExportDetails": true + }' \ + --silent \ + | jq -S \ + > $SCRIPT_DIR/kibana-objects.ndjson diff --git a/.ops/ecamp3-logging/files/kibana/kibana-objects.ndjson b/.ops/ecamp3-logging/files/kibana/kibana-objects.ndjson new file mode 100644 index 0000000000..50316cb84b --- /dev/null +++ b/.ops/ecamp3-logging/files/kibana/kibana-objects.ndjson @@ -0,0 +1,146 @@ +{ + "attributes": { + "fieldAttrs": "{\"container.name\":{\"count\":2},\"kubernetes.labels.app_kubernetes_io/name\":{\"count\":2},\"kubernetes.labels.app_kubernetes_io/part-of\":{\"count\":1},\"message\":{\"count\":3},\"requestUrl\":{\"count\":1},\"kubernetes.deployment.name\":{\"count\":2},\"kubernetes.labels.app.kubernetes.io/instance\":{\"count\":1},\"kubernetes.pod_name\":{\"count\":1},\"log\":{\"count\":1}}", + "fieldFormatMap": "{}", + "fields": "[]", + "name": "log-index-pattern", + "runtimeFieldMap": "{}", + "sourceFilters": "[]", + "timeFieldName": "@timestamp", + "title": "logstash-*", + "typeMeta": "{}" + }, + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-23T19:38:23.524Z", + "id": "e270616c-823f-485b-b1e5-0d3435383b91", + "managed": false, + "references": [], + "sort": [ + 1713901103524, + 5 + ], + "type": "index-pattern", + "typeMigrationVersion": "8.0.0", + "updated_at": "2024-04-23T19:38:23.524Z", + "version": "WzUsMV0=" +} +{ + "attributes": { + "columns": [ + "kubernetes.labels.app.kubernetes.io/instance", + "kubernetes.pod_name", + "requestUrl", + "escapedUrl", + "escapedUrlWithoutQuery", + "log" + ], + "description": "", + "grid": { + "columns": { + "kubernetes.labels.app.kubernetes.io/instance": { + "width": 143 + }, + "kubernetes.pod_name": { + "width": 174 + } + } + }, + "hideChart": false, + "isTextBasedQuery": false, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}" + }, + "sort": [ + [ + "@timestamp", + "desc" + ] + ], + "timeRestore": false, + "title": "Search", + "usesAdHocDataView": false, + "viewMode": "documents" + }, + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-23T19:38:23.524Z", + "id": "02e434c0-01a0-11ef-84f3-475f3a574907", + "managed": false, + "references": [ + { + "id": "e270616c-823f-485b-b1e5-0d3435383b91", + "name": "kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + } + ], + "sort": [ + 1713901103524, + 17 + ], + "type": "search", + "typeMigrationVersion": "10.2.0", + "updated_at": "2024-04-23T19:38:23.524Z", + "version": "WzE2LDJd" +} +{ + "attributes": { + "controlGroupInput": { + "chainingSystem": "HIERARCHICAL", + "controlStyle": "oneLine", + "ignoreParentSettingsJSON": "{\"ignoreFilters\":false,\"ignoreQuery\":false,\"ignoreTimerange\":false,\"ignoreValidations\":false}", + "panelsJSON": "{\"cfe99476-a962-4988-8ddf-e2c15995c2a2\":{\"type\":\"optionsListControl\",\"order\":0,\"grow\":true,\"width\":\"medium\",\"explicitInput\":{\"id\":\"cfe99476-a962-4988-8ddf-e2c15995c2a2\",\"fieldName\":\"kubernetes.labels.app.kubernetes.io/instance.keyword\",\"title\":\"Deployment\",\"grow\":true,\"width\":\"medium\",\"selectedOptions\":[],\"enhancements\":{}}}}" + }, + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}" + }, + "optionsJSON": "{\"useMargins\":true,\"syncColors\":false,\"syncCursor\":true,\"syncTooltips\":false,\"hidePanelTitles\":false}", + "panelsJSON": "[{\"version\":\"8.10.2\",\"type\":\"lens\",\"gridData\":{\"x\":24,\"y\":0,\"w\":24,\"h\":15,\"i\":\"abec7a0c-b69b-4eae-8f64-9b77d8548555\"},\"panelIndex\":\"abec7a0c-b69b-4eae-8f64-9b77d8548555\",\"embeddableConfig\":{\"attributes\":{\"title\":\"\",\"description\":\"\",\"visualizationType\":\"lnsXY\",\"type\":\"lens\",\"references\":[{\"id\":\"e270616c-823f-485b-b1e5-0d3435383b91\",\"name\":\"indexpattern-datasource-layer-bb76a1ab-de9b-40ac-bc6c-5eeca64f616b\",\"type\":\"index-pattern\"}],\"state\":{\"visualization\":{\"legend\":{\"isVisible\":true,\"position\":\"right\"},\"valueLabels\":\"hide\",\"fittingFunction\":\"None\",\"axisTitlesVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"tickLabelsVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"labelsOrientation\":{\"x\":0,\"yLeft\":0,\"yRight\":0},\"gridlinesVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"preferredSeriesType\":\"area_stacked\",\"layers\":[{\"layerId\":\"bb76a1ab-de9b-40ac-bc6c-5eeca64f616b\",\"seriesType\":\"area_stacked\",\"accessors\":[\"083fd753-b44b-431d-87ad-e8aa13b2688f\"],\"layerType\":\"data\",\"splitAccessor\":\"603c118f-36b2-4e67-92f3-85c77a133b2e\",\"xAccessor\":\"66fd69ef-88f7-4002-8c09-c1416a5d4d6c\"}],\"valuesInLegend\":false},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"datasourceStates\":{\"formBased\":{\"layers\":{\"bb76a1ab-de9b-40ac-bc6c-5eeca64f616b\":{\"columns\":{\"603c118f-36b2-4e67-92f3-85c77a133b2e\":{\"label\":\"Top 500 values of json.httpRequest.status\",\"dataType\":\"number\",\"operationType\":\"terms\",\"scale\":\"ordinal\",\"sourceField\":\"json.httpRequest.status\",\"isBucketed\":true,\"params\":{\"size\":500,\"orderBy\":{\"type\":\"alphabetical\",\"fallback\":false},\"orderDirection\":\"asc\",\"otherBucket\":true,\"missingBucket\":false,\"parentFormat\":{\"id\":\"terms\"},\"include\":[],\"exclude\":[],\"includeIsRegex\":false,\"excludeIsRegex\":false}},\"66fd69ef-88f7-4002-8c09-c1416a5d4d6c\":{\"label\":\"@timestamp\",\"dataType\":\"date\",\"operationType\":\"date_histogram\",\"sourceField\":\"@timestamp\",\"isBucketed\":true,\"scale\":\"interval\",\"params\":{\"interval\":\"5m\",\"includeEmptyRows\":true,\"dropPartials\":false}},\"083fd753-b44b-431d-87ad-e8aa13b2688fX0\":{\"label\":\"Part of unique_count(json.httpRequest.status)\",\"dataType\":\"number\",\"operationType\":\"unique_count\",\"scale\":\"ratio\",\"sourceField\":\"json.httpRequest.status\",\"isBucketed\":false,\"params\":{\"emptyAsNull\":false},\"customLabel\":true},\"083fd753-b44b-431d-87ad-e8aa13b2688f\":{\"label\":\"unique_count(json.httpRequest.status)\",\"dataType\":\"number\",\"operationType\":\"formula\",\"isBucketed\":false,\"scale\":\"ratio\",\"params\":{\"formula\":\"unique_count(json.httpRequest.status)\",\"isFormulaBroken\":false},\"references\":[\"083fd753-b44b-431d-87ad-e8aa13b2688fX0\"]}},\"columnOrder\":[\"603c118f-36b2-4e67-92f3-85c77a133b2e\",\"66fd69ef-88f7-4002-8c09-c1416a5d4d6c\",\"083fd753-b44b-431d-87ad-e8aa13b2688f\",\"083fd753-b44b-431d-87ad-e8aa13b2688fX0\"],\"sampling\":0.01,\"ignoreGlobalFilters\":false,\"incompleteColumns\":{}}}},\"indexpattern\":{\"layers\":{}},\"textBased\":{\"layers\":{}}},\"internalReferences\":[],\"adHocDataViews\":{}}},\"enhancements\":{}}},{\"version\":\"8.10.2\",\"type\":\"lens\",\"gridData\":{\"x\":0,\"y\":30,\"w\":24,\"h\":15,\"i\":\"2a435cc4-cf49-4522-a01c-5de034306ae0\"},\"panelIndex\":\"2a435cc4-cf49-4522-a01c-5de034306ae0\",\"embeddableConfig\":{\"attributes\":{\"title\":\"\",\"description\":\"\",\"visualizationType\":\"lnsDatatable\",\"type\":\"lens\",\"references\":[{\"type\":\"index-pattern\",\"id\":\"e270616c-823f-485b-b1e5-0d3435383b91\",\"name\":\"indexpattern-datasource-layer-835bca0b-3409-43fd-b02e-8d90334ea396\"}],\"state\":{\"visualization\":{\"columns\":[{\"columnId\":\"f7399748-ce1c-4df4-89f4-e3e30a67a023\",\"isTransposed\":false},{\"isTransposed\":false,\"columnId\":\"2548689a-01e7-4752-9373-8b3bcb13c670\"},{\"columnId\":\"dfffbbfd-1a5e-409d-9dfd-1cdf36bb6d01\",\"isTransposed\":false},{\"columnId\":\"e5ce64f2-d8df-49aa-9fec-983ead94cb12\",\"isTransposed\":false}],\"layerId\":\"835bca0b-3409-43fd-b02e-8d90334ea396\",\"layerType\":\"data\"},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"datasourceStates\":{\"formBased\":{\"layers\":{\"835bca0b-3409-43fd-b02e-8d90334ea396\":{\"columns\":{\"f7399748-ce1c-4df4-89f4-e3e30a67a023\":{\"label\":\"90th % of request time\",\"dataType\":\"number\",\"operationType\":\"percentile\",\"sourceField\":\"json.httpRequest.request_time_seconds\",\"isBucketed\":false,\"scale\":\"ratio\",\"params\":{\"percentile\":90},\"customLabel\":true},\"2548689a-01e7-4752-9373-8b3bcb13c670\":{\"label\":\"#\",\"dataType\":\"number\",\"operationType\":\"count\",\"isBucketed\":false,\"scale\":\"ratio\",\"sourceField\":\"___records___\",\"params\":{\"emptyAsNull\":true},\"customLabel\":true},\"dfffbbfd-1a5e-409d-9dfd-1cdf36bb6d01\":{\"label\":\"Median of request time\",\"dataType\":\"number\",\"operationType\":\"median\",\"sourceField\":\"json.httpRequest.request_time_seconds\",\"isBucketed\":false,\"scale\":\"ratio\",\"params\":{\"emptyAsNull\":true},\"customLabel\":true},\"e5ce64f2-d8df-49aa-9fec-983ead94cb12\":{\"label\":\"Top 20 values of escapedUrl.keyword\",\"dataType\":\"string\",\"operationType\":\"terms\",\"scale\":\"ordinal\",\"sourceField\":\"escapedUrl.keyword\",\"isBucketed\":true,\"params\":{\"size\":20,\"orderBy\":{\"type\":\"column\",\"columnId\":\"f7399748-ce1c-4df4-89f4-e3e30a67a023\"},\"orderDirection\":\"desc\",\"otherBucket\":true,\"missingBucket\":false,\"parentFormat\":{\"id\":\"terms\"},\"include\":[],\"exclude\":[],\"includeIsRegex\":false,\"excludeIsRegex\":false}}},\"columnOrder\":[\"e5ce64f2-d8df-49aa-9fec-983ead94cb12\",\"f7399748-ce1c-4df4-89f4-e3e30a67a023\",\"dfffbbfd-1a5e-409d-9dfd-1cdf36bb6d01\",\"2548689a-01e7-4752-9373-8b3bcb13c670\"],\"sampling\":1,\"ignoreGlobalFilters\":false,\"incompleteColumns\":{}}}},\"indexpattern\":{\"layers\":{}},\"textBased\":{\"layers\":{}}},\"internalReferences\":[],\"adHocDataViews\":{}}},\"enhancements\":{}}},{\"version\":\"8.10.2\",\"type\":\"lens\",\"gridData\":{\"x\":24,\"y\":15,\"w\":24,\"h\":15,\"i\":\"30f417c9-8766-433d-994c-8f1d5a1c25d0\"},\"panelIndex\":\"30f417c9-8766-433d-994c-8f1d5a1c25d0\",\"embeddableConfig\":{\"attributes\":{\"title\":\"\",\"description\":\"\",\"visualizationType\":\"lnsDatatable\",\"type\":\"lens\",\"references\":[{\"type\":\"index-pattern\",\"id\":\"e270616c-823f-485b-b1e5-0d3435383b91\",\"name\":\"indexpattern-datasource-layer-81072a4c-add7-4e53-86ef-48835dda22fc\"}],\"state\":{\"visualization\":{\"columns\":[{\"columnId\":\"3b58a496-25c2-4214-843a-ea61ff397fd3\",\"isTransposed\":false},{\"columnId\":\"a11ec684-1bc7-422b-a656-e1aea15d9e2b\",\"isTransposed\":false},{\"columnId\":\"12224576-d26b-4fc0-8074-1ad971fe6286\",\"isTransposed\":false},{\"columnId\":\"62cef7d1-2da6-460e-bd1f-2f40fc9a545c\",\"isTransposed\":false}],\"layerId\":\"81072a4c-add7-4e53-86ef-48835dda22fc\",\"layerType\":\"data\"},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"datasourceStates\":{\"formBased\":{\"layers\":{\"81072a4c-add7-4e53-86ef-48835dda22fc\":{\"columns\":{\"3b58a496-25c2-4214-843a-ea61ff397fd3\":{\"label\":\"200 Response\",\"dataType\":\"number\",\"operationType\":\"count\",\"isBucketed\":false,\"scale\":\"ratio\",\"sourceField\":\"json.httpRequest.status\",\"filter\":{\"query\":\"json.httpRequest.status >= 200 and json.httpRequest.status < 300\",\"language\":\"kuery\"},\"params\":{\"emptyAsNull\":true},\"customLabel\":true},\"a11ec684-1bc7-422b-a656-e1aea15d9e2b\":{\"label\":\"500 Responses\",\"dataType\":\"number\",\"operationType\":\"count\",\"isBucketed\":false,\"scale\":\"ratio\",\"sourceField\":\"___records___\",\"filter\":{\"query\":\"json.httpRequest.status >= 500\",\"language\":\"kuery\"},\"params\":{\"emptyAsNull\":true},\"customLabel\":true},\"12224576-d26b-4fc0-8074-1ad971fe6286\":{\"label\":\"400 Responses\",\"dataType\":\"number\",\"operationType\":\"count\",\"isBucketed\":false,\"scale\":\"ratio\",\"sourceField\":\"___records___\",\"filter\":{\"query\":\"json.httpRequest.status >= 400 AND json.httpRequest.status < 500\",\"language\":\"kuery\"},\"params\":{\"emptyAsNull\":true},\"customLabel\":true},\"62cef7d1-2da6-460e-bd1f-2f40fc9a545c\":{\"label\":\"Top 20 values of escapedUrlWithoutQuery.keyword\",\"dataType\":\"string\",\"operationType\":\"terms\",\"scale\":\"ordinal\",\"sourceField\":\"escapedUrlWithoutQuery.keyword\",\"isBucketed\":true,\"params\":{\"size\":20,\"orderBy\":{\"type\":\"column\",\"columnId\":\"a11ec684-1bc7-422b-a656-e1aea15d9e2b\"},\"orderDirection\":\"desc\",\"otherBucket\":true,\"missingBucket\":false,\"parentFormat\":{\"id\":\"terms\"},\"include\":[],\"exclude\":[],\"includeIsRegex\":false,\"excludeIsRegex\":false}}},\"columnOrder\":[\"62cef7d1-2da6-460e-bd1f-2f40fc9a545c\",\"3b58a496-25c2-4214-843a-ea61ff397fd3\",\"12224576-d26b-4fc0-8074-1ad971fe6286\",\"a11ec684-1bc7-422b-a656-e1aea15d9e2b\"],\"sampling\":1,\"ignoreGlobalFilters\":false,\"incompleteColumns\":{}}}},\"indexpattern\":{\"layers\":{}},\"textBased\":{\"layers\":{}}},\"internalReferences\":[],\"adHocDataViews\":{}}},\"enhancements\":{}}},{\"version\":\"8.10.2\",\"type\":\"lens\",\"gridData\":{\"x\":0,\"y\":15,\"w\":24,\"h\":15,\"i\":\"f8ee43e1-4387-45e6-80be-c0301a4dc991\"},\"panelIndex\":\"f8ee43e1-4387-45e6-80be-c0301a4dc991\",\"embeddableConfig\":{\"attributes\":{\"title\":\"\",\"description\":\"\",\"visualizationType\":\"lnsDatatable\",\"type\":\"lens\",\"references\":[{\"type\":\"index-pattern\",\"id\":\"e270616c-823f-485b-b1e5-0d3435383b91\",\"name\":\"indexpattern-datasource-layer-835bca0b-3409-43fd-b02e-8d90334ea396\"}],\"state\":{\"visualization\":{\"columns\":[{\"columnId\":\"f7399748-ce1c-4df4-89f4-e3e30a67a023\",\"isTransposed\":false},{\"isTransposed\":false,\"columnId\":\"2548689a-01e7-4752-9373-8b3bcb13c670\"},{\"columnId\":\"dfffbbfd-1a5e-409d-9dfd-1cdf36bb6d01\",\"isTransposed\":false},{\"columnId\":\"6a02ef93-f314-42f2-bca1-65af849ad659\",\"isTransposed\":false}],\"layerId\":\"835bca0b-3409-43fd-b02e-8d90334ea396\",\"layerType\":\"data\"},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"datasourceStates\":{\"formBased\":{\"layers\":{\"835bca0b-3409-43fd-b02e-8d90334ea396\":{\"columns\":{\"f7399748-ce1c-4df4-89f4-e3e30a67a023\":{\"label\":\"90th % of request time\",\"dataType\":\"number\",\"operationType\":\"percentile\",\"sourceField\":\"json.httpRequest.request_time_seconds\",\"isBucketed\":false,\"scale\":\"ratio\",\"params\":{\"percentile\":90},\"customLabel\":true},\"2548689a-01e7-4752-9373-8b3bcb13c670\":{\"label\":\"#\",\"dataType\":\"number\",\"operationType\":\"count\",\"isBucketed\":false,\"scale\":\"ratio\",\"sourceField\":\"___records___\",\"params\":{\"emptyAsNull\":true},\"customLabel\":true},\"dfffbbfd-1a5e-409d-9dfd-1cdf36bb6d01\":{\"label\":\"Median of request time\",\"dataType\":\"number\",\"operationType\":\"median\",\"sourceField\":\"json.httpRequest.request_time_seconds\",\"isBucketed\":false,\"scale\":\"ratio\",\"params\":{\"emptyAsNull\":true},\"customLabel\":true},\"6a02ef93-f314-42f2-bca1-65af849ad659\":{\"label\":\"Top 20 values of escapedUrlWithoutQuery.keyword\",\"dataType\":\"string\",\"operationType\":\"terms\",\"scale\":\"ordinal\",\"sourceField\":\"escapedUrlWithoutQuery.keyword\",\"isBucketed\":true,\"params\":{\"size\":20,\"orderBy\":{\"type\":\"column\",\"columnId\":\"f7399748-ce1c-4df4-89f4-e3e30a67a023\"},\"orderDirection\":\"desc\",\"otherBucket\":true,\"missingBucket\":false,\"parentFormat\":{\"id\":\"terms\"},\"include\":[],\"exclude\":[],\"includeIsRegex\":false,\"excludeIsRegex\":false,\"secondaryFields\":[]}}},\"columnOrder\":[\"6a02ef93-f314-42f2-bca1-65af849ad659\",\"f7399748-ce1c-4df4-89f4-e3e30a67a023\",\"dfffbbfd-1a5e-409d-9dfd-1cdf36bb6d01\",\"2548689a-01e7-4752-9373-8b3bcb13c670\"],\"sampling\":1,\"ignoreGlobalFilters\":false,\"incompleteColumns\":{}}}},\"indexpattern\":{\"layers\":{}},\"textBased\":{\"layers\":{}}},\"internalReferences\":[],\"adHocDataViews\":{}}},\"enhancements\":{}},\"title\":\"\"},{\"version\":\"8.10.2\",\"type\":\"search\",\"gridData\":{\"x\":0,\"y\":0,\"w\":24,\"h\":15,\"i\":\"40571518-d954-4816-be14-f9583498400b\"},\"panelIndex\":\"40571518-d954-4816-be14-f9583498400b\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_40571518-d954-4816-be14-f9583498400b\"}]", + "timeRestore": false, + "title": "ecamp3", + "version": 1 + }, + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-23T19:38:23.524Z", + "id": "cbf725c0-705f-11ee-bdbe-0de3df9703e1", + "managed": false, + "references": [ + { + "id": "e270616c-823f-485b-b1e5-0d3435383b91", + "name": "abec7a0c-b69b-4eae-8f64-9b77d8548555:indexpattern-datasource-layer-bb76a1ab-de9b-40ac-bc6c-5eeca64f616b", + "type": "index-pattern" + }, + { + "id": "e270616c-823f-485b-b1e5-0d3435383b91", + "name": "2a435cc4-cf49-4522-a01c-5de034306ae0:indexpattern-datasource-layer-835bca0b-3409-43fd-b02e-8d90334ea396", + "type": "index-pattern" + }, + { + "id": "e270616c-823f-485b-b1e5-0d3435383b91", + "name": "30f417c9-8766-433d-994c-8f1d5a1c25d0:indexpattern-datasource-layer-81072a4c-add7-4e53-86ef-48835dda22fc", + "type": "index-pattern" + }, + { + "id": "e270616c-823f-485b-b1e5-0d3435383b91", + "name": "f8ee43e1-4387-45e6-80be-c0301a4dc991:indexpattern-datasource-layer-835bca0b-3409-43fd-b02e-8d90334ea396", + "type": "index-pattern" + }, + { + "id": "02e434c0-01a0-11ef-84f3-475f3a574907", + "name": "40571518-d954-4816-be14-f9583498400b:panel_40571518-d954-4816-be14-f9583498400b", + "type": "search" + }, + { + "id": "e270616c-823f-485b-b1e5-0d3435383b91", + "name": "controlGroup_cfe99476-a962-4988-8ddf-e2c15995c2a2:optionsListDataView", + "type": "index-pattern" + } + ], + "sort": [ + 1713901103524, + 14 + ], + "type": "dashboard", + "typeMigrationVersion": "8.9.0", + "updated_at": "2024-04-23T19:38:23.524Z", + "version": "WzcsMV0=" +} diff --git a/.ops/ecamp3-logging/files/kibana/restore-kibana-objects.sh b/.ops/ecamp3-logging/files/kibana/restore-kibana-objects.sh new file mode 100755 index 0000000000..330bcd5e41 --- /dev/null +++ b/.ops/ecamp3-logging/files/kibana/restore-kibana-objects.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +SCRIPT_DIR=$(realpath "$(dirname "$0")") + +KIBANA_HOST=${KIBANA_HOST:-localhost:5601} + +tmp_file=/tmp/$(uuidgen).ndjson + +cat $SCRIPT_DIR/kibana-objects.ndjson | jq -c > $tmp_file + +curl -X POST "$KIBANA_HOST/api/saved_objects/_import?createNewCopies=false&overwrite=true" \ + -H "kbn-xsrf: true" \ + --form file=@$tmp_file diff --git a/.ops/ecamp3-logging/templates/_helpers.tpl b/.ops/ecamp3-logging/templates/_helpers.tpl new file mode 100644 index 0000000000..1f753487a7 --- /dev/null +++ b/.ops/ecamp3-logging/templates/_helpers.tpl @@ -0,0 +1,20 @@ +{{/* +Common labels +*/}} +{{- define "app.commonLabels" -}} +chart: {{ .Chart.Name }} +helm.sh/chart: {{ .Chart.Name }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Common selector labels +*/}} +{{- define "app.commonSelectorLabels" -}} +app.kubernetes.io/instance: {{ .Release.Name }} +app.kubernetes.io/part-of: {{ .Chart.Name }} +chart: {{ .Chart.Name }} +{{- end }} diff --git a/.ops/ecamp3-logging/templates/elasticsearch/elasticsearch_service.yaml b/.ops/ecamp3-logging/templates/elasticsearch/elasticsearch_service.yaml new file mode 100644 index 0000000000..54ad1ec93e --- /dev/null +++ b/.ops/ecamp3-logging/templates/elasticsearch/elasticsearch_service.yaml @@ -0,0 +1,19 @@ +kind: Service +apiVersion: v1 +metadata: + name: elasticsearch + namespace: {{ .Release.Namespace }} + labels: + app: elasticsearch + {{- include "app.commonLabels" . | nindent 4 }} + {{- include "app.commonSelectorLabels" . | nindent 4 }} +spec: + selector: + app: elasticsearch + {{- include "app.commonSelectorLabels" . | nindent 4 }} + clusterIP: None + ports: + - port: 9200 + name: rest + - port: 9300 + name: inter-node diff --git a/.ops/ecamp3-logging/templates/elasticsearch/elasticsearch_stateful_set.yaml b/.ops/ecamp3-logging/templates/elasticsearch/elasticsearch_stateful_set.yaml new file mode 100644 index 0000000000..28e52bdbcb --- /dev/null +++ b/.ops/ecamp3-logging/templates/elasticsearch/elasticsearch_stateful_set.yaml @@ -0,0 +1,88 @@ +{{- $resourceLimitInMb := .Values.elasticsearch.elasticNode.resources.limits.memory | replace "Mi" "" | int -}} +{{- $javaResources := div $resourceLimitInMb 2 -}} +{{- $minHeapSpace := $javaResources -}} +{{- $maxHeapSpace := $javaResources -}} + +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: elasticsearch-cluster + namespace: {{ .Release.Namespace }} + labels: + {{- include "app.commonLabels" . | nindent 4 }} + {{- include "app.commonSelectorLabels" . | nindent 4 }} +spec: + serviceName: elasticsearch + replicas: 1 + selector: + matchLabels: + app: elasticsearch + {{- include "app.commonSelectorLabels" . | nindent 6 }} + template: + metadata: + labels: + app: elasticsearch + {{- include "app.commonLabels" . | nindent 8 }} + {{- include "app.commonSelectorLabels" . | nindent 8 }} + spec: + containers: + - name: elasticsearch + image: "docker.elastic.co/elasticsearch/elasticsearch:{{ .Values.elastic.version }}" + resources: + {{- toYaml .Values.elasticsearch.elasticNode.resources | nindent 12 }} + ports: + - containerPort: 9200 + name: rest + protocol: TCP + - containerPort: 9300 + name: inter-node + protocol: TCP + volumeMounts: + - name: data + mountPath: /usr/share/elasticsearch/data + env: + - name: cluster.name + value: ecamp3-logs + - name: xpack.security.enabled + value: "false" + - name: node.name + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: cluster.initial_master_nodes + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: ES_JAVA_OPTS + value: "-Xms{{ $minHeapSpace }}m -Xmx{{ $maxHeapSpace }}m" + initContainers: + - name: fix-permissions + image: busybox + command: [ "sh", "-c", "chown -R 1000:1000 /usr/share/elasticsearch/data" ] + securityContext: + privileged: true + volumeMounts: + - name: data + mountPath: /usr/share/elasticsearch/data + - name: increase-vm-max-map + image: busybox + command: [ "sysctl", "-w", "vm.max_map_count=262144" ] + securityContext: + privileged: true + - name: increase-fd-ulimit + image: busybox + command: [ "sh", "-c", "ulimit -n 65536" ] + securityContext: + privileged: true + volumeClaimTemplates: + - metadata: + name: data + labels: + app: elasticsearch + {{- include "app.commonLabels" . | nindent 10 }} + {{- include "app.commonSelectorLabels" . | nindent 10 }} + spec: + accessModes: [ "ReadWriteOnce" ] + storageClassName: {{ .Values.elasticsearch.persistence.storageClassName }} + resources: + {{- toYaml .Values.elasticsearch.persistence.resources | nindent 10 }} diff --git a/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml b/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml new file mode 100644 index 0000000000..b6218ef2c5 --- /dev/null +++ b/.ops/ecamp3-logging/templates/fluentd/fluentd_clusterfilter.yaml @@ -0,0 +1,50 @@ +# from: https://stackoverflow.com/questions/41991128/parsing-inner-json-inside-fluentd +apiVersion: fluentd.fluent.io/v1alpha1 +kind: ClusterFilter +metadata: + name: cluster-filters + labels: + filter.fluentd.fluent.io/enabled: "true" + {{- include "app.commonLabels" . | nindent 4 }} + {{- include "app.commonSelectorLabels" . | nindent 4 }} +spec: + filters: + - customPlugin: + config: | + + @type parser + key_name log + reserve_data true + remove_key_name_field false + hash_value_field json + + @type multi_format + + format json + + + format none + + + + + @type record_transformer + enable_ruby + + requestUrl ${if record['json'] && record['json']['httpRequest'] && record['json']['httpRequest']['requestUrl']; then record['json']['httpRequest']['requestUrl']; else nil; end} + + + + @type record_transformer + enable_ruby + + escapedUrl ${if record['requestUrl']; then record['requestUrl'].gsub(/\/[0-9a-f]{6,}\/?/, "/{id}/").gsub(/%2F[0-9a-f]{6,}(%2F)?/, "%2F{id}%2F"); else nil; end} + + + + @type record_transformer + enable_ruby + + escapedUrlWithoutQuery ${if record['escapedUrl']; then record['escapedUrl'].gsub(/\?.*$/, ""); else nil; end} + + diff --git a/.ops/ecamp3-logging/templates/fluentd/fluentd_output_elasticsearch.yaml b/.ops/ecamp3-logging/templates/fluentd/fluentd_output_elasticsearch.yaml new file mode 100644 index 0000000000..61558b2627 --- /dev/null +++ b/.ops/ecamp3-logging/templates/fluentd/fluentd_output_elasticsearch.yaml @@ -0,0 +1,24 @@ +{{- if .Values.fluentd.output.elasticsearch.enable -}} +apiVersion: fluentd.fluent.io/v1alpha1 +kind: ClusterOutput +metadata: + name: fluentd-output-elasticsearch + labels: + output.fluentd.fluent.io/enabled: "true" + {{- include "app.commonLabels" . | nindent 4 }} + {{- include "app.commonSelectorLabels" . | nindent 4 }} +spec: + outputs: + - elasticsearch: + host: {{ .Values.fluentd.output.elasticsearch.host }} + port: {{ .Values.fluentd.output.elasticsearch.port }} + scheme: {{ .Values.fluentd.output.elasticsearch.scheme }} + logstashFormat: true + logstashPrefix: {{ .Values.fluentd.output.elasticsearch.logstashPrefix }} + sslVerify: {{ .Values.fluentd.output.elasticsearch.sslVerify }} + {{- if .Values.fluentd.output.elasticsearch.buffer }} + buffer: + type: {{ .Values.fluentd.output.elasticsearch.buffer.type }} + path: {{ .Values.fluentd.output.elasticsearch.buffer.path }} + {{- end }} +{{- end }} diff --git a/.ops/ecamp3-logging/templates/kibana/kibana_deployment.yaml b/.ops/ecamp3-logging/templates/kibana/kibana_deployment.yaml new file mode 100644 index 0000000000..04e45f5f27 --- /dev/null +++ b/.ops/ecamp3-logging/templates/kibana/kibana_deployment.yaml @@ -0,0 +1,32 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: kibana + namespace: {{ .Release.Namespace }} + labels: + app: kibana + {{- include "app.commonLabels" . | nindent 4 }} + {{- include "app.commonSelectorLabels" . | nindent 4 }} +spec: + replicas: 1 + selector: + matchLabels: + app: kibana + {{- include "app.commonSelectorLabels" . | nindent 6 }} + template: + metadata: + labels: + app: kibana + {{- include "app.commonLabels" . | nindent 8 }} + {{- include "app.commonSelectorLabels" . | nindent 8 }} + spec: + containers: + - name: kibana + image: "docker.elastic.co/kibana/kibana:{{ .Values.elastic.version }}" + resources: + {{- toYaml .Values.elasticsearch.elasticNode.resources | nindent 12 }} + env: + - name: ELASTICSEARCH_URL + value: http://elasticsearch:9200 + ports: + - containerPort: 5601 diff --git a/.ops/ecamp3-logging/templates/kibana/kibana_service.yaml b/.ops/ecamp3-logging/templates/kibana/kibana_service.yaml new file mode 100644 index 0000000000..aba8fb94a7 --- /dev/null +++ b/.ops/ecamp3-logging/templates/kibana/kibana_service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: kibana + namespace: {{ .Release.Namespace }} + labels: + app: kibana + {{- include "app.commonLabels" . | nindent 4 }} + {{- include "app.commonSelectorLabels" . | nindent 4 }} +spec: + ports: + - port: 5601 + selector: + app: kibana + {{- include "app.commonSelectorLabels" . | nindent 4 }} diff --git a/.ops/ecamp3-logging/values.yaml b/.ops/ecamp3-logging/values.yaml new file mode 100644 index 0000000000..3cbbffd45a --- /dev/null +++ b/.ops/ecamp3-logging/values.yaml @@ -0,0 +1,57 @@ +fluent-operator: + containerRuntime: containerd + fluentbit: + enable: true + input: + tail: + enable: true + systemd: + enable: false + filter: + kubernetes: + labels: true + annotations: true + output: + stdout: + # enable to debug fluentbit + enable: false + fluentd: + watchedNamespaces: + - default + - ingress-nginx + enable: true + +fluentd: + output: + elasticsearch: + enable: true + scheme: http + host: "elasticsearch.ecamp3-logging.svc.cluster.local" + port: 9200 + index: "kubernetes" + suppressTypeName: true + +elastic: + version: 8.13.2 + +elasticsearch: + elasticNode: + resources: + requests: + memory: 1000Mi + limits: + memory: 1000Mi + persistence: + storageClassName: do-block-storage + resources: + requests: + storage: 10Gi + +kibana: + name: kibana + version: + resources: + requests: + memory: 500Mi + limits: + memory: 1Gi From 57d80b72914ee2dd4559401decac67cbe3e6b510 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 06:08:25 +0000 Subject: [PATCH 04/14] chore(deps): update dependency node to v20.13.1 --- .docker-hub/print/Dockerfile | 4 ++-- .github/workflows/continuous-integration.yml | 14 +++++++------- .nvmrc | 2 +- .ops/aws-setup/package-lock.json | 8 ++++---- .ops/aws-setup/package.json | 2 +- docker-compose.yml | 8 ++++---- renovate.json | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.docker-hub/print/Dockerfile b/.docker-hub/print/Dockerfile index ca2200b3b9..344a5067fb 100644 --- a/.docker-hub/print/Dockerfile +++ b/.docker-hub/print/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM node:20.12.2 AS build-stage +FROM node:20.13.1 AS build-stage ARG SENTRY_AUTH_TOKEN ARG SENTRY_ORG ARG SENTRY_PRINT_PROJECT @@ -22,7 +22,7 @@ COPY print . RUN npm run build # production stage -FROM node:20.12.2 AS production-stage +FROM node:20.13.1 AS production-stage WORKDIR /app COPY --from=build-stage /app/.output ./.output diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a4b897e035..8dbb5ac633 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -63,7 +63,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20.12.2' + node-version: '20.13.1' - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: @@ -92,7 +92,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20.12.2' + node-version: '20.13.1' - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: @@ -121,7 +121,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20.12.2' + node-version: '20.13.1' - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: @@ -150,7 +150,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20.12.2' + node-version: '20.13.1' - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: @@ -253,7 +253,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20.12.2' + node-version: '20.13.1' - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: @@ -296,7 +296,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20.12.2' + node-version: '20.13.1' - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: @@ -335,7 +335,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20.12.2' + node-version: '20.13.1' - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: diff --git a/.nvmrc b/.nvmrc index 87834047a6..f203ab89b7 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.12.2 +20.13.1 diff --git a/.ops/aws-setup/package-lock.json b/.ops/aws-setup/package-lock.json index 7b403b086a..0e82edea0f 100644 --- a/.ops/aws-setup/package-lock.json +++ b/.ops/aws-setup/package-lock.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@babel/eslint-parser": "7.24.5", - "@types/node": "20.12.8", + "@types/node": "20.12.12", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", @@ -2889,9 +2889,9 @@ } }, "node_modules/@types/node": { - "version": "20.12.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.8.tgz", - "integrity": "sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==", + "version": "20.12.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", + "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" diff --git a/.ops/aws-setup/package.json b/.ops/aws-setup/package.json index a310180bab..19ea39cafc 100644 --- a/.ops/aws-setup/package.json +++ b/.ops/aws-setup/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@babel/eslint-parser": "7.24.5", - "@types/node": "20.12.8", + "@types/node": "20.12.12", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", diff --git a/docker-compose.yml b/docker-compose.yml index a0e71f3691..549e3e1e2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.9' services: frontend: - image: node:20.12.2 + image: node:20.13.1 container_name: 'ecamp3-frontend' ports: - '9229:9229' # jest debug @@ -94,7 +94,7 @@ services: - ./api/public:/srv/api/public:ro pdf: - image: node:20.12.2 + image: node:20.13.1 container_name: 'ecamp3-pdf' stdin_open: true tty: true @@ -113,7 +113,7 @@ services: - CI=${CI} print: - image: node:20.12.2 + image: node:20.13.1 container_name: 'ecamp3-print' user: ${USER_ID:-1000} volumes: @@ -192,7 +192,7 @@ services: working_dir: /e2e translation: - image: node:20.12.2 + image: node:20.13.1 profiles: ['translation'] container_name: 'ecamp3-translation' volumes: diff --git a/renovate.json b/renovate.json index 5f5530c124..37771b3f2b 100644 --- a/renovate.json +++ b/renovate.json @@ -5,7 +5,7 @@ ], "force": { "constraints": { - "node": "20.12.2", + "node": "20.13.1", "php": "8.3.6" } }, From 5a072d09145990e7ea294e481ea86973e719bd04 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 23:41:17 +0000 Subject: [PATCH 05/14] chore(deps): update amazon/aws-cli docker tag to v2.15.53 --- .ops/aws-setup/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ops/aws-setup/docker-compose.yml b/.ops/aws-setup/docker-compose.yml index 41b6149cac..0e657ee5c9 100644 --- a/.ops/aws-setup/docker-compose.yml +++ b/.ops/aws-setup/docker-compose.yml @@ -15,7 +15,7 @@ services: - AWS_DEFAULT_REGION=eu-west-3 aws-cli: - image: amazon/aws-cli:2.15.50 + image: amazon/aws-cli:2.15.53 container_name: 'ecamp3-aws-cli' volumes: - ./.aws:/root/.aws:delegated From 6524234c4b47d1e33601929623dbf035e50b3d25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 May 2024 14:27:14 +0000 Subject: [PATCH 06/14] chore(deps): update dependency rector/rector to v1.1.0 --- api/composer.json | 2 +- api/composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/composer.json b/api/composer.json index 28a2377a1a..cef522caf3 100644 --- a/api/composer.json +++ b/api/composer.json @@ -54,7 +54,7 @@ "php-coveralls/php-coveralls": "2.7.0", "phpstan/phpstan": "1.11.1", "phpunit/phpunit": "10.5.20", - "rector/rector": "1.0.5", + "rector/rector": "1.1.0", "spatie/phpunit-snapshot-assertions": "5.1.6", "symfony/browser-kit": "7.0.7", "symfony/css-selector": "7.0.7", diff --git a/api/composer.lock b/api/composer.lock index e71d6f5a74..6a8702c7cc 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "857ee74acdd63526bd41d20ef4a82216", + "content-hash": "4e5b8ce94da6b5b7b61a17bf0e4261dc", "packages": [ { "name": "api-platform/core", @@ -12873,21 +12873,21 @@ }, { "name": "rector/rector", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "73eb63e4f9011dba6b7c66c3262543014e352f34" + "reference": "556509e2dcf527369892b7d411379c4a02f31859" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/73eb63e4f9011dba6b7c66c3262543014e352f34", - "reference": "73eb63e4f9011dba6b7c66c3262543014e352f34", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/556509e2dcf527369892b7d411379c4a02f31859", + "reference": "556509e2dcf527369892b7d411379c4a02f31859", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.10.57" + "phpstan/phpstan": "^1.11" }, "conflict": { "rector/rector-doctrine": "*", @@ -12920,7 +12920,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/1.0.5" + "source": "https://github.com/rectorphp/rector/tree/1.1.0" }, "funding": [ { @@ -12928,7 +12928,7 @@ "type": "github" } ], - "time": "2024-05-10T05:31:15+00:00" + "time": "2024-05-18T09:40:27+00:00" }, { "name": "sebastian/cli-parser", From 14acb868a4ff0c10adf7b6468ddd326d2755c1c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 May 2024 17:09:46 +0000 Subject: [PATCH 07/14] chore(deps): lock file maintenance --- .ops/aws-setup/package-lock.json | 18 ++++----- frontend/package-lock.json | 12 +++--- pdf/package-lock.json | 6 +-- print/package-lock.json | 64 ++++++++++++++++---------------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.ops/aws-setup/package-lock.json b/.ops/aws-setup/package-lock.json index ca2a07afe0..bf11a627a8 100644 --- a/.ops/aws-setup/package-lock.json +++ b/.ops/aws-setup/package-lock.json @@ -3167,9 +3167,9 @@ } }, "node_modules/aws-sdk": { - "version": "2.1622.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1622.0.tgz", - "integrity": "sha512-ff/jc1XwSCWDcqa7ezLLsqRbs1IVPXMoUTMFHHYRTuNwGQDn/073DbmyLkqD4ARBcTxkOooSaP7uySoZ2ekFeg==", + "version": "2.1623.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1623.0.tgz", + "integrity": "sha512-SFPc+QJqoghsE0nn6YSmrDDDPpWc3m4rcDQYg6W3GQek+f1v6kycxM5+N58pMZ2iWhRSOTf9NQRcZj0ZU3PklQ==", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -3854,9 +3854,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.773", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.773.tgz", - "integrity": "sha512-87eHF+h3PlCRwbxVEAw9KtK3v7lWfc/sUDr0W76955AdYTG4bV/k0zrl585Qnj/skRMH2qOSiE+kqMeOQ+LOpw==", + "version": "1.4.774", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", + "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==", "dev": true, "license": "ISC", "peer": true @@ -4348,9 +4348,9 @@ } }, "node_modules/eslint-plugin-n/node_modules/globals": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.2.0.tgz", - "integrity": "sha512-FQ5YwCHZM3nCmtb5FzEWwdUc9K5d3V/w9mzcz8iGD1gC/aOTHc6PouYu0kkKipNJqHAT7m51sqzQjEjIP+cK0A==", + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.3.0.tgz", + "integrity": "sha512-cCdyVjIUVTtX8ZsPkq1oCsOsLmGIswqnjZYMJJTGaNApj1yHtLSymKhwH51ttirREn75z3p4k051clwg7rvNKA==", "dev": true, "license": "MIT", "engines": { diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 17fee3e947..6bc336540e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -6607,9 +6607,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.773", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.773.tgz", - "integrity": "sha512-87eHF+h3PlCRwbxVEAw9KtK3v7lWfc/sUDr0W76955AdYTG4bV/k0zrl585Qnj/skRMH2qOSiE+kqMeOQ+LOpw==", + "version": "1.4.774", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", + "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==", "dev": true, "license": "ISC" }, @@ -7131,9 +7131,9 @@ } }, "node_modules/eslint-plugin-n/node_modules/globals": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.2.0.tgz", - "integrity": "sha512-FQ5YwCHZM3nCmtb5FzEWwdUc9K5d3V/w9mzcz8iGD1gC/aOTHc6PouYu0kkKipNJqHAT7m51sqzQjEjIP+cK0A==", + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.3.0.tgz", + "integrity": "sha512-cCdyVjIUVTtX8ZsPkq1oCsOsLmGIswqnjZYMJJTGaNApj1yHtLSymKhwH51ttirREn75z3p4k051clwg7rvNKA==", "dev": true, "license": "MIT", "engines": { diff --git a/pdf/package-lock.json b/pdf/package-lock.json index 4c0deeea80..442153e4f0 100644 --- a/pdf/package-lock.json +++ b/pdf/package-lock.json @@ -4577,9 +4577,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.773", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.773.tgz", - "integrity": "sha512-87eHF+h3PlCRwbxVEAw9KtK3v7lWfc/sUDr0W76955AdYTG4bV/k0zrl585Qnj/skRMH2qOSiE+kqMeOQ+LOpw==", + "version": "1.4.774", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", + "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==", "dev": true, "license": "ISC" }, diff --git a/print/package-lock.json b/print/package-lock.json index 51f6d1056d..47b491b366 100644 --- a/print/package-lock.json +++ b/print/package-lock.json @@ -3883,9 +3883,9 @@ ] }, "node_modules/@rushstack/eslint-patch": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.10.2.tgz", - "integrity": "sha512-hw437iINopmQuxWPSUEvqE56NCPsiU8N4AYtfHmJFckclktzK9YQJieD3XkDCDH4OjL+C7zgPUh73R/nrcHrqw==", + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.10.3.tgz", + "integrity": "sha512-qC/xYId4NMebE6w/V33Fh9gWxLgURiNYgVNObbJl2LZv0GUUItCcCqC5axQSwRaAgaxl2mELq1rMzlswaQ0Zxg==", "dev": true, "license": "MIT" }, @@ -5541,16 +5541,16 @@ "license": "MIT" }, "node_modules/@vue/devtools-applet": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@vue/devtools-applet/-/devtools-applet-7.2.0.tgz", - "integrity": "sha512-ohl3uHejqu8v6BoCfsadpo6/QU1o585Im8AbH4bZiQTKdIot7OlBdk7pz9bK3muV6N1xKuiDNwYul0QYClOeSg==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/@vue/devtools-applet/-/devtools-applet-7.2.1.tgz", + "integrity": "sha512-WGFXgMaph+9aT6ApN0ZQEjjAEeVN/o6DuoXOI5lJzpvXGxRpVWonziNlIcXW9PG/xVuZVWAEST7CQpXs4kzmdg==", "dev": true, "license": "MIT", "dependencies": { - "@vue/devtools-core": "^7.2.0", - "@vue/devtools-kit": "^7.2.0", - "@vue/devtools-shared": "^7.2.0", - "@vue/devtools-ui": "^7.2.0", + "@vue/devtools-core": "^7.2.1", + "@vue/devtools-kit": "^7.2.1", + "@vue/devtools-shared": "^7.2.1", + "@vue/devtools-ui": "^7.2.1", "lodash-es": "^4.17.21", "perfect-debounce": "^1.0.0", "shiki": "1.5.2", @@ -5562,14 +5562,14 @@ } }, "node_modules/@vue/devtools-core": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.2.0.tgz", - "integrity": "sha512-cHSeu70rTtubt2DYia+VDGNTC1m84Xyuk5eNTjmOpMLECaJnWnzCv6kR84EZp7rG+MVZalJG+4ecX2GaTbU3cQ==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.2.1.tgz", + "integrity": "sha512-OyWl455UnJIVgZ6lo5WQ79WbDMoXtSRwyNKp9WzCZ0HhuQywIk4qv59KtLRe75uVmtGBde4hXNaSyRm+x9bY6g==", "dev": true, "license": "MIT", "dependencies": { - "@vue/devtools-kit": "^7.2.0", - "@vue/devtools-shared": "^7.2.0", + "@vue/devtools-kit": "^7.2.1", + "@vue/devtools-shared": "^7.2.1", "mitt": "^3.0.1", "nanoid": "^3.3.4", "pathe": "^1.1.2", @@ -5596,13 +5596,13 @@ } }, "node_modules/@vue/devtools-kit": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.2.0.tgz", - "integrity": "sha512-Kx+U0QiQg/g714euYKfnCdhTcOycSlH1oyTE57D0sAmisdsRCNLfXcnnIwcFY2jdCpuz9DNbuE0VWQuYF5zAZQ==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.2.1.tgz", + "integrity": "sha512-Wak/fin1X0Q8LLIfCAHBrdaaB+R6IdpSXsDByPHbQ3BmkCP0/cIo/oEGp9i0U2+gEqD4L3V9RDjNf1S34DTzQQ==", "dev": true, "license": "MIT", "dependencies": { - "@vue/devtools-shared": "^7.2.0", + "@vue/devtools-shared": "^7.2.1", "hookable": "^5.5.3", "mitt": "^3.0.1", "perfect-debounce": "^1.0.0", @@ -5613,9 +5613,9 @@ } }, "node_modules/@vue/devtools-shared": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.2.0.tgz", - "integrity": "sha512-gVr3IjKjU7axNvclRgICgy1gq/TDnF1hhBAEox+l5mMXZiTIFVIm1zpcIPssc0HxMDgzy+lXqOVsY4DGyZ+ZeA==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.2.1.tgz", + "integrity": "sha512-PCJF4UknJmOal68+X9XHyVeQ+idv0LFujkTOIW30+GaMJqwFVN9LkQKX4gLqn61KkGMdJTzQ1bt7EJag3TI6AA==", "dev": true, "license": "MIT", "dependencies": { @@ -5623,13 +5623,13 @@ } }, "node_modules/@vue/devtools-ui": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@vue/devtools-ui/-/devtools-ui-7.2.0.tgz", - "integrity": "sha512-5raf2DLgicnT6vr9oO8kgN49ZqdDYtyph4hBH3sg9bvY2UtHgJs6m8uPqai5vKSrrEy/V30Rq/tahQlOiEbi+Q==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/@vue/devtools-ui/-/devtools-ui-7.2.1.tgz", + "integrity": "sha512-3XwW6uTn5noXKN4T4T9rpFlQR0B050ebwUO+Y8HsWHv8XZ451xk+A89y00s1Zx7P2SRkDqeJgbi4kYSHnXkxbg==", "dev": true, "license": "MIT", "dependencies": { - "@vue/devtools-shared": "7.2.0", + "@vue/devtools-shared": "7.2.1", "@vueuse/components": "^10.9.0", "@vueuse/core": "^10.9.0", "@vueuse/integrations": "^10.9.0", @@ -8291,9 +8291,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.773", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.773.tgz", - "integrity": "sha512-87eHF+h3PlCRwbxVEAw9KtK3v7lWfc/sUDr0W76955AdYTG4bV/k0zrl585Qnj/skRMH2qOSiE+kqMeOQ+LOpw==", + "version": "1.4.774", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", + "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==", "dev": true, "license": "ISC" }, @@ -8387,9 +8387,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz", - "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz", + "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==", "dev": true, "license": "MIT", "peer": true From b559ef94c9425137c84e42e86266f81e0c2d50b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 May 2024 21:55:20 +0000 Subject: [PATCH 08/14] fix(deps): update dependency axios to v1.7.0 --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- print/package-lock.json | 8 ++++---- print/package.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 17fee3e947..f5920c3b23 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -40,7 +40,7 @@ "@zxcvbn-ts/language-fr": "3.0.2", "@zxcvbn-ts/language-it": "3.0.2", "assert": "2.1.0", - "axios": "1.6.8", + "axios": "1.7.0", "colorjs.io": "0.5.0", "comlink": "4.4.1", "dayjs": "1.11.11", @@ -5422,9 +5422,9 @@ } }, "node_modules/axios": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", - "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz", + "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", diff --git a/frontend/package.json b/frontend/package.json index d554a1838e..ff19cb976b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -52,7 +52,7 @@ "@zxcvbn-ts/language-fr": "3.0.2", "@zxcvbn-ts/language-it": "3.0.2", "assert": "2.1.0", - "axios": "1.6.8", + "axios": "1.7.0", "colorjs.io": "0.5.0", "comlink": "4.4.1", "dayjs": "1.11.11", diff --git a/print/package-lock.json b/print/package-lock.json index 51f6d1056d..74d72aa5c7 100644 --- a/print/package-lock.json +++ b/print/package-lock.json @@ -10,7 +10,7 @@ "@mdi/js": "7.4.47", "@sentry/integrations": "7.114.0", "@sentry/node": "7.116.0", - "axios": "1.6.8", + "axios": "1.7.0", "colorjs.io": "0.5.0", "dayjs": "1.11.11", "deepmerge": "4.3.1", @@ -6637,9 +6637,9 @@ } }, "node_modules/axios": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", - "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz", + "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", diff --git a/print/package.json b/print/package.json index b1f5bc69d3..d27203ab9b 100644 --- a/print/package.json +++ b/print/package.json @@ -19,7 +19,7 @@ "@mdi/js": "7.4.47", "@sentry/integrations": "7.114.0", "@sentry/node": "7.116.0", - "axios": "1.6.8", + "axios": "1.7.0", "colorjs.io": "0.5.0", "dayjs": "1.11.11", "deepmerge": "4.3.1", From 0b14a867d12198027b461e17d92dbcda958f4e17 Mon Sep 17 00:00:00 2001 From: BacLuc Date: Mon, 20 May 2024 12:29:53 +0200 Subject: [PATCH 09/14] remove version from docker-compose.yml files Fixes WARN[0000] /home/lucius/projects/ecamp/ecamp3/main/docker-compose.yml: `version` is obsolete --- .helm/ecamp3/files/db-backup-restore-image/docker-compose.yml | 2 -- .helm/ecamp3/files/db_backup_job/docker-compose.yml | 1 - .helm/ecamp3/files/hook_db_restore/docker-compose.yml | 1 - .ops/aws-setup/docker-compose.yml | 2 -- docker-compose.yml | 2 -- 5 files changed, 8 deletions(-) diff --git a/.helm/ecamp3/files/db-backup-restore-image/docker-compose.yml b/.helm/ecamp3/files/db-backup-restore-image/docker-compose.yml index 49763aabd7..6dbfb14d41 100644 --- a/.helm/ecamp3/files/db-backup-restore-image/docker-compose.yml +++ b/.helm/ecamp3/files/db-backup-restore-image/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: db-backup-restore-image: image: ${CONTAINER_REGISTRY:-docker.io}/${REPO_OWNER:-ecamp}/ecamp3-db-backup-restore:${VERSION:-local} diff --git a/.helm/ecamp3/files/db_backup_job/docker-compose.yml b/.helm/ecamp3/files/db_backup_job/docker-compose.yml index a01796896b..c00ab3c4c3 100644 --- a/.helm/ecamp3/files/db_backup_job/docker-compose.yml +++ b/.helm/ecamp3/files/db_backup_job/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.9' services: create-backup: build: diff --git a/.helm/ecamp3/files/hook_db_restore/docker-compose.yml b/.helm/ecamp3/files/hook_db_restore/docker-compose.yml index cc924211ae..4c414f4a1b 100644 --- a/.helm/ecamp3/files/hook_db_restore/docker-compose.yml +++ b/.helm/ecamp3/files/hook_db_restore/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.9' services: restore-backup: build: diff --git a/.ops/aws-setup/docker-compose.yml b/.ops/aws-setup/docker-compose.yml index 1664940b32..76f15be36f 100644 --- a/.ops/aws-setup/docker-compose.yml +++ b/.ops/aws-setup/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: aws-setup: image: pulumi/pulumi-nodejs:3.116.1 diff --git a/docker-compose.yml b/docker-compose.yml index a0e71f3691..2d6eb20bbb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: frontend: image: node:20.12.2 From 4282e92f17756750cdeb710acd1d7d051d7758e6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 19:45:50 +0000 Subject: [PATCH 10/14] fix(deps): update dependency axios to v1.7.1 --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- print/package-lock.json | 8 ++++---- print/package.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e196766888..133ed98c85 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -40,7 +40,7 @@ "@zxcvbn-ts/language-fr": "3.0.2", "@zxcvbn-ts/language-it": "3.0.2", "assert": "2.1.0", - "axios": "1.7.0", + "axios": "1.7.1", "colorjs.io": "0.5.0", "comlink": "4.4.1", "dayjs": "1.11.11", @@ -5422,9 +5422,9 @@ } }, "node_modules/axios": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz", - "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz", + "integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", diff --git a/frontend/package.json b/frontend/package.json index ff19cb976b..2863594661 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -52,7 +52,7 @@ "@zxcvbn-ts/language-fr": "3.0.2", "@zxcvbn-ts/language-it": "3.0.2", "assert": "2.1.0", - "axios": "1.7.0", + "axios": "1.7.1", "colorjs.io": "0.5.0", "comlink": "4.4.1", "dayjs": "1.11.11", diff --git a/print/package-lock.json b/print/package-lock.json index 5e785e2f6c..317768a35a 100644 --- a/print/package-lock.json +++ b/print/package-lock.json @@ -10,7 +10,7 @@ "@mdi/js": "7.4.47", "@sentry/integrations": "7.114.0", "@sentry/node": "7.116.0", - "axios": "1.7.0", + "axios": "1.7.1", "colorjs.io": "0.5.0", "dayjs": "1.11.11", "deepmerge": "4.3.1", @@ -6637,9 +6637,9 @@ } }, "node_modules/axios": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz", - "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz", + "integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", diff --git a/print/package.json b/print/package.json index d27203ab9b..48bb0d8e89 100644 --- a/print/package.json +++ b/print/package.json @@ -19,7 +19,7 @@ "@mdi/js": "7.4.47", "@sentry/integrations": "7.114.0", "@sentry/node": "7.116.0", - "axios": "1.7.0", + "axios": "1.7.1", "colorjs.io": "0.5.0", "dayjs": "1.11.11", "deepmerge": "4.3.1", From 06abcdcda2aeece9bb6fb20f3df40e155c23fd6e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 03:34:41 +0000 Subject: [PATCH 11/14] chore(deps): update amazon/aws-cli docker tag to v2.15.54 --- .ops/aws-setup/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ops/aws-setup/docker-compose.yml b/.ops/aws-setup/docker-compose.yml index 1664940b32..c1aa6fd1b9 100644 --- a/.ops/aws-setup/docker-compose.yml +++ b/.ops/aws-setup/docker-compose.yml @@ -15,7 +15,7 @@ services: - AWS_DEFAULT_REGION=eu-west-3 aws-cli: - image: amazon/aws-cli:2.15.53 + image: amazon/aws-cli:2.15.54 container_name: 'ecamp3-aws-cli' volumes: - ./.aws:/root/.aws:delegated From 7a1d921280f681264b3719b41d67a827df3e5ada Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 03:35:18 +0000 Subject: [PATCH 12/14] chore(deps): update dependency friendsofphp/php-cs-fixer to v3.57.2 --- api/composer.json | 2 +- api/composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/composer.json b/api/composer.json index cef522caf3..fab072fd3c 100644 --- a/api/composer.json +++ b/api/composer.json @@ -48,7 +48,7 @@ "webonyx/graphql-php": "15.11.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "3.57.1", + "friendsofphp/php-cs-fixer": "3.57.2", "hautelook/alice-bundle": "2.13.0", "justinrainbow/json-schema": "5.2.13", "php-coveralls/php-coveralls": "2.7.0", diff --git a/api/composer.lock b/api/composer.lock index 6a8702c7cc..57742b18a1 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4e5b8ce94da6b5b7b61a17bf0e4261dc", + "content-hash": "8155c78a75062643d8bb81bbc1b0cc64", "packages": [ { "name": "api-platform/core", @@ -11090,16 +11090,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.57.1", + "version": "v3.57.2", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "3f7efe667a8c9818aacceee478add7c0fc24cb21" + "reference": "22f7f3145606df92b02fb1bd22c30abfce956d3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3f7efe667a8c9818aacceee478add7c0fc24cb21", - "reference": "3f7efe667a8c9818aacceee478add7c0fc24cb21", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/22f7f3145606df92b02fb1bd22c30abfce956d3c", + "reference": "22f7f3145606df92b02fb1bd22c30abfce956d3c", "shasum": "" }, "require": { @@ -11178,7 +11178,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.57.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.57.2" }, "funding": [ { @@ -11186,7 +11186,7 @@ "type": "github" } ], - "time": "2024-05-15T22:01:07+00:00" + "time": "2024-05-20T20:41:57+00:00" }, { "name": "hautelook/alice-bundle", From b1dafc1d3d2686de7b5ae8b7223215c6d210231d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 03:43:12 +0000 Subject: [PATCH 13/14] chore(deps): lock file maintenance --- .ops/aws-setup/package-lock.json | 12 +- frontend/package-lock.json | 14 +- pdf/package-lock.json | 6 +- print/package-lock.json | 305 ++++++++++++++++--------------- translation/package-lock.json | 6 +- 5 files changed, 173 insertions(+), 170 deletions(-) diff --git a/.ops/aws-setup/package-lock.json b/.ops/aws-setup/package-lock.json index e5a5e518b2..ef0a12b776 100644 --- a/.ops/aws-setup/package-lock.json +++ b/.ops/aws-setup/package-lock.json @@ -3167,9 +3167,9 @@ } }, "node_modules/aws-sdk": { - "version": "2.1623.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1623.0.tgz", - "integrity": "sha512-SFPc+QJqoghsE0nn6YSmrDDDPpWc3m4rcDQYg6W3GQek+f1v6kycxM5+N58pMZ2iWhRSOTf9NQRcZj0ZU3PklQ==", + "version": "2.1624.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1624.0.tgz", + "integrity": "sha512-SxBGDkdmsQTXLKPaY+hLqjlQyZBaGaFD34EhTd4aYuuqT952sxYeDt7w75py4o4O5z4hUUTccqTF9dtpxCPJfg==", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -3854,9 +3854,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.774", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", - "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==", + "version": "1.4.775", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.775.tgz", + "integrity": "sha512-JpOfl1aNAiZ88wFzjPczTLwYIoPIsij8S9/XQH9lqMpiJOf23kxea68B8wje4f68t4rOIq4Bh+vP4I65njiJBw==", "dev": true, "license": "ISC", "peer": true diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e196766888..a51367ef2b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -6607,9 +6607,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.774", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", - "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==", + "version": "1.4.775", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.775.tgz", + "integrity": "sha512-JpOfl1aNAiZ88wFzjPczTLwYIoPIsij8S9/XQH9lqMpiJOf23kxea68B8wje4f68t4rOIq4Bh+vP4I65njiJBw==", "dev": true, "license": "ISC" }, @@ -10694,13 +10694,13 @@ } }, "node_modules/prosemirror-markdown": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/prosemirror-markdown/-/prosemirror-markdown-1.12.0.tgz", - "integrity": "sha512-6F5HS8Z0HDYiS2VQDZzfZP6A0s/I0gbkJy8NCzzDMtcsz3qrfqyroMMeoSjAmOhDITyon11NbXSzztfKi+frSQ==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/prosemirror-markdown/-/prosemirror-markdown-1.13.0.tgz", + "integrity": "sha512-UziddX3ZYSYibgx8042hfGKmukq5Aljp2qoBiJRejD/8MH70siQNz5RB1TrdTPheqLMy4aCe4GYNF10/3lQS5g==", "license": "MIT", "dependencies": { "markdown-it": "^14.0.0", - "prosemirror-model": "^1.0.0" + "prosemirror-model": "^1.20.0" } }, "node_modules/prosemirror-menu": { diff --git a/pdf/package-lock.json b/pdf/package-lock.json index 442153e4f0..d91bb8f063 100644 --- a/pdf/package-lock.json +++ b/pdf/package-lock.json @@ -4577,9 +4577,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.774", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", - "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==", + "version": "1.4.775", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.775.tgz", + "integrity": "sha512-JpOfl1aNAiZ88wFzjPczTLwYIoPIsij8S9/XQH9lqMpiJOf23kxea68B8wje4f68t4rOIq4Bh+vP4I65njiJBw==", "dev": true, "license": "ISC" }, diff --git a/print/package-lock.json b/print/package-lock.json index 5e785e2f6c..493f56b537 100644 --- a/print/package-lock.json +++ b/print/package-lock.json @@ -2569,11 +2569,11 @@ } }, "node_modules/@nuxt/ui-templates": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@nuxt/ui-templates/-/ui-templates-1.3.3.tgz", - "integrity": "sha512-3BG5doAREcD50dbKyXgmjD4b1GzY8CUy3T41jMhHZXNDdaNwOd31IBq+D6dV00OSrDVhzrTVj0IxsUsnMyHvIQ==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@nuxt/ui-templates/-/ui-templates-1.3.4.tgz", + "integrity": "sha512-zjuslnkj5zboZGis5QpmR5gvRTx5N8Ha/Rll+RRT8YZhXVNBincifhZ9apUQ9f6T0xJE8IHPyVyPx6WokomdYw==", "dev": true, - "license": "CC-BY-ND-4.0" + "license": "MIT" }, "node_modules/@nuxt/vite-builder": { "version": "3.11.2", @@ -4688,16 +4688,16 @@ } }, "node_modules/@unocss/astro": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/astro/-/astro-0.60.2.tgz", - "integrity": "sha512-H8kJHj8aCQXksr0o7OpHqNkzm0RmpOm+qCt8vRcJJVFrdzQyaIQ/vyq3BUTV0Ex6OSzPirTe8fOaWoZdKtKf2Q==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/astro/-/astro-0.60.3.tgz", + "integrity": "sha512-duFuyVhqYqQ15JZqx41UNgIxndqYRbOwDkJ7Y+R5N+u59a27vImz8B9eOFkHaZCFBWyH5jywkT8LVK1sfddFaw==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2", - "@unocss/reset": "0.60.2", - "@unocss/vite": "0.60.2" + "@unocss/core": "0.60.3", + "@unocss/reset": "0.60.3", + "@unocss/vite": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" @@ -4712,18 +4712,18 @@ } }, "node_modules/@unocss/cli": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/cli/-/cli-0.60.2.tgz", - "integrity": "sha512-zX7eM95UI6LpKRfHTr8T2gSlFFXemPUswBxR5H4vPVlLeeCOhJWfc04vGdtSwoix5qFdnhQWIwzXGXAaB+kwoA==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/cli/-/cli-0.60.3.tgz", + "integrity": "sha512-bN829zn6k4hrvDTLnUcI2uAJnSevHwlkOCaYxN/C+v11uGxIewk5Xum6Vm5kZ8JTpCR1jEu/i7wIBNde3XKN5g==", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@ampproject/remapping": "^2.3.0", "@rollup/pluginutils": "^5.1.0", - "@unocss/config": "0.60.2", - "@unocss/core": "0.60.2", - "@unocss/preset-uno": "0.60.2", + "@unocss/config": "0.60.3", + "@unocss/core": "0.60.3", + "@unocss/preset-uno": "0.60.3", "cac": "^6.7.14", "chokidar": "^3.6.0", "colorette": "^2.0.20", @@ -4744,14 +4744,14 @@ } }, "node_modules/@unocss/config": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/config/-/config-0.60.2.tgz", - "integrity": "sha512-EEgivE1xEnamAsYMcmjUmLJjOa9dBdV2zygT/blSFyX6rMfA4OuRlZ8hgfeWrHImZGiTXUU0jV2EaRmK9jEImQ==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/config/-/config-0.60.3.tgz", + "integrity": "sha512-3RGD7h3bS4qZA/Khcqhn1EgLgyPc85FSz5rubdywHRdHlpY9sdmuGEJahvqSLMN4MmdYQDmqEIEAJjENrdgZeQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2", + "@unocss/core": "0.60.3", "unconfig": "^0.3.13" }, "engines": { @@ -4762,9 +4762,9 @@ } }, "node_modules/@unocss/core": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/core/-/core-0.60.2.tgz", - "integrity": "sha512-9i+eAJAqvy9bv0vrQxUU7VtR+wO6Vfk6dqrPHKRV/vlbwRT18v/C++dQ2L6PLM1CKxgNTeld0iTlpo8J3xZlxQ==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/core/-/core-0.60.3.tgz", + "integrity": "sha512-4bBX1pavDl2DSCozEII7bxYGT0IkyO7kKlUuCtooTePWyLjf2F7essdzHkJ00EpNR64kkebR9V0lqBMBo07VPw==", "dev": true, "license": "MIT", "peer": true, @@ -4773,29 +4773,29 @@ } }, "node_modules/@unocss/extractor-arbitrary-variants": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/extractor-arbitrary-variants/-/extractor-arbitrary-variants-0.60.2.tgz", - "integrity": "sha512-uO4ZPUcaYvyWshXnqzFnSWeh+Du6xVYwaz3oBKq4n7Ryw2Grc0IhiZe6n9MC8w6nkbopdo6ngr5LnFGp86horQ==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/extractor-arbitrary-variants/-/extractor-arbitrary-variants-0.60.3.tgz", + "integrity": "sha512-PnwNwkeAHmbJbrf5XN0xQG1KT1VQEye8neYn5yz1MHnT8Cj2nqjrqoCRGLCLhpOUg3/MNj+bpiA7hGnFbXWaCQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2" + "@unocss/core": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/inspector": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/inspector/-/inspector-0.60.2.tgz", - "integrity": "sha512-tc+TtTA7yNCS10oT7MfI2rEv1KErwLgEDRvBLCM1vsXmjzsGxkhqnT3vT5pqRkENYh/QhmIfpz1899GvH8WBMQ==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/inspector/-/inspector-0.60.3.tgz", + "integrity": "sha512-2cXAPA1yddB79mmpMXxPpSpizn4TskAsB7aSocbprOTYIU2Ff53gfkkijnLixrBvbG8xw91d9oPuI5Hm9GCyMQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2", - "@unocss/rule-utils": "0.60.2", + "@unocss/core": "0.60.3", + "@unocss/rule-utils": "0.60.3", "gzip-size": "^6.0.0", "sirv": "^2.0.4" }, @@ -4821,16 +4821,16 @@ } }, "node_modules/@unocss/postcss": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/postcss/-/postcss-0.60.2.tgz", - "integrity": "sha512-fGXzhx5bh1iYxQ0wThmUsu+KMxCTqZsQQZ/a2kbTNzmOIslX1/cCWaQ62BWsfER7rOnZVG6DzGR+3CzVcDzuXg==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/postcss/-/postcss-0.60.3.tgz", + "integrity": "sha512-7jRsKgMz4wr3Rvnr/RpK/7g6o8bMrqjTb01imgHeaw7cmQsa9sH1HPCp+4lvHh2/QKKLwwRAC+fdnNmsf8JKjA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/config": "0.60.2", - "@unocss/core": "0.60.2", - "@unocss/rule-utils": "0.60.2", + "@unocss/config": "0.60.3", + "@unocss/core": "0.60.3", + "@unocss/rule-utils": "0.60.3", "css-tree": "^2.3.1", "fast-glob": "^3.3.2", "magic-string": "^0.30.10", @@ -4847,29 +4847,29 @@ } }, "node_modules/@unocss/preset-attributify": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/preset-attributify/-/preset-attributify-0.60.2.tgz", - "integrity": "sha512-PQDObhVtopL/eEceAHX/pBmPQhm50l4yhTu/pMH31hL13DuRYODngWe00jjgmMRTwIAFpMpDVKk2GjxeD05+cQ==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/preset-attributify/-/preset-attributify-0.60.3.tgz", + "integrity": "sha512-G/Lx9xq/tVKvjp/CcACyLU+p3mcrpgkMvy+Z3NSHfBAZAmbieBMFhwROxt5R8Bny66q3fYDtxxx+likpokpOAQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2" + "@unocss/core": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/preset-icons": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/preset-icons/-/preset-icons-0.60.2.tgz", - "integrity": "sha512-knE4CKn4tgjvyZQSZTuC5FIO2/jcP1AWBvpWyJTax5kcKAIrL8IU4b7PhiPwPrQpe0LBTtyQKWCXqWXp7DhDwA==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/preset-icons/-/preset-icons-0.60.3.tgz", + "integrity": "sha512-L3Ecr36xC+Y8v5WMQcNsGoOzu0HpgNLh5RlC2abs8OyBDGn1k3UqdEFdrhRt3bXpln9b8JkstHO7ZwYPgr2/Cg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@iconify/utils": "^2.1.23", - "@unocss/core": "0.60.2", + "@unocss/core": "0.60.3", "ofetch": "^1.3.4" }, "funding": { @@ -4877,73 +4877,73 @@ } }, "node_modules/@unocss/preset-mini": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/preset-mini/-/preset-mini-0.60.2.tgz", - "integrity": "sha512-Vp5UWzD9FgxeYNhyJIXjMt8HyL7joGJWzmFa2zR8ZAYZ+WIIIJWtxa+9/H8gJgnGTWa2H9oyj9h3IqOYT/lmSg==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/preset-mini/-/preset-mini-0.60.3.tgz", + "integrity": "sha512-7en8KBX3lN1Y6eCprbzA1QVfyXZD03B+oAxFXH8QPv5jRIL8Lm8sbXqE+VTsSME/OVp4DnS6LdGtDAm9mvIOSw==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2", - "@unocss/extractor-arbitrary-variants": "0.60.2", - "@unocss/rule-utils": "0.60.2" + "@unocss/core": "0.60.3", + "@unocss/extractor-arbitrary-variants": "0.60.3", + "@unocss/rule-utils": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/preset-tagify": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/preset-tagify/-/preset-tagify-0.60.2.tgz", - "integrity": "sha512-M730DpoPJ8/uG7aKme9EYrzspr0WfKp7z3CTpb2hb4YHuiCXmiTjdxo5xa9vK3ZGQTZlUkG0rz3TLw8tRKqRDg==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/preset-tagify/-/preset-tagify-0.60.3.tgz", + "integrity": "sha512-pzD6bgtGuIk7M1n/JQiR6EpwnVvafSTHoM70Jhf+T8MSuatDb+KFJCn3VELV2v38aikcUY5cTf95jqHQdzOAhQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2" + "@unocss/core": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/preset-typography": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/preset-typography/-/preset-typography-0.60.2.tgz", - "integrity": "sha512-QKJi1LbC/f8RwwSwV6yQCXu/8wlBcrNyKiUSe7o9I2NYP+mzINlp64pXEP43UtUQo6x8Dil/TuzpRqMFPG/pMA==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/preset-typography/-/preset-typography-0.60.3.tgz", + "integrity": "sha512-cOXOnxkgH0ZiYg/oHBbabzXi1q6oTZWgQ4fqrVxGI2CD4oiWYaPU/wzKsx930D6uBSIlBVDX/cov2j0dPWjgJg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2", - "@unocss/preset-mini": "0.60.2" + "@unocss/core": "0.60.3", + "@unocss/preset-mini": "0.60.3" } }, "node_modules/@unocss/preset-uno": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/preset-uno/-/preset-uno-0.60.2.tgz", - "integrity": "sha512-ggOCehuBm6depGV+79heBlcYlwgcfbIMLnxbywZPIrLwPB/4YaTArBcG4giKILyu4p2PcodAZvfv4uYXrLaE5Q==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/preset-uno/-/preset-uno-0.60.3.tgz", + "integrity": "sha512-PJSR78uaIRTsD9RFSQLwsrGAsjQoW5nWenU4n4GyZeskDsyQVgOcaKtvh+0aYjYdWBa1UvxeUL8Y+m29K4HnAA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2", - "@unocss/preset-mini": "0.60.2", - "@unocss/preset-wind": "0.60.2", - "@unocss/rule-utils": "0.60.2" + "@unocss/core": "0.60.3", + "@unocss/preset-mini": "0.60.3", + "@unocss/preset-wind": "0.60.3", + "@unocss/rule-utils": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/preset-web-fonts": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/preset-web-fonts/-/preset-web-fonts-0.60.2.tgz", - "integrity": "sha512-1lHZVOR6JHkPOvFBQeqZLoAwDk9spUxrX2WfLSVL+sCuBLLeo8voa/LnCxPxKiQwKZGEEoh+qM2MKsLnRd+P6w==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/preset-web-fonts/-/preset-web-fonts-0.60.3.tgz", + "integrity": "sha512-uYHvnqgLDawG3o9oBbasPWbSZ93kzk2JQBcH6xmHh7xqYtRdHqVbUjVU1zIqSjXm19SxFriSrNTl4ct2+/pJIg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2", + "@unocss/core": "0.60.3", "ofetch": "^1.3.4" }, "funding": { @@ -4951,25 +4951,25 @@ } }, "node_modules/@unocss/preset-wind": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/preset-wind/-/preset-wind-0.60.2.tgz", - "integrity": "sha512-9Ml2Wyn7LAcKfqHMJmflT/jdz5eLZtm3SEZKH5Lfk5MOyeVm6NDXjXK140u3zaP5tGKqtO6akJZGtYktWJ6+WQ==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/preset-wind/-/preset-wind-0.60.3.tgz", + "integrity": "sha512-q7yDJ/SyEkPmPBJvIeHd9Bt50LAu65q7WwKxJYfJkjfJvJUMj6DO8FgPnpeiwBeJh9897m2Ap6zoQ3JqBjPLHQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2", - "@unocss/preset-mini": "0.60.2", - "@unocss/rule-utils": "0.60.2" + "@unocss/core": "0.60.3", + "@unocss/preset-mini": "0.60.3", + "@unocss/rule-utils": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/reset": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/reset/-/reset-0.60.2.tgz", - "integrity": "sha512-kM0DYAcbmzpAyHefa/W+cifBTScWeZGsNpKagMQ6vci6OlTUiDB1GcmhQZ6dC0Ks59GtPmRbzZLaK1MgG6ayrA==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/reset/-/reset-0.60.3.tgz", + "integrity": "sha512-EuC8gkh8L8WvPOcjS/KqprEJXIKcpBPm+ou5G9D6WgDmJ+TgQrri5oR+QUmOmEnueQkVL7bnkFkIKeg71SJLFA==", "dev": true, "license": "MIT", "peer": true, @@ -4978,14 +4978,14 @@ } }, "node_modules/@unocss/rule-utils": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/rule-utils/-/rule-utils-0.60.2.tgz", - "integrity": "sha512-pg3XbU0s0TmmRk0UkSV6wTlca+Zz5xe9V+Mk8a5QqVp0oJ2jNWHO9AfzF4NcvTzM2zV2a/WbpjSBgoK8iAz3zg==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/rule-utils/-/rule-utils-0.60.3.tgz", + "integrity": "sha512-I47/DcKQ2z12W80+Ffth0K6LzNvqcQPYRWk7KwVemVoEiGYamMV8/s+SbB26Fk9KUFjh+Ns/pGAo4iJZo0ueUQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "^0.60.2", + "@unocss/core": "^0.60.3", "magic-string": "^0.30.10" }, "engines": { @@ -4996,31 +4996,31 @@ } }, "node_modules/@unocss/scope": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/scope/-/scope-0.60.2.tgz", - "integrity": "sha512-pdwNZzQBb6rllgCwirPPrydDZH2XL0DI8/W7iM1RKYiNeDYjoDAWdVD46CrRmxadiHesrhdIwDL6rQz7Q7bl0w==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/scope/-/scope-0.60.3.tgz", + "integrity": "sha512-uDUcBkFe8nRwNiU4YQyrOCjY7/+qFJI/Qr0eouMPOSEsQ6uIXQEWjykqUBJg2fvm0S2vbfBGO9tO/wCDIk5O3w==", "dev": true, "license": "MIT", "peer": true }, "node_modules/@unocss/transformer-attributify-jsx": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/transformer-attributify-jsx/-/transformer-attributify-jsx-0.60.2.tgz", - "integrity": "sha512-GZbtuZLz3COMhEqdc33zmn8cKupAzVeLcAV66EL+zj7hfZIvrIEs5RFajtzlkQa7RC5YOOjZfHxMccGBEP1RMQ==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/transformer-attributify-jsx/-/transformer-attributify-jsx-0.60.3.tgz", + "integrity": "sha512-zcPu4tUm/1EnqcFpf6+XzUzfb2BzJBcfNMkFzl/5BSTMECEDgdj4QGBWxnTuSlSZs4digRABGtuAHUO7k1qfgA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2" + "@unocss/core": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/transformer-attributify-jsx-babel": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/transformer-attributify-jsx-babel/-/transformer-attributify-jsx-babel-0.60.2.tgz", - "integrity": "sha512-mb66b39qsjyH7+XqC/0ciLdPatVKH5CfMDxUMvzczuFTQ/+V3VAN/Mm6Ru+oxMgbf7qPTALSnLgu6RUhEldTzA==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/transformer-attributify-jsx-babel/-/transformer-attributify-jsx-babel-0.60.3.tgz", + "integrity": "sha512-6WcEFPSaxscGR22dRUcNqY0ippC3/Q/LBVFVSCJh++hoIPVCZbxF505cPq/bOdF2bpNzj9yXW0OJt03nB505Hg==", "dev": true, "license": "MIT", "peer": true, @@ -5028,68 +5028,68 @@ "@babel/core": "^7.24.5", "@babel/plugin-syntax-jsx": "^7.24.1", "@babel/preset-typescript": "^7.24.1", - "@unocss/core": "0.60.2" + "@unocss/core": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/transformer-compile-class": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/transformer-compile-class/-/transformer-compile-class-0.60.2.tgz", - "integrity": "sha512-dZfkGsqd7mdyRRCG8om5lTxQ4CjaaDka8gPbVawbDkK4U53G2vnN3daVlE7UflUXS32hOPj16RfOcb8cH+pypw==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/transformer-compile-class/-/transformer-compile-class-0.60.3.tgz", + "integrity": "sha512-j6wiYgtNqMlrctaZUuN4S+vANW0DMb9wW3KbJ2XvB7lXftfY1bbZ3IKenAyFp0ZLdKs69B6irJbCbIS5OAKKXQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2" + "@unocss/core": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/transformer-directives": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/transformer-directives/-/transformer-directives-0.60.2.tgz", - "integrity": "sha512-p4ZtXoz1mZ125WfANFAD6pXwQJdA4lfff5abZfoDiTPLvtvYQFmwGCeBXUnEKAnBnTwwiBD2zsIwGfumWAsqrA==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/transformer-directives/-/transformer-directives-0.60.3.tgz", + "integrity": "sha512-JuFpxyB1yvS2YoiguO5+8Ou6k9yyojZCnnDYXXZqMGLp1KdLiDcAPZQyShoD5HLzPGHtAbQELUz9TcX3VMLEoQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2", - "@unocss/rule-utils": "0.60.2", + "@unocss/core": "0.60.3", + "@unocss/rule-utils": "0.60.3", "css-tree": "^2.3.1" } }, "node_modules/@unocss/transformer-variant-group": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/transformer-variant-group/-/transformer-variant-group-0.60.2.tgz", - "integrity": "sha512-2eE2MZhFhNj+3fxO9VE1yC8LddUn9vetNZKrgGlegrBH/jOL9Pn/vygBmMAg1XFLEgC3DtvwdzCKMVttV30Ivw==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/transformer-variant-group/-/transformer-variant-group-0.60.3.tgz", + "integrity": "sha512-jQg0+W49jA7Z+4mRQbZWZKV6aXJXQfAHRC3oo4C9vEyTXL2jb952K12XVcJhXnbLYpnUKwytR+vbshXMIHWZwA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/core": "0.60.2" + "@unocss/core": "0.60.3" }, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@unocss/vite": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/@unocss/vite/-/vite-0.60.2.tgz", - "integrity": "sha512-+gBjyT5z/aZgPIZxpUbiXyOt1diY9YQfIJStOhBG0MP6daMdDX78SnDuUq/zKMk9EJuZ3FxhbZF5dYSD4bhJmw==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/@unocss/vite/-/vite-0.60.3.tgz", + "integrity": "sha512-I3EOR3g245IGDp3DS17AQAMwNQrh6L6kIlXG3+wt5IZ1zu1ahZmKA8/xxh6oo2TNdu4rI6nQbcLIRn+8eSyfQw==", "dev": true, "license": "MIT", "peer": true, "dependencies": { "@ampproject/remapping": "^2.3.0", "@rollup/pluginutils": "^5.1.0", - "@unocss/config": "0.60.2", - "@unocss/core": "0.60.2", - "@unocss/inspector": "0.60.2", - "@unocss/scope": "0.60.2", - "@unocss/transformer-directives": "0.60.2", + "@unocss/config": "0.60.3", + "@unocss/core": "0.60.3", + "@unocss/inspector": "0.60.3", + "@unocss/scope": "0.60.3", + "@unocss/transformer-directives": "0.60.3", "chokidar": "^3.6.0", "fast-glob": "^3.3.2", "magic-string": "^0.30.10" @@ -6454,6 +6454,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "deprecated": "This package is no longer supported.", "dev": true, "license": "ISC", "dependencies": { @@ -8172,9 +8173,9 @@ } }, "node_modules/dompurify": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.3.tgz", - "integrity": "sha512-5sOWYSNPaxz6o2MUPvtyxTTqR4D3L77pr5rUQoWgD5ROQtVIZQgJkXbo1DLlK3vj11YGw5+LnF4SYti4gZmwng==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.4.tgz", + "integrity": "sha512-2gnshi6OshmuKil8rMZuQCGiUF3cUxHY3NGDzUAdUx/NPEe5DVnO8BDoAQouvgwnx0R/+a6jUn36Z0FSdq8vww==", "license": "(MPL-2.0 OR Apache-2.0)" }, "node_modules/domutils": { @@ -8291,9 +8292,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.774", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", - "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==", + "version": "1.4.775", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.775.tgz", + "integrity": "sha512-JpOfl1aNAiZ88wFzjPczTLwYIoPIsij8S9/XQH9lqMpiJOf23kxea68B8wje4f68t4rOIq4Bh+vP4I65njiJBw==", "dev": true, "license": "ISC" }, @@ -9231,6 +9232,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "deprecated": "This package is no longer supported.", "dev": true, "license": "ISC", "dependencies": { @@ -12143,6 +12145,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "deprecated": "This package is no longer supported.", "dev": true, "license": "ISC", "dependencies": { @@ -12485,9 +12488,9 @@ } }, "node_modules/openapi-typescript": { - "version": "6.7.5", - "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-6.7.5.tgz", - "integrity": "sha512-ZD6dgSZi0u1QCP55g8/2yS5hNJfIpgqsSGHLxxdOjvY7eIrXzj271FJEQw33VwsZ6RCtO/NOuhxa7GBWmEudyA==", + "version": "6.7.6", + "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-6.7.6.tgz", + "integrity": "sha512-c/hfooPx+RBIOPM09GSxABOZhYPblDoyaGhqBkD/59vtpN21jEuWKDlM0KYTvqJVlSYjKs0tBcIdeXKChlSPtw==", "dev": true, "license": "MIT", "dependencies": { @@ -12495,7 +12498,7 @@ "fast-glob": "^3.3.2", "js-yaml": "^4.1.0", "supports-color": "^9.4.0", - "undici": "^5.28.2", + "undici": "^5.28.4", "yargs-parser": "^21.1.1" }, "bin": { @@ -16358,33 +16361,33 @@ } }, "node_modules/unocss": { - "version": "0.60.2", - "resolved": "https://registry.npmjs.org/unocss/-/unocss-0.60.2.tgz", - "integrity": "sha512-Cj1IXS+VZuiZtQxHn/ffAAN422gUusUEgF1RS83WyNB0kMsJyIxb9KK9N425QAvQvsKpL5GrZs5KoNtU3zGMog==", + "version": "0.60.3", + "resolved": "https://registry.npmjs.org/unocss/-/unocss-0.60.3.tgz", + "integrity": "sha512-pUBbpgGRKCa6oB/LrGEFBWP2/2E1ZOY8XO7aVJKo2x10rqLS8tGykn1VoBUgbGJsv/8W8tskTVz+RFbCyKP+kA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@unocss/astro": "0.60.2", - "@unocss/cli": "0.60.2", - "@unocss/core": "0.60.2", - "@unocss/extractor-arbitrary-variants": "0.60.2", - "@unocss/postcss": "0.60.2", - "@unocss/preset-attributify": "0.60.2", - "@unocss/preset-icons": "0.60.2", - "@unocss/preset-mini": "0.60.2", - "@unocss/preset-tagify": "0.60.2", - "@unocss/preset-typography": "0.60.2", - "@unocss/preset-uno": "0.60.2", - "@unocss/preset-web-fonts": "0.60.2", - "@unocss/preset-wind": "0.60.2", - "@unocss/reset": "0.60.2", - "@unocss/transformer-attributify-jsx": "0.60.2", - "@unocss/transformer-attributify-jsx-babel": "0.60.2", - "@unocss/transformer-compile-class": "0.60.2", - "@unocss/transformer-directives": "0.60.2", - "@unocss/transformer-variant-group": "0.60.2", - "@unocss/vite": "0.60.2" + "@unocss/astro": "0.60.3", + "@unocss/cli": "0.60.3", + "@unocss/core": "0.60.3", + "@unocss/extractor-arbitrary-variants": "0.60.3", + "@unocss/postcss": "0.60.3", + "@unocss/preset-attributify": "0.60.3", + "@unocss/preset-icons": "0.60.3", + "@unocss/preset-mini": "0.60.3", + "@unocss/preset-tagify": "0.60.3", + "@unocss/preset-typography": "0.60.3", + "@unocss/preset-uno": "0.60.3", + "@unocss/preset-web-fonts": "0.60.3", + "@unocss/preset-wind": "0.60.3", + "@unocss/reset": "0.60.3", + "@unocss/transformer-attributify-jsx": "0.60.3", + "@unocss/transformer-attributify-jsx-babel": "0.60.3", + "@unocss/transformer-compile-class": "0.60.3", + "@unocss/transformer-directives": "0.60.3", + "@unocss/transformer-variant-group": "0.60.3", + "@unocss/vite": "0.60.3" }, "engines": { "node": ">=14" @@ -16393,7 +16396,7 @@ "url": "https://github.com/sponsors/antfu" }, "peerDependencies": { - "@unocss/webpack": "0.60.2", + "@unocss/webpack": "0.60.3", "vite": "^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0" }, "peerDependenciesMeta": { diff --git a/translation/package-lock.json b/translation/package-lock.json index 9a3e2043b5..8d46acb095 100644 --- a/translation/package-lock.json +++ b/translation/package-lock.json @@ -25,9 +25,9 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", - "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz", + "integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", From 1cdaf086892eaf64aca465b0c53a59d9fb3d0b4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 10:40:58 +0000 Subject: [PATCH 14/14] fix(deps): update dependency phpdocumentor/reflection-docblock to v5.4.1 --- api/composer.json | 2 +- api/composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/composer.json b/api/composer.json index fab072fd3c..956d8854a4 100644 --- a/api/composer.json +++ b/api/composer.json @@ -18,7 +18,7 @@ "league/oauth2-google": "4.0.1", "lexik/jwt-authentication-bundle": "2.21.0", "nelmio/cors-bundle": "2.4.0", - "phpdocumentor/reflection-docblock": "5.4.0", + "phpdocumentor/reflection-docblock": "5.4.1", "phpmyadmin/sql-parser": "5.9.0", "ramsey/uuid": "4.7.6", "rize/uri-template": "0.3.6", diff --git a/api/composer.lock b/api/composer.lock index 57742b18a1..6618eb180f 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8155c78a75062643d8bb81bbc1b0cc64", + "content-hash": "5d657de2f0c97fd30a113c7fb0eb6b89", "packages": [ { "name": "api-platform/core", @@ -3735,16 +3735,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.0", + "version": "5.4.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a" + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", "shasum": "" }, "require": { @@ -3793,9 +3793,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" }, - "time": "2024-04-09T21:13:58+00:00" + "time": "2024-05-21T05:55:05+00:00" }, { "name": "phpdocumentor/type-resolver",