From 85f1c1c80e367d986bb6299515f7660c05ed31d7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 00:20:35 +0000 Subject: [PATCH 001/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`all-cont?= =?UTF-8?q?ributors-cli`=20to=20v6.26.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2da8d87002..a5002c3a1f 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@types/webpack-env": "1.18.1", "@typescript-eslint/eslint-plugin": "5.61.0", "@typescript-eslint/parser": "5.61.0", - "all-contributors-cli": "6.26.0", + "all-contributors-cli": "6.26.1", "copy-dir": "1.3.0", "css-loader": "6.8.1", "eslint": "8.44.0", diff --git a/yarn.lock b/yarn.lock index 44012ec9c1..95a720fc9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3507,9 +3507,9 @@ __metadata: languageName: node linkType: hard -"all-contributors-cli@npm:6.26.0": - version: 6.26.0 - resolution: "all-contributors-cli@npm:6.26.0" +"all-contributors-cli@npm:6.26.1": + version: 6.26.1 + resolution: "all-contributors-cli@npm:6.26.1" dependencies: "@babel/runtime": ^7.7.6 async: ^3.1.0 @@ -3527,7 +3527,7 @@ __metadata: optional: true bin: all-contributors: dist/cli.js - checksum: 68bb5591086cbfaa53f4699ebf628e5a692271301413744deb478ebbbb81ff599d3d69987ae7dfc30d1a048ccc44bed8ed62cf830e67948f0f440d3aef462033 + checksum: beb26d059cb4eba272f301b770f678b9729f55501ce658f0fe339b0ba4669cc38562876be162dadb97b163adb79281edac09f3168fac8f472af8455e2249c06b languageName: node linkType: hard @@ -7005,7 +7005,7 @@ __metadata: "@typescript-eslint/parser": 5.61.0 acorn: 8.10.0 acorn-walk: 8.2.0 - all-contributors-cli: 6.26.0 + all-contributors-cli: 6.26.1 broadcast-channel: 4.20.2 copy-dir: 1.3.0 css-loader: 6.8.1 From 6824a9dad5aee04565f040d8ce0457ef6e322c4c Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 10 Jul 2023 09:04:39 +0000 Subject: [PATCH 002/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230710?= =?UTF-8?q?.1100=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a5002c3a1f..062d76f649 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230709.1445", + "version": "4.7.7+20230710.1100", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 5e282ea383..8b01586b37 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -149,7 +149,7 @@ "all-contributors-cli": { "icon": "https://allcontributors.org/img/icons/android-icon-192x192.png", "url": "https://github.com/all-contributors/all-contributors-cli#readme", - "version": "6.26.0" + "version": "6.26.1" }, "broadcast-channel": { "icon": "https://raw.githubusercontent.com/pubkey/broadcast-channel/master/docs/files/icon.png", From f3c0c639c5d5a08825ba0acf04b498d451cecc9a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:05:54 +0000 Subject: [PATCH 003/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`semver`?= =?UTF-8?q?=20to=20v7.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 21 +++++---------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 062d76f649..554a924aef 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "moment": "2.29.4", "pinia": "2.1.4", "qrcode": "1.5.3", - "semver": "7.5.3", + "semver": "7.5.4", "showdown": "2.1.0", "ua-parser-js": "1.0.35", "vue": "2.7.14", diff --git a/yarn.lock b/yarn.lock index 95a720fc9a..98bbee3ad2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7039,7 +7039,7 @@ __metadata: qrcode: 1.5.3 sass: 1.63.6 sass-loader: 13.3.2 - semver: 7.5.3 + semver: 7.5.4 showdown: 2.1.0 terser: 5.18.2 ts-loader: 9.4.4 @@ -8680,14 +8680,14 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.3": - version: 7.5.3 - resolution: "semver@npm:7.5.3" +"semver@npm:7.5.4, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.3": + version: 7.5.4 + resolution: "semver@npm:7.5.4" dependencies: lru-cache: ^6.0.0 bin: semver: bin/semver.js - checksum: 9d58db16525e9f749ad0a696a1f27deabaa51f66e91d2fa2b0db3de3e9644e8677de3b7d7a03f4c15bc81521e0c3916d7369e0572dbde250d9bedf5194e2a8a7 + checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3 languageName: node linkType: hard @@ -8700,17 +8700,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.3": - version: 7.5.4 - resolution: "semver@npm:7.5.4" - dependencies: - lru-cache: ^6.0.0 - bin: - semver: bin/semver.js - checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3 - languageName: node - linkType: hard - "serialize-javascript@npm:^4.0.0": version: 4.0.0 resolution: "serialize-javascript@npm:4.0.0" From 094bd6f916d1c24c38d8804b942a16dfd18bc581 Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 10 Jul 2023 09:56:29 +0000 Subject: [PATCH 004/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230710?= =?UTF-8?q?.1153=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 554a924aef..6c93902475 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230710.1100", + "version": "4.7.7+20230710.1153", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 8b01586b37..d54cf3d7a5 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -303,7 +303,7 @@ "version": "13.3.2" }, "semver": { - "version": "7.5.3" + "version": "7.5.4" }, "showdown": { "icon": "https://avatars.githubusercontent.com/u/2754978", From 03144b69ac45e77a14df3be5cd41475b6b38a78e Mon Sep 17 00:00:00 2001 From: jan Date: Tue, 11 Jul 2023 00:11:30 +0200 Subject: [PATCH 005/182] =?UTF-8?q?=F0=9F=91=BD=20[na]=20update=20mission?= =?UTF-8?q?=20icons=20to=20new=20ingame=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/notificationAlert/main.ts | 11 +++++++---- typings/Ingame.d.ts | 28 +++++++++++++++++++++++---- typings/helpers.d.ts | 4 +++- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/modules/notificationAlert/main.ts b/src/modules/notificationAlert/main.ts index 6b13f1681b..13b31426a2 100644 --- a/src/modules/notificationAlert/main.ts +++ b/src/modules/notificationAlert/main.ts @@ -576,11 +576,14 @@ export default (async ({ LSSM, $m, $mc, getSetting }) => { mission.mtid ); const icon = - (mission.mtid !== null - ? window.mission_graphics[mission.mtid]?.[ - mission.vehicle_state + (mission.mission_type + ? window.mission_graphics_lookups.generic[ + mission.mission_type ] - : 0) || `/images/${mission.icon}.png`; + : window.mission_graphics_lookups.regular[ + mission.mtid + ])?.[mission.vehicle_state] || + `/images/${mission.icon}.png`; const isEventMission = isAllianceMission && mission.user_id === null; const { caption, address, id } = mission; diff --git a/typings/Ingame.d.ts b/typings/Ingame.d.ts index 7070cdd3e6..8693036192 100644 --- a/typings/Ingame.d.ts +++ b/typings/Ingame.d.ts @@ -61,7 +61,7 @@ interface SicherheitswacheRadioMessage extends BasicRadioMessage { export type RadioMessage = SicherheitswacheRadioMessage | VehicleRadioMessage; -export interface MissionMarkerAdd { +interface MissionMarkerAddBase { address: string; alliance_id: number | null; caption: string; @@ -78,7 +78,6 @@ export interface MissionMarkerAdd { live_current_value: number; missing_text: string; missing_text_short: string; - mtid: number | null; // mission type id (null => diy mission) patients_count: number; prisoners_count: number; sw: boolean; @@ -95,10 +94,24 @@ export interface MissionMarkerAdd { pumping_date_end: number; } -export interface MissionTimer extends MissionMarkerAdd { - date_end_calc: number; +interface RegularMissionMarkerAdd extends MissionMarkerAddBase { + mission_type: null; + mtid: number; // mtid = mission type id +} + +interface GenericMissionMarkerAdd extends MissionMarkerAddBase { + mission_type: keyof MissionGraphicsLookup['generic']; + mtid: null; } +export type MissionMarkerAdd = + | GenericMissionMarkerAdd + | RegularMissionMarkerAdd; + +export type MissionTimer = MissionMarkerAdd & { + date_end_calc: number; +}; + export interface PatientMarkerAdd { id: number; live_current_value: number; @@ -151,3 +164,10 @@ export interface BuildingMarkerAdd { filter_id: string; detail_button: string; } + +export interface MissionGraphicsLookup { + regular: [string, string, string][]; // red, yellow, green + generic: Partial< + Record<'alliance_custom' | 'handoff', [string, string, string]> + >; +} diff --git a/typings/helpers.d.ts b/typings/helpers.d.ts index 821bd3f79f..1cdea5c969 100644 --- a/typings/helpers.d.ts +++ b/typings/helpers.d.ts @@ -27,6 +27,7 @@ import type { import type { BuildingMarker, BuildingMarkerAdd, + MissionGraphicsLookup, MissionMarker, PatientTimer, POIMarker, @@ -83,7 +84,8 @@ declare global { mission_position_new_marker?: L.Marker; building_new_marker?: L.Marker; building_move_marker?: L.Marker; - mission_graphics: [string, string, string][]; + mission_graphics_lookups: MissionGraphicsLookup; + mission_graphics: MissionGraphicsLookup['regular']; patient_timers: PatientTimer[]; sale_count_down: number; mission_label: boolean; From 6be532d50dbd676b4e485cde3cd636c0799f931f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 22:52:24 +0000 Subject: [PATCH 006/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`vuepress?= =?UTF-8?q?-plugin-sitemap2`=20to=20v2.0.0-beta.231?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vuepress/package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/.vuepress/package.json b/docs/.vuepress/package.json index 2842c05c80..971be5a3e8 100644 --- a/docs/.vuepress/package.json +++ b/docs/.vuepress/package.json @@ -15,6 +15,6 @@ "vue": "3.3.4", "vuepress": "2.0.0-beta.64", "vuepress-plugin-clipboard": "2.1.5", - "vuepress-plugin-sitemap2": "2.0.0-beta.230" + "vuepress-plugin-sitemap2": "2.0.0-beta.231" } } diff --git a/yarn.lock b/yarn.lock index 98bbee3ad2..016d3b53d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6973,7 +6973,7 @@ __metadata: vue: 3.3.4 vuepress: 2.0.0-beta.64 vuepress-plugin-clipboard: 2.1.5 - vuepress-plugin-sitemap2: 2.0.0-beta.230 + vuepress-plugin-sitemap2: 2.0.0-beta.231 languageName: unknown linkType: soft @@ -8680,7 +8680,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.4, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.3": +"semver@npm:7.5.4, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -9834,7 +9834,7 @@ __metadata: languageName: node linkType: hard -"vue-router@npm:^4.1.6, vue-router@npm:^4.2.2": +"vue-router@npm:^4.1.6, vue-router@npm:^4.2.2, vue-router@npm:^4.2.4": version: 4.2.4 resolution: "vue-router@npm:4.2.4" dependencies: @@ -9923,14 +9923,14 @@ __metadata: languageName: node linkType: hard -"vuepress-plugin-sitemap2@npm:2.0.0-beta.230": - version: 2.0.0-beta.230 - resolution: "vuepress-plugin-sitemap2@npm:2.0.0-beta.230" +"vuepress-plugin-sitemap2@npm:2.0.0-beta.231": + version: 2.0.0-beta.231 + resolution: "vuepress-plugin-sitemap2@npm:2.0.0-beta.231" dependencies: "@vuepress/shared": 2.0.0-beta.64 "@vuepress/utils": 2.0.0-beta.64 sitemap: ^7.1.1 - vuepress-shared: 2.0.0-beta.230 + vuepress-shared: 2.0.0-beta.231 peerDependencies: vuepress: 2.0.0-beta.64 vuepress-vite: 2.0.0-beta.64 @@ -9942,13 +9942,13 @@ __metadata: optional: true vuepress-webpack: optional: true - checksum: 739e63959b91babc85ae0ba7e1d53b376d943de41447e750561739d5079d949215ee59a82dad0370a2c203632dbdf08e206be75bde700af0393be0690fc4be61 + checksum: 5bd15d40a60871bef5c1be8ebee74801a1e5425206ebc56525407c2bf46c341a65d5cc57f1c5f6fece5f1a38f8821c16cfe2a2fc4e2bf0d5875fff7068d617ea languageName: node linkType: hard -"vuepress-shared@npm:2.0.0-beta.230": - version: 2.0.0-beta.230 - resolution: "vuepress-shared@npm:2.0.0-beta.230" +"vuepress-shared@npm:2.0.0-beta.231": + version: 2.0.0-beta.231 + resolution: "vuepress-shared@npm:2.0.0-beta.231" dependencies: "@vuepress/client": 2.0.0-beta.64 "@vuepress/shared": 2.0.0-beta.64 @@ -9959,10 +9959,10 @@ __metadata: execa: ^7.1.1 fflate: ^0.8.0 gray-matter: ^4.0.3 - semver: ^7.5.3 + semver: ^7.5.4 striptags: ^3.2.0 vue: ^3.3.4 - vue-router: ^4.2.2 + vue-router: ^4.2.4 peerDependencies: vuepress: 2.0.0-beta.64 vuepress-vite: 2.0.0-beta.64 @@ -9974,7 +9974,7 @@ __metadata: optional: true vuepress-webpack: optional: true - checksum: bb959ecec9d96a688f1e8f3828ae9e33e76a5f4d8263fa15a4283d40ed01219fbfc9c450bf6aa41b4c97a416545b4bf418a7455c3ef38f767eeee32dd9894cab + checksum: 14c4499c8bfe892e86b91465508e547dfe1438ecfa9f1ed5cfa4e1ff98a03bafb4f20b6082dddcfdb660c18f639e0780723aa4d763e674fd3f9f7b1532d5695b languageName: node linkType: hard From b4dbbf4d716f448eb106d4f29667ccb5e091cf0d Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 11 Jul 2023 03:29:29 +0000 Subject: [PATCH 007/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230711?= =?UTF-8?q?.0526=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6c93902475..2a97042b24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230710.1153", + "version": "4.7.7+20230711.0526", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index d54cf3d7a5..79508a41e9 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -407,7 +407,7 @@ }, "vuepress-plugin-sitemap2": { "url": "https://plugin-sitemap2.vuejs.press/", - "version": "2.0.0-beta.230" + "version": "2.0.0-beta.231" }, "webpack": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From a3a2df0bb661e02427f0ee53930d0fdecaf99ed5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 03:30:37 +0000 Subject: [PATCH 008/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20typescrip?= =?UTF-8?q?t-eslint=20to=20v6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- yarn.lock | 162 ++++++++++++++++++++++++++------------------------- 2 files changed, 84 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index 2a97042b24..8a1fe9053a 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,8 @@ "@types/ua-parser-js": "0.7.36", "@types/vue-select": "3.16.2", "@types/webpack-env": "1.18.1", - "@typescript-eslint/eslint-plugin": "5.61.0", - "@typescript-eslint/parser": "5.61.0", + "@typescript-eslint/eslint-plugin": "6.0.0", + "@typescript-eslint/parser": "6.0.0", "all-contributors-cli": "6.26.1", "copy-dir": "1.3.0", "css-loader": "6.8.1", diff --git a/yarn.lock b/yarn.lock index 016d3b53d1..a0b5bf370f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2294,7 +2294,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.11, @types/json-schema@npm:^7.0.8": version: 7.0.12 resolution: "@types/json-schema@npm:7.0.12" checksum: 00239e97234eeb5ceefb0c1875d98ade6e922bfec39dd365ec6bd360b5c2f825e612ac4f6e5f1d13601b8b30f378f15e6faa805a3a732f4a1bbe61915163d293 @@ -2519,124 +2519,128 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.61.0" +"@typescript-eslint/eslint-plugin@npm:6.0.0": + version: 6.0.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.0.0" dependencies: - "@eslint-community/regexpp": ^4.4.0 - "@typescript-eslint/scope-manager": 5.61.0 - "@typescript-eslint/type-utils": 5.61.0 - "@typescript-eslint/utils": 5.61.0 + "@eslint-community/regexpp": ^4.5.0 + "@typescript-eslint/scope-manager": 6.0.0 + "@typescript-eslint/type-utils": 6.0.0 + "@typescript-eslint/utils": 6.0.0 + "@typescript-eslint/visitor-keys": 6.0.0 debug: ^4.3.4 + grapheme-splitter: ^1.0.4 graphemer: ^1.4.0 - ignore: ^5.2.0 + ignore: ^5.2.4 + natural-compare: ^1.4.0 natural-compare-lite: ^1.4.0 - semver: ^7.3.7 - tsutils: ^3.21.0 + semver: ^7.5.0 + ts-api-utils: ^1.0.1 peerDependencies: - "@typescript-eslint/parser": ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: d9e891fb43ccb75322fc40d58d02479f98bd3c962db71075438868b13f579643d714a24b5477a827be7ca2e7e9f6058c406241b6696a6395c6fcbd6de76e015c + checksum: 863f30b8ceb24d104fc8a41774e4f597a35525533aa99721198293b51628a2d986dcc6413893f27eb9db5a49c2fd2cc91d3aece8ed23d590f3eb4e9939c3d6ad languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/parser@npm:5.61.0" +"@typescript-eslint/parser@npm:6.0.0": + version: 6.0.0 + resolution: "@typescript-eslint/parser@npm:6.0.0" dependencies: - "@typescript-eslint/scope-manager": 5.61.0 - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/typescript-estree": 5.61.0 + "@typescript-eslint/scope-manager": 6.0.0 + "@typescript-eslint/types": 6.0.0 + "@typescript-eslint/typescript-estree": 6.0.0 + "@typescript-eslint/visitor-keys": 6.0.0 debug: ^4.3.4 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 2422bca03ecc6830700aaa739ec46b8e9ab6c0a47a67f140dc6b62a42a8b98997e73bce52c6a010b8a9b461211c46ba865d5b7f680a7823cf5c245d3b61f7fd5 + checksum: a22f0c8f67eb244134f9d79d78faf1b6e2c0965495d78eef94a5680868f3d0fd9446a3ce5dc1e36dde02587da5d962944f3d83679c712d0b819ac99cdb9f7143 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/scope-manager@npm:5.61.0" +"@typescript-eslint/scope-manager@npm:6.0.0": + version: 6.0.0 + resolution: "@typescript-eslint/scope-manager@npm:6.0.0" dependencies: - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/visitor-keys": 5.61.0 - checksum: 6dfbb42c4b7d796ae3c395398bdfd2e5a4ae8aaf1448381278ecc39a1d1045af2cb452da5a00519d265bc1a5997523de22d5021acb4dbe1648502fe61512d3c6 + "@typescript-eslint/types": 6.0.0 + "@typescript-eslint/visitor-keys": 6.0.0 + checksum: 450015be6454f953d0ea0da020ab47597e96a7a15c1002eed16c57430783bd7b045513d57a126606fb35e8971f1ce65fbefd845e3b5496bf75284cbe1681d0b9 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/type-utils@npm:5.61.0" +"@typescript-eslint/type-utils@npm:6.0.0": + version: 6.0.0 + resolution: "@typescript-eslint/type-utils@npm:6.0.0" dependencies: - "@typescript-eslint/typescript-estree": 5.61.0 - "@typescript-eslint/utils": 5.61.0 + "@typescript-eslint/typescript-estree": 6.0.0 + "@typescript-eslint/utils": 6.0.0 debug: ^4.3.4 - tsutils: ^3.21.0 + ts-api-utils: ^1.0.1 peerDependencies: - eslint: "*" + eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: f0203fd48c6218f004dd73a9a71ba4cf97f015d0f13a7b3c821a3ba7ec814839bae270a1db589184ca7091fe54815a3171d1993e8a25200bf33e131bd6e855d4 + checksum: 53f46237891cfa738f6a4bc766a4dbb8d745b1cb9cbe2d2b40f2a4abcf0327d4aa92d9ce5361e87cd26d82e0159f358e28b0c67759eb053c4fd752654dc9dcb1 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/types@npm:5.61.0" - checksum: d311ca2141f6bcb5f0f8f97ddbc218c9911e0735aaa30f0f2e64d518fb33568410754e1b04bf157175f8783504f8ec62a7ab53a66a18507f43edb1e21fe69e90 +"@typescript-eslint/types@npm:6.0.0": + version: 6.0.0 + resolution: "@typescript-eslint/types@npm:6.0.0" + checksum: a2e232b66b0b057152f4a94d7e0be75f32e389c9c1ec9ed9901ed5aab6e5df08c07bde9865710e315d835e4400ec2232f9c3c525b6edf8a85675ebfbfb69d3a5 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.61.0" +"@typescript-eslint/typescript-estree@npm:6.0.0": + version: 6.0.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.0.0" dependencies: - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/visitor-keys": 5.61.0 + "@typescript-eslint/types": 6.0.0 + "@typescript-eslint/visitor-keys": 6.0.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 + semver: ^7.5.0 + ts-api-utils: ^1.0.1 peerDependenciesMeta: typescript: optional: true - checksum: efe25a1b2774939c02cb9b388cf72efa672811f1c39a87ddd617937f63c2320551ce459ba69c6d022e33322594d40b9f2d2c6bc9937387718adc40dc5e57ea8e + checksum: 6214ff9cc3c4fd7fe03f846e96a498ecf85916083bb60d419bc5a12142cff912670032b1de5ea52ab353ca7eeb4e1cc8fa475a22958b010043c88e274df49859 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/utils@npm:5.61.0" +"@typescript-eslint/utils@npm:6.0.0": + version: 6.0.0 + resolution: "@typescript-eslint/utils@npm:6.0.0" dependencies: - "@eslint-community/eslint-utils": ^4.2.0 - "@types/json-schema": ^7.0.9 + "@eslint-community/eslint-utils": ^4.3.0 + "@types/json-schema": ^7.0.11 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.61.0 - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/typescript-estree": 5.61.0 + "@typescript-eslint/scope-manager": 6.0.0 + "@typescript-eslint/types": 6.0.0 + "@typescript-eslint/typescript-estree": 6.0.0 eslint-scope: ^5.1.1 - semver: ^7.3.7 + semver: ^7.5.0 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 24efc1964e6c92db96fe0d9a390550e4f27e8f353e51a9b46bda03e6692ea5d40f398d539235a4ff0894e9e45dfcfb51df953ade2ae9d17a1421449625ce6f5a + eslint: ^7.0.0 || ^8.0.0 + checksum: 94b9b616282f6fa1ae50ba371a482a3c8c50268ef8039b4e86d29c445e95025c819358a5cc9955c4668482d97ef026e7a49e7f4b3a4685347136ef5bbd297e4d languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.61.0" +"@typescript-eslint/visitor-keys@npm:6.0.0": + version: 6.0.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.0.0" dependencies: - "@typescript-eslint/types": 5.61.0 - eslint-visitor-keys: ^3.3.0 - checksum: a8d589f61ddfc380787218da4d347e8f9aef0f82f4a93f1daee46786bda889a90961c7ec1b470db5e3261438a728fdfd956f5bda6ee2de22c4be2d2152d6e270 + "@typescript-eslint/types": 6.0.0 + eslint-visitor-keys: ^3.4.1 + checksum: b0d9848a4490174db1d25b5f336548bb11dde4e0ce664c3dc341bed89fb3a3ada091aeb7f5d2d371433815332d93339c6cb77f7a24469c329c3d055b15237bfa languageName: node linkType: hard @@ -7001,8 +7005,8 @@ __metadata: "@types/ua-parser-js": 0.7.36 "@types/vue-select": 3.16.2 "@types/webpack-env": 1.18.1 - "@typescript-eslint/eslint-plugin": 5.61.0 - "@typescript-eslint/parser": 5.61.0 + "@typescript-eslint/eslint-plugin": 6.0.0 + "@typescript-eslint/parser": 6.0.0 acorn: 8.10.0 acorn-walk: 8.2.0 all-contributors-cli: 6.26.1 @@ -8680,7 +8684,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.4, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.4": +"semver@npm:7.5.4, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.1, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -9308,6 +9312,15 @@ __metadata: languageName: node linkType: hard +"ts-api-utils@npm:^1.0.1": + version: 1.0.1 + resolution: "ts-api-utils@npm:1.0.1" + peerDependencies: + typescript: ">=4.2.0" + checksum: 78794fc7270d295b36c1ac613465b5dc7e7226907a533125b30f177efef9dd630d4e503b00be31b44335eb2ebf9e136ebe97353f8fc5d383885d5fead9d54c09 + languageName: node + linkType: hard + "ts-debounce@npm:^4.0.0": version: 4.0.0 resolution: "ts-debounce@npm:4.0.0" @@ -9380,7 +9393,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.8.1, tslib@npm:^1.9.0": +"tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd @@ -9394,17 +9407,6 @@ __metadata: languageName: node linkType: hard -"tsutils@npm:^3.21.0": - version: 3.21.0 - resolution: "tsutils@npm:3.21.0" - dependencies: - tslib: ^1.8.1 - peerDependencies: - typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - checksum: 1843f4c1b2e0f975e08c4c21caa4af4f7f65a12ac1b81b3b8489366826259323feb3fc7a243123453d2d1a02314205a7634e048d4a8009921da19f99755cdc48 - languageName: node - linkType: hard - "type-check@npm:^0.4.0, type-check@npm:~0.4.0": version: 0.4.0 resolution: "type-check@npm:0.4.0" From 899be13b92cd0c65cb2c9df01225d28abb245c83 Mon Sep 17 00:00:00 2001 From: jan Date: Tue, 11 Jul 2023 13:18:03 +0200 Subject: [PATCH 009/182] =?UTF-8?q?=F0=9F=90=9B=20fix=20ESLint=20issues=20?= =?UTF-8?q?from=20typescript-eslint=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.json | 3 ++- src/modules/redesign/parsers/einsaetze.ts | 1 - src/modules/redesign/parsers/einsatz.ts | 1 - src/modules/redesign/parsers/messages/new.ts | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 3b0f67cb1f..01f2f06bc3 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -53,7 +53,8 @@ "@typescript-eslint/consistent-type-definitions": ["error", "interface"], "@typescript-eslint/consistent-type-imports": ["error"], "@typescript-eslint/method-signature-style": ["error", "method"], - "@typescript-eslint/sort-type-union-intersection-members": ["error"], + "@typescript-eslint/no-duplicate-enum-values": ["off"], + "@typescript-eslint/sort-type-constituents": ["error"], "array-callback-return": ["error"], "block-scoped-var": "warn", "curly": ["error", "multi-or-nest", "consistent"], diff --git a/src/modules/redesign/parsers/einsaetze.ts b/src/modules/redesign/parsers/einsaetze.ts index c06f535b1d..49b9b3b740 100644 --- a/src/modules/redesign/parsers/einsaetze.ts +++ b/src/modules/redesign/parsers/einsaetze.ts @@ -1,6 +1,5 @@ import type { RedesignParser } from 'typings/modules/Redesign'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface EinsaetzeWindow {} export default >(() => ({})); diff --git a/src/modules/redesign/parsers/einsatz.ts b/src/modules/redesign/parsers/einsatz.ts index 9011d1a4f2..d6b5c295a3 100644 --- a/src/modules/redesign/parsers/einsatz.ts +++ b/src/modules/redesign/parsers/einsatz.ts @@ -1,6 +1,5 @@ import type { RedesignParser } from 'typings/modules/Redesign'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface EinsatzWindow {} export default >(() => ({})); diff --git a/src/modules/redesign/parsers/messages/new.ts b/src/modules/redesign/parsers/messages/new.ts index 513135e0d3..87e0fb74b2 100644 --- a/src/modules/redesign/parsers/messages/new.ts +++ b/src/modules/redesign/parsers/messages/new.ts @@ -1,6 +1,5 @@ import type { RedesignParser } from 'typings/modules/Redesign'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface NewMessageWindow {} export default >(() => ({})); From 74c1e90329a77d0aa0b6c7ec984d7ad54e3e9b14 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 11 Jul 2023 11:41:36 +0000 Subject: [PATCH 010/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230711?= =?UTF-8?q?.1338=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 4 ++-- yarn.lock | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8a1fe9053a..23fefc9b2d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230711.0526", + "version": "4.7.7+20230711.1338", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 79508a41e9..d8e116a511 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -105,11 +105,11 @@ }, "@typescript-eslint/eslint-plugin": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "5.61.0" + "version": "6.0.0" }, "@typescript-eslint/parser": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "5.61.0" + "version": "6.0.0" }, "@vuepress/client": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", diff --git a/yarn.lock b/yarn.lock index a0b5bf370f..485fdd7153 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4011,9 +4011,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001473, caniuse-lite@npm:^1.0.30001503": - version: 1.0.30001514 - resolution: "caniuse-lite@npm:1.0.30001514" - checksum: ee2e90fe63cb59fb4a1515eb6b157f1c26d3ccba496b994b0f03088c39c282ee2fb8c160ad7b677ee196b5bb078b23f2f9474c32e4e47724f4d782de92bb8bbe + version: 1.0.30001515 + resolution: "caniuse-lite@npm:1.0.30001515" + checksum: ec5d51785aea6af5cf62ca9d35821d36ab7fa0f85e3e7f752d532025ad59e07131fa3cb3a0a6c486b5ac8620c8c3440e761dc5b38c990d49c17655906f216123 languageName: node linkType: hard From a939fd813b34bcc816e8d384f1508f9961bcc281 Mon Sep 17 00:00:00 2001 From: jan Date: Tue, 11 Jul 2023 16:07:29 +0200 Subject: [PATCH 011/182] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20migrate=20arr=20co?= =?UTF-8?q?mponent=20to=20composition=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/{arr.vue => arrEntry.vue} | 99 +++++------------------- src/modules/redesign/components/aaos.vue | 2 +- 2 files changed, 19 insertions(+), 82 deletions(-) rename src/components/{arr.vue => arrEntry.vue} (52%) diff --git a/src/components/arr.vue b/src/components/arrEntry.vue similarity index 52% rename from src/components/arr.vue rename to src/components/arrEntry.vue index 90bc41b7d1..0d18d9a069 100644 --- a/src/components/arr.vue +++ b/src/components/arrEntry.vue @@ -1,9 +1,8 @@ - diff --git a/src/modules/redesign/components/aaos.vue b/src/modules/redesign/components/aaos.vue index 3f6a5d7afd..5711a8ab87 100644 --- a/src/modules/redesign/components/aaos.vue +++ b/src/modules/redesign/components/aaos.vue @@ -184,7 +184,7 @@ export default Vue.extend< components: { ARR: () => import( - /* webpackChunkName: "components/arr" */ '../../../components/arr.vue' + /* webpackChunkName: "components/arr" */ '../../../components/arrEntry.vue' ), }, data() { From eb48d37b27fcf6e215bd51956e01c9ad7c6538c0 Mon Sep 17 00:00:00 2001 From: jan Date: Tue, 11 Jul 2023 16:26:48 +0200 Subject: [PATCH 012/182] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20migrate=20annivers?= =?UTF-8?q?ary=20component=20to=20composition=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/anniversary.vue | 401 ------------------------ src/components/anniversaryComponent.vue | 360 +++++++++++++++++++++ src/mainpageCore.ts | 2 +- 3 files changed, 361 insertions(+), 402 deletions(-) delete mode 100644 src/components/anniversary.vue create mode 100644 src/components/anniversaryComponent.vue diff --git a/src/components/anniversary.vue b/src/components/anniversary.vue deleted file mode 100644 index a51caee8b7..0000000000 --- a/src/components/anniversary.vue +++ /dev/null @@ -1,401 +0,0 @@ - - - - - - diff --git a/src/components/anniversaryComponent.vue b/src/components/anniversaryComponent.vue new file mode 100644 index 0000000000..5f9e89050d --- /dev/null +++ b/src/components/anniversaryComponent.vue @@ -0,0 +1,360 @@ + + + + + + diff --git a/src/mainpageCore.ts b/src/mainpageCore.ts index 32760f5423..d4ab070fd6 100644 --- a/src/mainpageCore.ts +++ b/src/mainpageCore.ts @@ -51,7 +51,7 @@ export default async (LSSM: Vue): Promise => { if (new Date() < new Date('2022-11-29T00:00')) { import( - /* webpackChunkName: "components/anniversary" */ './components/anniversary.vue' + /* webpackChunkName: "components/anniversary" */ './components/anniversaryComponent.vue' ).then(({ default: anniversary }) => { const anniversaryWrapper = document.createElement('div'); document.body.append(anniversaryWrapper); From 9cd3224734fc73e05b242e62f1ca8f24197f7bd9 Mon Sep 17 00:00:00 2001 From: jan Date: Tue, 11 Jul 2023 22:48:21 +0200 Subject: [PATCH 013/182] =?UTF-8?q?=E2=9C=A8=20[dcs]=20add=20CSV=20export?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit all currently requested exports mentioned in #920 are now implemented --- .../dailyCreditsSummary.vue | 42 ++++++++++++++++--- src/modules/dailyCreditsSummary/i18n/cs_CZ.ts | 1 + src/modules/dailyCreditsSummary/i18n/de_DE.ts | 1 + src/modules/dailyCreditsSummary/i18n/en_AU.ts | 1 + src/modules/dailyCreditsSummary/i18n/en_GB.ts | 1 + src/modules/dailyCreditsSummary/i18n/en_US.ts | 1 + src/modules/dailyCreditsSummary/i18n/fi_FI.ts | 1 + src/modules/dailyCreditsSummary/i18n/fr_FR.ts | 1 + src/modules/dailyCreditsSummary/i18n/it_IT.ts | 1 + src/modules/dailyCreditsSummary/i18n/nb_NO.ts | 1 + src/modules/dailyCreditsSummary/i18n/nl_NL.ts | 1 + src/modules/dailyCreditsSummary/i18n/pl_PL.ts | 1 + src/modules/dailyCreditsSummary/i18n/sv_SE.ts | 1 + .../dailyCreditsSummary.d.ts | 5 +++ 14 files changed, 53 insertions(+), 6 deletions(-) diff --git a/src/modules/dailyCreditsSummary/dailyCreditsSummary.vue b/src/modules/dailyCreditsSummary/dailyCreditsSummary.vue index 0f547ee86d..44b4cbcf04 100644 --- a/src/modules/dailyCreditsSummary/dailyCreditsSummary.vue +++ b/src/modules/dailyCreditsSummary/dailyCreditsSummary.vue @@ -82,7 +82,7 @@ {{ $m('export.json.raw') }} @@ -92,16 +92,22 @@ {{ $m('export.json.prettified') }} +
  • + + {{ $m('export.csv') }} + +
  • @@ -263,6 +269,30 @@ export default Vue.extend< }); return Object.values(result).filter(({ amount }) => amount > 0); }, + exports() { + return { + json: JSON.stringify(this.creditsTypeSum), + jsonPretty: JSON.stringify(this.creditsTypeSum, null, 4), + csv: `${[ + 'desc', + 'total', + 'amount', + 'backgroundColor', + 'textColor', + ].join(',')}\n${this.creditsTypeSum + .map( + ({ desc, total, amount, backgroundColor, textColor }) => + [ + desc, + total, + amount, + backgroundColor, + textColor, + ].join(',') + ) + .join('\n')}`, + }; + }, incomeChartOptions() { return { ...this.basicChartOptions, diff --git a/src/modules/dailyCreditsSummary/i18n/cs_CZ.ts b/src/modules/dailyCreditsSummary/i18n/cs_CZ.ts index 6f0c58e178..2915abed94 100644 --- a/src/modules/dailyCreditsSummary/i18n/cs_CZ.ts +++ b/src/modules/dailyCreditsSummary/i18n/cs_CZ.ts @@ -102,5 +102,6 @@ export default { raw: 'JSON (raw)', prettified: 'JSON (upravený)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/de_DE.ts b/src/modules/dailyCreditsSummary/i18n/de_DE.ts index 510ba1473a..bbf60a780d 100644 --- a/src/modules/dailyCreditsSummary/i18n/de_DE.ts +++ b/src/modules/dailyCreditsSummary/i18n/de_DE.ts @@ -107,5 +107,6 @@ export default { raw: 'JSON (Rohformat)', prettified: 'JSON (schöne Ausgabe)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/en_AU.ts b/src/modules/dailyCreditsSummary/i18n/en_AU.ts index 2260b275a0..a4e889d571 100644 --- a/src/modules/dailyCreditsSummary/i18n/en_AU.ts +++ b/src/modules/dailyCreditsSummary/i18n/en_AU.ts @@ -102,5 +102,6 @@ export default { raw: 'JSON (raw)', prettified: 'JSON (prettified)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/en_GB.ts b/src/modules/dailyCreditsSummary/i18n/en_GB.ts index 5bb0dadd20..01dd918fde 100644 --- a/src/modules/dailyCreditsSummary/i18n/en_GB.ts +++ b/src/modules/dailyCreditsSummary/i18n/en_GB.ts @@ -102,5 +102,6 @@ export default { raw: 'JSON (raw)', prettified: 'JSON (prettified)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/en_US.ts b/src/modules/dailyCreditsSummary/i18n/en_US.ts index 3f9a91963a..207652ddb3 100644 --- a/src/modules/dailyCreditsSummary/i18n/en_US.ts +++ b/src/modules/dailyCreditsSummary/i18n/en_US.ts @@ -102,5 +102,6 @@ export default { raw: 'JSON (raw)', prettified: 'JSON (prettified)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/fi_FI.ts b/src/modules/dailyCreditsSummary/i18n/fi_FI.ts index 5f01f48912..ccc2781856 100644 --- a/src/modules/dailyCreditsSummary/i18n/fi_FI.ts +++ b/src/modules/dailyCreditsSummary/i18n/fi_FI.ts @@ -102,5 +102,6 @@ export default { raw: 'JSON (raw)', prettified: 'JSON (prettified)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/fr_FR.ts b/src/modules/dailyCreditsSummary/i18n/fr_FR.ts index 1d21cba652..62c029fd25 100644 --- a/src/modules/dailyCreditsSummary/i18n/fr_FR.ts +++ b/src/modules/dailyCreditsSummary/i18n/fr_FR.ts @@ -102,5 +102,6 @@ export default { raw: 'JSON (brut)', prettified: 'JSON (simplifié)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/it_IT.ts b/src/modules/dailyCreditsSummary/i18n/it_IT.ts index 190dc6abb5..fe2254092f 100644 --- a/src/modules/dailyCreditsSummary/i18n/it_IT.ts +++ b/src/modules/dailyCreditsSummary/i18n/it_IT.ts @@ -102,5 +102,6 @@ export default { raw: 'JSON (grezzo)', prettified: 'JSON (abbellito)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/nb_NO.ts b/src/modules/dailyCreditsSummary/i18n/nb_NO.ts index d4ddf392da..2cfcb8179e 100644 --- a/src/modules/dailyCreditsSummary/i18n/nb_NO.ts +++ b/src/modules/dailyCreditsSummary/i18n/nb_NO.ts @@ -98,5 +98,6 @@ export default { raw: 'JSON (raw)', prettified: 'JSON (prettified)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/nl_NL.ts b/src/modules/dailyCreditsSummary/i18n/nl_NL.ts index 7f49ac3008..af1c6a3b8e 100644 --- a/src/modules/dailyCreditsSummary/i18n/nl_NL.ts +++ b/src/modules/dailyCreditsSummary/i18n/nl_NL.ts @@ -103,5 +103,6 @@ export default { raw: 'JSON (Ruwe data)', prettified: 'JSON (Mooie weergave)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/pl_PL.ts b/src/modules/dailyCreditsSummary/i18n/pl_PL.ts index c4f2b0354a..3359b0907e 100644 --- a/src/modules/dailyCreditsSummary/i18n/pl_PL.ts +++ b/src/modules/dailyCreditsSummary/i18n/pl_PL.ts @@ -102,5 +102,6 @@ export default { raw: 'JSON (raw)', prettified: 'JSON (prettified)', }, + csv: 'CSV', }, }; diff --git a/src/modules/dailyCreditsSummary/i18n/sv_SE.ts b/src/modules/dailyCreditsSummary/i18n/sv_SE.ts index 4b76a7c49d..13138b6465 100644 --- a/src/modules/dailyCreditsSummary/i18n/sv_SE.ts +++ b/src/modules/dailyCreditsSummary/i18n/sv_SE.ts @@ -102,5 +102,6 @@ export default { raw: 'JSON (raw)', prettified: 'JSON (prettified)', }, + csv: 'CSV', }, }; diff --git a/typings/modules/dailyCreditsSummary/dailyCreditsSummary.d.ts b/typings/modules/dailyCreditsSummary/dailyCreditsSummary.d.ts index eca49e328b..afb83e9664 100644 --- a/typings/modules/dailyCreditsSummary/dailyCreditsSummary.d.ts +++ b/typings/modules/dailyCreditsSummary/dailyCreditsSummary.d.ts @@ -56,6 +56,11 @@ export interface DailyCreditsSummaryComputed { sorted: Category[]; filtered: Category[]; creditsTypeSum: Category[]; + exports: { + json: string; + jsonPretty: string; + csv: string; + }; incomeChartOptions: ChartOptions; expensesChartOptions: ChartOptions; } From 6fea259f617ecba7e80429e434b4ea871552e9e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 22:28:26 +0000 Subject: [PATCH 014/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-p?= =?UTF-8?q?lugin-prettier`=20to=20v5.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 23fefc9b2d..d4ebcea3a0 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "eslint-plugin-import": "2.27.5", "eslint-plugin-jsdoc": "46.4.3", "eslint-plugin-markdownlint": "0.4.1", - "eslint-plugin-prettier": "5.0.0-alpha.2", + "eslint-plugin-prettier": "5.0.0", "eslint-plugin-regexp": "1.15.0", "eslint-plugin-tsdoc": "0.2.17", "eslint-plugin-unicorn": "47.0.0", diff --git a/yarn.lock b/yarn.lock index 485fdd7153..ec65f4f8e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5065,9 +5065,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-prettier@npm:5.0.0-alpha.2": - version: 5.0.0-alpha.2 - resolution: "eslint-plugin-prettier@npm:5.0.0-alpha.2" +"eslint-plugin-prettier@npm:5.0.0": + version: 5.0.0 + resolution: "eslint-plugin-prettier@npm:5.0.0" dependencies: prettier-linter-helpers: ^1.0.0 synckit: ^0.8.5 @@ -5080,7 +5080,7 @@ __metadata: optional: true eslint-config-prettier: optional: true - checksum: 612798739d498244e16031b1c8cf4617db9c0526b134afea2e8b6960fcab6bcde403e2e60e3647854ebefc2374ce5ce6453cba89649a5bdf66ab9045beb4d666 + checksum: 84e88744b9050f2d5ef31b94e85294dda16f3a53c2449f9d33eac8ae6264889b459bf35a68e438fb6b329c2a1d6491aac4bfa00d86317e7009de3dad0311bec6 languageName: node linkType: hard @@ -7021,7 +7021,7 @@ __metadata: eslint-plugin-import: 2.27.5 eslint-plugin-jsdoc: 46.4.3 eslint-plugin-markdownlint: 0.4.1 - eslint-plugin-prettier: 5.0.0-alpha.2 + eslint-plugin-prettier: 5.0.0 eslint-plugin-regexp: 1.15.0 eslint-plugin-tsdoc: 0.2.17 eslint-plugin-unicorn: 47.0.0 From a7c706b533b1f69ab0a35e5eb9ba09f92bfda87f Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 12 Jul 2023 03:29:10 +0000 Subject: [PATCH 015/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230712?= =?UTF-8?q?.0526=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d4ebcea3a0..ecc5d77bb9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230711.1338", + "version": "4.7.7+20230712.0526", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index d8e116a511..8d77bd7468 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -204,7 +204,7 @@ "eslint-plugin-prettier": { "icon": "https://prettier.io/icon.png", "url": "https://github.com/prettier/eslint-plugin-prettier#readme", - "version": "5.0.0-alpha.2" + "version": "5.0.0" }, "eslint-plugin-regexp": { "url": "https://github.com/ota-meshi/eslint-plugin-regexp#readme", From 849cce982a2b0fafbc7d1a6f6600f6abb6f72412 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 03:30:20 +0000 Subject: [PATCH 016/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20vuepress?= =?UTF-8?q?=20to=20v2.0.0-beta.66?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vuepress/package.json | 12 +- yarn.lock | 607 +++++++++++++++++++----------------- 2 files changed, 332 insertions(+), 287 deletions(-) diff --git a/docs/.vuepress/package.json b/docs/.vuepress/package.json index 971be5a3e8..5c41de656c 100644 --- a/docs/.vuepress/package.json +++ b/docs/.vuepress/package.json @@ -3,17 +3,17 @@ "license": "CC-BY-NC-SA-4.0", "dependencies": { "@primer/octicons": "19.4.0", - "@vuepress/client": "2.0.0-beta.64", - "@vuepress/plugin-pwa": "2.0.0-beta.64", - "@vuepress/plugin-pwa-popup": "2.0.0-beta.64", - "@vuepress/plugin-register-components": "2.0.0-beta.64", - "@vuepress/plugin-search": "2.0.0-beta.64", + "@vuepress/client": "2.0.0-beta.66", + "@vuepress/plugin-pwa": "2.0.0-beta.66", + "@vuepress/plugin-pwa-popup": "2.0.0-beta.66", + "@vuepress/plugin-register-components": "2.0.0-beta.66", + "@vuepress/plugin-search": "2.0.0-beta.66", "cloc": "2.11.0", "moment": "2.29.4", "showdown": "2.1.0", "simple-git": "3.19.1", "vue": "3.3.4", - "vuepress": "2.0.0-beta.64", + "vuepress": "2.0.0-beta.66", "vuepress-plugin-clipboard": "2.1.5", "vuepress-plugin-sitemap2": "2.0.0-beta.231" } diff --git a/yarn.lock b/yarn.lock index ec65f4f8e7..4aecb8afa3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1375,156 +1375,156 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/android-arm64@npm:0.17.19" +"@esbuild/android-arm64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/android-arm64@npm:0.18.11" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/android-arm@npm:0.17.19" +"@esbuild/android-arm@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/android-arm@npm:0.18.11" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/android-x64@npm:0.17.19" +"@esbuild/android-x64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/android-x64@npm:0.18.11" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/darwin-arm64@npm:0.17.19" +"@esbuild/darwin-arm64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/darwin-arm64@npm:0.18.11" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/darwin-x64@npm:0.17.19" +"@esbuild/darwin-x64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/darwin-x64@npm:0.18.11" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/freebsd-arm64@npm:0.17.19" +"@esbuild/freebsd-arm64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/freebsd-arm64@npm:0.18.11" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/freebsd-x64@npm:0.17.19" +"@esbuild/freebsd-x64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/freebsd-x64@npm:0.18.11" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-arm64@npm:0.17.19" +"@esbuild/linux-arm64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/linux-arm64@npm:0.18.11" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-arm@npm:0.17.19" +"@esbuild/linux-arm@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/linux-arm@npm:0.18.11" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-ia32@npm:0.17.19" +"@esbuild/linux-ia32@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/linux-ia32@npm:0.18.11" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-loong64@npm:0.17.19" +"@esbuild/linux-loong64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/linux-loong64@npm:0.18.11" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-mips64el@npm:0.17.19" +"@esbuild/linux-mips64el@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/linux-mips64el@npm:0.18.11" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-ppc64@npm:0.17.19" +"@esbuild/linux-ppc64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/linux-ppc64@npm:0.18.11" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-riscv64@npm:0.17.19" +"@esbuild/linux-riscv64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/linux-riscv64@npm:0.18.11" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-s390x@npm:0.17.19" +"@esbuild/linux-s390x@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/linux-s390x@npm:0.18.11" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/linux-x64@npm:0.17.19" +"@esbuild/linux-x64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/linux-x64@npm:0.18.11" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/netbsd-x64@npm:0.17.19" +"@esbuild/netbsd-x64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/netbsd-x64@npm:0.18.11" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/openbsd-x64@npm:0.17.19" +"@esbuild/openbsd-x64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/openbsd-x64@npm:0.18.11" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/sunos-x64@npm:0.17.19" +"@esbuild/sunos-x64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/sunos-x64@npm:0.18.11" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/win32-arm64@npm:0.17.19" +"@esbuild/win32-arm64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/win32-arm64@npm:0.18.11" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/win32-ia32@npm:0.17.19" +"@esbuild/win32-ia32@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/win32-ia32@npm:0.18.11" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.17.19": - version: 0.17.19 - resolution: "@esbuild/win32-x64@npm:0.17.19" +"@esbuild/win32-x64@npm:0.18.11": + version: 0.18.11 + resolution: "@esbuild/win32-x64@npm:0.18.11" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -2804,41 +2804,41 @@ __metadata: languageName: node linkType: hard -"@vuepress/bundler-vite@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/bundler-vite@npm:2.0.0-beta.64" +"@vuepress/bundler-vite@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/bundler-vite@npm:2.0.0-beta.66" dependencies: "@vitejs/plugin-vue": ^4.2.3 - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 autoprefixer: ^10.4.14 connect-history-api-fallback: ^2.0.0 - postcss: ^8.4.24 + postcss: ^8.4.25 postcss-load-config: ^4.0.1 - rollup: ^3.26.0 - vite: ~4.3.9 + rollup: ^3.26.2 + vite: ~4.4.2 vue: ^3.3.4 - vue-router: ^4.2.2 - checksum: 6cc312a45200b8ccb0baeef67e169ae53395297ca21f2628f4187643f219a91b8f3a9929028dfe31771a00b8ef22800a14944e8850aa99532f082f611924e2f5 + vue-router: ^4.2.4 + checksum: 64f5c73e5cab7bb472ebacbaf7c15dc74ca90418b01eff6c0f7ea3fd28c9d1344974323e7d44150fb1d0f4775c9a905e35ea7f8625dae87f014eb4c0b838182a languageName: node linkType: hard -"@vuepress/cli@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/cli@npm:2.0.0-beta.64" +"@vuepress/cli@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/cli@npm:2.0.0-beta.66" dependencies: - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 cac: ^6.7.14 chokidar: ^3.5.3 envinfo: ^7.10.0 - esbuild: ~0.17.19 + esbuild: ~0.18.11 bin: vuepress-cli: bin/vuepress.js - checksum: 82e9f4755ffe63b9423923560541ff28f6bd5a114748c11a30046d2927209f59c67886be2cfdffca397d50aab08ff6b8af3b192a928f914041230f032619efc7 + checksum: 8ed633f279ead654233c60f777de04faf284ff13e12b664178c9d5afff22476828f7fbd6ab8074f38830e1184348b21a29d581077be1e1969716384d52d9996e languageName: node linkType: hard @@ -2867,6 +2867,19 @@ __metadata: languageName: node linkType: hard +"@vuepress/client@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/client@npm:2.0.0-beta.66" + dependencies: + "@vue/devtools-api": ^6.5.0 + "@vuepress/shared": 2.0.0-beta.66 + "@vueuse/core": ^10.2.1 + vue: ^3.3.4 + vue-router: ^4.2.4 + checksum: 48b0b9a8b1db73938dcec92bc523bae65f7d8981dea90702a09269d7dec6e35c09b962ac5a263f51a0468dec45eae26f1dabf83808dfebbe916d8af503784914 + languageName: node + linkType: hard + "@vuepress/core@npm:2.0.0-beta.60": version: 2.0.0-beta.60 resolution: "@vuepress/core@npm:2.0.0-beta.60" @@ -2880,16 +2893,16 @@ __metadata: languageName: node linkType: hard -"@vuepress/core@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/core@npm:2.0.0-beta.64" +"@vuepress/core@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/core@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/markdown": 2.0.0-beta.64 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/markdown": 2.0.0-beta.66 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 vue: ^3.3.4 - checksum: 63fefba5a9413008b44eb27b0397231fc3efc20fbe03528161079e4c2a8408be5c96d7a7cc4821bd75d25f8aa60a2c9966b9ec4a454daa5570452000e79f17de + checksum: 8c75ec1ba8ddd799653e177337fe1c73f6ec40f8c49ba80df680579ab1e71d81b9566d68ce208924f3e02caeb36d5b91bc9a10924ff614327bc717c0bc634701 languageName: node linkType: hard @@ -2917,9 +2930,9 @@ __metadata: languageName: node linkType: hard -"@vuepress/markdown@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/markdown@npm:2.0.0-beta.64" +"@vuepress/markdown@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/markdown@npm:2.0.0-beta.66" dependencies: "@mdit-vue/plugin-component": ^0.12.0 "@mdit-vue/plugin-frontmatter": ^0.12.0 @@ -2931,196 +2944,196 @@ __metadata: "@mdit-vue/types": ^0.12.0 "@types/markdown-it": ^12.2.3 "@types/markdown-it-emoji": ^2.0.2 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 markdown-it: ^13.0.1 markdown-it-anchor: ^8.6.7 markdown-it-emoji: ^2.0.2 mdurl: ^1.0.1 - checksum: 9c97f1188c21ec95e172f44887fceab466d4a61ae7e2d73accc41fc397948ace10b62fdec972c2b31067bdbb4799035b0227f7aefe5ff4d3a234183fe9c418e5 + checksum: a721210c7b1e5dacf2cd9146ab78f7443e150ed3402c359b69ef8c2d41d74cd7c61821c25acc3aa5d9c8d06412f6cc384cfb17b8c28567081cead14cd1001c72 languageName: node linkType: hard -"@vuepress/plugin-active-header-links@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-active-header-links@npm:2.0.0-beta.64" +"@vuepress/plugin-active-header-links@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-active-header-links@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 ts-debounce: ^4.0.0 vue: ^3.3.4 - vue-router: ^4.2.2 - checksum: da1e66a380b3121ada5cd215d743600f68a3b6093273b168f248407b9e1770b02b41829e5f2c6102b34fa05db13f69f098433e397b7dad24f92c0a552061e799 + vue-router: ^4.2.4 + checksum: c97571916dcb0f1968fc48582ee73a0a69127dd2b67bafc51af6e5316f73ab03a7ab86b768932b70a75e1baf2a20471338829eab79e8f94031dac2eebb951159 languageName: node linkType: hard -"@vuepress/plugin-back-to-top@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-back-to-top@npm:2.0.0-beta.64" +"@vuepress/plugin-back-to-top@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-back-to-top@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 ts-debounce: ^4.0.0 vue: ^3.3.4 - checksum: bd66ca05045b87b8a7e9ebb3f0b8c8b9fd089ebbb90f60bbc461ccd8a8313b4dc3f9691b78bd7d3cb38742b005dd3fef85d708aa30b1e4fe4a04a775ac927f48 + checksum: 898c9e7c919a3b2452db33fe62ea4b9e4830400b64931a53ab7ffc8de2618b806f441c2eb5b25839e6dd909deac1ae3e1fad92c46537e419a05aac92a1a6dd05 languageName: node linkType: hard -"@vuepress/plugin-container@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-container@npm:2.0.0-beta.64" +"@vuepress/plugin-container@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-container@npm:2.0.0-beta.66" dependencies: "@types/markdown-it": ^12.2.3 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/markdown": 2.0.0-beta.64 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/markdown": 2.0.0-beta.66 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 markdown-it: ^13.0.1 markdown-it-container: ^3.0.0 - checksum: b4377452990c3efc3848d7815beee4c9f0f69b60835bfd11c90122de6447eac55feb5871bed87c0489bef1e4484e8ed9c67bbc8d5299c406323752f60720913f + checksum: 1fe1944bea8e9a770aae54dff3ccfa5cd9cffe89e07f6f78e825a793b7a80ba5fbcf0b4b282e51f799f6f2ca5a645387035a82d82b6574c32f46dfd3dfa009f6 languageName: node linkType: hard -"@vuepress/plugin-external-link-icon@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-external-link-icon@npm:2.0.0-beta.64" +"@vuepress/plugin-external-link-icon@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-external-link-icon@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/markdown": 2.0.0-beta.64 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/markdown": 2.0.0-beta.66 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 vue: ^3.3.4 - checksum: 5ecf763026307d0f72b15b54986395f1abaf1b96aeaa3b85da66c8579bea73ef1f23809f14342c59d86da9ed1c7b6de662b727f5df25c2736fccf70d45abf68f + checksum: ee25f6b3add7216e37c6a156b8c8ab6f8e774ac7d3e97bf2916a885d6a014bf8eb69a83dde22dc4ffed88787c9eae81f0ae5adce04178ccb9138ee9a950be1ec languageName: node linkType: hard -"@vuepress/plugin-git@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-git@npm:2.0.0-beta.64" +"@vuepress/plugin-git@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-git@npm:2.0.0-beta.66" dependencies: - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 execa: ^7.1.1 - checksum: 7d00cbd8b81f0313ecbff1427d596a3188b83335b1d66bf28c5952776155bb07186df3eb0a10794b40e222cc0b9062fba29234bafc7cfd14cdf7e6db765fa6fa + checksum: f1d6d1668d487a600f4be58ebb3d35413798941997e0d4df2050945c14854faa8d59c4e64353f1a1f039d15372bfd6dba6bacff3b291f8e7c4fb0e86f371f7cb languageName: node linkType: hard -"@vuepress/plugin-medium-zoom@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-medium-zoom@npm:2.0.0-beta.64" +"@vuepress/plugin-medium-zoom@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-medium-zoom@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 medium-zoom: ^1.0.8 vue: ^3.3.4 - checksum: 47233295b4db5d9d3afc1641913ddce01ae569352b17561784751a907e73e6cc8d7b2f8baf3b9366d24fdf0a79ba387f295d086c9da23e414eeb0fc0bbc0f4ed + checksum: 7da120a23690dab5c817890e9c9a63804af4978ac2b4be2846caacfacc106bf70a5e1a08180c68812aff156124cc253577fe190630ccbd8c8ff07ebf96d38d80 languageName: node linkType: hard -"@vuepress/plugin-nprogress@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-nprogress@npm:2.0.0-beta.64" +"@vuepress/plugin-nprogress@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-nprogress@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 vue: ^3.3.4 - vue-router: ^4.2.2 - checksum: d9a8c69b91d882f9f379374e68eb3990662d675c0499e6cf995b015c00b5694be3da16fbe31fbfa066fe789522f13062361db2c62067e5ecfbbdcb294d09d8be + vue-router: ^4.2.4 + checksum: fbb7c0f02a19fe0f751890f46399a50df1ae594e36776fa783d5b80ab0622d0b01352715959d45b5e8c61c140161487a4a330d0062e24c1d6cf5c67e328fbab2 languageName: node linkType: hard -"@vuepress/plugin-palette@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-palette@npm:2.0.0-beta.64" +"@vuepress/plugin-palette@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-palette@npm:2.0.0-beta.66" dependencies: - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 chokidar: ^3.5.3 - checksum: c2a708c4f3d13a76aff41faf0626886e628316d8a6a838e5d5ce494972fa3407047581bb0d9cb5b5801401e286a888f1b17729358ac43f7ad83e1b694f893c28 + checksum: 7b8359fff683ff27509c46f3c230b418189bc862387ff0989321fe6b1dcb36563fa6702c76cc059f4501f8f4ab06b5cdc595e5df2ae39c26c7de1fc1721c6c57 languageName: node linkType: hard -"@vuepress/plugin-prismjs@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-prismjs@npm:2.0.0-beta.64" +"@vuepress/plugin-prismjs@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-prismjs@npm:2.0.0-beta.66" dependencies: - "@vuepress/core": 2.0.0-beta.64 + "@vuepress/core": 2.0.0-beta.66 prismjs: ^1.29.0 - checksum: cd0462a2c262259051cf61965eb74996d287a0887f69c0bc25211060dfc2347ab218f2c538fb9aaeb97f841b5266ad97f2c87c3a5699b4e03c2c094a031f6c6d + checksum: 5c32f34b76b943c417d70dc93320a610f1f91de9c1f95044d3a84bd0cfcde9379a03a39fc26a963c951f85d5057b7da4e52dd8a8bed8bcce66c674932777d600 languageName: node linkType: hard -"@vuepress/plugin-pwa-popup@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-pwa-popup@npm:2.0.0-beta.64" +"@vuepress/plugin-pwa-popup@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-pwa-popup@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/plugin-pwa": 2.0.0-beta.64 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/plugin-pwa": 2.0.0-beta.66 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 vue: ^3.3.4 - checksum: 1074579d000317fb96ca650a52f16d40207f4c5746e50c971864dacafe847e4c10abbbf705f6f1c75035fb27fb47fa08683686ca91b680a5a99a09e9c1db3bb7 + checksum: 72afef9916c338a1afe203108e4cc7ff131389ef39ca01a16c1bccae8a63b7a6d0aa8fc4b107dae3918fb8aefd2eae1def8563f724485954efc50695e255d328 languageName: node linkType: hard -"@vuepress/plugin-pwa@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-pwa@npm:2.0.0-beta.64" +"@vuepress/plugin-pwa@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-pwa@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 - mitt: ^3.0.0 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 + mitt: ^3.0.1 register-service-worker: ^1.7.2 vue: ^3.3.4 workbox-build: ^7.0.0 - checksum: 9038c4cd50734d728a59e1ecd9f7ccc724a22ba4d920d82de1c2f98e8c85f5c5d4798cf01179a29ad83e06ee8916f07c8155ee2c02be46a5d35c8148d3acae5a + checksum: c41e88bc032e3c4610f955d0cdea588fa3929b7a0579c522f6fd75386e162829ab5fdabcc5c17461c30765a6f5189203840074df0752c986a0734e235598f4af languageName: node linkType: hard -"@vuepress/plugin-register-components@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-register-components@npm:2.0.0-beta.64" +"@vuepress/plugin-register-components@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-register-components@npm:2.0.0-beta.66" dependencies: - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 chokidar: ^3.5.3 - checksum: 6c75670facc77348d3dae3a0ee9e6407a9f2a43bd202e946ce6eb897802b87f3c90ced780672959c298e43023cf6ec9d7b5acf62e11bb99aa0dec3e817ecd334 + checksum: 19b9113372c1a5663560f06ea3eea96ce18b98c6479ac8b65e115503858bac9a176577f9bd6124ff33d13832a5e7428ef76ae930f8d973cba5dc7a76df42bd2c languageName: node linkType: hard -"@vuepress/plugin-search@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-search@npm:2.0.0-beta.64" +"@vuepress/plugin-search@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-search@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 chokidar: ^3.5.3 vue: ^3.3.4 - vue-router: ^4.2.2 - checksum: 766bac350613263b8638db52f77030fbac3b132da385dacb0c737842ba06424a87482fa453d135ed2520ce3eb84176ae0ecc7f753df6645f7df853040a088db8 + vue-router: ^4.2.4 + checksum: 49fd9f1f80c3e9ab5f1fbe5aac64ecfd4afdf32a21300b40a0710ebaa436b7efd615890a91c6949225be8abc4043ab741856ff8483f29ed3384cb4717eb7a39c languageName: node linkType: hard -"@vuepress/plugin-theme-data@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/plugin-theme-data@npm:2.0.0-beta.64" +"@vuepress/plugin-theme-data@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/plugin-theme-data@npm:2.0.0-beta.66" dependencies: "@vue/devtools-api": ^6.5.0 - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 vue: ^3.3.4 - checksum: 8030c0a6064d79f197b4f1b9ff35c28d3d5be67ab7aca9d325a22c93fcd73ec7bf042e6f1cd73544bff11b2043d9b9eb6fc76d35731936387acddce4024ea476 + checksum: 9ed872186bf11513dc49e6b31a0a23ffebba68c5a13b9149f2ce2bbe2794cbdf2d05d91e3fe096da8c18fb0b16fd57e6a037a6a7100b976545c063330938d2fc languageName: node linkType: hard @@ -3144,35 +3157,45 @@ __metadata: languageName: node linkType: hard -"@vuepress/theme-default@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "@vuepress/theme-default@npm:2.0.0-beta.64" +"@vuepress/shared@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/shared@npm:2.0.0-beta.66" dependencies: - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/plugin-active-header-links": 2.0.0-beta.64 - "@vuepress/plugin-back-to-top": 2.0.0-beta.64 - "@vuepress/plugin-container": 2.0.0-beta.64 - "@vuepress/plugin-external-link-icon": 2.0.0-beta.64 - "@vuepress/plugin-git": 2.0.0-beta.64 - "@vuepress/plugin-medium-zoom": 2.0.0-beta.64 - "@vuepress/plugin-nprogress": 2.0.0-beta.64 - "@vuepress/plugin-palette": 2.0.0-beta.64 - "@vuepress/plugin-prismjs": 2.0.0-beta.64 - "@vuepress/plugin-theme-data": 2.0.0-beta.64 - "@vuepress/shared": 2.0.0-beta.64 - "@vuepress/utils": 2.0.0-beta.64 + "@mdit-vue/types": ^0.12.0 + "@vue/shared": ^3.3.4 + checksum: ec84a1ed72460e2c0f01742206ffd3b86703603d91a15826a14a5c65503d66bd7d13166d83eb570808efdd45aedb6ad01217cb70843582f6a7acd705e38b9e08 + languageName: node + linkType: hard + +"@vuepress/theme-default@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/theme-default@npm:2.0.0-beta.66" + dependencies: + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/plugin-active-header-links": 2.0.0-beta.66 + "@vuepress/plugin-back-to-top": 2.0.0-beta.66 + "@vuepress/plugin-container": 2.0.0-beta.66 + "@vuepress/plugin-external-link-icon": 2.0.0-beta.66 + "@vuepress/plugin-git": 2.0.0-beta.66 + "@vuepress/plugin-medium-zoom": 2.0.0-beta.66 + "@vuepress/plugin-nprogress": 2.0.0-beta.66 + "@vuepress/plugin-palette": 2.0.0-beta.66 + "@vuepress/plugin-prismjs": 2.0.0-beta.66 + "@vuepress/plugin-theme-data": 2.0.0-beta.66 + "@vuepress/shared": 2.0.0-beta.66 + "@vuepress/utils": 2.0.0-beta.66 "@vueuse/core": ^10.2.1 sass: ^1.63.6 sass-loader: ^13.3.2 vue: ^3.3.4 - vue-router: ^4.2.2 + vue-router: ^4.2.4 peerDependencies: sass-loader: ^13.2.1 peerDependenciesMeta: sass-loader: optional: true - checksum: 8e96a5f08046b863e558fe5b3f53f2ae7d16cbf1af6800b068cf1e8fc7dc1c55e5ab90e7a8a12cff60e611dc2cf1090aac00f3e385c122522fb217379a3b06d3 + checksum: b4c481bad4ad5f79e87deaec3a6a2bef8805e3fb9d17b0ba519ce45eb2d01a6212c894d6eb69b59634b244f897ffa2014408a3d9a4062753767875876fce60b4 languageName: node linkType: hard @@ -3214,6 +3237,25 @@ __metadata: languageName: node linkType: hard +"@vuepress/utils@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "@vuepress/utils@npm:2.0.0-beta.66" + dependencies: + "@types/debug": ^4.1.8 + "@types/fs-extra": ^11.0.1 + "@types/hash-sum": ^1.0.0 + "@vuepress/shared": 2.0.0-beta.66 + debug: ^4.3.4 + fs-extra: ^11.1.1 + globby: ^13.2.2 + hash-sum: ^2.0.0 + ora: ^6.3.1 + picocolors: ^1.0.0 + upath: ^2.0.1 + checksum: 26fc21cca67c104353e2809aacdf2f44434990aeb607d01fff34ee82d901490cfb1a4ac9714591cc62abb8efcb2f14ebbb37ac4f560f9dd3e69c09708197b1d0 + languageName: node + linkType: hard + "@vueuse/core@npm:^10.2.1": version: 10.2.1 resolution: "@vueuse/core@npm:10.2.1" @@ -4841,32 +4883,32 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.17.5, esbuild@npm:~0.17.19": - version: 0.17.19 - resolution: "esbuild@npm:0.17.19" - dependencies: - "@esbuild/android-arm": 0.17.19 - "@esbuild/android-arm64": 0.17.19 - "@esbuild/android-x64": 0.17.19 - "@esbuild/darwin-arm64": 0.17.19 - "@esbuild/darwin-x64": 0.17.19 - "@esbuild/freebsd-arm64": 0.17.19 - "@esbuild/freebsd-x64": 0.17.19 - "@esbuild/linux-arm": 0.17.19 - "@esbuild/linux-arm64": 0.17.19 - "@esbuild/linux-ia32": 0.17.19 - "@esbuild/linux-loong64": 0.17.19 - "@esbuild/linux-mips64el": 0.17.19 - "@esbuild/linux-ppc64": 0.17.19 - "@esbuild/linux-riscv64": 0.17.19 - "@esbuild/linux-s390x": 0.17.19 - "@esbuild/linux-x64": 0.17.19 - "@esbuild/netbsd-x64": 0.17.19 - "@esbuild/openbsd-x64": 0.17.19 - "@esbuild/sunos-x64": 0.17.19 - "@esbuild/win32-arm64": 0.17.19 - "@esbuild/win32-ia32": 0.17.19 - "@esbuild/win32-x64": 0.17.19 +"esbuild@npm:^0.18.10, esbuild@npm:~0.18.11": + version: 0.18.11 + resolution: "esbuild@npm:0.18.11" + dependencies: + "@esbuild/android-arm": 0.18.11 + "@esbuild/android-arm64": 0.18.11 + "@esbuild/android-x64": 0.18.11 + "@esbuild/darwin-arm64": 0.18.11 + "@esbuild/darwin-x64": 0.18.11 + "@esbuild/freebsd-arm64": 0.18.11 + "@esbuild/freebsd-x64": 0.18.11 + "@esbuild/linux-arm": 0.18.11 + "@esbuild/linux-arm64": 0.18.11 + "@esbuild/linux-ia32": 0.18.11 + "@esbuild/linux-loong64": 0.18.11 + "@esbuild/linux-mips64el": 0.18.11 + "@esbuild/linux-ppc64": 0.18.11 + "@esbuild/linux-riscv64": 0.18.11 + "@esbuild/linux-s390x": 0.18.11 + "@esbuild/linux-x64": 0.18.11 + "@esbuild/netbsd-x64": 0.18.11 + "@esbuild/openbsd-x64": 0.18.11 + "@esbuild/sunos-x64": 0.18.11 + "@esbuild/win32-arm64": 0.18.11 + "@esbuild/win32-ia32": 0.18.11 + "@esbuild/win32-x64": 0.18.11 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -4914,7 +4956,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: ac11b1a5a6008e4e37ccffbd6c2c054746fc58d0ed4a2f9ee643bd030cfcea9a33a235087bc777def8420f2eaafb3486e76adb7bdb7241a9143b43a69a10afd8 + checksum: fbd981388fe391c4f0a1b71120ca86ee75cc6de88c01bd6883f26d8450cb3beeaae602459f9a8b9dc9e026ad68b67cda2cad5f5327c9960a53fa0cb358c61d97 languageName: node linkType: hard @@ -5797,7 +5839,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^13.1.3, globby@npm:^13.2.1": +"globby@npm:^13.1.3, globby@npm:^13.2.1, globby@npm:^13.2.2": version: 13.2.2 resolution: "globby@npm:13.2.2" dependencies: @@ -6965,17 +7007,17 @@ __metadata: resolution: "lss-manager-v4-docs@workspace:docs/.vuepress" dependencies: "@primer/octicons": 19.4.0 - "@vuepress/client": 2.0.0-beta.64 - "@vuepress/plugin-pwa": 2.0.0-beta.64 - "@vuepress/plugin-pwa-popup": 2.0.0-beta.64 - "@vuepress/plugin-register-components": 2.0.0-beta.64 - "@vuepress/plugin-search": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 + "@vuepress/plugin-pwa": 2.0.0-beta.66 + "@vuepress/plugin-pwa-popup": 2.0.0-beta.66 + "@vuepress/plugin-register-components": 2.0.0-beta.66 + "@vuepress/plugin-search": 2.0.0-beta.66 cloc: 2.11.0 moment: 2.29.4 showdown: 2.1.0 simple-git: 3.19.1 vue: 3.3.4 - vuepress: 2.0.0-beta.64 + vuepress: 2.0.0-beta.66 vuepress-plugin-clipboard: 2.1.5 vuepress-plugin-sitemap2: 2.0.0-beta.231 languageName: unknown @@ -7373,7 +7415,7 @@ __metadata: languageName: node linkType: hard -"mitt@npm:^3.0.0": +"mitt@npm:^3.0.1": version: 3.0.1 resolution: "mitt@npm:3.0.1" checksum: b55a489ac9c2949ab166b7f060601d3b6d893a852515ae9eca4e11df01c013876df777ea109317622b5c1c60e8aae252558e33c8c94e14124db38f64a39614b1 @@ -8068,7 +8110,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.1.10, postcss@npm:^8.4.14, postcss@npm:^8.4.21, postcss@npm:^8.4.23, postcss@npm:^8.4.24": +"postcss@npm:^8.1.10, postcss@npm:^8.4.14, postcss@npm:^8.4.21, postcss@npm:^8.4.25": version: 8.4.25 resolution: "postcss@npm:8.4.25" dependencies: @@ -8506,7 +8548,7 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^3.21.0, rollup@npm:^3.26.0": +"rollup@npm:^3.25.2, rollup@npm:^3.26.2": version: 3.26.2 resolution: "rollup@npm:3.26.2" dependencies: @@ -9678,17 +9720,18 @@ __metadata: languageName: node linkType: hard -"vite@npm:~4.3.9": - version: 4.3.9 - resolution: "vite@npm:4.3.9" +"vite@npm:~4.4.2": + version: 4.4.3 + resolution: "vite@npm:4.4.3" dependencies: - esbuild: ^0.17.5 + esbuild: ^0.18.10 fsevents: ~2.3.2 - postcss: ^8.4.23 - rollup: ^3.21.0 + postcss: ^8.4.25 + rollup: ^3.25.2 peerDependencies: "@types/node": ">= 14" less: "*" + lightningcss: ^1.21.0 sass: "*" stylus: "*" sugarss: "*" @@ -9701,6 +9744,8 @@ __metadata: optional: true less: optional: true + lightningcss: + optional: true sass: optional: true stylus: @@ -9711,7 +9756,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 8c45a516278d1e0425fac00c0877336790f71484a851a318346a70e0d2aef9f3b9651deb2f9f002c791ceb920eda7d6a3cda753bdefd657321c99f448b02dd25 + checksum: 2f7c90de35c840ed7f33000d65006053885c0342aa7c19cee7369d7b3d92473a9bae790f910eb3e9900bdb7ca89559a772ee4782f35636ec4e6bd10717e7f5ff languageName: node linkType: hard @@ -9980,33 +10025,33 @@ __metadata: languageName: node linkType: hard -"vuepress-vite@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "vuepress-vite@npm:2.0.0-beta.64" +"vuepress-vite@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "vuepress-vite@npm:2.0.0-beta.66" dependencies: - "@vuepress/bundler-vite": 2.0.0-beta.64 - "@vuepress/cli": 2.0.0-beta.64 - "@vuepress/core": 2.0.0-beta.64 - "@vuepress/theme-default": 2.0.0-beta.64 + "@vuepress/bundler-vite": 2.0.0-beta.66 + "@vuepress/cli": 2.0.0-beta.66 + "@vuepress/core": 2.0.0-beta.66 + "@vuepress/theme-default": 2.0.0-beta.66 vue: ^3.3.4 peerDependencies: - "@vuepress/client": 2.0.0-beta.64 + "@vuepress/client": 2.0.0-beta.66 vue: ^3.3.4 bin: vuepress: bin/vuepress.js vuepress-vite: bin/vuepress.js - checksum: c1bbe3d578ea1a88225bee026902a11fa1aebd9d49d0bd333bd143a7e62b6bbb853a7a082cb1327c3ed02610126539e45fe33b5043f7381ac40caf2530357157 + checksum: f7111a75636c27c061cedea5a7f6a4b2243ad9f049a68e0ef29da4593958caf52446248c7b0ebe58455f102f7e2295abb2ef6330ea95ad322fdaaea3c233c516 languageName: node linkType: hard -"vuepress@npm:2.0.0-beta.64": - version: 2.0.0-beta.64 - resolution: "vuepress@npm:2.0.0-beta.64" +"vuepress@npm:2.0.0-beta.66": + version: 2.0.0-beta.66 + resolution: "vuepress@npm:2.0.0-beta.66" dependencies: - vuepress-vite: 2.0.0-beta.64 + vuepress-vite: 2.0.0-beta.66 bin: vuepress: bin/vuepress.js - checksum: aa37c27da6793814dd704659f8c845b280c49779399c0f07c2ff2b18f88797e6ec37de342355cd5166463d207e39a15f6aa8625b211e420895df2a3e8a9173ce + checksum: 960249a94242d3b3a839680b48db9ce5f6974eb437544014d1050850bb24d5c7c63df8ec234b754e48de8d8e6df188aaa4cf605aff8dbae57541c1d3191b64db languageName: node linkType: hard From 270e2b1e9b2a01c867aa40b199b979633e7bfd49 Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 12 Jul 2023 03:58:43 +0000 Subject: [PATCH 017/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230712?= =?UTF-8?q?.0555=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index ecc5d77bb9..396afe4c9d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230712.0526", + "version": "4.7.7+20230712.0555", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 8d77bd7468..a710f1bb3a 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -114,27 +114,27 @@ "@vuepress/client": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", "url": "https://github.com/vuepress", - "version": "2.0.0-beta.64" + "version": "2.0.0-beta.66" }, "@vuepress/plugin-pwa": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", "url": "https://github.com/vuepress", - "version": "2.0.0-beta.64" + "version": "2.0.0-beta.66" }, "@vuepress/plugin-pwa-popup": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", "url": "https://github.com/vuepress", - "version": "2.0.0-beta.64" + "version": "2.0.0-beta.66" }, "@vuepress/plugin-register-components": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", "url": "https://github.com/vuepress", - "version": "2.0.0-beta.64" + "version": "2.0.0-beta.66" }, "@vuepress/plugin-search": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", "url": "https://github.com/vuepress", - "version": "2.0.0-beta.64" + "version": "2.0.0-beta.66" }, "acorn": { "icon": "https://avatars.githubusercontent.com/u/34631683", @@ -398,7 +398,7 @@ "vuepress": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", "url": "https://github.com/vuepress", - "version": "2.0.0-beta.64" + "version": "2.0.0-beta.66" }, "vuepress-plugin-clipboard": { "icon": "https://vuepress.qbb.sh/hero.png", From a591189fa546882f289f40e6497216b495a675ea Mon Sep 17 00:00:00 2001 From: jan Date: Wed, 12 Jul 2023 11:38:08 +0200 Subject: [PATCH 018/182] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20migrate=20dcs/dcsB?= =?UTF-8?q?adge=20to=20composition=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/dscBadge.vue | 65 +++++++------------ 1 file changed, 24 insertions(+), 41 deletions(-) diff --git a/src/modules/dailyCreditsSummary/components/dscBadge.vue b/src/modules/dailyCreditsSummary/components/dscBadge.vue index b7e8ebdacd..f337686c62 100644 --- a/src/modules/dailyCreditsSummary/components/dscBadge.vue +++ b/src/modules/dailyCreditsSummary/components/dscBadge.vue @@ -1,62 +1,45 @@ - diff --git a/typings/modules/dailyCreditsSummary/dailyCreditsSummary.d.ts b/typings/modules/dailyCreditsSummary/dailyCreditsSummary.d.ts index afb83e9664..9b0a423832 100644 --- a/typings/modules/dailyCreditsSummary/dailyCreditsSummary.d.ts +++ b/typings/modules/dailyCreditsSummary/dailyCreditsSummary.d.ts @@ -1,7 +1,3 @@ -import type { CreditsDailyWindow } from 'modules/redesign/parsers/credits/daily'; -import type { CreditsTypes } from './main'; -import type VueI18n from 'vue-i18n'; - interface BasicChartOptions { chart: { type: 'pie'; @@ -35,15 +31,6 @@ interface ChartOptions extends BasicChartOptions { ]; } -export interface DailyCreditsSummary { - hidden: boolean; - sort: 'amount' | 'desc' | 'total'; - sortDir: 'asc' | 'desc'; - search: ''; - showAverage: boolean; - basicChartOptions: BasicChartOptions; -} - export interface Category { desc: string; total: number; @@ -51,26 +38,3 @@ export interface Category { backgroundColor: string; textColor: string; } - -export interface DailyCreditsSummaryComputed { - sorted: Category[]; - filtered: Category[]; - creditsTypeSum: Category[]; - exports: { - json: string; - jsonPretty: string; - csv: string; - }; - incomeChartOptions: ChartOptions; - expensesChartOptions: ChartOptions; -} - -export interface DailyCreditsSummaryMethods { - setSort(s: DailyCreditsSummary['sort']): void; - $m(key: string, args?: Record): VueI18n.TranslateResult; -} - -export interface DailyCreditsSummaryProps { - entries: CreditsDailyWindow['entries']; - creditsTypes: CreditsTypes; -} From 241ca5729071a9be4987f6e574a892ddf540d1c4 Mon Sep 17 00:00:00 2001 From: jan Date: Sun, 16 Jul 2023 20:50:40 +0200 Subject: [PATCH 037/182] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[ecw/mk]=20migrate?= =?UTF-8?q?=20mkPreview=20to=20composition=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/missionKeywords/mkPreview.vue | 35 ++++++++++++++++ .../components/missionKeywords/preview.vue | 41 ------------------- src/modules/extendedCallWindow/settings.ts | 8 ++-- typings/Setting.d.ts | 6 ++- 4 files changed, 43 insertions(+), 47 deletions(-) create mode 100644 src/modules/extendedCallWindow/components/missionKeywords/mkPreview.vue delete mode 100644 src/modules/extendedCallWindow/components/missionKeywords/preview.vue diff --git a/src/modules/extendedCallWindow/components/missionKeywords/mkPreview.vue b/src/modules/extendedCallWindow/components/missionKeywords/mkPreview.vue new file mode 100644 index 0000000000..803f0eafa8 --- /dev/null +++ b/src/modules/extendedCallWindow/components/missionKeywords/mkPreview.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/modules/extendedCallWindow/components/missionKeywords/preview.vue b/src/modules/extendedCallWindow/components/missionKeywords/preview.vue deleted file mode 100644 index e716ecdb1a..0000000000 --- a/src/modules/extendedCallWindow/components/missionKeywords/preview.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/src/modules/extendedCallWindow/settings.ts b/src/modules/extendedCallWindow/settings.ts index 35495421d4..aee1aa77de 100644 --- a/src/modules/extendedCallWindow/settings.ts +++ b/src/modules/extendedCallWindow/settings.ts @@ -1,5 +1,5 @@ import aipreview from './components/alarmIcons/preview.vue'; -import mkpreview from './components/missionKeywords/preview.vue'; +import mkPreview from './components/missionKeywords/mkPreview.vue'; import type { $m, ModuleSettingFunction } from 'typings/Module'; import type { @@ -370,10 +370,10 @@ export default (async (MODULE_ID: string, LSSM: Vue, $m: $m) => { type: 'color', }, }, - { + >{ type: 'preview', - component: mkpreview, - title: $m('settings.missionKeywords.preview'), + component: mkPreview, + title: $m('settings.missionKeywords.preview').toString(), size: 1, }, >{ diff --git a/typings/Setting.d.ts b/typings/Setting.d.ts index e3b99cf259..fcd99ebe0d 100644 --- a/typings/Setting.d.ts +++ b/typings/Setting.d.ts @@ -158,10 +158,12 @@ interface AppendableListSetting { ) => string | false); } -export interface PreviewElement +export interface PreviewElement extends Omit { type: 'preview'; - component: ExtendedVue; + component: Component extends undefined + ? ExtendedVue + : Component; } export interface AppendableList extends SettingTemplate { From 01f80f45847e50072a558f0c7e8ee36221d15509 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jul 2023 22:14:26 +0000 Subject: [PATCH 038/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-p?= =?UTF-8?q?lugin-jsdoc`=20to=20v46.4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4554b9d7be..2d394e0124 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "eslint-import-resolver-typescript": "3.5.5", "eslint-plugin-compat": "4.1.4", "eslint-plugin-import": "2.27.5", - "eslint-plugin-jsdoc": "46.4.3", + "eslint-plugin-jsdoc": "46.4.4", "eslint-plugin-markdownlint": "0.4.1", "eslint-plugin-prettier": "5.0.0", "eslint-plugin-regexp": "1.15.0", diff --git a/yarn.lock b/yarn.lock index c5346aef1e..376a6c499f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5041,9 +5041,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jsdoc@npm:46.4.3": - version: 46.4.3 - resolution: "eslint-plugin-jsdoc@npm:46.4.3" +"eslint-plugin-jsdoc@npm:46.4.4": + version: 46.4.4 + resolution: "eslint-plugin-jsdoc@npm:46.4.4" dependencies: "@es-joy/jsdoccomment": ~0.39.4 are-docs-informative: ^0.0.2 @@ -5056,7 +5056,7 @@ __metadata: spdx-expression-parse: ^3.0.1 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 9cec116649f7bcd8abea165975ce5d5ae8fd095b3f7c53e00a93c0bd3aeeeb913c8ed3d5c9f67f04fe84d71d20c342b44cf41fc0f7dfd93bdafadeae8c235a81 + checksum: bc97f2f146aedcf43b1610a80eb9623deb365a30ba54eb37e6f82c6f205136aa51f67a65b0625729cb33ec941710bfa08d9d18b59296e2d84c2fd6a57d63c2be languageName: node linkType: hard @@ -7026,7 +7026,7 @@ __metadata: eslint-import-resolver-typescript: 3.5.5 eslint-plugin-compat: 4.1.4 eslint-plugin-import: 2.27.5 - eslint-plugin-jsdoc: 46.4.3 + eslint-plugin-jsdoc: 46.4.4 eslint-plugin-markdownlint: 0.4.1 eslint-plugin-prettier: 5.0.0 eslint-plugin-regexp: 1.15.0 From b361e66dcaa26225179b5f53281df52b7fd9683b Mon Sep 17 00:00:00 2001 From: Build Server Date: Sun, 16 Jul 2023 22:33:38 +0000 Subject: [PATCH 039/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230717?= =?UTF-8?q?.0030=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2d394e0124..893bd7394c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230716.1453", + "version": "4.7.7+20230717.0030", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 7d900ded4c..1cf067fdb1 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -200,7 +200,7 @@ "version": "2.27.5" }, "eslint-plugin-jsdoc": { - "version": "46.4.3" + "version": "46.4.4" }, "eslint-plugin-markdownlint": { "url": "https://gitlab.com/pawelbbdrozd/eslint-plugin-markdownlint/-/blob/main/README.md", From 8c67854923dd52d23bd224834f60bdb1712b3a53 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jul 2023 22:34:43 +0000 Subject: [PATCH 040/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint`?= =?UTF-8?q?=20to=20v8.45.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 893bd7394c..da3602e564 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "all-contributors-cli": "6.26.1", "copy-dir": "1.3.0", "css-loader": "6.8.1", - "eslint": "8.44.0", + "eslint": "8.45.0", "eslint-config-prettier": "8.8.0", "eslint-import-resolver-typescript": "3.5.5", "eslint-plugin-compat": "4.1.4", diff --git a/yarn.lock b/yarn.lock index 376a6c499f..7a2a0630d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5188,9 +5188,9 @@ __metadata: languageName: node linkType: hard -"eslint@npm:8.44.0": - version: 8.44.0 - resolution: "eslint@npm:8.44.0" +"eslint@npm:8.45.0": + version: 8.45.0 + resolution: "eslint@npm:8.45.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.4.0 @@ -5217,7 +5217,6 @@ __metadata: globals: ^13.19.0 graphemer: ^1.4.0 ignore: ^5.2.0 - import-fresh: ^3.0.0 imurmurhash: ^0.1.4 is-glob: ^4.0.0 is-path-inside: ^3.0.3 @@ -5229,11 +5228,10 @@ __metadata: natural-compare: ^1.4.0 optionator: ^0.9.3 strip-ansi: ^6.0.1 - strip-json-comments: ^3.1.0 text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: d06309ce4aafb9d27d558c8e5e5aa5cba3bbec3ce8ceccbc7d4b7a35f2b67fd40189159155553270e2e6febeb69bd8a3b60d6241c8f5ddc2ef1702ccbd328501 + checksum: 3e6dcce5cc43c5e301662db88ee26d1d188b22c177b9f104d7eefd1191236980bd953b3670fe2fac287114b26d7c5420ab48407d7ea1c3a446d6313c000009da languageName: node linkType: hard @@ -6137,7 +6135,7 @@ __metadata: languageName: node linkType: hard -"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1": +"import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -7021,7 +7019,7 @@ __metadata: copy-dir: 1.3.0 css-loader: 6.8.1 emoji-toolkit: 7.0.1 - eslint: 8.44.0 + eslint: 8.45.0 eslint-config-prettier: 8.8.0 eslint-import-resolver-typescript: 3.5.5 eslint-plugin-compat: 4.1.4 @@ -9124,7 +9122,7 @@ __metadata: languageName: node linkType: hard -"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": +"strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443 From 4aa53aadeec208b872ad8c6417f081632db8208b Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 17 Jul 2023 06:00:15 +0000 Subject: [PATCH 041/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230717?= =?UTF-8?q?.0757=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index da3602e564..33962aef03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230717.0030", + "version": "4.7.7+20230717.0757", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 1cf067fdb1..f4a6010290 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -182,7 +182,7 @@ "eslint": { "icon": "https://eslint.org/icon-512.png", "url": "https://eslint.org", - "version": "8.44.0" + "version": "8.45.0" }, "eslint-config-prettier": { "icon": "https://prettier.io/icon.png", From 4aed960679643da3984a111b2144ac93a390e6d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 06:01:22 +0000 Subject: [PATCH 042/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-p?= =?UTF-8?q?lugin-unicorn`=20to=20v48?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 32 +++++++++++--------------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 33962aef03..9e73af4bc5 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "eslint-plugin-prettier": "5.0.0", "eslint-plugin-regexp": "1.15.0", "eslint-plugin-tsdoc": "0.2.17", - "eslint-plugin-unicorn": "47.0.0", + "eslint-plugin-unicorn": "48.0.0", "eslint-plugin-vue": "9.15.1", "html-loader": "4.2.0", "husky": "8.0.3", diff --git a/yarn.lock b/yarn.lock index 7a2a0630d5..23ec475099 100644 --- a/yarn.lock +++ b/yarn.lock @@ -301,7 +301,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.19.1, @babel/helper-validator-identifier@npm:^7.22.5": +"@babel/helper-validator-identifier@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-validator-identifier@npm:7.22.5" checksum: 7f0f30113474a28298c12161763b49de5018732290ca4de13cdaefd4fd0d635a6fe3f6686c37a02905fb1e64f21a5ee2b55140cf7b070e729f1bd66866506aea @@ -5118,11 +5118,11 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-unicorn@npm:47.0.0": - version: 47.0.0 - resolution: "eslint-plugin-unicorn@npm:47.0.0" +"eslint-plugin-unicorn@npm:48.0.0": + version: 48.0.0 + resolution: "eslint-plugin-unicorn@npm:48.0.0" dependencies: - "@babel/helper-validator-identifier": ^7.19.1 + "@babel/helper-validator-identifier": ^7.22.5 "@eslint-community/eslint-utils": ^4.4.0 ci-info: ^3.8.0 clean-regexp: ^1.0.0 @@ -5133,14 +5133,13 @@ __metadata: lodash: ^4.17.21 pluralize: ^8.0.0 read-pkg-up: ^7.0.1 - regexp-tree: ^0.1.24 + regexp-tree: ^0.1.27 regjsparser: ^0.10.0 - safe-regex: ^2.1.1 - semver: ^7.3.8 + semver: ^7.5.4 strip-indent: ^3.0.0 peerDependencies: - eslint: ">=8.38.0" - checksum: 8d93bd76d54fb44e134c6576e3bda72dbf4c9cb5bae90451ace6acf1c48e6d7329f1e36db1d19266a5da499afeff6bf0c647875d69adc92d546bcc2d8b765cca + eslint: ">=8.44.0" + checksum: fc42b6ac3018d43cd68a2d91de43a0f761824a15de5f3c201b3369e15dc3675843bae1644de65b9aa87b2cd1f79ea9188087c54477bef9deef924a1200d5219f languageName: node linkType: hard @@ -7029,7 +7028,7 @@ __metadata: eslint-plugin-prettier: 5.0.0 eslint-plugin-regexp: 1.15.0 eslint-plugin-tsdoc: 0.2.17 - eslint-plugin-unicorn: 47.0.0 + eslint-plugin-unicorn: 48.0.0 eslint-plugin-vue: 9.15.1 he: 1.2.0 highcharts: 11.1.0 @@ -8281,7 +8280,7 @@ __metadata: languageName: node linkType: hard -"regexp-tree@npm:^0.1.24, regexp-tree@npm:~0.1.1": +"regexp-tree@npm:^0.1.27": version: 0.1.27 resolution: "regexp-tree@npm:0.1.27" bin: @@ -8578,15 +8577,6 @@ __metadata: languageName: node linkType: hard -"safe-regex@npm:^2.1.1": - version: 2.1.1 - resolution: "safe-regex@npm:2.1.1" - dependencies: - regexp-tree: ~0.1.1 - checksum: 5d734e2193c63ef0cb00f60c0244e0f8a30ecb31923633cd34636808d6a7c4c206d650017953ae1db8bc33967c2f06af33488dea6f038f4e38212beb7bed77b4 - languageName: node - linkType: hard - "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" From 3cee91476ee4703e81cab5521cdccd437c1eb22e Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 17 Jul 2023 08:13:40 +0000 Subject: [PATCH 043/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230717?= =?UTF-8?q?.1009=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9e73af4bc5..06a3ff9e5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230717.0757", + "version": "4.7.7+20230717.1009", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index f4a6010290..ddd4bb4227 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -223,7 +223,7 @@ "eslint-plugin-unicorn": { "icon": "https://cloud.githubusercontent.com/assets/170270/18659176/1cc373d0-7f33-11e6-890f-0ba35362ee7e.jpg", "url": "https://github.com/sindresorhus/eslint-plugin-unicorn", - "version": "47.0.0" + "version": "48.0.0" }, "eslint-plugin-vue": { "icon": "https://vuejs.org/logo.svg", From 483f139482487fa52beb7f456a91afbe0697da5e Mon Sep 17 00:00:00 2001 From: jan Date: Mon, 17 Jul 2023 15:58:14 +0200 Subject: [PATCH 044/182] =?UTF-8?q?=E2=9C=A8=20[prebuild]=20generate=20lis?= =?UTF-8?q?t=20of=20available=20FA=20Icons=20by=20style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prebuild/collectFAIconNames.ts | 58 ++++++++++++++++++++++++++++++++++ prebuild/index.ts | 2 ++ src/generated/faIcons.json | 1 + 3 files changed, 61 insertions(+) create mode 100644 prebuild/collectFAIconNames.ts create mode 100644 src/generated/faIcons.json diff --git a/prebuild/collectFAIconNames.ts b/prebuild/collectFAIconNames.ts new file mode 100644 index 0000000000..aaaea46405 --- /dev/null +++ b/prebuild/collectFAIconNames.ts @@ -0,0 +1,58 @@ +import fs from 'fs'; +import path from 'path'; + +import yaml from 'js-yaml'; + +// these Types have been extracted from the FontAwesome metadata/icons.yml +interface Icon { + changes: string[]; + label: string; + search: Search; + styles: string[]; + unicode: string; + voted: boolean; + aliases?: Aliases; +} + +interface Aliases { + names?: string[]; + unicodes?: Unicodes; +} + +interface Unicodes { + composite?: string[]; + secondary?: string[]; + primary?: string[]; +} + +interface Search { + terms: string[]; +} + +const iconsByStyle: Record = {}; + +const icons = yaml.load( + fs.readFileSync( + path.join( + __dirname, + '..', + 'node_modules', + '@fortawesome', + 'fontawesome-free', + 'metadata', + 'icons.yml' + ), + 'utf8' + ) +) as Record; +Object.entries(icons).forEach(([name, icon]) => + icon.styles.forEach(style => { + if (!iconsByStyle[style]) iconsByStyle[style] = []; + iconsByStyle[style].push(name, ...(icon.aliases?.names ?? [])); + }) +); +export default (): void => + fs.writeFileSync( + './src/generated/faIcons.json', + JSON.stringify(iconsByStyle) + ); diff --git a/prebuild/index.ts b/prebuild/index.ts index 2463c699a3..574cf9e409 100644 --- a/prebuild/index.ts +++ b/prebuild/index.ts @@ -1,5 +1,6 @@ import buildAPI from './api'; import buildUserscript from './buildUserscript'; +import collectFAIconNames from './collectFAIconNames'; import copyStatic from './copyStatic'; import { emptyFolder } from './emptyDir'; import getLibraries from './getLibraries'; @@ -26,6 +27,7 @@ const timeWrap = async (name: string, fn: () => Promise | unknown) => { await timeWrap('copyStatic', copyStatic); await timeWrap('build API', buildAPI); await timeWrap('Collect Third-Party Libraries', getLibraries); + await timeWrap('Collect FA-Icons', collectFAIconNames); console.timeEnd('prebuild'); console.log('Prebuild ran successfully, building...'); diff --git a/src/generated/faIcons.json b/src/generated/faIcons.json new file mode 100644 index 0000000000..decb7bb8f7 --- /dev/null +++ b/src/generated/faIcons.json @@ -0,0 +1 @@ +{"solid":["0","1","2","3","4","5","6","7","8","9","a","address-book","contact-book","address-card","contact-card","vcard","align-center","align-justify","align-left","align-right","anchor","anchor-circle-check","anchor-circle-exclamation","anchor-circle-xmark","anchor-lock","angle-down","angle-left","angle-right","angle-up","angles-down","angle-double-down","angles-left","angle-double-left","angles-right","angle-double-right","angles-up","angle-double-up","ankh","apple-whole","apple-alt","archway","arrow-down","arrow-down-1-9","sort-numeric-asc","sort-numeric-down","arrow-down-9-1","sort-numeric-desc","sort-numeric-down-alt","arrow-down-a-z","sort-alpha-asc","sort-alpha-down","arrow-down-long","long-arrow-down","arrow-down-short-wide","sort-amount-desc","sort-amount-down-alt","arrow-down-up-across-line","arrow-down-up-lock","arrow-down-wide-short","sort-amount-asc","sort-amount-down","arrow-down-z-a","sort-alpha-desc","sort-alpha-down-alt","arrow-left","arrow-left-long","long-arrow-left","arrow-pointer","mouse-pointer","arrow-right","arrow-right-arrow-left","exchange","arrow-right-from-bracket","sign-out","arrow-right-long","long-arrow-right","arrow-right-to-bracket","sign-in","arrow-right-to-city","arrow-rotate-left","arrow-left-rotate","arrow-rotate-back","arrow-rotate-backward","undo","arrow-rotate-right","arrow-right-rotate","arrow-rotate-forward","redo","arrow-trend-down","arrow-trend-up","arrow-turn-down","level-down","arrow-turn-up","level-up","arrow-up","arrow-up-1-9","sort-numeric-up","arrow-up-9-1","sort-numeric-up-alt","arrow-up-a-z","sort-alpha-up","arrow-up-from-bracket","arrow-up-from-ground-water","arrow-up-from-water-pump","arrow-up-long","long-arrow-up","arrow-up-right-dots","arrow-up-right-from-square","external-link","arrow-up-short-wide","sort-amount-up-alt","arrow-up-wide-short","sort-amount-up","arrow-up-z-a","sort-alpha-up-alt","arrows-down-to-line","arrows-down-to-people","arrows-left-right","arrows-h","arrows-left-right-to-line","arrows-rotate","refresh","sync","arrows-spin","arrows-split-up-and-left","arrows-to-circle","arrows-to-dot","arrows-to-eye","arrows-turn-right","arrows-turn-to-dots","arrows-up-down","arrows-v","arrows-up-down-left-right","arrows","arrows-up-to-line","asterisk","at","atom","audio-description","austral-sign","award","b","baby","baby-carriage","carriage-baby","backward","backward-fast","fast-backward","backward-step","step-backward","bacon","bacteria","bacterium","bag-shopping","shopping-bag","bahai","haykal","baht-sign","ban","cancel","ban-smoking","smoking-ban","bandage","band-aid","bangladeshi-taka-sign","barcode","bars","navicon","bars-progress","tasks-alt","bars-staggered","reorder","stream","baseball","baseball-ball","baseball-bat-ball","basket-shopping","shopping-basket","basketball","basketball-ball","bath","bathtub","battery-empty","battery-0","battery-full","battery","battery-5","battery-half","battery-3","battery-quarter","battery-2","battery-three-quarters","battery-4","bed","bed-pulse","procedures","beer-mug-empty","beer","bell","bell-concierge","concierge-bell","bell-slash","bezier-curve","bicycle","binoculars","biohazard","bitcoin-sign","blender","blender-phone","blog","bold","bolt","zap","bolt-lightning","bomb","bone","bong","book","book-atlas","atlas","book-bible","bible","book-bookmark","book-journal-whills","journal-whills","book-medical","book-open","book-open-reader","book-reader","book-quran","quran","book-skull","book-dead","book-tanakh","tanakh","bookmark","border-all","border-none","border-top-left","border-style","bore-hole","bottle-droplet","bottle-water","bowl-food","bowl-rice","bowling-ball","box","box-archive","archive","box-open","box-tissue","boxes-packing","boxes-stacked","boxes","boxes-alt","braille","brain","brazilian-real-sign","bread-slice","bridge","bridge-circle-check","bridge-circle-exclamation","bridge-circle-xmark","bridge-lock","bridge-water","briefcase","briefcase-medical","broom","broom-ball","quidditch","quidditch-broom-ball","brush","bucket","bug","bug-slash","bugs","building","building-circle-arrow-right","building-circle-check","building-circle-exclamation","building-circle-xmark","building-columns","bank","institution","museum","university","building-flag","building-lock","building-ngo","building-shield","building-un","building-user","building-wheat","bullhorn","bullseye","burger","hamburger","burst","bus","bus-simple","bus-alt","business-time","briefcase-clock","c","cable-car","tram","cake-candles","birthday-cake","cake","calculator","calendar","calendar-check","calendar-day","calendar-days","calendar-alt","calendar-minus","calendar-plus","calendar-week","calendar-xmark","calendar-times","camera","camera-alt","camera-retro","camera-rotate","campground","candy-cane","cannabis","capsules","car","automobile","car-battery","battery-car","car-burst","car-crash","car-on","car-rear","car-alt","car-side","car-tunnel","caravan","caret-down","caret-left","caret-right","caret-up","carrot","cart-arrow-down","cart-flatbed","dolly-flatbed","cart-flatbed-suitcase","luggage-cart","cart-plus","cart-shopping","shopping-cart","cash-register","cat","cedi-sign","cent-sign","certificate","chair","chalkboard","blackboard","chalkboard-user","chalkboard-teacher","champagne-glasses","glass-cheers","charging-station","chart-area","area-chart","chart-bar","bar-chart","chart-column","chart-gantt","chart-line","line-chart","chart-pie","pie-chart","chart-simple","check","check-double","check-to-slot","vote-yea","cheese","chess","chess-bishop","chess-board","chess-king","chess-knight","chess-pawn","chess-queen","chess-rook","chevron-down","chevron-left","chevron-right","chevron-up","child","child-combatant","child-rifle","child-dress","child-reaching","children","church","circle","circle-arrow-down","arrow-circle-down","circle-arrow-left","arrow-circle-left","circle-arrow-right","arrow-circle-right","circle-arrow-up","arrow-circle-up","circle-check","check-circle","circle-chevron-down","chevron-circle-down","circle-chevron-left","chevron-circle-left","circle-chevron-right","chevron-circle-right","circle-chevron-up","chevron-circle-up","circle-dollar-to-slot","donate","circle-dot","dot-circle","circle-down","arrow-alt-circle-down","circle-exclamation","exclamation-circle","circle-h","hospital-symbol","circle-half-stroke","adjust","circle-info","info-circle","circle-left","arrow-alt-circle-left","circle-minus","minus-circle","circle-nodes","circle-notch","circle-pause","pause-circle","circle-play","play-circle","circle-plus","plus-circle","circle-question","question-circle","circle-radiation","radiation-alt","circle-right","arrow-alt-circle-right","circle-stop","stop-circle","circle-up","arrow-alt-circle-up","circle-user","user-circle","circle-xmark","times-circle","xmark-circle","city","clapperboard","clipboard","clipboard-check","clipboard-list","clipboard-question","clipboard-user","clock","clock-four","clock-rotate-left","history","clone","closed-captioning","cloud","cloud-arrow-down","cloud-download","cloud-download-alt","cloud-arrow-up","cloud-upload","cloud-upload-alt","cloud-bolt","thunderstorm","cloud-meatball","cloud-moon","cloud-moon-rain","cloud-rain","cloud-showers-heavy","cloud-showers-water","cloud-sun","cloud-sun-rain","clover","code","code-branch","code-commit","code-compare","code-fork","code-merge","code-pull-request","coins","colon-sign","comment","comment-dollar","comment-dots","commenting","comment-medical","comment-slash","comment-sms","sms","comments","comments-dollar","compact-disc","compass","compass-drafting","drafting-compass","compress","computer","computer-mouse","mouse","cookie","cookie-bite","copy","copyright","couch","cow","credit-card","credit-card-alt","crop","crop-simple","crop-alt","cross","crosshairs","crow","crown","crutch","cruzeiro-sign","cube","cubes","cubes-stacked","d","database","delete-left","backspace","democrat","desktop","desktop-alt","dharmachakra","diagram-next","diagram-predecessor","diagram-project","project-diagram","diagram-successor","diamond","diamond-turn-right","directions","dice","dice-d20","dice-d6","dice-five","dice-four","dice-one","dice-six","dice-three","dice-two","disease","display","divide","dna","dog","dollar-sign","dollar","usd","dolly","dolly-box","dong-sign","door-closed","door-open","dove","down-left-and-up-right-to-center","compress-alt","down-long","long-arrow-alt-down","download","dragon","draw-polygon","droplet","tint","droplet-slash","tint-slash","drum","drum-steelpan","drumstick-bite","dumbbell","dumpster","dumpster-fire","dungeon","e","ear-deaf","deaf","deafness","hard-of-hearing","ear-listen","assistive-listening-systems","earth-africa","globe-africa","earth-americas","earth","earth-america","globe-americas","earth-asia","globe-asia","earth-europe","globe-europe","earth-oceania","globe-oceania","egg","eject","elevator","ellipsis","ellipsis-h","ellipsis-vertical","ellipsis-v","envelope","envelope-circle-check","envelope-open","envelope-open-text","envelopes-bulk","mail-bulk","equals","eraser","ethernet","euro-sign","eur","euro","exclamation","expand","explosion","eye","eye-dropper","eye-dropper-empty","eyedropper","eye-low-vision","low-vision","eye-slash","f","face-angry","angry","face-dizzy","dizzy","face-flushed","flushed","face-frown","frown","face-frown-open","frown-open","face-grimace","grimace","face-grin","grin","face-grin-beam","grin-beam","face-grin-beam-sweat","grin-beam-sweat","face-grin-hearts","grin-hearts","face-grin-squint","grin-squint","face-grin-squint-tears","grin-squint-tears","face-grin-stars","grin-stars","face-grin-tears","grin-tears","face-grin-tongue","grin-tongue","face-grin-tongue-squint","grin-tongue-squint","face-grin-tongue-wink","grin-tongue-wink","face-grin-wide","grin-alt","face-grin-wink","grin-wink","face-kiss","kiss","face-kiss-beam","kiss-beam","face-kiss-wink-heart","kiss-wink-heart","face-laugh","laugh","face-laugh-beam","laugh-beam","face-laugh-squint","laugh-squint","face-laugh-wink","laugh-wink","face-meh","meh","face-meh-blank","meh-blank","face-rolling-eyes","meh-rolling-eyes","face-sad-cry","sad-cry","face-sad-tear","sad-tear","face-smile","smile","face-smile-beam","smile-beam","face-smile-wink","smile-wink","face-surprise","surprise","face-tired","tired","fan","faucet","faucet-drip","fax","feather","feather-pointed","feather-alt","ferry","file","file-arrow-down","file-download","file-arrow-up","file-upload","file-audio","file-circle-check","file-circle-exclamation","file-circle-minus","file-circle-plus","file-circle-question","file-circle-xmark","file-code","file-contract","file-csv","file-excel","file-export","arrow-right-from-file","file-image","file-import","arrow-right-to-file","file-invoice","file-invoice-dollar","file-lines","file-alt","file-text","file-medical","file-pdf","file-pen","file-edit","file-powerpoint","file-prescription","file-shield","file-signature","file-video","file-waveform","file-medical-alt","file-word","file-zipper","file-archive","fill","fill-drip","film","filter","filter-circle-dollar","funnel-dollar","filter-circle-xmark","fingerprint","fire","fire-burner","fire-extinguisher","fire-flame-curved","fire-alt","fire-flame-simple","burn","fish","fish-fins","flag","flag-checkered","flag-usa","flask","flask-vial","floppy-disk","save","florin-sign","folder","folder-blank","folder-closed","folder-minus","folder-open","folder-plus","folder-tree","font","font-awesome","font-awesome-flag","font-awesome-logo-full","football","football-ball","forward","forward-fast","fast-forward","forward-step","step-forward","franc-sign","frog","futbol","futbol-ball","soccer-ball","g","gamepad","gas-pump","gauge","dashboard","gauge-med","tachometer-alt-average","gauge-high","tachometer-alt","tachometer-alt-fast","gauge-simple","gauge-simple-med","tachometer-average","gauge-simple-high","tachometer","tachometer-fast","gavel","legal","gear","cog","gears","cogs","gem","genderless","ghost","gift","gifts","glass-water","glass-water-droplet","glasses","globe","golf-ball-tee","golf-ball","gopuram","graduation-cap","mortar-board","greater-than","greater-than-equal","grip","grip-horizontal","grip-lines","grip-lines-vertical","grip-vertical","group-arrows-rotate","guarani-sign","guitar","gun","h","hammer","hamsa","hand","hand-paper","hand-back-fist","hand-rock","hand-dots","allergies","hand-fist","fist-raised","hand-holding","hand-holding-dollar","hand-holding-usd","hand-holding-droplet","hand-holding-water","hand-holding-hand","hand-holding-heart","hand-holding-medical","hand-lizard","hand-middle-finger","hand-peace","hand-point-down","hand-point-left","hand-point-right","hand-point-up","hand-pointer","hand-scissors","hand-sparkles","hand-spock","handcuffs","hands","sign-language","signing","hands-asl-interpreting","american-sign-language-interpreting","asl-interpreting","hands-american-sign-language-interpreting","hands-bound","hands-bubbles","hands-wash","hands-clapping","hands-holding","hands-holding-child","hands-holding-circle","hands-praying","praying-hands","handshake","handshake-angle","hands-helping","handshake-simple","handshake-alt","handshake-simple-slash","handshake-alt-slash","handshake-slash","hanukiah","hard-drive","hdd","hashtag","hat-cowboy","hat-cowboy-side","hat-wizard","head-side-cough","head-side-cough-slash","head-side-mask","head-side-virus","heading","header","headphones","headphones-simple","headphones-alt","headset","heart","heart-circle-bolt","heart-circle-check","heart-circle-exclamation","heart-circle-minus","heart-circle-plus","heart-circle-xmark","heart-crack","heart-broken","heart-pulse","heartbeat","helicopter","helicopter-symbol","helmet-safety","hard-hat","hat-hard","helmet-un","highlighter","hill-avalanche","hill-rockslide","hippo","hockey-puck","holly-berry","horse","horse-head","hospital","hospital-alt","hospital-wide","hospital-user","hot-tub-person","hot-tub","hotdog","hotel","hourglass","hourglass-empty","hourglass-end","hourglass-3","hourglass-half","hourglass-2","hourglass-start","hourglass-1","house","home","home-alt","home-lg-alt","house-chimney","home-lg","house-chimney-crack","house-damage","house-chimney-medical","clinic-medical","house-chimney-user","house-chimney-window","house-circle-check","house-circle-exclamation","house-circle-xmark","house-crack","house-fire","house-flag","house-flood-water","house-flood-water-circle-arrow-right","house-laptop","laptop-house","house-lock","house-medical","house-medical-circle-check","house-medical-circle-exclamation","house-medical-circle-xmark","house-medical-flag","house-signal","house-tsunami","house-user","home-user","hryvnia-sign","hryvnia","hurricane","i","i-cursor","ice-cream","icicles","icons","heart-music-camera-bolt","id-badge","id-card","drivers-license","id-card-clip","id-card-alt","igloo","image","image-portrait","portrait","images","inbox","indent","indian-rupee-sign","indian-rupee","inr","industry","infinity","info","italic","j","jar","jar-wheat","jedi","jet-fighter","fighter-jet","jet-fighter-up","joint","jug-detergent","k","kaaba","key","keyboard","khanda","kip-sign","kit-medical","first-aid","kitchen-set","kiwi-bird","l","land-mine-on","landmark","landmark-dome","landmark-alt","landmark-flag","language","laptop","laptop-code","laptop-file","laptop-medical","lari-sign","layer-group","leaf","left-long","long-arrow-alt-left","left-right","arrows-alt-h","lemon","less-than","less-than-equal","life-ring","lightbulb","lines-leaning","link","chain","link-slash","chain-broken","chain-slash","unlink","lira-sign","list","list-squares","list-check","tasks","list-ol","list-1-2","list-numeric","list-ul","list-dots","litecoin-sign","location-arrow","location-crosshairs","location","location-dot","map-marker-alt","location-pin","map-marker","location-pin-lock","lock","lock-open","locust","lungs","lungs-virus","m","magnet","magnifying-glass","search","magnifying-glass-arrow-right","magnifying-glass-chart","magnifying-glass-dollar","search-dollar","magnifying-glass-location","search-location","magnifying-glass-minus","search-minus","magnifying-glass-plus","search-plus","manat-sign","map","map-location","map-marked","map-location-dot","map-marked-alt","map-pin","marker","mars","mars-and-venus","mars-and-venus-burst","mars-double","mars-stroke","mars-stroke-right","mars-stroke-h","mars-stroke-up","mars-stroke-v","martini-glass","glass-martini-alt","martini-glass-citrus","cocktail","martini-glass-empty","glass-martini","mask","mask-face","mask-ventilator","masks-theater","theater-masks","mattress-pillow","maximize","expand-arrows-alt","medal","memory","menorah","mercury","message","comment-alt","meteor","microchip","microphone","microphone-lines","microphone-alt","microphone-lines-slash","microphone-alt-slash","microphone-slash","microscope","mill-sign","minimize","compress-arrows-alt","minus","subtract","mitten","mobile","mobile-android","mobile-phone","mobile-button","mobile-retro","mobile-screen","mobile-android-alt","mobile-screen-button","mobile-alt","money-bill","money-bill-1","money-bill-alt","money-bill-1-wave","money-bill-wave-alt","money-bill-transfer","money-bill-trend-up","money-bill-wave","money-bill-wheat","money-bills","money-check","money-check-dollar","money-check-alt","monument","moon","mortar-pestle","mosque","mosquito","mosquito-net","motorcycle","mound","mountain","mountain-city","mountain-sun","mug-hot","mug-saucer","coffee","music","n","naira-sign","network-wired","neuter","newspaper","not-equal","notdef","note-sticky","sticky-note","notes-medical","o","object-group","object-ungroup","oil-can","oil-well","om","otter","outdent","dedent","p","pager","paint-roller","paintbrush","paint-brush","palette","pallet","panorama","paper-plane","paperclip","parachute-box","paragraph","passport","paste","file-clipboard","pause","paw","peace","pen","pen-clip","pen-alt","pen-fancy","pen-nib","pen-ruler","pencil-ruler","pen-to-square","edit","pencil","pencil-alt","people-arrows","people-arrows-left-right","people-carry-box","people-carry","people-group","people-line","people-pulling","people-robbery","people-roof","pepper-hot","percent","percentage","person","male","person-arrow-down-to-line","person-arrow-up-from-line","person-biking","biking","person-booth","person-breastfeeding","person-burst","person-cane","person-chalkboard","person-circle-check","person-circle-exclamation","person-circle-minus","person-circle-plus","person-circle-question","person-circle-xmark","person-digging","digging","person-dots-from-line","diagnoses","person-dress","female","person-dress-burst","person-drowning","person-falling","person-falling-burst","person-half-dress","person-harassing","person-hiking","hiking","person-military-pointing","person-military-rifle","person-military-to-person","person-praying","pray","person-pregnant","person-rays","person-rifle","person-running","running","person-shelter","person-skating","skating","person-skiing","skiing","person-skiing-nordic","skiing-nordic","person-snowboarding","snowboarding","person-swimming","swimmer","person-through-window","person-walking","walking","person-walking-arrow-loop-left","person-walking-arrow-right","person-walking-dashed-line-arrow-right","person-walking-luggage","person-walking-with-cane","blind","peseta-sign","peso-sign","phone","phone-flip","phone-alt","phone-slash","phone-volume","volume-control-phone","photo-film","photo-video","piggy-bank","pills","pizza-slice","place-of-worship","plane","plane-arrival","plane-circle-check","plane-circle-exclamation","plane-circle-xmark","plane-departure","plane-lock","plane-slash","plane-up","plant-wilt","plate-wheat","play","plug","plug-circle-bolt","plug-circle-check","plug-circle-exclamation","plug-circle-minus","plug-circle-plus","plug-circle-xmark","plus","add","plus-minus","podcast","poo","poo-storm","poo-bolt","poop","power-off","prescription","prescription-bottle","prescription-bottle-medical","prescription-bottle-alt","print","pump-medical","pump-soap","puzzle-piece","q","qrcode","question","quote-left","quote-left-alt","quote-right","quote-right-alt","r","radiation","radio","rainbow","ranking-star","receipt","record-vinyl","rectangle-ad","ad","rectangle-list","list-alt","rectangle-xmark","rectangle-times","times-rectangle","window-close","recycle","registered","repeat","reply","mail-reply","reply-all","mail-reply-all","republican","restroom","retweet","ribbon","right-from-bracket","sign-out-alt","right-left","exchange-alt","right-long","long-arrow-alt-right","right-to-bracket","sign-in-alt","ring","road","road-barrier","road-bridge","road-circle-check","road-circle-exclamation","road-circle-xmark","road-lock","road-spikes","robot","rocket","rotate","sync-alt","rotate-left","rotate-back","rotate-backward","undo-alt","rotate-right","redo-alt","rotate-forward","route","rss","feed","ruble-sign","rouble","rub","ruble","rug","ruler","ruler-combined","ruler-horizontal","ruler-vertical","rupee-sign","rupee","rupiah-sign","s","sack-dollar","sack-xmark","sailboat","satellite","satellite-dish","scale-balanced","balance-scale","scale-unbalanced","balance-scale-left","scale-unbalanced-flip","balance-scale-right","school","school-circle-check","school-circle-exclamation","school-circle-xmark","school-flag","school-lock","scissors","cut","screwdriver","screwdriver-wrench","tools","scroll","scroll-torah","torah","sd-card","section","seedling","sprout","server","shapes","triangle-circle-square","share","arrow-turn-right","mail-forward","share-from-square","share-square","share-nodes","share-alt","sheet-plastic","shekel-sign","ils","shekel","sheqel","sheqel-sign","shield","shield-blank","shield-cat","shield-dog","shield-halved","shield-alt","shield-heart","shield-virus","ship","shirt","t-shirt","tshirt","shoe-prints","shop","store-alt","shop-lock","shop-slash","store-alt-slash","shower","shrimp","shuffle","random","shuttle-space","space-shuttle","sign-hanging","sign","signal","signal-5","signal-perfect","signature","signs-post","map-signs","sim-card","sink","sitemap","skull","skull-crossbones","slash","sleigh","sliders","sliders-h","smog","smoking","snowflake","snowman","snowplow","soap","socks","solar-panel","sort","unsorted","sort-down","sort-desc","sort-up","sort-asc","spa","spaghetti-monster-flying","pastafarianism","spell-check","spider","spinner","splotch","spoon","utensil-spoon","spray-can","spray-can-sparkles","air-freshener","square","square-arrow-up-right","external-link-square","square-caret-down","caret-square-down","square-caret-left","caret-square-left","square-caret-right","caret-square-right","square-caret-up","caret-square-up","square-check","check-square","square-envelope","envelope-square","square-full","square-h","h-square","square-minus","minus-square","square-nfi","square-parking","parking","square-pen","pen-square","pencil-square","square-person-confined","square-phone","phone-square","square-phone-flip","phone-square-alt","square-plus","plus-square","square-poll-horizontal","poll-h","square-poll-vertical","poll","square-root-variable","square-root-alt","square-rss","rss-square","square-share-nodes","share-alt-square","square-up-right","external-link-square-alt","square-virus","square-xmark","times-square","xmark-square","staff-snake","rod-asclepius","rod-snake","staff-aesculapius","stairs","stamp","stapler","star","star-and-crescent","star-half","star-half-stroke","star-half-alt","star-of-david","star-of-life","sterling-sign","gbp","pound-sign","stethoscope","stop","stopwatch","stopwatch-20","store","store-slash","street-view","strikethrough","stroopwafel","subscript","suitcase","suitcase-medical","medkit","suitcase-rolling","sun","sun-plant-wilt","superscript","swatchbook","synagogue","syringe","t","table","table-cells","th","table-cells-large","th-large","table-columns","columns","table-list","th-list","table-tennis-paddle-ball","ping-pong-paddle-ball","table-tennis","tablet","tablet-android","tablet-button","tablet-screen-button","tablet-alt","tablets","tachograph-digital","digital-tachograph","tag","tags","tape","tarp","tarp-droplet","taxi","cab","teeth","teeth-open","temperature-arrow-down","temperature-down","temperature-arrow-up","temperature-up","temperature-empty","temperature-0","thermometer-0","thermometer-empty","temperature-full","temperature-4","thermometer-4","thermometer-full","temperature-half","temperature-2","thermometer-2","thermometer-half","temperature-high","temperature-low","temperature-quarter","temperature-1","thermometer-1","thermometer-quarter","temperature-three-quarters","temperature-3","thermometer-3","thermometer-three-quarters","tenge-sign","tenge","tent","tent-arrow-down-to-line","tent-arrow-left-right","tent-arrow-turn-left","tent-arrows-down","tents","terminal","text-height","text-slash","remove-format","text-width","thermometer","thumbs-down","thumbs-up","thumbtack","thumb-tack","ticket","ticket-simple","ticket-alt","timeline","toggle-off","toggle-on","toilet","toilet-paper","toilet-paper-slash","toilet-portable","toilets-portable","toolbox","tooth","torii-gate","tornado","tower-broadcast","broadcast-tower","tower-cell","tower-observation","tractor","trademark","traffic-light","trailer","train","train-subway","subway","train-tram","transgender","transgender-alt","trash","trash-arrow-up","trash-restore","trash-can","trash-alt","trash-can-arrow-up","trash-restore-alt","tree","tree-city","triangle-exclamation","exclamation-triangle","warning","trophy","trowel","trowel-bricks","truck","truck-arrow-right","truck-droplet","truck-fast","shipping-fast","truck-field","truck-field-un","truck-front","truck-medical","ambulance","truck-monster","truck-moving","truck-pickup","truck-plane","truck-ramp-box","truck-loading","tty","teletype","turkish-lira-sign","try","turkish-lira","turn-down","level-down-alt","turn-up","level-up-alt","tv","television","tv-alt","u","umbrella","umbrella-beach","underline","universal-access","unlock","unlock-keyhole","unlock-alt","up-down","arrows-alt-v","up-down-left-right","arrows-alt","up-long","long-arrow-alt-up","up-right-and-down-left-from-center","expand-alt","up-right-from-square","external-link-alt","upload","user","user-astronaut","user-check","user-clock","user-doctor","user-md","user-gear","user-cog","user-graduate","user-group","user-friends","user-injured","user-large","user-alt","user-large-slash","user-alt-slash","user-lock","user-minus","user-ninja","user-nurse","user-pen","user-edit","user-plus","user-secret","user-shield","user-slash","user-tag","user-tie","user-xmark","user-times","users","users-between-lines","users-gear","users-cog","users-line","users-rays","users-rectangle","users-slash","users-viewfinder","utensils","cutlery","v","van-shuttle","shuttle-van","vault","vector-square","venus","venus-double","venus-mars","vest","vest-patches","vial","vial-circle-check","vial-virus","vials","video","video-camera","video-slash","vihara","virus","virus-covid","virus-covid-slash","virus-slash","viruses","voicemail","volcano","volleyball","volleyball-ball","volume-high","volume-up","volume-low","volume-down","volume-off","volume-xmark","volume-mute","volume-times","vr-cardboard","w","walkie-talkie","wallet","wand-magic","magic","wand-magic-sparkles","magic-wand-sparkles","wand-sparkles","warehouse","water","water-ladder","ladder-water","swimming-pool","wave-square","weight-hanging","weight-scale","weight","wheat-awn","wheat-alt","wheat-awn-circle-exclamation","wheelchair","wheelchair-move","wheelchair-alt","whiskey-glass","glass-whiskey","wifi","wifi-3","wifi-strong","wind","window-maximize","window-minimize","window-restore","wine-bottle","wine-glass","wine-glass-empty","wine-glass-alt","won-sign","krw","won","worm","wrench","x","x-ray","xmark","close","multiply","remove","times","xmarks-lines","y","yen-sign","cny","jpy","rmb","yen","yin-yang","z"],"brands":["42-group","innosoft","500px","accessible-icon","accusoft","adn","adversal","affiliatetheme","airbnb","algolia","alipay","amazon","amazon-pay","amilia","android","angellist","angrycreative","angular","app-store","app-store-ios","apper","apple","apple-pay","artstation","asymmetrik","atlassian","audible","autoprefixer","avianex","aviato","aws","bandcamp","battle-net","behance","bilibili","bimobject","bitbucket","bitcoin","bity","black-tie","blackberry","blogger","blogger-b","bluetooth","bluetooth-b","bootstrap","bots","btc","buffer","buromobelexperte","buy-n-large","buysellads","canadian-maple-leaf","cc-amazon-pay","cc-amex","cc-apple-pay","cc-diners-club","cc-discover","cc-jcb","cc-mastercard","cc-paypal","cc-stripe","cc-visa","centercode","centos","chrome","chromecast","cloudflare","cloudscale","cloudsmith","cloudversify","cmplid","codepen","codiepie","confluence","connectdevelop","contao","cotton-bureau","cpanel","creative-commons","creative-commons-by","creative-commons-nc","creative-commons-nc-eu","creative-commons-nc-jp","creative-commons-nd","creative-commons-pd","creative-commons-pd-alt","creative-commons-remix","creative-commons-sa","creative-commons-sampling","creative-commons-sampling-plus","creative-commons-share","creative-commons-zero","critical-role","css3","css3-alt","cuttlefish","d-and-d","d-and-d-beyond","dailymotion","dashcube","deezer","delicious","deploydog","deskpro","dev","deviantart","dhl","diaspora","digg","digital-ocean","discord","discourse","dochub","docker","draft2digital","dribbble","dropbox","drupal","dyalog","earlybirds","ebay","edge","edge-legacy","elementor","ello","ember","empire","envira","erlang","ethereum","etsy","evernote","expeditedssl","facebook","facebook-f","facebook-messenger","fantasy-flight-games","fedex","fedora","figma","firefox","firefox-browser","first-order","first-order-alt","firstdraft","flickr","flipboard","fly","font-awesome","font-awesome-flag","font-awesome-logo-full","fonticons","fonticons-fi","fort-awesome","fort-awesome-alt","forumbee","foursquare","free-code-camp","freebsd","fulcrum","galactic-republic","galactic-senate","get-pocket","gg","gg-circle","git","git-alt","github","github-alt","gitkraken","gitlab","gitter","glide","glide-g","gofore","golang","goodreads","goodreads-g","google","google-drive","google-pay","google-play","google-plus","google-plus-g","google-wallet","gratipay","grav","gripfire","grunt","guilded","gulp","hacker-news","hackerrank","hashnode","hips","hire-a-helper","hive","hooli","hornbill","hotjar","houzz","html5","hubspot","ideal","imdb","instagram","instalod","intercom","internet-explorer","invision","ioxhost","itch-io","itunes","itunes-note","java","jedi-order","jenkins","jira","joget","joomla","js","jsfiddle","kaggle","keybase","keycdn","kickstarter","kickstarter-k","korvue","laravel","lastfm","leanpub","less","line","linkedin","linkedin-in","linode","linux","lyft","magento","mailchimp","mandalorian","markdown","mastodon","maxcdn","mdb","medapps","medium","medium-m","medrt","meetup","megaport","mendeley","meta","microblog","microsoft","mix","mixcloud","mixer","mizuni","modx","monero","napster","neos","nfc-directional","nfc-symbol","nimblr","node","node-js","npm","ns8","nutritionix","octopus-deploy","odnoklassniki","odysee","old-republic","opencart","openid","opera","optin-monster","orcid","osi","padlet","page4","pagelines","palfed","patreon","paypal","perbyte","periscope","phabricator","phoenix-framework","phoenix-squadron","php","pied-piper","pied-piper-alt","pied-piper-hat","pied-piper-pp","pinterest","pinterest-p","pix","playstation","product-hunt","pushed","python","qq","quinscape","quora","r-project","raspberry-pi","ravelry","react","reacteurope","readme","rebel","red-river","reddit","reddit-alien","redhat","renren","replyd","researchgate","resolving","rev","rocketchat","rockrms","rust","safari","salesforce","sass","schlix","screenpal","scribd","searchengin","sellcast","sellsy","servicestack","shirtsinbulk","shopify","shopware","simplybuilt","sistrix","sith","sitrox","sketch","skyatlas","skype","slack","slack-hash","slideshare","snapchat","snapchat-ghost","soundcloud","sourcetree","space-awesome","speakap","speaker-deck","spotify","square-behance","behance-square","square-dribbble","dribbble-square","square-facebook","facebook-square","square-font-awesome","square-font-awesome-stroke","font-awesome-alt","square-git","git-square","square-github","github-square","square-gitlab","gitlab-square","square-google-plus","google-plus-square","square-hacker-news","hacker-news-square","square-instagram","instagram-square","square-js","js-square","square-lastfm","lastfm-square","square-odnoklassniki","odnoklassniki-square","square-pied-piper","pied-piper-square","square-pinterest","pinterest-square","square-reddit","reddit-square","square-snapchat","snapchat-square","square-steam","steam-square","square-tumblr","tumblr-square","square-twitter","twitter-square","square-viadeo","viadeo-square","square-vimeo","vimeo-square","square-whatsapp","whatsapp-square","square-xing","xing-square","square-youtube","youtube-square","squarespace","stack-exchange","stack-overflow","stackpath","staylinked","steam","steam-symbol","sticker-mule","strava","stripe","stripe-s","stubber","studiovinari","stumbleupon","stumbleupon-circle","superpowers","supple","suse","swift","symfony","teamspeak","telegram","telegram-plane","tencent-weibo","the-red-yeti","themeco","themeisle","think-peaks","tiktok","trade-federation","trello","tumblr","twitch","twitter","typo3","uber","ubuntu","uikit","umbraco","uncharted","uniregistry","unity","unsplash","untappd","ups","usb","usps","ussunnah","vaadin","viacoin","viadeo","viber","vimeo","vimeo-v","vine","vk","vnv","vuejs","watchman-monitoring","waze","weebly","weibo","weixin","whatsapp","whmcs","wikipedia-w","windows","wirsindhandwerk","wsh","wix","wizards-of-the-coast","wodu","wolf-pack-battalion","wordpress","wordpress-simple","wpbeginner","wpexplorer","wpforms","wpressr","rendact","xbox","xing","y-combinator","yahoo","yammer","yandex","yandex-international","yarn","yelp","yoast","youtube","zhihu"],"regular":["address-book","contact-book","address-card","contact-card","vcard","bell","bell-slash","bookmark","building","calendar","calendar-check","calendar-days","calendar-alt","calendar-minus","calendar-plus","calendar-xmark","calendar-times","chart-bar","bar-chart","chess-bishop","chess-king","chess-knight","chess-pawn","chess-queen","chess-rook","circle","circle-check","check-circle","circle-dot","dot-circle","circle-down","arrow-alt-circle-down","circle-left","arrow-alt-circle-left","circle-pause","pause-circle","circle-play","play-circle","circle-question","question-circle","circle-right","arrow-alt-circle-right","circle-stop","stop-circle","circle-up","arrow-alt-circle-up","circle-user","user-circle","circle-xmark","times-circle","xmark-circle","clipboard","clock","clock-four","clone","closed-captioning","comment","comment-dots","commenting","comments","compass","copy","copyright","credit-card","credit-card-alt","envelope","envelope-open","eye","eye-slash","face-angry","angry","face-dizzy","dizzy","face-flushed","flushed","face-frown","frown","face-frown-open","frown-open","face-grimace","grimace","face-grin","grin","face-grin-beam","grin-beam","face-grin-beam-sweat","grin-beam-sweat","face-grin-hearts","grin-hearts","face-grin-squint","grin-squint","face-grin-squint-tears","grin-squint-tears","face-grin-stars","grin-stars","face-grin-tears","grin-tears","face-grin-tongue","grin-tongue","face-grin-tongue-squint","grin-tongue-squint","face-grin-tongue-wink","grin-tongue-wink","face-grin-wide","grin-alt","face-grin-wink","grin-wink","face-kiss","kiss","face-kiss-beam","kiss-beam","face-kiss-wink-heart","kiss-wink-heart","face-laugh","laugh","face-laugh-beam","laugh-beam","face-laugh-squint","laugh-squint","face-laugh-wink","laugh-wink","face-meh","meh","face-meh-blank","meh-blank","face-rolling-eyes","meh-rolling-eyes","face-sad-cry","sad-cry","face-sad-tear","sad-tear","face-smile","smile","face-smile-beam","smile-beam","face-smile-wink","smile-wink","face-surprise","surprise","face-tired","tired","file","file-audio","file-code","file-excel","file-image","file-lines","file-alt","file-text","file-pdf","file-powerpoint","file-video","file-word","file-zipper","file-archive","flag","floppy-disk","save","folder","folder-blank","folder-closed","folder-open","font-awesome","font-awesome-flag","font-awesome-logo-full","futbol","futbol-ball","soccer-ball","gem","hand","hand-paper","hand-back-fist","hand-rock","hand-lizard","hand-peace","hand-point-down","hand-point-left","hand-point-right","hand-point-up","hand-pointer","hand-scissors","hand-spock","handshake","hard-drive","hdd","heart","hospital","hospital-alt","hospital-wide","hourglass","hourglass-empty","hourglass-half","hourglass-2","id-badge","id-card","drivers-license","image","images","keyboard","lemon","life-ring","lightbulb","map","message","comment-alt","money-bill-1","money-bill-alt","moon","newspaper","note-sticky","sticky-note","object-group","object-ungroup","paper-plane","paste","file-clipboard","pen-to-square","edit","rectangle-list","list-alt","rectangle-xmark","rectangle-times","times-rectangle","window-close","registered","share-from-square","share-square","snowflake","square","square-caret-down","caret-square-down","square-caret-left","caret-square-left","square-caret-right","caret-square-right","square-caret-up","caret-square-up","square-check","check-square","square-full","square-minus","minus-square","square-plus","plus-square","star","star-half","star-half-stroke","star-half-alt","sun","thumbs-down","thumbs-up","trash-can","trash-alt","user","window-maximize","window-minimize","window-restore"]} \ No newline at end of file From 4514790870cedbf30763435f74641f8a5c816c9c Mon Sep 17 00:00:00 2001 From: jan Date: Mon, 17 Jul 2023 16:25:36 +0200 Subject: [PATCH 045/182] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[ecw/ai]=20migrate?= =?UTF-8?q?=20alarmIcons=20preview=20to=20composition=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/alarmIcons/aiPreview.vue | 38 +++++++++++++++++++ .../components/alarmIcons/preview.vue | 26 ------------- src/modules/extendedCallWindow/settings.ts | 6 +-- 3 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 src/modules/extendedCallWindow/components/alarmIcons/aiPreview.vue delete mode 100644 src/modules/extendedCallWindow/components/alarmIcons/preview.vue diff --git a/src/modules/extendedCallWindow/components/alarmIcons/aiPreview.vue b/src/modules/extendedCallWindow/components/alarmIcons/aiPreview.vue new file mode 100644 index 0000000000..13c1603b85 --- /dev/null +++ b/src/modules/extendedCallWindow/components/alarmIcons/aiPreview.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/modules/extendedCallWindow/components/alarmIcons/preview.vue b/src/modules/extendedCallWindow/components/alarmIcons/preview.vue deleted file mode 100644 index 24d4a4494a..0000000000 --- a/src/modules/extendedCallWindow/components/alarmIcons/preview.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/src/modules/extendedCallWindow/settings.ts b/src/modules/extendedCallWindow/settings.ts index aee1aa77de..180a0fa5b3 100644 --- a/src/modules/extendedCallWindow/settings.ts +++ b/src/modules/extendedCallWindow/settings.ts @@ -1,4 +1,4 @@ -import aipreview from './components/alarmIcons/preview.vue'; +import aiPreview from './components/alarmIcons/aiPreview.vue'; import mkPreview from './components/missionKeywords/mkPreview.vue'; import type { $m, ModuleSettingFunction } from 'typings/Module'; @@ -431,9 +431,9 @@ export default (async (MODULE_ID: string, LSSM: Vue, $m: $m) => { labels: ['solid', 'regular', 'brand'], }, }, - { + >{ type: 'preview', - component: aipreview, + component: aiPreview, title: $m('settings.alarmIcons.preview'), size: 1, }, From 3c59d364c49b0196f026af7fc4b5eb913bc68e38 Mon Sep 17 00:00:00 2001 From: Tobias Date: Mon, 17 Jul 2023 22:44:07 +0200 Subject: [PATCH 046/182] =?UTF-8?q?=F0=9F=93=9D=20[docs]=20docs=20improvem?= =?UTF-8?q?ents?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de_DE/f\303\244rbbareAAO-Kategorien.png" | Bin src/modules/extendedCallWindow/docs/de_DE.md | 2 +- src/modules/redesign/docs/pl_PL.md | 7 ++++--- src/modules/schoolingOverview/docs/fr_FR.md | 2 +- src/modules/shareAlliancePost/docs/fr_FR.md | 18 +++++++++--------- 5 files changed, 15 insertions(+), 14 deletions(-) rename "src/modules/extendedCallWindow/docs/assets/de_DE/F\303\244rbbare AAO-Kategorien.png" => "src/modules/extendedCallWindow/docs/assets/de_DE/f\303\244rbbareAAO-Kategorien.png" (100%) diff --git "a/src/modules/extendedCallWindow/docs/assets/de_DE/F\303\244rbbare AAO-Kategorien.png" "b/src/modules/extendedCallWindow/docs/assets/de_DE/f\303\244rbbareAAO-Kategorien.png" similarity index 100% rename from "src/modules/extendedCallWindow/docs/assets/de_DE/F\303\244rbbare AAO-Kategorien.png" rename to "src/modules/extendedCallWindow/docs/assets/de_DE/f\303\244rbbareAAO-Kategorien.png" diff --git a/src/modules/extendedCallWindow/docs/de_DE.md b/src/modules/extendedCallWindow/docs/de_DE.md index a89b5f6ca3..b7519567c1 100644 --- a/src/modules/extendedCallWindow/docs/de_DE.md +++ b/src/modules/extendedCallWindow/docs/de_DE.md @@ -264,4 +264,4 @@ Zur besseren Übersicht kann man die Tabs der AAO-Kategorien individuell anpasse Sowohl für die Hintergrund-, als auch die Schriftfarbe können entweder Standard- oder benutzerdefinierte Farben ausgewählt werden. -![Färbbare AAO-Kategorien](./Färbbare AAO-Kategorien.png) +![Färbbare AAO-Kategorien](./färbbareAAO-Kategorien.png) diff --git a/src/modules/redesign/docs/pl_PL.md b/src/modules/redesign/docs/pl_PL.md index 72de66e689..4e32355e6a 100644 --- a/src/modules/redesign/docs/pl_PL.md +++ b/src/modules/redesign/docs/pl_PL.md @@ -7,10 +7,11 @@ ponieważ przeprojektowanie szybko powoduje, -| Zalety | Wady | -| :------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------: | --- | + +| Zalety | Wady | +| :-----------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | | Cała gra działa trochę szybciej. | Niektóre skrypty mogą nie działać z “przeprojektowaniem” bez dodatkowej pracy. Oczywiście przed premierą upewniamy się, że wszystkie popularne skrypty są kompatybilne. | -| Świeży i nowoczesny design. | Będziesz musiał się przyzwyczaić do znacznie zmienionego wyglądu gry | | +| Świeży i nowoczesny design. | Będziesz musiał się przyzwyczaić do znacznie zmienionego wyglądu gry | diff --git a/src/modules/schoolingOverview/docs/fr_FR.md b/src/modules/schoolingOverview/docs/fr_FR.md index 1953903403..1934d50ce0 100644 --- a/src/modules/schoolingOverview/docs/fr_FR.md +++ b/src/modules/schoolingOverview/docs/fr_FR.md @@ -26,4 +26,4 @@ Voici par exemple ce qui se passe pour les formations avec vos propres participa Et pour les formations ouvertes : -! [Formations ouvertes](alliance.png) +![Formations ouvertes](./alliance.png) diff --git a/src/modules/shareAlliancePost/docs/fr_FR.md b/src/modules/shareAlliancePost/docs/fr_FR.md index fe4ee39da1..924655fe6f 100644 --- a/src/modules/shareAlliancePost/docs/fr_FR.md +++ b/src/modules/shareAlliancePost/docs/fr_FR.md @@ -8,11 +8,11 @@ Vous pouvez définir des modèles pour les notes d'incident dans les paramètres ### Crédits -<> `{{credits}}` sont remplacés par les crédits moyens, les récompenses de la mission. + `{{credits}}` sont remplacés par les crédits moyens, les récompenses de la mission. ### Adresse -<> `{{address}}` est remplacé par l'adresse complète de la mission. + `{{address}}` est remplacé par l'adresse complète de la mission. Vous pouvez utiliser `{{city}}` pour insérer uniquement le code postal et le nom de la ville. @@ -20,20 +20,20 @@ Pour ne pas avoir le code postal/zipcode, il suffit d'utiliser `{{cityWithoutZip ### Restant -<> `{{remaining}}` est remplacé par les véhicules qui sont encore nécessaires pour cette mission. + `{{remaining}}` est remplacé par les véhicules qui sont encore nécessaires pour cette mission. Il reflète exactement le texte dans la case rouge "Véhicules nécessaires". ### Patients -<> `{{patients}}` est remplacé par le nombre de patients actuellement présents à la mission. + `{{patients}}` est remplacé par le nombre de patients actuellement présents à la mission. ### Début d'une mission planifiée -<> `{{beginAt}}` est remplacé par l'heure à laquelle une mission planifiée commencera. + `{{beginAt}}` est remplacé par l'heure à laquelle une mission planifiée commencera. ### Nom de la mission -<> `{{name}}` est remplacé par le nom de la mission. +`{{name}}` est remplacé par le nom de la mission. **Uniquement disponible dans la fenêtre de mission** `{{remainingSpecial}}` est remplacé par les véhicules en approche et ceux sélectionnés. @@ -41,13 +41,13 @@ Donc ceux de la liste des Interventions (le contenu de la boîte rouge). ### Le trajet le plus long -<> `{{longestDrive}}` +`{{longestDrive}}` est remplacé par le temps qu'il faut pour que tous les véhicules sélectionnés soient sur place. **Important** : Cette variable n'est évidemment pas disponible lors du partage dans la liste des missions ! ### Date -<> `{{today}}` est remplacé par la date local (jour et mois). +`{{today}}` est remplacé par la date local (jour et mois). De même, `{{tomorrow}}` produit la date de demain (jour et mois). @@ -55,7 +55,7 @@ De même, `{{tomorrow}}` produit la date de demain (jour et mois). Vous pouvez également définir des distances temporelles. Le système est un peu compliqué, alors lisez attentivement : -<> `{{now+5}}` ajoute exactement 5 heures, `{{now+5.5}}` ajoute 5 heures et 30 minutes. +`{{now+5}}` ajoute exactement 5 heures, `{{now+5.5}}` ajoute 5 heures et 30 minutes. Vous pouvez utiliser n'importe quel nombre à ajouter. Vous pouvez également choisir d'arrondir à l'unité supérieure ou inférieure. From c93f2e683651d3461c79d8c8cf89b72aad315a1c Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 17 Jul 2023 20:48:24 +0000 Subject: [PATCH 047/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230717?= =?UTF-8?q?.2245=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/modules/redesign/docs/pl_PL.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 06a3ff9e5e..d2c9f57dc8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230717.1009", + "version": "4.7.7+20230717.2245", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/modules/redesign/docs/pl_PL.md b/src/modules/redesign/docs/pl_PL.md index 4e32355e6a..c51863312e 100644 --- a/src/modules/redesign/docs/pl_PL.md +++ b/src/modules/redesign/docs/pl_PL.md @@ -7,7 +7,6 @@ ponieważ przeprojektowanie szybko powoduje, - | Zalety | Wady | | :-----------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | | Cała gra działa trochę szybciej. | Niektóre skrypty mogą nie działać z “przeprojektowaniem” bez dodatkowej pracy. Oczywiście przed premierą upewniamy się, że wszystkie popularne skrypty są kompatybilne. | From ab4f892e4f9a6b9b0012ccf84aaf3fa530e97870 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 22:39:47 +0000 Subject: [PATCH 048/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20typescrip?= =?UTF-8?q?t-eslint=20to=20v6.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- yarn.lock | 130 +++++++++++++++++++++++++-------------------------- 2 files changed, 66 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index d2c9f57dc8..b3d263e754 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "@types/ua-parser-js": "0.7.36", "@types/vue-select": "3.16.2", "@types/webpack-env": "1.18.1", - "@typescript-eslint/eslint-plugin": "6.0.0", - "@typescript-eslint/parser": "6.0.0", + "@typescript-eslint/eslint-plugin": "6.1.0", + "@typescript-eslint/parser": "6.1.0", "all-contributors-cli": "6.26.1", "copy-dir": "1.3.0", "css-loader": "6.8.1", diff --git a/yarn.lock b/yarn.lock index 23ec475099..678ca53a7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1536,7 +1536,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.5.0": +"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.5.0, @eslint-community/regexpp@npm:^4.5.1": version: 4.5.1 resolution: "@eslint-community/regexpp@npm:4.5.1" checksum: 6d901166d64998d591fab4db1c2f872981ccd5f6fe066a1ad0a93d4e11855ecae6bfb76660869a469563e8882d4307228cebd41142adb409d182f2966771e57e @@ -2299,7 +2299,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.11, @types/json-schema@npm:^7.0.8": +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8": version: 7.0.12 resolution: "@types/json-schema@npm:7.0.12" checksum: 00239e97234eeb5ceefb0c1875d98ade6e922bfec39dd365ec6bd360b5c2f825e612ac4f6e5f1d13601b8b30f378f15e6faa805a3a732f4a1bbe61915163d293 @@ -2459,7 +2459,7 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:7.5.0, @types/semver@npm:^7.3.12": +"@types/semver@npm:7.5.0, @types/semver@npm:^7.5.0": version: 7.5.0 resolution: "@types/semver@npm:7.5.0" checksum: 0a64b9b9c7424d9a467658b18dd70d1d781c2d6f033096a6e05762d20ebbad23c1b69b0083b0484722aabf35640b78ccc3de26368bcae1129c87e9df028a22e2 @@ -2524,22 +2524,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.0.0" +"@typescript-eslint/eslint-plugin@npm:6.1.0": + version: 6.1.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.1.0" dependencies: - "@eslint-community/regexpp": ^4.5.0 - "@typescript-eslint/scope-manager": 6.0.0 - "@typescript-eslint/type-utils": 6.0.0 - "@typescript-eslint/utils": 6.0.0 - "@typescript-eslint/visitor-keys": 6.0.0 + "@eslint-community/regexpp": ^4.5.1 + "@typescript-eslint/scope-manager": 6.1.0 + "@typescript-eslint/type-utils": 6.1.0 + "@typescript-eslint/utils": 6.1.0 + "@typescript-eslint/visitor-keys": 6.1.0 debug: ^4.3.4 - grapheme-splitter: ^1.0.4 graphemer: ^1.4.0 ignore: ^5.2.4 natural-compare: ^1.4.0 natural-compare-lite: ^1.4.0 - semver: ^7.5.0 + semver: ^7.5.4 ts-api-utils: ^1.0.1 peerDependencies: "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha @@ -2547,44 +2546,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 863f30b8ceb24d104fc8a41774e4f597a35525533aa99721198293b51628a2d986dcc6413893f27eb9db5a49c2fd2cc91d3aece8ed23d590f3eb4e9939c3d6ad + checksum: e1f05d8d49041b47cdbea8fc80f87f03dc0f7273deb2f34f73661831572fe62976ab3780972496428ce6fa31d3f53236a4c90cd9948d45f5004631edbfa3d42a languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/parser@npm:6.0.0" +"@typescript-eslint/parser@npm:6.1.0": + version: 6.1.0 + resolution: "@typescript-eslint/parser@npm:6.1.0" dependencies: - "@typescript-eslint/scope-manager": 6.0.0 - "@typescript-eslint/types": 6.0.0 - "@typescript-eslint/typescript-estree": 6.0.0 - "@typescript-eslint/visitor-keys": 6.0.0 + "@typescript-eslint/scope-manager": 6.1.0 + "@typescript-eslint/types": 6.1.0 + "@typescript-eslint/typescript-estree": 6.1.0 + "@typescript-eslint/visitor-keys": 6.1.0 debug: ^4.3.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: a22f0c8f67eb244134f9d79d78faf1b6e2c0965495d78eef94a5680868f3d0fd9446a3ce5dc1e36dde02587da5d962944f3d83679c712d0b819ac99cdb9f7143 + checksum: dc59cda4396ca09e3aa2bd5b99d8ef9526df56567d4a9b953668102116db975dfb2426c3369560a2b02e083d49e43b4cebb252144d175e900096eb0b17f7ae3c languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/scope-manager@npm:6.0.0" +"@typescript-eslint/scope-manager@npm:6.1.0": + version: 6.1.0 + resolution: "@typescript-eslint/scope-manager@npm:6.1.0" dependencies: - "@typescript-eslint/types": 6.0.0 - "@typescript-eslint/visitor-keys": 6.0.0 - checksum: 450015be6454f953d0ea0da020ab47597e96a7a15c1002eed16c57430783bd7b045513d57a126606fb35e8971f1ce65fbefd845e3b5496bf75284cbe1681d0b9 + "@typescript-eslint/types": 6.1.0 + "@typescript-eslint/visitor-keys": 6.1.0 + checksum: 57c73b8713be79abebbcfef1d58f78a820ea88a5c37a44d2c9a76130216d9ee824134fae215dde794121cfaf1284370da77e1e5184ba71812aebb1a8cf39f325 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/type-utils@npm:6.0.0" +"@typescript-eslint/type-utils@npm:6.1.0": + version: 6.1.0 + resolution: "@typescript-eslint/type-utils@npm:6.1.0" dependencies: - "@typescript-eslint/typescript-estree": 6.0.0 - "@typescript-eslint/utils": 6.0.0 + "@typescript-eslint/typescript-estree": 6.1.0 + "@typescript-eslint/utils": 6.1.0 debug: ^4.3.4 ts-api-utils: ^1.0.1 peerDependencies: @@ -2592,60 +2591,59 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 53f46237891cfa738f6a4bc766a4dbb8d745b1cb9cbe2d2b40f2a4abcf0327d4aa92d9ce5361e87cd26d82e0159f358e28b0c67759eb053c4fd752654dc9dcb1 + checksum: 83b2ffcf3aa297b60deb2e9ddd946b9c15cc55d0727dfc8a3447e8e5402428f6ee3fc67fb9d5d8ade25da4069ca77e23777caf02bcacd2a1e75b66cfc4d76579 languageName: node linkType: hard -"@typescript-eslint/types@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/types@npm:6.0.0" - checksum: a2e232b66b0b057152f4a94d7e0be75f32e389c9c1ec9ed9901ed5aab6e5df08c07bde9865710e315d835e4400ec2232f9c3c525b6edf8a85675ebfbfb69d3a5 +"@typescript-eslint/types@npm:6.1.0": + version: 6.1.0 + resolution: "@typescript-eslint/types@npm:6.1.0" + checksum: c1f55ebfda7af5e63077beb65fe5a82de7ae7afb913a4ebfb023f2889d5ec06f75b6ebca6ee45d6d205508a52fa5a6bf5821182c3e7e4400ac9304083b88f139 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.0.0" +"@typescript-eslint/typescript-estree@npm:6.1.0": + version: 6.1.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.1.0" dependencies: - "@typescript-eslint/types": 6.0.0 - "@typescript-eslint/visitor-keys": 6.0.0 + "@typescript-eslint/types": 6.1.0 + "@typescript-eslint/visitor-keys": 6.1.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 - semver: ^7.5.0 + semver: ^7.5.4 ts-api-utils: ^1.0.1 peerDependenciesMeta: typescript: optional: true - checksum: 6214ff9cc3c4fd7fe03f846e96a498ecf85916083bb60d419bc5a12142cff912670032b1de5ea52ab353ca7eeb4e1cc8fa475a22958b010043c88e274df49859 + checksum: 42729b8952a78ff9fc7d3833e16de25f1a3502461ebe5d09a28fb4375c8e5978dde0dd1f8a7973bf7470ff9023cce84de82e968b02a09f54a0f753d21d9127e8 languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/utils@npm:6.0.0" +"@typescript-eslint/utils@npm:6.1.0": + version: 6.1.0 + resolution: "@typescript-eslint/utils@npm:6.1.0" dependencies: - "@eslint-community/eslint-utils": ^4.3.0 - "@types/json-schema": ^7.0.11 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 6.0.0 - "@typescript-eslint/types": 6.0.0 - "@typescript-eslint/typescript-estree": 6.0.0 - eslint-scope: ^5.1.1 - semver: ^7.5.0 + "@eslint-community/eslint-utils": ^4.4.0 + "@types/json-schema": ^7.0.12 + "@types/semver": ^7.5.0 + "@typescript-eslint/scope-manager": 6.1.0 + "@typescript-eslint/types": 6.1.0 + "@typescript-eslint/typescript-estree": 6.1.0 + semver: ^7.5.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 94b9b616282f6fa1ae50ba371a482a3c8c50268ef8039b4e86d29c445e95025c819358a5cc9955c4668482d97ef026e7a49e7f4b3a4685347136ef5bbd297e4d + checksum: eb47a6b56e142ca68231f0f43af68d4cf5161235943aaf19c268156e3e751e10dd8ea3e0e297a7c0796b9eb3c5268b3c659821b909799949b55a524707c82e13 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.0.0": - version: 6.0.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.0.0" +"@typescript-eslint/visitor-keys@npm:6.1.0": + version: 6.1.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.1.0" dependencies: - "@typescript-eslint/types": 6.0.0 + "@typescript-eslint/types": 6.1.0 eslint-visitor-keys: ^3.4.1 - checksum: b0d9848a4490174db1d25b5f336548bb11dde4e0ce664c3dc341bed89fb3a3ada091aeb7f5d2d371433815332d93339c6cb77f7a24469c329c3d055b15237bfa + checksum: 21c7c9b9a52325e3b67c0015deb99a1603b19703af7c002e87f32e2d8f9910813985877ee7b589dc9938d308e3d082cf97c8ca43c2c95b86a919c426d8913439 languageName: node linkType: hard @@ -5160,7 +5158,7 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.1": +"eslint-scope@npm:5.1.1": version: 5.1.1 resolution: "eslint-scope@npm:5.1.1" dependencies: @@ -7009,8 +7007,8 @@ __metadata: "@types/ua-parser-js": 0.7.36 "@types/vue-select": 3.16.2 "@types/webpack-env": 1.18.1 - "@typescript-eslint/eslint-plugin": 6.0.0 - "@typescript-eslint/parser": 6.0.0 + "@typescript-eslint/eslint-plugin": 6.1.0 + "@typescript-eslint/parser": 6.1.0 acorn: 8.10.0 acorn-walk: 8.2.0 all-contributors-cli: 6.26.1 @@ -8680,7 +8678,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.4, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.1, semver@npm:^7.5.4": +"semver@npm:7.5.4, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: From b67e680f3016557f6acddedbe0ab311302de6382 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 18 Jul 2023 04:49:59 +0000 Subject: [PATCH 049/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230718?= =?UTF-8?q?.0647=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b3d263e754..b23728b9c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230717.2245", + "version": "4.7.7+20230718.0647", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index ddd4bb4227..b52d92cf47 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -110,11 +110,11 @@ }, "@typescript-eslint/eslint-plugin": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "6.0.0" + "version": "6.1.0" }, "@typescript-eslint/parser": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "6.0.0" + "version": "6.1.0" }, "@vuepress/client": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", From 61512b049e9dbc0717cd7de48f6fc7fa3eaee252 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 04:51:03 +0000 Subject: [PATCH 050/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`terser`?= =?UTF-8?q?=20to=20v5.19.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b23728b9c9..f27717a75f 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "prettier": "3.0.0", "sass": "1.63.6", "sass-loader": "13.3.2", - "terser": "5.19.0", + "terser": "5.19.1", "ts-loader": "9.4.4", "ts-node": "10.9.1", "typescript": "5.1.6", diff --git a/yarn.lock b/yarn.lock index 678ca53a7b..8aa9cc3cf9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7047,7 +7047,7 @@ __metadata: sass-loader: 13.3.2 semver: 7.5.4 showdown: 2.1.0 - terser: 5.19.0 + terser: 5.19.1 ts-loader: 9.4.4 ts-node: 10.9.1 typescript: 5.1.6 @@ -9230,7 +9230,21 @@ __metadata: languageName: node linkType: hard -"terser@npm:5.19.0, terser@npm:^5.0.0, terser@npm:^5.15.1, terser@npm:^5.16.8": +"terser@npm:5.19.1": + version: 5.19.1 + resolution: "terser@npm:5.19.1" + dependencies: + "@jridgewell/source-map": ^0.3.3 + acorn: ^8.8.2 + commander: ^2.20.0 + source-map-support: ~0.5.20 + bin: + terser: bin/terser + checksum: 18657b2a282238a1ca9c825efa966f4dd043a33196b2f8a7a2cba406a2006e14f55295b9d9cf6380a18599b697e9579e4092c99b9f40c7871ceec01cc98e3606 + languageName: node + linkType: hard + +"terser@npm:^5.0.0, terser@npm:^5.15.1, terser@npm:^5.16.8": version: 5.19.0 resolution: "terser@npm:5.19.0" dependencies: From 7a7a99ec89f6a1c239dd575707e553dbc4b63025 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 18 Jul 2023 05:22:36 +0000 Subject: [PATCH 051/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230718?= =?UTF-8?q?.0719=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f27717a75f..9c74632c58 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230718.0647", + "version": "4.7.7+20230718.0719", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index b52d92cf47..974882731e 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -321,7 +321,7 @@ "terser": { "icon": "https://terser.org/img/terser-square-logo.png", "url": "https://terser.org", - "version": "5.19.0" + "version": "5.19.1" }, "ts-loader": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From b56a65e4df6dabf9bd4ac242baed5e069113a57a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 05:23:42 +0000 Subject: [PATCH 052/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`webpack`?= =?UTF-8?q?=20to=20v5.88.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9c74632c58..acd300e4ac 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "util": "0.12.5", "vue-loader": "15.10.1", "vue-template-compiler": "2.7.14", - "webpack": "5.88.1" + "webpack": "5.88.2" }, "engines": { "node": "18.16.1" diff --git a/yarn.lock b/yarn.lock index 8aa9cc3cf9..88932b24ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7065,7 +7065,7 @@ __metadata: vue-select: 3.20.2 vue-slim-tabs: 0.4.0 vue-template-compiler: 2.7.14 - webpack: 5.88.1 + webpack: 5.88.2 languageName: unknown linkType: soft @@ -10084,9 +10084,9 @@ __metadata: languageName: node linkType: hard -"webpack@npm:5.88.1": - version: 5.88.1 - resolution: "webpack@npm:5.88.1" +"webpack@npm:5.88.2": + version: 5.88.2 + resolution: "webpack@npm:5.88.2" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^1.0.0 @@ -10117,7 +10117,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: 726e7e05ab2e7c142609a673dd6aa1a711ed97f349418a2a393d650c5ddad172d191257f60e1e37f6b2a77261571c202aabd5ce9240791a686774f0801cf5ec2 + checksum: 79476a782da31a21f6dd38fbbd06b68da93baf6a62f0d08ca99222367f3b8668f5a1f2086b7bb78e23172e31fa6df6fa7ab09b25e827866c4fc4dc2b30443ce2 languageName: node linkType: hard From 1bc4629ddf86de5088e0d126cfe0337c8f243944 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 18 Jul 2023 05:57:35 +0000 Subject: [PATCH 053/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230718?= =?UTF-8?q?.0754=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index acd300e4ac..f6ab5eefb1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230718.0719", + "version": "4.7.7+20230718.0754", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 974882731e..3ca439924b 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -422,6 +422,6 @@ "webpack": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", "url": "https://github.com/webpack/webpack", - "version": "5.88.1" + "version": "5.88.2" } } \ No newline at end of file From af9913aaa6afc558dc53fe28a58798f4e3b8b98c Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 19 Jul 2023 13:31:31 +0200 Subject: [PATCH 054/182] =?UTF-8?q?=F0=9F=90=9B[buildings]=20change=20max?= =?UTF-8?q?=20cells=20in=20Alliance=20Prison=20US?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en_US/buildings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/en_US/buildings.ts b/src/i18n/en_US/buildings.ts index e18db9d7db..95e53c6d06 100644 --- a/src/i18n/en_US/buildings.ts +++ b/src/i18n/en_US/buildings.ts @@ -526,7 +526,7 @@ export default { newCells: 1, cannotDisable: true, }, - 9 + 29 ), ], levelcost: [], From 88fbcc3bcaf5aa45a920e322306e1027f6fc77e1 Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 19 Jul 2023 11:36:04 +0000 Subject: [PATCH 055/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230719?= =?UTF-8?q?.1333=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/browsers.json | 4 ++-- yarn.lock | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f6ab5eefb1..b37086c0c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230718.0754", + "version": "4.7.7+20230719.1333", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/browsers.json b/src/generated/browsers.json index f6f49fdd1e..c517a15838 100644 --- a/src/generated/browsers.json +++ b/src/generated/browsers.json @@ -1,8 +1,8 @@ { "chrome": { "download": "https://chrome.com", - "latest": 114, - "supported": 108 + "latest": 115, + "supported": 109 }, "edge": { "download": "https://microsoft.com/edge", diff --git a/yarn.lock b/yarn.lock index 88932b24ce..756afa8e4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4014,9 +4014,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001473, caniuse-lite@npm:^1.0.30001503": - version: 1.0.30001516 - resolution: "caniuse-lite@npm:1.0.30001516" - checksum: 044adf3493b734a356a2922445a30095a0f6de6b9194695cdf74deafe7bef658e85858a31177762c2813f6e1ed2722d832d59eee0ecb2151e93a611ee18cb21f + version: 1.0.30001517 + resolution: "caniuse-lite@npm:1.0.30001517" + checksum: e4e87436ae1c4408cf4438aac22902b31eb03f3f5bad7f33bc518d12ffb35f3fd9395ccf7efc608ee046f90ce324ec6f7f26f8a8172b8c43c26a06ecee612a29 languageName: node linkType: hard From 3abeb20bb4feb8660c0dc4804a77d7ece17dd55c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 00:44:19 +0000 Subject: [PATCH 056/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`sass`=20?= =?UTF-8?q?to=20v1.64.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b37086c0c0..2818e2e8e1 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "js-yaml": "4.1.0", "moment-timezone": "0.5.43", "prettier": "3.0.0", - "sass": "1.63.6", + "sass": "1.64.0", "sass-loader": "13.3.2", "terser": "5.19.1", "ts-loader": "9.4.4", diff --git a/yarn.lock b/yarn.lock index 756afa8e4c..354efbb084 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7043,7 +7043,7 @@ __metadata: pinia: 2.1.4 prettier: 3.0.0 qrcode: 1.5.3 - sass: 1.63.6 + sass: 1.64.0 sass-loader: 13.3.2 semver: 7.5.4 showdown: 2.1.0 @@ -8606,7 +8606,20 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.63.6, sass@npm:^1.63.6": +"sass@npm:1.64.0": + version: 1.64.0 + resolution: "sass@npm:1.64.0" + dependencies: + chokidar: ">=3.0.0 <4.0.0" + immutable: ^4.0.0 + source-map-js: ">=0.6.2 <2.0.0" + bin: + sass: sass.js + checksum: b4eb9b1bdeb1c00e76427d7fe3e5f80d831327178cdee657aa4e014edfc64ebbfe43177147403da1e04d76a24f4093f5a9b1c8d9d80c94579937d8adc5a6ef66 + languageName: node + linkType: hard + +"sass@npm:^1.63.6": version: 1.63.6 resolution: "sass@npm:1.63.6" dependencies: From a1ec567d11e4d7528ebffc5c68e399320bdf9db0 Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 20 Jul 2023 05:44:42 +0000 Subject: [PATCH 057/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230720?= =?UTF-8?q?.0741=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2818e2e8e1..bdd98684fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230719.1333", + "version": "4.7.7+20230720.0741", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 3ca439924b..a13f524d81 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -300,7 +300,7 @@ "sass": { "icon": "https://sass-lang.com/assets/img/logos/logo.svg", "url": "https://github.com/sass/dart-sass", - "version": "1.63.6" + "version": "1.64.0" }, "sass-loader": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From de3c6f691028d58b27931c0425d3a9e8cc2604bb Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 20 Jul 2023 10:49:46 +0200 Subject: [PATCH 058/182] =?UTF-8?q?=F0=9F=90=9B[eCW]=20Fix=20#2493?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/extendedCallWindow/i18n/de_DE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/extendedCallWindow/i18n/de_DE.json b/src/modules/extendedCallWindow/i18n/de_DE.json index 0c4550dedc..4b034c21c8 100644 --- a/src/modules/extendedCallWindow/i18n/de_DE.json +++ b/src/modules/extendedCallWindow/i18n/de_DE.json @@ -146,7 +146,7 @@ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 30, 33, 34, 36, 37, 46, 53, 57, 75, 76, 83, 84, 85, 86, 87, 88, 89, 90, 104, - 105, 106, 107 + 105, 106, 107, 114 ] }, { @@ -371,4 +371,4 @@ "total": "Gesamt", "vehicles": "Fahrzeuge" } -} \ No newline at end of file +} From dc9bbb256d14a6e8a1538d6f202e6c33c318573d Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 20 Jul 2023 08:55:08 +0000 Subject: [PATCH 059/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230720?= =?UTF-8?q?.1051=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/modules/extendedCallWindow/i18n/de_DE.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bdd98684fb..d260a3bf33 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230720.0741", + "version": "4.7.7+20230720.1051", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/modules/extendedCallWindow/i18n/de_DE.json b/src/modules/extendedCallWindow/i18n/de_DE.json index 4b034c21c8..b7c269fdce 100644 --- a/src/modules/extendedCallWindow/i18n/de_DE.json +++ b/src/modules/extendedCallWindow/i18n/de_DE.json @@ -371,4 +371,4 @@ "total": "Gesamt", "vehicles": "Fahrzeuge" } -} +} \ No newline at end of file From f72b44a99ec5836b5b790e679a8c9863a15bd7a0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jul 2023 00:03:41 +0000 Subject: [PATCH 060/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Lock=20file=20main?= =?UTF-8?q?tenance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yarn.lock | 391 +++++++++++++++++++++++++++++------------------------- 1 file changed, 212 insertions(+), 179 deletions(-) diff --git a/yarn.lock b/yarn.lock index 354efbb084..caa3892e09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -151,9 +151,9 @@ __metadata: languageName: node linkType: hard -"@babel/helper-define-polyfill-provider@npm:^0.4.1": - version: 0.4.1 - resolution: "@babel/helper-define-polyfill-provider@npm:0.4.1" +"@babel/helper-define-polyfill-provider@npm:^0.4.2": + version: 0.4.2 + resolution: "@babel/helper-define-polyfill-provider@npm:0.4.2" dependencies: "@babel/helper-compilation-targets": ^7.22.6 "@babel/helper-plugin-utils": ^7.22.5 @@ -161,8 +161,8 @@ __metadata: lodash.debounce: ^4.0.8 resolve: ^1.14.2 peerDependencies: - "@babel/core": ^7.4.0-0 - checksum: 712b440cdd343ac7c4617225f91b0a9db5a7b1c96356b720e011af64ad6c4da9c66889f8d2962a0a2ae2e4ccb6a9b4a210c4a3c8c8ff103846b3d93b61bc6634 + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 1f6dec0c5d0876d278fe15b71238eccc5f74c4e2efa2c78aaafa8bc2cc96336b8e68d94cd1a78497356c96e8b91b8c1f4452179820624d1702aee2f9832e6569 languageName: node linkType: hard @@ -1272,8 +1272,8 @@ __metadata: linkType: hard "@babel/preset-modules@npm:^0.1.5": - version: 0.1.5 - resolution: "@babel/preset-modules@npm:0.1.5" + version: 0.1.6 + resolution: "@babel/preset-modules@npm:0.1.6" dependencies: "@babel/helper-plugin-utils": ^7.0.0 "@babel/plugin-proposal-unicode-property-regex": ^7.4.4 @@ -1281,8 +1281,8 @@ __metadata: "@babel/types": ^7.4.4 esutils: ^2.0.2 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10 + "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0 + checksum: 9700992d2b9526e703ab49eb8c4cd0b26bec93594d57c6b808967619df1a387565e0e58829b65b5bd6d41049071ea0152c9195b39599515fddb3e52b09a55ff0 languageName: node linkType: hard @@ -1371,156 +1371,156 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/android-arm64@npm:0.18.12" +"@esbuild/android-arm64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/android-arm64@npm:0.18.15" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/android-arm@npm:0.18.12" +"@esbuild/android-arm@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/android-arm@npm:0.18.15" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/android-x64@npm:0.18.12" +"@esbuild/android-x64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/android-x64@npm:0.18.15" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/darwin-arm64@npm:0.18.12" +"@esbuild/darwin-arm64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/darwin-arm64@npm:0.18.15" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/darwin-x64@npm:0.18.12" +"@esbuild/darwin-x64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/darwin-x64@npm:0.18.15" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/freebsd-arm64@npm:0.18.12" +"@esbuild/freebsd-arm64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/freebsd-arm64@npm:0.18.15" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/freebsd-x64@npm:0.18.12" +"@esbuild/freebsd-x64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/freebsd-x64@npm:0.18.15" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/linux-arm64@npm:0.18.12" +"@esbuild/linux-arm64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/linux-arm64@npm:0.18.15" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/linux-arm@npm:0.18.12" +"@esbuild/linux-arm@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/linux-arm@npm:0.18.15" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/linux-ia32@npm:0.18.12" +"@esbuild/linux-ia32@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/linux-ia32@npm:0.18.15" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/linux-loong64@npm:0.18.12" +"@esbuild/linux-loong64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/linux-loong64@npm:0.18.15" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/linux-mips64el@npm:0.18.12" +"@esbuild/linux-mips64el@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/linux-mips64el@npm:0.18.15" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/linux-ppc64@npm:0.18.12" +"@esbuild/linux-ppc64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/linux-ppc64@npm:0.18.15" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/linux-riscv64@npm:0.18.12" +"@esbuild/linux-riscv64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/linux-riscv64@npm:0.18.15" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/linux-s390x@npm:0.18.12" +"@esbuild/linux-s390x@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/linux-s390x@npm:0.18.15" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/linux-x64@npm:0.18.12" +"@esbuild/linux-x64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/linux-x64@npm:0.18.15" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/netbsd-x64@npm:0.18.12" +"@esbuild/netbsd-x64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/netbsd-x64@npm:0.18.15" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/openbsd-x64@npm:0.18.12" +"@esbuild/openbsd-x64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/openbsd-x64@npm:0.18.15" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/sunos-x64@npm:0.18.12" +"@esbuild/sunos-x64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/sunos-x64@npm:0.18.15" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/win32-arm64@npm:0.18.12" +"@esbuild/win32-arm64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/win32-arm64@npm:0.18.15" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/win32-ia32@npm:0.18.12" +"@esbuild/win32-ia32@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/win32-ia32@npm:0.18.15" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.18.12": - version: 0.18.12 - resolution: "@esbuild/win32-x64@npm:0.18.12" +"@esbuild/win32-x64@npm:0.18.15": + version: 0.18.15 + resolution: "@esbuild/win32-x64@npm:0.18.15" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -1988,9 +1988,9 @@ __metadata: linkType: hard "@mdn/browser-compat-data@npm:^5.2.34, @mdn/browser-compat-data@npm:^5.2.47": - version: 5.3.3 - resolution: "@mdn/browser-compat-data@npm:5.3.3" - checksum: f52a4e4cf2951fb89a0436aaeb1d9d878220ac98c9af555cfd672ded055089ed6c0b1474471ab20c0254af0ecb87af08e4005e2a3f756c6fd6c30c238f752a3c + version: 5.3.5 + resolution: "@mdn/browser-compat-data@npm:5.3.5" + checksum: d6b10fa7096d6ee6439131c62b47bdb997acfe1059408c78eddde5cb52397dbb15160281661ed8659c0985cdc32c8e679ee2e0b45e946f0d436ed0e5714ba7d5 languageName: node linkType: hard @@ -2013,15 +2013,6 @@ __metadata: languageName: node linkType: hard -"@nicolo-ribaudo/semver-v6@npm:^6.3.3": - version: 6.3.3 - resolution: "@nicolo-ribaudo/semver-v6@npm:6.3.3" - bin: - semver: bin/semver.js - checksum: 8290855b1591477d2298364541fda64fafd4acc110b387067a71c9b05f4105c0a4ac079857ae9cd107c42ee884e8724a406b5116f069575e02d7ab87a35a5272 - languageName: node - linkType: hard - "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -2379,9 +2370,9 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 20.4.2 - resolution: "@types/node@npm:20.4.2" - checksum: 99e544ea7560d51f01f95627fc40394c24a13da8f041121a0da13e4ef0a2aa332932eaf9a5e8d0e30d1c07106e96a183be392cbba62e8cf0bf6a085d5c0f4149 + version: 20.4.3 + resolution: "@types/node@npm:20.4.3" + checksum: 4df3664821af2328c25e3d78486ec94f45f5f4a35222678954b5c7dd5d4c4e5a0cdc9f51e09a7f7f078559639293f6cee79d37e751295552be824af1f3d8ad12 languageName: node linkType: hard @@ -3704,6 +3695,20 @@ __metadata: languageName: node linkType: hard +"arraybuffer.prototype.slice@npm:^1.0.1": + version: 1.0.1 + resolution: "arraybuffer.prototype.slice@npm:1.0.1" + dependencies: + array-buffer-byte-length: ^1.0.0 + call-bind: ^1.0.2 + define-properties: ^1.2.0 + get-intrinsic: ^1.2.1 + is-array-buffer: ^3.0.2 + is-shared-array-buffer: ^1.0.2 + checksum: e3e9b2a3e988ebfeddce4c7e8f69df730c9e48cb04b0d40ff0874ce3d86b3d1339dd520ffde5e39c02610bc172ecfbd4bc93324b1cabd9554c44a56b131ce0ce + languageName: node + linkType: hard + "ast-metadata-inferer@npm:^0.8.0": version: 0.8.0 resolution: "ast-metadata-inferer@npm:0.8.0" @@ -3753,38 +3758,38 @@ __metadata: linkType: hard "babel-plugin-polyfill-corejs2@npm:^0.4.4": - version: 0.4.4 - resolution: "babel-plugin-polyfill-corejs2@npm:0.4.4" + version: 0.4.5 + resolution: "babel-plugin-polyfill-corejs2@npm:0.4.5" dependencies: "@babel/compat-data": ^7.22.6 - "@babel/helper-define-polyfill-provider": ^0.4.1 - "@nicolo-ribaudo/semver-v6": ^6.3.3 + "@babel/helper-define-polyfill-provider": ^0.4.2 + semver: ^6.3.1 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 0273f3d74ccbf78086a3b14bb11b1fb94933830f51c576a24229d75b3b91c8b357c3a381d4ab3146abf9b052fa4c33ec9368dd010ada9ee355e1d03ff64e1ff0 + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 33a8e06aa54e2858d211c743d179f0487b03222f9ca1bfd7c4865bca243fca942a3358cb75f6bb894ed476cbddede834811fbd6903ff589f055821146f053e1a languageName: node linkType: hard "babel-plugin-polyfill-corejs3@npm:^0.8.2": - version: 0.8.2 - resolution: "babel-plugin-polyfill-corejs3@npm:0.8.2" + version: 0.8.3 + resolution: "babel-plugin-polyfill-corejs3@npm:0.8.3" dependencies: - "@babel/helper-define-polyfill-provider": ^0.4.1 + "@babel/helper-define-polyfill-provider": ^0.4.2 core-js-compat: ^3.31.0 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 0bc3e9e0114eba18f4fea8a9ff5a6016cae73b74cb091290c3f75fd7b9e34e712ee26f95b52d796f283970d7c6256fb01196e3608e8db03f620e3389d56d37c6 + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: dcbb30e551702a82cfd4d2c375da2c317658e55f95e9edcda93b9bbfdcc8fb6e5344efcb144e04d3406859e7682afce7974c60ededd9f12072a48a83dd22a0da languageName: node linkType: hard "babel-plugin-polyfill-regenerator@npm:^0.5.1": - version: 0.5.1 - resolution: "babel-plugin-polyfill-regenerator@npm:0.5.1" + version: 0.5.2 + resolution: "babel-plugin-polyfill-regenerator@npm:0.5.2" dependencies: - "@babel/helper-define-polyfill-provider": ^0.4.1 + "@babel/helper-define-polyfill-provider": ^0.4.2 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 85a56d28b34586fbe482225fb6a9592fc793a459c5eea987a3427fb723c7aa2f76916348a9fc5e9ca48754ebf6086cfbb9226f4cd0cf9c6257f94553622562ed + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: d962200f604016a9a09bc9b4aaf60a3db7af876bb65bcefaeac04d44ac9d9ec4037cf24ce117760cc141d7046b6394c7eb0320ba9665cb4a2ee64df2be187c93 languageName: node linkType: hard @@ -4649,9 +4654,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.431": - version: 1.4.461 - resolution: "electron-to-chromium@npm:1.4.461" - checksum: 84960b8fe41a1a97f47962f7ec509d94efffc8361286d55f360f81ce0804029af886796c576eb2c0a6011347ba0903c551476808f0614dc94b4564abaf415e70 + version: 1.4.468 + resolution: "electron-to-chromium@npm:1.4.468" + checksum: 3da242381c95286a928ef03501c0fdcc71b773e382cc8574aa998562ae8c9b14712c910879b41d6184fd954ccecc2424865754a86e20d83077a35a0b75a1cfea languageName: node linkType: hard @@ -4765,10 +4770,11 @@ __metadata: linkType: hard "es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4": - version: 1.21.3 - resolution: "es-abstract@npm:1.21.3" + version: 1.22.1 + resolution: "es-abstract@npm:1.22.1" dependencies: array-buffer-byte-length: ^1.0.0 + arraybuffer.prototype.slice: ^1.0.1 available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 es-set-tostringtag: ^2.0.1 @@ -4795,15 +4801,18 @@ __metadata: object-keys: ^1.1.1 object.assign: ^4.1.4 regexp.prototype.flags: ^1.5.0 + safe-array-concat: ^1.0.0 safe-regex-test: ^1.0.0 string.prototype.trim: ^1.2.7 string.prototype.trimend: ^1.0.6 string.prototype.trimstart: ^1.0.6 + typed-array-buffer: ^1.0.0 + typed-array-byte-length: ^1.0.0 typed-array-byte-offset: ^1.0.0 typed-array-length: ^1.0.4 unbox-primitive: ^1.0.2 which-typed-array: ^1.1.10 - checksum: 4c5ee900699030a629fc224a3595dcd05f9ff31d607e72bc9042d15e3b1bfde99f408c940b622e96439e755a7b23a3b9e47f3be234015750d32dad38b8f772f4 + checksum: 614e2c1c3717cb8d30b6128ef12ea110e06fd7d75ad77091ca1c5dbfb00da130e62e4bbbbbdda190eada098a22b27fe0f99ae5a1171dac2c8663b1e8be8a3a9b languageName: node linkType: hard @@ -4846,31 +4855,31 @@ __metadata: linkType: hard "esbuild@npm:^0.18.10, esbuild@npm:~0.18.11": - version: 0.18.12 - resolution: "esbuild@npm:0.18.12" - dependencies: - "@esbuild/android-arm": 0.18.12 - "@esbuild/android-arm64": 0.18.12 - "@esbuild/android-x64": 0.18.12 - "@esbuild/darwin-arm64": 0.18.12 - "@esbuild/darwin-x64": 0.18.12 - "@esbuild/freebsd-arm64": 0.18.12 - "@esbuild/freebsd-x64": 0.18.12 - "@esbuild/linux-arm": 0.18.12 - "@esbuild/linux-arm64": 0.18.12 - "@esbuild/linux-ia32": 0.18.12 - "@esbuild/linux-loong64": 0.18.12 - "@esbuild/linux-mips64el": 0.18.12 - "@esbuild/linux-ppc64": 0.18.12 - "@esbuild/linux-riscv64": 0.18.12 - "@esbuild/linux-s390x": 0.18.12 - "@esbuild/linux-x64": 0.18.12 - "@esbuild/netbsd-x64": 0.18.12 - "@esbuild/openbsd-x64": 0.18.12 - "@esbuild/sunos-x64": 0.18.12 - "@esbuild/win32-arm64": 0.18.12 - "@esbuild/win32-ia32": 0.18.12 - "@esbuild/win32-x64": 0.18.12 + version: 0.18.15 + resolution: "esbuild@npm:0.18.15" + dependencies: + "@esbuild/android-arm": 0.18.15 + "@esbuild/android-arm64": 0.18.15 + "@esbuild/android-x64": 0.18.15 + "@esbuild/darwin-arm64": 0.18.15 + "@esbuild/darwin-x64": 0.18.15 + "@esbuild/freebsd-arm64": 0.18.15 + "@esbuild/freebsd-x64": 0.18.15 + "@esbuild/linux-arm": 0.18.15 + "@esbuild/linux-arm64": 0.18.15 + "@esbuild/linux-ia32": 0.18.15 + "@esbuild/linux-loong64": 0.18.15 + "@esbuild/linux-mips64el": 0.18.15 + "@esbuild/linux-ppc64": 0.18.15 + "@esbuild/linux-riscv64": 0.18.15 + "@esbuild/linux-s390x": 0.18.15 + "@esbuild/linux-x64": 0.18.15 + "@esbuild/netbsd-x64": 0.18.15 + "@esbuild/openbsd-x64": 0.18.15 + "@esbuild/sunos-x64": 0.18.15 + "@esbuild/win32-arm64": 0.18.15 + "@esbuild/win32-ia32": 0.18.15 + "@esbuild/win32-x64": 0.18.15 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -4918,7 +4927,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 9d5aac77f637bf69f161dbf900f91cdec38c4bd47562b81302a2f790781fc1430f17790ee934058fa18379673c2987b0310fa61e8ccefb37065b8cc79956f099 + checksum: 81eb78fb5ff9f4304512e383f518862875fa7a0cce0ef9e0270d80ebd21bf0210d5cd6cf721f8a96ca64cc2d36ade03d9ed80cbcd5e81530b5a7b95ab86f8ca6 languageName: node linkType: hard @@ -6487,15 +6496,11 @@ __metadata: linkType: hard "is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9": - version: 1.1.10 - resolution: "is-typed-array@npm:1.1.10" + version: 1.1.12 + resolution: "is-typed-array@npm:1.1.12" dependencies: - available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 - for-each: ^0.3.3 - gopd: ^1.0.1 - has-tostringtag: ^1.0.0 - checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017 + which-typed-array: ^1.1.11 + checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796 languageName: node linkType: hard @@ -6524,6 +6529,13 @@ __metadata: languageName: node linkType: hard +"isarray@npm:^2.0.5": + version: 2.0.5 + resolution: "isarray@npm:2.0.5" + checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a + languageName: node + linkType: hard + "isexe@npm:^2.0.0": version: 2.0.0 resolution: "isexe@npm:2.0.0" @@ -8071,14 +8083,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.1.10, postcss@npm:^8.4.14, postcss@npm:^8.4.21, postcss@npm:^8.4.25": - version: 8.4.26 - resolution: "postcss@npm:8.4.26" +"postcss@npm:^8.1.10, postcss@npm:^8.4.14, postcss@npm:^8.4.21, postcss@npm:^8.4.25, postcss@npm:^8.4.26": + version: 8.4.27 + resolution: "postcss@npm:8.4.27" dependencies: nanoid: ^3.3.6 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: 1cf08ee10d58cbe98f94bf12ac49a5e5ed1588507d333d2642aacc24369ca987274e1f60ff4cbf0081f70d2ab18a5cd3a4a273f188d835b8e7f3ba381b184e57 + checksum: 1cdd0c298849df6cd65f7e646a3ba36870a37b65f55fd59d1a165539c263e9b4872a402bf4ed1ca1bc31f58b68b2835545e33ea1a23b161a1f8aa6d5ded81e78 languageName: node linkType: hard @@ -8510,8 +8522,8 @@ __metadata: linkType: hard "rollup@npm:^3.25.2, rollup@npm:^3.26.2": - version: 3.26.2 - resolution: "rollup@npm:3.26.2" + version: 3.26.3 + resolution: "rollup@npm:3.26.3" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -8519,7 +8531,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 7186beeba0e6fd33b37aa33ede7157e77af0a0be4b75d345a51dab4be5962a8e7a1c5ec8868e7c4cd361b456eb1b47bdb75e5db32ab37a546bed383d06b40384 + checksum: e6a765b2b7af709170344cc804392936613e06b6bdab46a04d264368d154bdadaaaf77de39e6e656bf728a060d7b4867d81e2464d791c0f37dd5b21aa9c7a6df languageName: node linkType: hard @@ -8557,6 +8569,18 @@ __metadata: languageName: node linkType: hard +"safe-array-concat@npm:^1.0.0": + version: 1.0.0 + resolution: "safe-array-concat@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.0 + has-symbols: ^1.0.3 + isarray: ^2.0.5 + checksum: f43cb98fe3b566327d0c09284de2b15fb85ae964a89495c1b1a5d50c7c8ed484190f4e5e71aacc167e16231940079b326f2c0807aea633d47cc7322f40a6b57f + languageName: node + linkType: hard + "safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" @@ -8606,7 +8630,7 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.64.0": +"sass@npm:1.64.0, sass@npm:^1.63.6": version: 1.64.0 resolution: "sass@npm:1.64.0" dependencies: @@ -8619,19 +8643,6 @@ __metadata: languageName: node linkType: hard -"sass@npm:^1.63.6": - version: 1.63.6 - resolution: "sass@npm:1.63.6" - dependencies: - chokidar: ">=3.0.0 <4.0.0" - immutable: ^4.0.0 - source-map-js: ">=0.6.2 <2.0.0" - bin: - sass: sass.js - checksum: 3372319904658eeafaf78a09a6fcb3368a68e6d76fe3c43c2d009f4f72e475ab22b82ef483ef5c00fcda3ab00066846c0bd88c36b42771b855f6ab80c7eda541 - languageName: node - linkType: hard - "sax@npm:^1.2.4": version: 1.2.4 resolution: "sax@npm:1.2.4" @@ -9258,8 +9269,8 @@ __metadata: linkType: hard "terser@npm:^5.0.0, terser@npm:^5.15.1, terser@npm:^5.16.8": - version: 5.19.0 - resolution: "terser@npm:5.19.0" + version: 5.19.2 + resolution: "terser@npm:5.19.2" dependencies: "@jridgewell/source-map": ^0.3.3 acorn: ^8.8.2 @@ -9267,7 +9278,7 @@ __metadata: source-map-support: ~0.5.20 bin: terser: bin/terser - checksum: 31c937f1a30c03b68825df7803a3584b13616647438be6cbc0914b688f064a3f4f938d8182e476342ddd1675e84798393b076caeb549393f4df768aec9abd6bd + checksum: e059177775b4d4f4cff219ad89293175aefbd1b081252270444dc83e42a2c5f07824eb2a85eae6e22ef6eb7ef04b21af36dd7d1dd7cfb93912310e57d416a205 languageName: node linkType: hard @@ -9472,6 +9483,29 @@ __metadata: languageName: node linkType: hard +"typed-array-buffer@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-buffer@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.1 + is-typed-array: ^1.1.10 + checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3 + languageName: node + linkType: hard + +"typed-array-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-length@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + for-each: ^0.3.3 + has-proto: ^1.0.1 + is-typed-array: ^1.1.10 + checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94 + languageName: node + linkType: hard + "typed-array-byte-offset@npm:^1.0.0": version: 1.0.0 resolution: "typed-array-byte-offset@npm:1.0.0" @@ -9713,12 +9747,12 @@ __metadata: linkType: hard "vite@npm:~4.4.2": - version: 4.4.4 - resolution: "vite@npm:4.4.4" + version: 4.4.6 + resolution: "vite@npm:4.4.6" dependencies: esbuild: ^0.18.10 fsevents: ~2.3.2 - postcss: ^8.4.25 + postcss: ^8.4.26 rollup: ^3.25.2 peerDependencies: "@types/node": ">= 14" @@ -9748,7 +9782,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 51c208e53680fa46f7166e49b037625ae43d507f85f1fd3da7e290263bccb77d5f8c466fe82746285927620afeeff949ac3b8e1b6a7b4fe7bfe11419729256b4 + checksum: 5a821897f1e03f9786f827acb89e3117a79b8901d184bbc3a2e48d6404b37975a5cdeb6b6969ec24ed1e81d96f1959ed6f9426cbb64501d1e4770bdb20f9c02f languageName: node linkType: hard @@ -10175,17 +10209,16 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.10, which-typed-array@npm:^1.1.2": - version: 1.1.10 - resolution: "which-typed-array@npm:1.1.10" +"which-typed-array@npm:^1.1.10, which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2": + version: 1.1.11 + resolution: "which-typed-array@npm:1.1.11" dependencies: available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 for-each: ^0.3.3 gopd: ^1.0.1 has-tostringtag: ^1.0.0 - is-typed-array: ^1.1.10 - checksum: 149f54f5d11773ce938c60a2c36306720a1824eccb62bda0620170932c2783fa50ad0226254c5741a962e35c7ccba5f4e4c402b8618cb3b4f2cf47bf5e6ade31 + checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206 languageName: node linkType: hard From 34f8e0d60659a341e2c05189ef7d8f4179ad2c52 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 22 Jul 2023 20:55:21 +0200 Subject: [PATCH 061/182] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[arrCounter]=20hoo?= =?UTF-8?q?k=20into=20native=20method?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/extendedCallWindow/assets/arrCounter.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/modules/extendedCallWindow/assets/arrCounter.ts b/src/modules/extendedCallWindow/assets/arrCounter.ts index 62df11de3c..7e949968ae 100644 --- a/src/modules/extendedCallWindow/assets/arrCounter.ts +++ b/src/modules/extendedCallWindow/assets/arrCounter.ts @@ -84,9 +84,13 @@ export default async ( arr => arr.classList.remove(highlightClass) ); } - if (resetSelection) window.vehicleSelectionReset(); }; + LSSM.$stores.root.hook({ + event: 'vehicleSelectionReset', + callback: resetCounters, + }); + if (counter || highlight) { const clickHandler = (arr: HTMLAnchorElement) => { if (arr.querySelector('.label-danger')) return; @@ -109,8 +113,6 @@ export default async ( counterNodes[arrId] = counterNode; } - if (arr.getAttribute('reset') === 'true') resetCounters(); - if (counter) { counterNode.setAttribute( 'data-amount', @@ -175,7 +177,9 @@ export default async ( 'navbar-btn', 'hidden-xs' ); - resetBtn.addEventListener('click', resetCounters); + if (resetSelection) + resetBtn.addEventListener('click', window.vehicleSelectionReset); + else resetBtn.addEventListener('click', resetCounters); resetBtn.textContent = $m('arrCounter.reset', { text: $m(`arrCounter.resetTexts.${resetBtnTexts.join('_')}`), }).toString(); From 4d85b858c87b607061e36e53d739907f1334a174 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 00:16:36 +0000 Subject: [PATCH 062/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`sass`=20?= =?UTF-8?q?to=20v1.64.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d260a3bf33..6cf55ba142 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "js-yaml": "4.1.0", "moment-timezone": "0.5.43", "prettier": "3.0.0", - "sass": "1.64.0", + "sass": "1.64.1", "sass-loader": "13.3.2", "terser": "5.19.1", "ts-loader": "9.4.4", diff --git a/yarn.lock b/yarn.lock index caa3892e09..0ae540c0ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7055,7 +7055,7 @@ __metadata: pinia: 2.1.4 prettier: 3.0.0 qrcode: 1.5.3 - sass: 1.64.0 + sass: 1.64.1 sass-loader: 13.3.2 semver: 7.5.4 showdown: 2.1.0 @@ -8630,7 +8630,20 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.64.0, sass@npm:^1.63.6": +"sass@npm:1.64.1": + version: 1.64.1 + resolution: "sass@npm:1.64.1" + dependencies: + chokidar: ">=3.0.0 <4.0.0" + immutable: ^4.0.0 + source-map-js: ">=0.6.2 <2.0.0" + bin: + sass: sass.js + checksum: e908f96f3d5fa5869e2f2aec97548c93d6ef390680af89870fcae8bdbaee2392ac650fbeae8d2ef8e4c99cb9f81e6b3624e1cb659af6d6e746332a22233b5ad8 + languageName: node + linkType: hard + +"sass@npm:^1.63.6": version: 1.64.0 resolution: "sass@npm:1.64.0" dependencies: From 7181f7a42cfc5e777fe8f717977772f31ced991f Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 24 Jul 2023 04:57:00 +0000 Subject: [PATCH 063/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230724?= =?UTF-8?q?.0653=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6cf55ba142..af3c969784 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230720.1051", + "version": "4.7.7+20230724.0653", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index a13f524d81..31bb14a3af 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -300,7 +300,7 @@ "sass": { "icon": "https://sass-lang.com/assets/img/logos/logo.svg", "url": "https://github.com/sass/dart-sass", - "version": "1.64.0" + "version": "1.64.1" }, "sass-loader": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From c3a5dec4adbe116b897a6ec1390dda5fe89ff17b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 04:58:06 +0000 Subject: [PATCH 064/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`terser`?= =?UTF-8?q?=20to=20v5.19.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index af3c969784..71a09aeec8 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "prettier": "3.0.0", "sass": "1.64.1", "sass-loader": "13.3.2", - "terser": "5.19.1", + "terser": "5.19.2", "ts-loader": "9.4.4", "ts-node": "10.9.1", "typescript": "5.1.6", diff --git a/yarn.lock b/yarn.lock index 0ae540c0ec..227291ce01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7059,7 +7059,7 @@ __metadata: sass-loader: 13.3.2 semver: 7.5.4 showdown: 2.1.0 - terser: 5.19.1 + terser: 5.19.2 ts-loader: 9.4.4 ts-node: 10.9.1 typescript: 5.1.6 @@ -9267,21 +9267,7 @@ __metadata: languageName: node linkType: hard -"terser@npm:5.19.1": - version: 5.19.1 - resolution: "terser@npm:5.19.1" - dependencies: - "@jridgewell/source-map": ^0.3.3 - acorn: ^8.8.2 - commander: ^2.20.0 - source-map-support: ~0.5.20 - bin: - terser: bin/terser - checksum: 18657b2a282238a1ca9c825efa966f4dd043a33196b2f8a7a2cba406a2006e14f55295b9d9cf6380a18599b697e9579e4092c99b9f40c7871ceec01cc98e3606 - languageName: node - linkType: hard - -"terser@npm:^5.0.0, terser@npm:^5.15.1, terser@npm:^5.16.8": +"terser@npm:5.19.2, terser@npm:^5.0.0, terser@npm:^5.15.1, terser@npm:^5.16.8": version: 5.19.2 resolution: "terser@npm:5.19.2" dependencies: From 372133b95090e5914b6c5652a2928099df2cee54 Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 24 Jul 2023 05:28:50 +0000 Subject: [PATCH 065/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230724?= =?UTF-8?q?.0725=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 71a09aeec8..259b3a536a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230724.0653", + "version": "4.7.7+20230724.0725", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 31bb14a3af..16418bab57 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -321,7 +321,7 @@ "terser": { "icon": "https://terser.org/img/terser-square-logo.png", "url": "https://terser.org", - "version": "5.19.1" + "version": "5.19.2" }, "ts-loader": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From ed9decc7906a12701c26c1a98939abf0fd531ff8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 22:46:56 +0000 Subject: [PATCH 066/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`@types/n?= =?UTF-8?q?ode`=20to=20v18.17.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 259b3a536a..cb38264336 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@types/js-yaml": "4.0.5", "@types/leaflet": "1.9.3", "@types/lodash": "4.14.195", - "@types/node": "18.16.19", + "@types/node": "18.17.0", "@types/pdfmake": "0.2.2", "@types/prettier": "2.7.3", "@types/qrcode": "1.5.1", diff --git a/yarn.lock b/yarn.lock index 227291ce01..1e915372f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2376,10 +2376,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:18.16.19": - version: 18.16.19 - resolution: "@types/node@npm:18.16.19" - checksum: 63c31f09616508aa7135380a4c79470a897b75f9ff3a70eb069e534dfabdec3f32fb0f9df5939127f1086614d980ddea0fa5e8cc29a49103c4f74cd687618aaf +"@types/node@npm:18.17.0": + version: 18.17.0 + resolution: "@types/node@npm:18.17.0" + checksum: 3a43c5c5541342751b514485144818a515fac5427f663066068eaacbe8a108cbe1207aae75ec89d34c3b32414c334aad84e9083cf7fcf3ebfd970adc871314a4 languageName: node linkType: hard @@ -7009,7 +7009,7 @@ __metadata: "@types/js-yaml": 4.0.5 "@types/leaflet": 1.9.3 "@types/lodash": 4.14.195 - "@types/node": 18.16.19 + "@types/node": 18.17.0 "@types/pdfmake": 0.2.2 "@types/prettier": 2.7.3 "@types/qrcode": 1.5.1 From b15f034450e7fcd974f877a4cccc0f6c9ceaee45 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 25 Jul 2023 03:13:05 +0000 Subject: [PATCH 067/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230725?= =?UTF-8?q?.0509=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cb38264336..fd81520d8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230724.0725", + "version": "4.7.7+20230725.0509", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 16418bab57..45b01d6087 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -62,7 +62,7 @@ "@types/node": { "icon": "https://avatars.githubusercontent.com/u/3637556", "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node", - "version": "18.16.19" + "version": "18.17.0" }, "@types/pdfmake": { "icon": "https://avatars.githubusercontent.com/u/3637556", From c94cb33379ee514e1507a5a5f3b9664ec74964ec Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 03:14:21 +0000 Subject: [PATCH 068/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20typescrip?= =?UTF-8?q?t-eslint=20to=20v6.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index fd81520d8a..4fa8f77519 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "@types/ua-parser-js": "0.7.36", "@types/vue-select": "3.16.2", "@types/webpack-env": "1.18.1", - "@typescript-eslint/eslint-plugin": "6.1.0", - "@typescript-eslint/parser": "6.1.0", + "@typescript-eslint/eslint-plugin": "6.2.0", + "@typescript-eslint/parser": "6.2.0", "all-contributors-cli": "6.26.1", "copy-dir": "1.3.0", "css-loader": "6.8.1", diff --git a/yarn.lock b/yarn.lock index 1e915372f5..e1f8f37eda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2515,15 +2515,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.1.0": - version: 6.1.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.1.0" +"@typescript-eslint/eslint-plugin@npm:6.2.0": + version: 6.2.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.2.0" dependencies: "@eslint-community/regexpp": ^4.5.1 - "@typescript-eslint/scope-manager": 6.1.0 - "@typescript-eslint/type-utils": 6.1.0 - "@typescript-eslint/utils": 6.1.0 - "@typescript-eslint/visitor-keys": 6.1.0 + "@typescript-eslint/scope-manager": 6.2.0 + "@typescript-eslint/type-utils": 6.2.0 + "@typescript-eslint/utils": 6.2.0 + "@typescript-eslint/visitor-keys": 6.2.0 debug: ^4.3.4 graphemer: ^1.4.0 ignore: ^5.2.4 @@ -2537,44 +2537,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: e1f05d8d49041b47cdbea8fc80f87f03dc0f7273deb2f34f73661831572fe62976ab3780972496428ce6fa31d3f53236a4c90cd9948d45f5004631edbfa3d42a + checksum: 1ef46b1c2e3e2013f66b4982dcfb9e198a3824cc1503b843e553201a108a3cb6e4adfb2c486158c89d993e5e4b9d99aeb2af28297e43da98c4750dae8f5131b5 languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.1.0": - version: 6.1.0 - resolution: "@typescript-eslint/parser@npm:6.1.0" +"@typescript-eslint/parser@npm:6.2.0": + version: 6.2.0 + resolution: "@typescript-eslint/parser@npm:6.2.0" dependencies: - "@typescript-eslint/scope-manager": 6.1.0 - "@typescript-eslint/types": 6.1.0 - "@typescript-eslint/typescript-estree": 6.1.0 - "@typescript-eslint/visitor-keys": 6.1.0 + "@typescript-eslint/scope-manager": 6.2.0 + "@typescript-eslint/types": 6.2.0 + "@typescript-eslint/typescript-estree": 6.2.0 + "@typescript-eslint/visitor-keys": 6.2.0 debug: ^4.3.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: dc59cda4396ca09e3aa2bd5b99d8ef9526df56567d4a9b953668102116db975dfb2426c3369560a2b02e083d49e43b4cebb252144d175e900096eb0b17f7ae3c + checksum: ba79674f2d4599a24c7afa8f18ec28243b80df39f82a4a6b7a4ce7c584ec37d4ade40a3aa058d597a5cbf71647a40d0995866748d14cf4b52d8ad4420d10f669 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.1.0": - version: 6.1.0 - resolution: "@typescript-eslint/scope-manager@npm:6.1.0" +"@typescript-eslint/scope-manager@npm:6.2.0": + version: 6.2.0 + resolution: "@typescript-eslint/scope-manager@npm:6.2.0" dependencies: - "@typescript-eslint/types": 6.1.0 - "@typescript-eslint/visitor-keys": 6.1.0 - checksum: 57c73b8713be79abebbcfef1d58f78a820ea88a5c37a44d2c9a76130216d9ee824134fae215dde794121cfaf1284370da77e1e5184ba71812aebb1a8cf39f325 + "@typescript-eslint/types": 6.2.0 + "@typescript-eslint/visitor-keys": 6.2.0 + checksum: 75a650a3ede78bf841a3bf3f4880b94a06aa4c420f399a6fb9faee19a2e5998f7e330a13f78e07c4958413345bab58b0593f09fa163a77e8f6353012e795660c languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.1.0": - version: 6.1.0 - resolution: "@typescript-eslint/type-utils@npm:6.1.0" +"@typescript-eslint/type-utils@npm:6.2.0": + version: 6.2.0 + resolution: "@typescript-eslint/type-utils@npm:6.2.0" dependencies: - "@typescript-eslint/typescript-estree": 6.1.0 - "@typescript-eslint/utils": 6.1.0 + "@typescript-eslint/typescript-estree": 6.2.0 + "@typescript-eslint/utils": 6.2.0 debug: ^4.3.4 ts-api-utils: ^1.0.1 peerDependencies: @@ -2582,23 +2582,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 83b2ffcf3aa297b60deb2e9ddd946b9c15cc55d0727dfc8a3447e8e5402428f6ee3fc67fb9d5d8ade25da4069ca77e23777caf02bcacd2a1e75b66cfc4d76579 + checksum: 9adb542fb3c49bf5c1fecca98549bee3fcfd28a0ceee5227817a1ceb0841b912e322f58ba1b3ca98a47fc998cbec0a3d69cacb9cf9ac4be1d133b11bb9d53aae languageName: node linkType: hard -"@typescript-eslint/types@npm:6.1.0": - version: 6.1.0 - resolution: "@typescript-eslint/types@npm:6.1.0" - checksum: c1f55ebfda7af5e63077beb65fe5a82de7ae7afb913a4ebfb023f2889d5ec06f75b6ebca6ee45d6d205508a52fa5a6bf5821182c3e7e4400ac9304083b88f139 +"@typescript-eslint/types@npm:6.2.0": + version: 6.2.0 + resolution: "@typescript-eslint/types@npm:6.2.0" + checksum: 81878866cf7f49dbc335cce05adfbd994f348e2ebe9538fd6e934fa82e44186c16b2112b8d5f9f4c528ea127be157185be5e35e4913db4880d20ac495785baaf languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.1.0": - version: 6.1.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.1.0" +"@typescript-eslint/typescript-estree@npm:6.2.0": + version: 6.2.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.2.0" dependencies: - "@typescript-eslint/types": 6.1.0 - "@typescript-eslint/visitor-keys": 6.1.0 + "@typescript-eslint/types": 6.2.0 + "@typescript-eslint/visitor-keys": 6.2.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -2607,34 +2607,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 42729b8952a78ff9fc7d3833e16de25f1a3502461ebe5d09a28fb4375c8e5978dde0dd1f8a7973bf7470ff9023cce84de82e968b02a09f54a0f753d21d9127e8 + checksum: 5bfd5bf09feff6c4807cfa65cf407dd0249f7d487d6820941dd05999ee35cacdabaacadf23c92b90b57920025e93088e93924bc8df41f393ac0366538eb2902f languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.1.0": - version: 6.1.0 - resolution: "@typescript-eslint/utils@npm:6.1.0" +"@typescript-eslint/utils@npm:6.2.0": + version: 6.2.0 + resolution: "@typescript-eslint/utils@npm:6.2.0" dependencies: "@eslint-community/eslint-utils": ^4.4.0 "@types/json-schema": ^7.0.12 "@types/semver": ^7.5.0 - "@typescript-eslint/scope-manager": 6.1.0 - "@typescript-eslint/types": 6.1.0 - "@typescript-eslint/typescript-estree": 6.1.0 + "@typescript-eslint/scope-manager": 6.2.0 + "@typescript-eslint/types": 6.2.0 + "@typescript-eslint/typescript-estree": 6.2.0 semver: ^7.5.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: eb47a6b56e142ca68231f0f43af68d4cf5161235943aaf19c268156e3e751e10dd8ea3e0e297a7c0796b9eb3c5268b3c659821b909799949b55a524707c82e13 + checksum: 54f062412a8ce23554ca4063d275327981640426b1ecd1073d30dd8b9464ff7af68b8f9f6272033bad9307815d56f2f922faa8a995421efdccd6165dd62557e1 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.1.0": - version: 6.1.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.1.0" +"@typescript-eslint/visitor-keys@npm:6.2.0": + version: 6.2.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.2.0" dependencies: - "@typescript-eslint/types": 6.1.0 + "@typescript-eslint/types": 6.2.0 eslint-visitor-keys: ^3.4.1 - checksum: 21c7c9b9a52325e3b67c0015deb99a1603b19703af7c002e87f32e2d8f9910813985877ee7b589dc9938d308e3d082cf97c8ca43c2c95b86a919c426d8913439 + checksum: b400c657c7e5c65b289304f6f5cee6536f23b3441306f82aff2d2e047e13770330715d4f7b29e734b0b2dab6030e41028894d5cd441696115bfea43ad18b2c54 languageName: node linkType: hard @@ -7019,8 +7019,8 @@ __metadata: "@types/ua-parser-js": 0.7.36 "@types/vue-select": 3.16.2 "@types/webpack-env": 1.18.1 - "@typescript-eslint/eslint-plugin": 6.1.0 - "@typescript-eslint/parser": 6.1.0 + "@typescript-eslint/eslint-plugin": 6.2.0 + "@typescript-eslint/parser": 6.2.0 acorn: 8.10.0 acorn-walk: 8.2.0 all-contributors-cli: 6.26.1 From d38b2337dc3c332f6adbbacd9feb90123a7b8df9 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 25 Jul 2023 04:41:26 +0000 Subject: [PATCH 069/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230725?= =?UTF-8?q?.0637=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4fa8f77519..e1e51c5df3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230725.0509", + "version": "4.7.7+20230725.0637", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 45b01d6087..8215e1f96c 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -110,11 +110,11 @@ }, "@typescript-eslint/eslint-plugin": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "6.1.0" + "version": "6.2.0" }, "@typescript-eslint/parser": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "6.1.0" + "version": "6.2.0" }, "@vuepress/client": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", From 74ac7a995bc7bc378dd039828a5ce032a2fd95e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:11:06 +0000 Subject: [PATCH 070/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`@types/n?= =?UTF-8?q?ode`=20to=20v18.17.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e1e51c5df3..f829acefa7 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@types/js-yaml": "4.0.5", "@types/leaflet": "1.9.3", "@types/lodash": "4.14.195", - "@types/node": "18.17.0", + "@types/node": "18.17.1", "@types/pdfmake": "0.2.2", "@types/prettier": "2.7.3", "@types/qrcode": "1.5.1", diff --git a/yarn.lock b/yarn.lock index e1f8f37eda..dee314c023 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2376,10 +2376,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:18.17.0": - version: 18.17.0 - resolution: "@types/node@npm:18.17.0" - checksum: 3a43c5c5541342751b514485144818a515fac5427f663066068eaacbe8a108cbe1207aae75ec89d34c3b32414c334aad84e9083cf7fcf3ebfd970adc871314a4 +"@types/node@npm:18.17.1": + version: 18.17.1 + resolution: "@types/node@npm:18.17.1" + checksum: 56201bda9a2d05d68602df63b4e67b0545ac8c6d0280bd5fb31701350a978a577a027501fbf49db99bf177f2242ebd1244896bfd35e89042d5bd7dfebff28d4e languageName: node linkType: hard @@ -7009,7 +7009,7 @@ __metadata: "@types/js-yaml": 4.0.5 "@types/leaflet": 1.9.3 "@types/lodash": 4.14.195 - "@types/node": 18.17.0 + "@types/node": 18.17.1 "@types/pdfmake": 0.2.2 "@types/prettier": 2.7.3 "@types/qrcode": 1.5.1 From a99a9b2df456f8e38500dfc3aa4310cc8424579b Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 26 Jul 2023 04:11:30 +0000 Subject: [PATCH 071/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230726?= =?UTF-8?q?.0608=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f829acefa7..ee41ffa4ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230725.0637", + "version": "4.7.7+20230726.0608", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 8215e1f96c..96a037e505 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -62,7 +62,7 @@ "@types/node": { "icon": "https://avatars.githubusercontent.com/u/3637556", "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node", - "version": "18.17.0" + "version": "18.17.1" }, "@types/pdfmake": { "icon": "https://avatars.githubusercontent.com/u/3637556", From 320474f99a0fb9ca4b57e16a1cc0d60fca5e2d13 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 04:12:32 +0000 Subject: [PATCH 072/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-p?= =?UTF-8?q?lugin-unicorn`=20to=20v48.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ee41ffa4ac..8349ab9274 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "eslint-plugin-prettier": "5.0.0", "eslint-plugin-regexp": "1.15.0", "eslint-plugin-tsdoc": "0.2.17", - "eslint-plugin-unicorn": "48.0.0", + "eslint-plugin-unicorn": "48.0.1", "eslint-plugin-vue": "9.15.1", "html-loader": "4.2.0", "husky": "8.0.3", diff --git a/yarn.lock b/yarn.lock index dee314c023..e36eb61c8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5125,9 +5125,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-unicorn@npm:48.0.0": - version: 48.0.0 - resolution: "eslint-plugin-unicorn@npm:48.0.0" +"eslint-plugin-unicorn@npm:48.0.1": + version: 48.0.1 + resolution: "eslint-plugin-unicorn@npm:48.0.1" dependencies: "@babel/helper-validator-identifier": ^7.22.5 "@eslint-community/eslint-utils": ^4.4.0 @@ -5146,7 +5146,7 @@ __metadata: strip-indent: ^3.0.0 peerDependencies: eslint: ">=8.44.0" - checksum: fc42b6ac3018d43cd68a2d91de43a0f761824a15de5f3c201b3369e15dc3675843bae1644de65b9aa87b2cd1f79ea9188087c54477bef9deef924a1200d5219f + checksum: e63112cbaa3a1347cbb427160d7b3c6a1f8cc8ef512075a0ab285c64761772356f4eb5f82c9fb1a8cde63d8794f8aa819eda02fa0a7c44bc9955c5113f87be78 languageName: node linkType: hard @@ -7038,7 +7038,7 @@ __metadata: eslint-plugin-prettier: 5.0.0 eslint-plugin-regexp: 1.15.0 eslint-plugin-tsdoc: 0.2.17 - eslint-plugin-unicorn: 48.0.0 + eslint-plugin-unicorn: 48.0.1 eslint-plugin-vue: 9.15.1 he: 1.2.0 highcharts: 11.1.0 From 13b0e131e784c2a1288894b543a3416b825bb516 Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 26 Jul 2023 04:49:37 +0000 Subject: [PATCH 073/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230726?= =?UTF-8?q?.0646=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8349ab9274..02ff9e51e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230726.0608", + "version": "4.7.7+20230726.0646", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 96a037e505..b62c0b2214 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -223,7 +223,7 @@ "eslint-plugin-unicorn": { "icon": "https://cloud.githubusercontent.com/assets/170270/18659176/1cc373d0-7f33-11e6-890f-0ba35362ee7e.jpg", "url": "https://github.com/sindresorhus/eslint-plugin-unicorn", - "version": "48.0.0" + "version": "48.0.1" }, "eslint-plugin-vue": { "icon": "https://vuejs.org/logo.svg", From 13fc36e5c08d93c890f821d44eb520da6a339a5a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 22:06:34 +0000 Subject: [PATCH 074/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`@types/l?= =?UTF-8?q?odash`=20to=20v4.14.196?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 02ff9e51e0..96865f3725 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@types/jquery": "3.5.16", "@types/js-yaml": "4.0.5", "@types/leaflet": "1.9.3", - "@types/lodash": "4.14.195", + "@types/lodash": "4.14.196", "@types/node": "18.17.1", "@types/pdfmake": "0.2.2", "@types/prettier": "2.7.3", diff --git a/yarn.lock b/yarn.lock index e36eb61c8e..cfcb49aff4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2329,10 +2329,10 @@ __metadata: languageName: node linkType: hard -"@types/lodash@npm:4.14.195": - version: 4.14.195 - resolution: "@types/lodash@npm:4.14.195" - checksum: 39b75ca635b3fa943d17d3d3aabc750babe4c8212485a4df166fe0516e39288e14b0c60afc6e21913cc0e5a84734633c71e617e2bd14eaa1cf51b8d7799c432e +"@types/lodash@npm:4.14.196": + version: 4.14.196 + resolution: "@types/lodash@npm:4.14.196" + checksum: 201d17c3e62ae02a93c99ec78e024b2be9bd75564dd8fd8c26f6ac51a985ab280d28ce2688c3bcdfe785b0991cd9814edff19ee000234c7b45d9a697f09feb6a languageName: node linkType: hard @@ -7008,7 +7008,7 @@ __metadata: "@types/jquery": 3.5.16 "@types/js-yaml": 4.0.5 "@types/leaflet": 1.9.3 - "@types/lodash": 4.14.195 + "@types/lodash": 4.14.196 "@types/node": 18.17.1 "@types/pdfmake": 0.2.2 "@types/prettier": 2.7.3 From e201bf4bb730e2147cf3b020164a67d912f18679 Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 27 Jul 2023 05:30:03 +0000 Subject: [PATCH 075/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230727?= =?UTF-8?q?.0726=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 96865f3725..22b3a3c301 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230726.0646", + "version": "4.7.7+20230727.0726", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index b62c0b2214..b3103e2798 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -57,7 +57,7 @@ "@types/lodash": { "icon": "https://avatars.githubusercontent.com/u/3637556", "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/lodash", - "version": "4.14.195" + "version": "4.14.196" }, "@types/node": { "icon": "https://avatars.githubusercontent.com/u/3637556", From b9e2edba0ef336d820ffdb3475353f1c4945f624 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 05:31:23 +0000 Subject: [PATCH 076/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`pinia`?= =?UTF-8?q?=20to=20v2.1.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 22b3a3c301..12de063c4a 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lodash": "4.17.21", "mini-svg-data-uri": "1.4.4", "moment": "2.29.4", - "pinia": "2.1.4", + "pinia": "2.1.6", "qrcode": "1.5.3", "semver": "7.5.4", "showdown": "2.1.0", diff --git a/yarn.lock b/yarn.lock index cfcb49aff4..0294ed05e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7052,7 +7052,7 @@ __metadata: mini-svg-data-uri: 1.4.4 moment: 2.29.4 moment-timezone: 0.5.43 - pinia: 2.1.4 + pinia: 2.1.6 prettier: 3.0.0 qrcode: 1.5.3 sass: 1.64.1 @@ -7961,9 +7961,9 @@ __metadata: languageName: node linkType: hard -"pinia@npm:2.1.4": - version: 2.1.4 - resolution: "pinia@npm:2.1.4" +"pinia@npm:2.1.6": + version: 2.1.6 + resolution: "pinia@npm:2.1.6" dependencies: "@vue/devtools-api": ^6.5.0 vue-demi: ">=0.14.5" @@ -7976,7 +7976,7 @@ __metadata: optional: true typescript: optional: true - checksum: 5285b1415e6c88698d41393e9144dfd0fbbb7f88cdc90637f6bf3526046c1f171befe01b2b063e9f6004f16b6c8dc1ed3ae9b2434ccf69403fec291215f0e1e3 + checksum: 4e881e590c4f6ec9c2dc6174cf7ecc71a48bff1f3a5be878669b3b2fd32994fa64c3cbf499d138bc4e0f222ac6ad1d07935b0a592791acdaf8c9f2a12c98f042 languageName: node linkType: hard From 95ca7cac64f6deda9156fe1a4031c6025ab93a6a Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 27 Jul 2023 06:00:12 +0000 Subject: [PATCH 077/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230727?= =?UTF-8?q?.0756=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 12de063c4a..4b044b8b9a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230727.0726", + "version": "4.7.7+20230727.0756", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index b3103e2798..d66f00f80b 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -286,7 +286,7 @@ "pinia": { "icon": "https://pinia.vuejs.org/logo.svg", "url": "https://github.com/vuejs/pinia#readme", - "version": "2.1.4" + "version": "2.1.6" }, "prettier": { "icon": "https://prettier.io/icon.png", From ddb01d193ed2fee37023f6736c8968e2d76cbc98 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 22:40:55 +0000 Subject: [PATCH 078/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-p?= =?UTF-8?q?lugin-jsdoc`=20to=20v46.4.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 4b044b8b9a..425dee547e 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "eslint-import-resolver-typescript": "3.5.5", "eslint-plugin-compat": "4.1.4", "eslint-plugin-import": "2.27.5", - "eslint-plugin-jsdoc": "46.4.4", + "eslint-plugin-jsdoc": "46.4.5", "eslint-plugin-markdownlint": "0.4.1", "eslint-plugin-prettier": "5.0.0", "eslint-plugin-regexp": "1.15.0", diff --git a/yarn.lock b/yarn.lock index 0294ed05e5..186f366e47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5048,9 +5048,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jsdoc@npm:46.4.4": - version: 46.4.4 - resolution: "eslint-plugin-jsdoc@npm:46.4.4" +"eslint-plugin-jsdoc@npm:46.4.5": + version: 46.4.5 + resolution: "eslint-plugin-jsdoc@npm:46.4.5" dependencies: "@es-joy/jsdoccomment": ~0.39.4 are-docs-informative: ^0.0.2 @@ -5059,11 +5059,11 @@ __metadata: escape-string-regexp: ^4.0.0 esquery: ^1.5.0 is-builtin-module: ^3.2.1 - semver: ^7.5.1 + semver: ^7.5.4 spdx-expression-parse: ^3.0.1 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: bc97f2f146aedcf43b1610a80eb9623deb365a30ba54eb37e6f82c6f205136aa51f67a65b0625729cb33ec941710bfa08d9d18b59296e2d84c2fd6a57d63c2be + checksum: aa470a07b8bb9fbded04d0a0c2e38236b1404a88ecac7d614942b4a6fc2b619b048dea781b4a28dfc30010ca27df1fef94b2c53ab80286789793de0f4c55a835 languageName: node linkType: hard @@ -7033,7 +7033,7 @@ __metadata: eslint-import-resolver-typescript: 3.5.5 eslint-plugin-compat: 4.1.4 eslint-plugin-import: 2.27.5 - eslint-plugin-jsdoc: 46.4.4 + eslint-plugin-jsdoc: 46.4.5 eslint-plugin-markdownlint: 0.4.1 eslint-plugin-prettier: 5.0.0 eslint-plugin-regexp: 1.15.0 @@ -8715,7 +8715,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.4, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.4": +"semver@npm:7.5.4, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.8, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: From 1e8faadc1290b3ad4f3f0fd4f5e610c270072c81 Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 28 Jul 2023 04:38:55 +0000 Subject: [PATCH 079/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230728?= =?UTF-8?q?.0635=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 425dee547e..59c8abe203 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230727.0756", + "version": "4.7.7+20230728.0635", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index d66f00f80b..72ab52c96c 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -200,7 +200,7 @@ "version": "2.27.5" }, "eslint-plugin-jsdoc": { - "version": "46.4.4" + "version": "46.4.5" }, "eslint-plugin-markdownlint": { "url": "https://gitlab.com/pawelbbdrozd/eslint-plugin-markdownlint/-/blob/main/README.md", From 72ab4ef079de809f6e4bcb1263d0b715463db8d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 28 Jul 2023 04:40:08 +0000 Subject: [PATCH 080/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-c?= =?UTF-8?q?onfig-prettier`=20to=20v8.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 59c8abe203..5192a52df7 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "copy-dir": "1.3.0", "css-loader": "6.8.1", "eslint": "8.45.0", - "eslint-config-prettier": "8.8.0", + "eslint-config-prettier": "8.9.0", "eslint-import-resolver-typescript": "3.5.5", "eslint-plugin-compat": "4.1.4", "eslint-plugin-import": "2.27.5", diff --git a/yarn.lock b/yarn.lock index 186f366e47..aadee3b7e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4952,14 +4952,14 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:8.8.0": - version: 8.8.0 - resolution: "eslint-config-prettier@npm:8.8.0" +"eslint-config-prettier@npm:8.9.0": + version: 8.9.0 + resolution: "eslint-config-prettier@npm:8.9.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: 1e94c3882c4d5e41e1dcfa2c368dbccbfe3134f6ac7d40101644d3bfbe3eb2f2ffac757f3145910b5eacf20c0e85e02b91293d3126d770cbf3dc390b3564681c + checksum: a675d0dabd76b700ef2d062b5ec6a634e105a8e8c070f95281fd2ccb614527fac60b4c758132058c50f0521fd19313f1f5be45ce9ebf081f2e5f77ae6eb7d8db languageName: node linkType: hard @@ -7029,7 +7029,7 @@ __metadata: css-loader: 6.8.1 emoji-toolkit: 7.0.1 eslint: 8.45.0 - eslint-config-prettier: 8.8.0 + eslint-config-prettier: 8.9.0 eslint-import-resolver-typescript: 3.5.5 eslint-plugin-compat: 4.1.4 eslint-plugin-import: 2.27.5 From 13b382b280373a671a872370fbbf75bb80392ccc Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 28 Jul 2023 05:12:19 +0000 Subject: [PATCH 081/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230728?= =?UTF-8?q?.0708=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5192a52df7..81b70167d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230728.0635", + "version": "4.7.7+20230728.0708", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 72ab52c96c..4a8fb6369c 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -186,7 +186,7 @@ }, "eslint-config-prettier": { "icon": "https://prettier.io/icon.png", - "version": "8.8.0" + "version": "8.9.0" }, "eslint-import-resolver-typescript": { "version": "3.5.5" From dff5c1c6cebe3a894ec275cf2ebc2819ef85fcbc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 29 Jul 2023 08:46:41 +0000 Subject: [PATCH 082/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Lock=20file=20main?= =?UTF-8?q?tenance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yarn.lock | 301 ++++++++++++++++++++++++++---------------------------- 1 file changed, 144 insertions(+), 157 deletions(-) diff --git a/yarn.lock b/yarn.lock index aadee3b7e8..cc3c0056e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1371,156 +1371,156 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/android-arm64@npm:0.18.15" +"@esbuild/android-arm64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/android-arm64@npm:0.18.17" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/android-arm@npm:0.18.15" +"@esbuild/android-arm@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/android-arm@npm:0.18.17" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/android-x64@npm:0.18.15" +"@esbuild/android-x64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/android-x64@npm:0.18.17" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/darwin-arm64@npm:0.18.15" +"@esbuild/darwin-arm64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/darwin-arm64@npm:0.18.17" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/darwin-x64@npm:0.18.15" +"@esbuild/darwin-x64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/darwin-x64@npm:0.18.17" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/freebsd-arm64@npm:0.18.15" +"@esbuild/freebsd-arm64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/freebsd-arm64@npm:0.18.17" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/freebsd-x64@npm:0.18.15" +"@esbuild/freebsd-x64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/freebsd-x64@npm:0.18.17" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/linux-arm64@npm:0.18.15" +"@esbuild/linux-arm64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/linux-arm64@npm:0.18.17" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/linux-arm@npm:0.18.15" +"@esbuild/linux-arm@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/linux-arm@npm:0.18.17" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/linux-ia32@npm:0.18.15" +"@esbuild/linux-ia32@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/linux-ia32@npm:0.18.17" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/linux-loong64@npm:0.18.15" +"@esbuild/linux-loong64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/linux-loong64@npm:0.18.17" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/linux-mips64el@npm:0.18.15" +"@esbuild/linux-mips64el@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/linux-mips64el@npm:0.18.17" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/linux-ppc64@npm:0.18.15" +"@esbuild/linux-ppc64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/linux-ppc64@npm:0.18.17" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/linux-riscv64@npm:0.18.15" +"@esbuild/linux-riscv64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/linux-riscv64@npm:0.18.17" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/linux-s390x@npm:0.18.15" +"@esbuild/linux-s390x@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/linux-s390x@npm:0.18.17" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/linux-x64@npm:0.18.15" +"@esbuild/linux-x64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/linux-x64@npm:0.18.17" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/netbsd-x64@npm:0.18.15" +"@esbuild/netbsd-x64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/netbsd-x64@npm:0.18.17" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/openbsd-x64@npm:0.18.15" +"@esbuild/openbsd-x64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/openbsd-x64@npm:0.18.17" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/sunos-x64@npm:0.18.15" +"@esbuild/sunos-x64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/sunos-x64@npm:0.18.17" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/win32-arm64@npm:0.18.15" +"@esbuild/win32-arm64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/win32-arm64@npm:0.18.17" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/win32-ia32@npm:0.18.15" +"@esbuild/win32-ia32@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/win32-ia32@npm:0.18.17" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.18.15": - version: 0.18.15 - resolution: "@esbuild/win32-x64@npm:0.18.15" +"@esbuild/win32-x64@npm:0.18.17": + version: 0.18.17 + resolution: "@esbuild/win32-x64@npm:0.18.17" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -1537,15 +1537,15 @@ __metadata: linkType: hard "@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.5.0, @eslint-community/regexpp@npm:^4.5.1": - version: 4.5.1 - resolution: "@eslint-community/regexpp@npm:4.5.1" - checksum: 6d901166d64998d591fab4db1c2f872981ccd5f6fe066a1ad0a93d4e11855ecae6bfb76660869a469563e8882d4307228cebd41142adb409d182f2966771e57e + version: 4.6.2 + resolution: "@eslint-community/regexpp@npm:4.6.2" + checksum: a3c341377b46b54fa228f455771b901d1a2717f95d47dcdf40199df30abc000ba020f747f114f08560d119e979d882a94cf46cfc51744544d54b00319c0f2724 languageName: node linkType: hard "@eslint/eslintrc@npm:^2.1.0": - version: 2.1.0 - resolution: "@eslint/eslintrc@npm:2.1.0" + version: 2.1.1 + resolution: "@eslint/eslintrc@npm:2.1.1" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -1556,7 +1556,7 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: d5ed0adbe23f6571d8c9bb0ca6edf7618dc6aed4046aa56df7139f65ae7b578874e0d9c796df784c25bda648ceb754b6320277d828c8b004876d7443b8dc018c + checksum: bf909ea183d27238c257a82d4ffdec38ca94b906b4b8dfae02ecbe7ecc9e5a8182ef5e469c808bb8cb4fea4750f43ac4ca7c4b4a167b6cd7e3aaacd386b2bd25 languageName: node linkType: hard @@ -1988,9 +1988,9 @@ __metadata: linkType: hard "@mdn/browser-compat-data@npm:^5.2.34, @mdn/browser-compat-data@npm:^5.2.47": - version: 5.3.5 - resolution: "@mdn/browser-compat-data@npm:5.3.5" - checksum: d6b10fa7096d6ee6439131c62b47bdb997acfe1059408c78eddde5cb52397dbb15160281661ed8659c0985cdc32c8e679ee2e0b45e946f0d436ed0e5714ba7d5 + version: 5.3.6 + resolution: "@mdn/browser-compat-data@npm:5.3.6" + checksum: 71ddfc1296d83b3ae5b70797c876fb024be4977190defef3a7fa408e90760776dada840a0df473a2b0fe78e442554edb2f2b102a5b22e36798be2db0b28c5593 languageName: node linkType: hard @@ -2204,12 +2204,12 @@ __metadata: linkType: hard "@types/eslint@npm:*": - version: 8.44.0 - resolution: "@types/eslint@npm:8.44.0" + version: 8.44.1 + resolution: "@types/eslint@npm:8.44.1" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: 2655f409a4ecdd64bb9dd9eb6715e7a2ac30c0e7f902b414e10dbe9d6d497baa5a0f13105e1f7bd5ad7a913338e2ab4bed1faf192a7a0d27d1acd45ba79d3f69 + checksum: 8b45be72d3c22a1ee0b1cc7e7fb0e34e32bbf959e6b7e0e46d160c17894aedf159c1db5c85750f10068884c741eebc37a1cc7ea659de23a8df0c9a3203e2ff9d languageName: node linkType: hard @@ -2370,9 +2370,9 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 20.4.3 - resolution: "@types/node@npm:20.4.3" - checksum: 4df3664821af2328c25e3d78486ec94f45f5f4a35222678954b5c7dd5d4c4e5a0cdc9f51e09a7f7f078559639293f6cee79d37e751295552be824af1f3d8ad12 + version: 20.4.5 + resolution: "@types/node@npm:20.4.5" + checksum: 36a0304a8dc346a1b2d2edac4c4633eecf70875793d61a5274d0df052d7a7af7a8e34f29884eac4fbd094c4f0201477dcb39c0ecd3307ca141688806538d1138 languageName: node linkType: hard @@ -4334,11 +4334,11 @@ __metadata: linkType: hard "core-js-compat@npm:^3.31.0": - version: 3.31.1 - resolution: "core-js-compat@npm:3.31.1" + version: 3.32.0 + resolution: "core-js-compat@npm:3.32.0" dependencies: browserslist: ^4.21.9 - checksum: 9a16d6992621f4e099169297381a28d5712cdef7df1fa85352a7c285a5885d5d7a117ec2eae9ad715ed88c7cc774787a22cdb8aceababf6775fbc8b0cbeccdb7 + checksum: e740b348dfd8dc25ac851ab625a1d5a63c012252bdd6d8ae92d1b2ebf46e6cf57ca6cbec4494cbacdd90d3f8ed822480c8a7106c990dbe9055ebdf5b79fbb92e languageName: node linkType: hard @@ -4654,9 +4654,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.431": - version: 1.4.468 - resolution: "electron-to-chromium@npm:1.4.468" - checksum: 3da242381c95286a928ef03501c0fdcc71b773e382cc8574aa998562ae8c9b14712c910879b41d6184fd954ccecc2424865754a86e20d83077a35a0b75a1cfea + version: 1.4.477 + resolution: "electron-to-chromium@npm:1.4.477" + checksum: 1bf6117b2b58d4f18eff4f019fdffd0a68988142e095d8e59a66dbd0b6587e963b405aefc925b229959de20e3e8483849bcc41e3edb4366a359f825bc0a97377 languageName: node linkType: hard @@ -4855,31 +4855,31 @@ __metadata: linkType: hard "esbuild@npm:^0.18.10, esbuild@npm:~0.18.11": - version: 0.18.15 - resolution: "esbuild@npm:0.18.15" - dependencies: - "@esbuild/android-arm": 0.18.15 - "@esbuild/android-arm64": 0.18.15 - "@esbuild/android-x64": 0.18.15 - "@esbuild/darwin-arm64": 0.18.15 - "@esbuild/darwin-x64": 0.18.15 - "@esbuild/freebsd-arm64": 0.18.15 - "@esbuild/freebsd-x64": 0.18.15 - "@esbuild/linux-arm": 0.18.15 - "@esbuild/linux-arm64": 0.18.15 - "@esbuild/linux-ia32": 0.18.15 - "@esbuild/linux-loong64": 0.18.15 - "@esbuild/linux-mips64el": 0.18.15 - "@esbuild/linux-ppc64": 0.18.15 - "@esbuild/linux-riscv64": 0.18.15 - "@esbuild/linux-s390x": 0.18.15 - "@esbuild/linux-x64": 0.18.15 - "@esbuild/netbsd-x64": 0.18.15 - "@esbuild/openbsd-x64": 0.18.15 - "@esbuild/sunos-x64": 0.18.15 - "@esbuild/win32-arm64": 0.18.15 - "@esbuild/win32-ia32": 0.18.15 - "@esbuild/win32-x64": 0.18.15 + version: 0.18.17 + resolution: "esbuild@npm:0.18.17" + dependencies: + "@esbuild/android-arm": 0.18.17 + "@esbuild/android-arm64": 0.18.17 + "@esbuild/android-x64": 0.18.17 + "@esbuild/darwin-arm64": 0.18.17 + "@esbuild/darwin-x64": 0.18.17 + "@esbuild/freebsd-arm64": 0.18.17 + "@esbuild/freebsd-x64": 0.18.17 + "@esbuild/linux-arm": 0.18.17 + "@esbuild/linux-arm64": 0.18.17 + "@esbuild/linux-ia32": 0.18.17 + "@esbuild/linux-loong64": 0.18.17 + "@esbuild/linux-mips64el": 0.18.17 + "@esbuild/linux-ppc64": 0.18.17 + "@esbuild/linux-riscv64": 0.18.17 + "@esbuild/linux-s390x": 0.18.17 + "@esbuild/linux-x64": 0.18.17 + "@esbuild/netbsd-x64": 0.18.17 + "@esbuild/openbsd-x64": 0.18.17 + "@esbuild/sunos-x64": 0.18.17 + "@esbuild/win32-arm64": 0.18.17 + "@esbuild/win32-ia32": 0.18.17 + "@esbuild/win32-x64": 0.18.17 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -4927,7 +4927,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 81eb78fb5ff9f4304512e383f518862875fa7a0cce0ef9e0270d80ebd21bf0210d5cd6cf721f8a96ca64cc2d36ade03d9ed80cbcd5e81530b5a7b95ab86f8ca6 + checksum: c6e1ffa776978a45697763a07ec9b16411db3d3b3997b2c4a0165a211727fce8b63b87165a28d8ef60d3a28b98197bbbc2833e51b89888a4437e0a483dffc8ff languageName: node linkType: hard @@ -5178,19 +5178,19 @@ __metadata: linkType: hard "eslint-scope@npm:^7.1.1, eslint-scope@npm:^7.2.0": - version: 7.2.1 - resolution: "eslint-scope@npm:7.2.1" + version: 7.2.2 + resolution: "eslint-scope@npm:7.2.2" dependencies: esrecurse: ^4.3.0 estraverse: ^5.2.0 - checksum: dccda5c8909216f6261969b72c77b95e385f9086bed4bc09d8a6276df8439d8f986810fd9ac3bd02c94c0572cefc7fdbeae392c69df2e60712ab8263986522c5 + checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e languageName: node linkType: hard "eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1": - version: 3.4.1 - resolution: "eslint-visitor-keys@npm:3.4.1" - checksum: f05121d868202736b97de7d750847a328fcfa8593b031c95ea89425333db59676ac087fa905eba438d0a3c5769632f828187e0c1a0d271832a2153c1d3661c2c + version: 3.4.2 + resolution: "eslint-visitor-keys@npm:3.4.2" + checksum: 9e0e7e4aaea705c097ae37c97410e5f167d4d2193be2edcb1f0760762ede3df01545e4820ae314f42dcec687745f2c6dcaf6d83575c4a2a241eb0c8517d724f2 languageName: node linkType: hard @@ -5347,8 +5347,8 @@ __metadata: linkType: hard "execa@npm:^7.1.1": - version: 7.1.1 - resolution: "execa@npm:7.1.1" + version: 7.2.0 + resolution: "execa@npm:7.2.0" dependencies: cross-spawn: ^7.0.3 get-stream: ^6.0.1 @@ -5359,7 +5359,7 @@ __metadata: onetime: ^6.0.0 signal-exit: ^3.0.7 strip-final-newline: ^3.0.0 - checksum: 21fa46fc69314ace4068cf820142bdde5b643a5d89831c2c9349479c1555bff137a291b8e749e7efca36535e4e0a8c772c11008ca2e84d2cbd6ca141a3c8f937 + checksum: 14fd17ba0ca8c87b277584d93b1d9fc24f2a65e5152b31d5eb159a3b814854283eaae5f51efa9525e304447e2f757c691877f7adff8fde5746aae67eb1edd1cc languageName: node linkType: hard @@ -5405,15 +5405,15 @@ __metadata: linkType: hard "fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0": - version: 3.3.0 - resolution: "fast-glob@npm:3.3.0" + version: 3.3.1 + resolution: "fast-glob@npm:3.3.1" dependencies: "@nodelib/fs.stat": ^2.0.2 "@nodelib/fs.walk": ^1.2.3 glob-parent: ^5.1.2 merge2: ^1.3.0 micromatch: ^4.0.4 - checksum: 20df62be28eb5426fe8e40e0d05601a63b1daceb7c3d87534afcad91bdcf1e4b1743cf2d5247d6e225b120b46df0b9053a032b2691ba34ee121e033acd81f547 + checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5 languageName: node linkType: hard @@ -6544,15 +6544,15 @@ __metadata: linkType: hard "jackspeak@npm:^2.0.3": - version: 2.2.1 - resolution: "jackspeak@npm:2.2.1" + version: 2.2.2 + resolution: "jackspeak@npm:2.2.2" dependencies: "@isaacs/cliui": ^8.0.2 "@pkgjs/parseargs": ^0.11.0 dependenciesMeta: "@pkgjs/parseargs": optional: true - checksum: e29291c0d0f280a063fa18fbd1e891ab8c2d7519fd34052c0ebde38538a15c603140d60c2c7f432375ff7ee4c5f1c10daa8b2ae19a97c3d4affe308c8360c1df + checksum: 7b1468dd910afc00642db87448f24b062346570b8b47531409aa9012bcb95fdf7ec2b1c48edbb8b57a938c08391f8cc01b5034fc335aa3a2e74dbcc0ee5c555a languageName: node linkType: hard @@ -7091,11 +7091,11 @@ __metadata: linkType: hard "magic-string@npm:^0.30.0": - version: 0.30.1 - resolution: "magic-string@npm:0.30.1" + version: 0.30.2 + resolution: "magic-string@npm:0.30.2" dependencies: "@jridgewell/sourcemap-codec": ^1.4.15 - checksum: 7bc7e4493e32a77068f3753bf8652d4ab44142122eb7fb9fa871af83bef2cd2c57518a6769701cd5d0379bd624a13bc8c72ca25ac5655b27e5a61adf1fd38db2 + checksum: c0bbb9b27b2772e6bfaa5d0f6452d47c462d588ae7c43fbaac062b07836d3ec0140fcdd42a57aa53ed990abafcdd0fc17907813921b5df04eccf43e67674bc57 languageName: node linkType: hard @@ -8522,8 +8522,8 @@ __metadata: linkType: hard "rollup@npm:^3.25.2, rollup@npm:^3.26.2": - version: 3.26.3 - resolution: "rollup@npm:3.26.3" + version: 3.27.0 + resolution: "rollup@npm:3.27.0" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -8531,7 +8531,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: e6a765b2b7af709170344cc804392936613e06b6bdab46a04d264368d154bdadaaaf77de39e6e656bf728a060d7b4867d81e2464d791c0f37dd5b21aa9c7a6df + checksum: f60c2c288d039dc14e1f6e7fd673b7fcb11928b5a781675791b37a741f63b7af110fc5d040d60d603175b6e03ff978bed83db018dd2ac542ef809fe1a5b32dae languageName: node linkType: hard @@ -8630,7 +8630,7 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.64.1": +"sass@npm:1.64.1, sass@npm:^1.63.6": version: 1.64.1 resolution: "sass@npm:1.64.1" dependencies: @@ -8643,19 +8643,6 @@ __metadata: languageName: node linkType: hard -"sass@npm:^1.63.6": - version: 1.64.0 - resolution: "sass@npm:1.64.0" - dependencies: - chokidar: ">=3.0.0 <4.0.0" - immutable: ^4.0.0 - source-map-js: ">=0.6.2 <2.0.0" - bin: - sass: sass.js - checksum: b4eb9b1bdeb1c00e76427d7fe3e5f80d831327178cdee657aa4e014edfc64ebbfe43177147403da1e04d76a24f4093f5a9b1c8d9d80c94579937d8adc5a6ef66 - languageName: node - linkType: hard - "sax@npm:^1.2.4": version: 1.2.4 resolution: "sax@npm:1.2.4" @@ -8806,9 +8793,9 @@ __metadata: linkType: hard "signal-exit@npm:^4.0.1": - version: 4.0.2 - resolution: "signal-exit@npm:4.0.2" - checksum: 41f5928431cc6e91087bf0343db786a6313dd7c6fd7e551dbc141c95bb5fb26663444fd9df8ea47c5d7fc202f60aa7468c3162a9365cbb0615fc5e1b1328fe31 + version: 4.1.0 + resolution: "signal-exit@npm:4.1.0" + checksum: 64c757b498cb8629ffa5f75485340594d2f8189e9b08700e69199069c8e3070fb3e255f7ab873c05dc0b3cec412aea7402e10a5990cb6a050bd33ba062a6c549 languageName: node linkType: hard @@ -9432,9 +9419,9 @@ __metadata: linkType: hard "tslib@npm:^2.0.3, tslib@npm:^2.5.0, tslib@npm:^2.6.0": - version: 2.6.0 - resolution: "tslib@npm:2.6.0" - checksum: c01066038f950016a18106ddeca4649b4d76caa76ec5a31e2a26e10586a59fceb4ee45e96719bf6c715648e7c14085a81fee5c62f7e9ebee68e77a5396e5538f + version: 2.6.1 + resolution: "tslib@npm:2.6.1" + checksum: b0d176d176487905b66ae4d5856647df50e37beea7571c53b8d10ba9222c074b81f1410fb91da13debaf2cbc970663609068bdebafa844ea9d69b146527c38fe languageName: node linkType: hard @@ -9746,8 +9733,8 @@ __metadata: linkType: hard "vite@npm:~4.4.2": - version: 4.4.6 - resolution: "vite@npm:4.4.6" + version: 4.4.7 + resolution: "vite@npm:4.4.7" dependencies: esbuild: ^0.18.10 fsevents: ~2.3.2 @@ -9781,7 +9768,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 5a821897f1e03f9786f827acb89e3117a79b8901d184bbc3a2e48d6404b37975a5cdeb6b6969ec24ed1e81d96f1959ed6f9426cbb64501d1e4770bdb20f9c02f + checksum: 787c4d891da18d0a0545bee07dec73c3201979dcf2b1ea3dc13fdd2d3b9ad76d413bcc0e68502183e309007a612c1f4116adefe0093d95fbbb9cf1c1755f7e41 languageName: node linkType: hard From 947b95462624a5dbd90413fa44c603b776ecb8d6 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 29 Jul 2023 12:28:33 +0200 Subject: [PATCH 083/182] =?UTF-8?q?=F0=9F=92=9A=20[deploy]=20delete=20outd?= =?UTF-8?q?ated=20files=20on=20deployment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a956a570b6..55e86ab241 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,7 +41,17 @@ jobs: - name: '[🚀] Deployment' if: ${{ success() }} - run: rsync -ruthz --stats --progress -e "ssh -p 22" ./dist/dist/ ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEPLOY_DIR }}/${{ inputs.branch }} + # -h => human-readable output format for numbers + # -i => itemize changes + # -r => recursive + # -t => preserve modification times + # -u => update (skip files that are newer on the receiver) + # -z => compress for transfer + # --delete --delete-delay => delete files on server that are not in the local directory (in an efficient way) + # --stats => show stats at the end + # --progress => show progress during transfer + # -e => specify ssh port + run: rsync -hirtuz --delete --delete-delay --stats --progress -e "ssh -p 22" ./dist/dist/ ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEPLOY_DIR }}/${{ inputs.branch }} - name: '[🔗] Create symlinks on server' if: ${{ success() }} From c9368eb0e3e20482fb19d67b81b7cdc9f1a1474a Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 29 Jul 2023 12:43:47 +0200 Subject: [PATCH 084/182] =?UTF-8?q?=E2=9C=A8=20[hotkeys]=20new=20hotkey:?= =?UTF-8?q?=20mission.vehicleList.reset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/hotkeys/assets/commands/mission.ts | 5 ++++- src/modules/hotkeys/i18n/cs_CZ.root.json | 1 + src/modules/hotkeys/i18n/de_DE.root.json | 1 + src/modules/hotkeys/i18n/en_AU.root.json | 1 + src/modules/hotkeys/i18n/en_GB.root.json | 1 + src/modules/hotkeys/i18n/en_US.root.json | 1 + src/modules/hotkeys/i18n/es_ES.root.json | 1 + src/modules/hotkeys/i18n/fi_FI.root.json | 1 + src/modules/hotkeys/i18n/fr_FR.root.json | 1 + src/modules/hotkeys/i18n/nb_NO.root.json | 1 + src/modules/hotkeys/i18n/nl_NL.root.json | 1 + src/modules/hotkeys/i18n/pl_PL.root.json | 1 + src/modules/hotkeys/i18n/sv_SE.root.json | 1 + src/modules/hotkeys/settings.ts | 1 + 14 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/modules/hotkeys/assets/commands/mission.ts b/src/modules/hotkeys/assets/commands/mission.ts index e035dbc7ba..bc99e7669c 100644 --- a/src/modules/hotkeys/assets/commands/mission.ts +++ b/src/modules/hotkeys/assets/commands/mission.ts @@ -170,7 +170,7 @@ export default < loadMissingBtn: HTMLAnchorElement | null; }, [], - ['next', 'previous', 'loadMissing'] + ['next', 'previous', 'loadMissing', 'reset'] > >{ validatorFunction() { @@ -203,6 +203,9 @@ export default < if (this.loadMissingBtn?.style.display != 'none') this.loadMissingBtn?.click(); }, + reset() { + window.vehicleSelectionReset(); + }, }, backalarm: < Scope diff --git a/src/modules/hotkeys/i18n/cs_CZ.root.json b/src/modules/hotkeys/i18n/cs_CZ.root.json index 084ff93c45..1c2689b5f7 100644 --- a/src/modules/hotkeys/i18n/cs_CZ.root.json +++ b/src/modules/hotkeys/i18n/cs_CZ.root.json @@ -161,6 +161,7 @@ "loadMissing": "Load missing vehicles", "next": "next tab", "previous": "previous tab", + "reset": "reset vehicle selection", "title": "vehicle list" } }, diff --git a/src/modules/hotkeys/i18n/de_DE.root.json b/src/modules/hotkeys/i18n/de_DE.root.json index d91727aeac..b642d880e7 100644 --- a/src/modules/hotkeys/i18n/de_DE.root.json +++ b/src/modules/hotkeys/i18n/de_DE.root.json @@ -162,6 +162,7 @@ "loadMissing": "Fehlende Fahrzeuge nachladen", "next": "Nächster Tab", "previous": "Vorheriger Tab", + "reset": "Fahrzeugauswahl zurücksetzen", "title": "Fahrzeugliste" } }, diff --git a/src/modules/hotkeys/i18n/en_AU.root.json b/src/modules/hotkeys/i18n/en_AU.root.json index 9c97440d13..f31959bd09 100644 --- a/src/modules/hotkeys/i18n/en_AU.root.json +++ b/src/modules/hotkeys/i18n/en_AU.root.json @@ -154,6 +154,7 @@ "loadMissing": "Load missing vehicles", "next": "next tab", "previous": "previous tab", + "reset": "reset vehicle selection", "title": "vehicle list" } }, diff --git a/src/modules/hotkeys/i18n/en_GB.root.json b/src/modules/hotkeys/i18n/en_GB.root.json index 55dbb67a0d..385eac605d 100644 --- a/src/modules/hotkeys/i18n/en_GB.root.json +++ b/src/modules/hotkeys/i18n/en_GB.root.json @@ -155,6 +155,7 @@ "loadMissing": "Load missing vehicles", "next": "next tab", "previous": "previous tab", + "reset": "reset vehicle selection", "title": "vehicle list" } }, diff --git a/src/modules/hotkeys/i18n/en_US.root.json b/src/modules/hotkeys/i18n/en_US.root.json index 55dbb67a0d..385eac605d 100644 --- a/src/modules/hotkeys/i18n/en_US.root.json +++ b/src/modules/hotkeys/i18n/en_US.root.json @@ -155,6 +155,7 @@ "loadMissing": "Load missing vehicles", "next": "next tab", "previous": "previous tab", + "reset": "reset vehicle selection", "title": "vehicle list" } }, diff --git a/src/modules/hotkeys/i18n/es_ES.root.json b/src/modules/hotkeys/i18n/es_ES.root.json index 47ff41884e..be70fb6091 100644 --- a/src/modules/hotkeys/i18n/es_ES.root.json +++ b/src/modules/hotkeys/i18n/es_ES.root.json @@ -158,6 +158,7 @@ "loadMissing": "Load missing vehicles", "next": "next tab", "previous": "previous tab", + "reset": "reset vehicle selection", "title": "vehicle list" } }, diff --git a/src/modules/hotkeys/i18n/fi_FI.root.json b/src/modules/hotkeys/i18n/fi_FI.root.json index 4fa246fb89..47718e34b9 100644 --- a/src/modules/hotkeys/i18n/fi_FI.root.json +++ b/src/modules/hotkeys/i18n/fi_FI.root.json @@ -159,6 +159,7 @@ "loadMissing": "Lataa puuttuvat ajoneuvot", "next": "seuraava välilehti", "previous": "edellinen välilehti", + "reset": "reset vehicle selection", "title": "ajoneuvo lista" } }, diff --git a/src/modules/hotkeys/i18n/fr_FR.root.json b/src/modules/hotkeys/i18n/fr_FR.root.json index e93b0d4d32..99cba813d3 100644 --- a/src/modules/hotkeys/i18n/fr_FR.root.json +++ b/src/modules/hotkeys/i18n/fr_FR.root.json @@ -161,6 +161,7 @@ "loadMissing": "Chargement des véhicules manquants", "next": "Onglet Suivant", "previous": "Onglet Précédent", + "reset": "reset vehicle selection", "title": "Liste des véhicules" } }, diff --git a/src/modules/hotkeys/i18n/nb_NO.root.json b/src/modules/hotkeys/i18n/nb_NO.root.json index 3a0dcfe7c0..eb3fc0a77c 100644 --- a/src/modules/hotkeys/i18n/nb_NO.root.json +++ b/src/modules/hotkeys/i18n/nb_NO.root.json @@ -155,6 +155,7 @@ "loadMissing": "Load missing vehicles", "next": "next tab", "previous": "previous tab", + "reset": "reset vehicle selection", "title": "vehicle list" } }, diff --git a/src/modules/hotkeys/i18n/nl_NL.root.json b/src/modules/hotkeys/i18n/nl_NL.root.json index cb68188138..ecefc4adaf 100644 --- a/src/modules/hotkeys/i18n/nl_NL.root.json +++ b/src/modules/hotkeys/i18n/nl_NL.root.json @@ -155,6 +155,7 @@ "loadMissing": "Laad missende voertuigen", "next": "volgende tab", "previous": "vorige tab", + "reset": "reset vehicle selection", "title": "Voertuigenlijst" } }, diff --git a/src/modules/hotkeys/i18n/pl_PL.root.json b/src/modules/hotkeys/i18n/pl_PL.root.json index 99df79a7c9..0d5e202b54 100644 --- a/src/modules/hotkeys/i18n/pl_PL.root.json +++ b/src/modules/hotkeys/i18n/pl_PL.root.json @@ -158,6 +158,7 @@ "loadMissing": "Załaduj brakujące pojazdy", "next": "Poprzednia zakładka", "previous": "Następna zakładka", + "reset": "reset vehicle selection", "title": "Lista pojazdów" } }, diff --git a/src/modules/hotkeys/i18n/sv_SE.root.json b/src/modules/hotkeys/i18n/sv_SE.root.json index d462d0a971..9962d47866 100644 --- a/src/modules/hotkeys/i18n/sv_SE.root.json +++ b/src/modules/hotkeys/i18n/sv_SE.root.json @@ -161,6 +161,7 @@ "loadMissing": "Load missing vehicles", "next": "next tab", "previous": "previous tab", + "reset": "reset vehicle selection", "title": "vehicle list" } }, diff --git a/src/modules/hotkeys/settings.ts b/src/modules/hotkeys/settings.ts index 498758f505..0735da143e 100644 --- a/src/modules/hotkeys/settings.ts +++ b/src/modules/hotkeys/settings.ts @@ -62,6 +62,7 @@ export default ((MODULE_ID, LSSM, $m) => { 'mission.vehicleList.next', 'mission.vehicleList.previous', 'mission.vehicleList.loadMissing', + 'mission.vehicleList.reset', 'mission.backalarm.allVehicles', 'mission.backalarm.onlyAmbulance', 'mission.backalarm.abortApproach', From 4cb9db274dac8f5a244804273ee1d67e56a06126 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 29 Jul 2023 15:11:51 +0200 Subject: [PATCH 085/182] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[core]=20migrate?= =?UTF-8?q?=20main=20vue=20file=20to=20composition=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/LSSMV4.vue | 103 +++++++++++++++++++------------------------------ src/i18n.ts | 20 ++++++---- 2 files changed, 51 insertions(+), 72 deletions(-) diff --git a/src/LSSMV4.vue b/src/LSSMV4.vue index 82a586c8ff..d03358abd9 100644 --- a/src/LSSMV4.vue +++ b/src/LSSMV4.vue @@ -2,7 +2,7 @@
    - diff --git a/src/i18n.ts b/src/i18n.ts index 34c4a8f995..7a01fe2176 100644 --- a/src/i18n.ts +++ b/src/i18n.ts @@ -65,18 +65,22 @@ export default async (Vue: VueConstructor): Promise => { return i18n; }; -const useI18n = (scope: string) => { +const useI18n = (scope?: string) => { const { t, tc } = useI18nHelper(); return { $t: t, $tc: tc, - $m: (key: VueI18n.Path, args?: VueI18n.Values) => - t(`${scope}.${key}`, args), - $mc: ( - key: VueI18n.Path, - choice?: VueI18n.Choice, - args?: VueI18n.Values - ) => tc(`${scope}.${key}`, choice, args), + $m: scope + ? (key: VueI18n.Path, args?: VueI18n.Values) => + t(`${scope}.${key}`, args) + : t, + $mc: scope + ? ( + key: VueI18n.Path, + choice?: VueI18n.Choice, + args?: VueI18n.Values + ) => tc(`${scope}.${key}`, choice, args) + : tc, }; }; From 4d5a5d1a295fad7e70699f5ce36a9b614845a32a Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 29 Jul 2023 15:18:52 +0200 Subject: [PATCH 086/182] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[core]=20outsource?= =?UTF-8?q?=20main=20style=20to=20main.sass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/LSSMV4.vue | 233 --------------------------------------------- src/core.ts | 2 + src/sass/main.sass | 230 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+), 233 deletions(-) create mode 100644 src/sass/main.sass diff --git a/src/LSSMV4.vue b/src/LSSMV4.vue index d03358abd9..2210dd5f3e 100644 --- a/src/LSSMV4.vue +++ b/src/LSSMV4.vue @@ -87,236 +87,3 @@ onMounted(() => { getCurrentInstance()?.proxy.$el.before(modalsContainer); }); - - diff --git a/src/core.ts b/src/core.ts index 31e8917f93..ded98d8a01 100644 --- a/src/core.ts +++ b/src/core.ts @@ -27,6 +27,8 @@ import LSSMV4 from './LSSMV4.vue'; import registerGlobalSettings from './core/registerGlobalSettings'; import utils from './utils'; +import './sass/main.sass'; + require('./natives/navTabsClicker'); require('./natives/lightbox'); diff --git a/src/sass/main.sass b/src/sass/main.sass new file mode 100644 index 0000000000..bc3ee85e8a --- /dev/null +++ b/src/sass/main.sass @@ -0,0 +1,230 @@ +@import "~vue-select/src/scss/vue-select.scss" + +.alert-unimportant + background-image: linear-gradient(to bottom, #909090 0, #505050 100%) + border-color: #303030 + color: #ffffff + +body.dark + .vm--modal + background-color: #505050 + color: white + + &.vue-dialog + a + color: #6dd5f4 + + .vue-dialog-button:hover + background-color: rgba(249, 249, 249, 0.25) + + .vs__dropdown-toggle + border-color: dimgrey + + .vs__selected + color: white + background-color: #505050 + + .vs__dropdown-menu + color: white + background-color: #505050 + + .vs__dropdown-option + color: white + + .text-muted + color: darkgray + + ._vue-flash-msg-body ._vue-flash-msg-body__icon + background-color: #505050 + + pre + color: #f5f5f5 + background: #333 + + &:not(.leaflet-no-dark-tooltip) .leaflet-tooltip + background-color: #505050 + color: #ddd + border: #505050 + + &.leaflet-tooltip-left::before + border-left-color: #505050 + + &.leaflet-tooltip-right::before + border-right-color: #505050 + + &.leaflet-no-dark-tooltip .leaflet-tooltip tr + background-color: unset + + &.leaflet-dark-controls + .leaflet-control-layers + background-color: #a0a0a0 + + .leaflet-bar + a + background-color: #a0a0a0 + + &:hover + background-color: #dadada + + .bg-danger + background-color: #a94442 + + > :not(nav):not(#col_navbar_holder) .dropdown-menu + background-image: linear-gradient(to bottom, #505050 0, #000 100%) + color: #fff + border: #000 + + > li > a + color: #fff + + &:focus, &:hover + background-image: linear-gradient(to bottom, #5a5a5a 0, #353535 100%) + + .highcharts-axis-labels text, + .highcharts-legend-item text, + .highcharts-axis-title + color: white !important + fill: white !important + + .alert-unimportant + background-color: #303030 + border-color: #303030 + background-image: none + + .help-block + color: #c2c2c2 + +.vm--container + z-index: 5001 !important + + .vm--overlay[data-modal="dialog"] + background-color: rgba(0, 0, 0, 0.7) + pointer-events: none + + .vm--modal + padding: 1rem + overflow: auto !important + max-height: 100vh !important + + &.vue-dialog code + word-break: break-word + +.vue-tablist + list-style: none + display: flex + flex-flow: wrap + padding-left: 0 + border-bottom: 1px solid #e2e2e2 + + + .vue-tab + padding: 5px 10px + cursor: pointer + user-select: none + border: 1px solid transparent + border-bottom-color: #e2e2e2 + border-radius: 3px 3px 0 0 + position: relative + bottom: -1px + font-weight: bold + font-size: 120% + + + &[aria-selected='true'] + border-color: #e2e2e2 + border-bottom-color: transparent + + + &[aria-disabled='true'] + cursor: not-allowed + color: #999 + +.lssm_notice_bg + background-color: #77dc81 + +.lssm_overlay + position: fixed + top: 1rem + left: 1rem + z-index: 10006 + padding: 10px + +[draggable] + user-select: none + cursor: pointer + + &:hover + text-decoration: none + +.vue-notification-group + transform: scale(1.5) + margin: 1em + z-index: 10006 !important + + &.bottom.center + transform-origin: bottom center + + .lssm-notification + border-top-width: 5px !important + + &.top.center + transform-origin: top center + + .lssm-notification + border-bottom-width: 5px !important + + &.right + &.bottom + transform-origin: bottom right + + &.top + transform-origin: top right + + .lssm-notification + border-left-width: 5px !important + + &.left + &.bottom + transform-origin: bottom left + + &.top + transform-origin: top left + + .lssm-notification + border-right-width: 5px !important + + .vue-notification-wrapper + margin: 0.1ch + + .lssm-notification + font-size: 12px + padding: 10px + border-width: 0 + border-style: solid + display: grid + grid-template-columns: auto 1fr + word-break: break-word + cursor: pointer + + &.notification-danger + border-color: #ce4844 !important + + &.notification-warning + border-color: #aa6708 !important + + &.notification-info + border-color: #1b809e !important + + &.notification-success + border-color: #2b542c !important + + &.notification-unimportant + border-color: #707070 !important + + img + max-width: 100px + padding-right: 1ch + align-self: center + +.leaflet-layer.leaflet-heatmap-layer + background-color: transparent !important From 1f6ea8d62ff6c76c47bcbf995e27438293874c20 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 30 Jul 2023 22:12:05 +0000 Subject: [PATCH 087/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`vuepress?= =?UTF-8?q?-plugin-sitemap2`=20to=20v2.0.0-beta.234?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vuepress/package.json | 2 +- yarn.lock | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/.vuepress/package.json b/docs/.vuepress/package.json index 2bcf6c6784..83b3395188 100644 --- a/docs/.vuepress/package.json +++ b/docs/.vuepress/package.json @@ -15,6 +15,6 @@ "vue": "3.3.4", "vuepress": "2.0.0-beta.66", "vuepress-plugin-clipboard": "2.1.5", - "vuepress-plugin-sitemap2": "2.0.0-beta.233" + "vuepress-plugin-sitemap2": "2.0.0-beta.234" } } diff --git a/yarn.lock b/yarn.lock index cc3c0056e9..01612d9155 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5346,7 +5346,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:^7.1.1": +"execa@npm:^7.1.1, execa@npm:^7.2.0": version: 7.2.0 resolution: "execa@npm:7.2.0" dependencies: @@ -6990,7 +6990,7 @@ __metadata: vue: 3.3.4 vuepress: 2.0.0-beta.66 vuepress-plugin-clipboard: 2.1.5 - vuepress-plugin-sitemap2: 2.0.0-beta.233 + vuepress-plugin-sitemap2: 2.0.0-beta.234 languageName: unknown linkType: soft @@ -9992,14 +9992,14 @@ __metadata: languageName: node linkType: hard -"vuepress-plugin-sitemap2@npm:2.0.0-beta.233": - version: 2.0.0-beta.233 - resolution: "vuepress-plugin-sitemap2@npm:2.0.0-beta.233" +"vuepress-plugin-sitemap2@npm:2.0.0-beta.234": + version: 2.0.0-beta.234 + resolution: "vuepress-plugin-sitemap2@npm:2.0.0-beta.234" dependencies: "@vuepress/shared": 2.0.0-beta.66 "@vuepress/utils": 2.0.0-beta.66 sitemap: ^7.1.1 - vuepress-shared: 2.0.0-beta.233 + vuepress-shared: 2.0.0-beta.234 peerDependencies: vuepress: 2.0.0-beta.66 vuepress-vite: 2.0.0-beta.66 @@ -10011,13 +10011,13 @@ __metadata: optional: true vuepress-webpack: optional: true - checksum: 605bb2051acc1e0de12397fa4140fe075abc823b9728a5900b19c2373dcee013d55cf6bbe68c06d9b326a561bb772a9b55e8fa68ca0e82f7bd8875394eaf3114 + checksum: 126bb869ed2ff6d340207d6cd80671a4042a61893f9ccbe67f410ce46b45e6d00888eb94bedacaf279310988fee7e1e03d4f3926dc7f7a83fc78b5b91c633eac languageName: node linkType: hard -"vuepress-shared@npm:2.0.0-beta.233": - version: 2.0.0-beta.233 - resolution: "vuepress-shared@npm:2.0.0-beta.233" +"vuepress-shared@npm:2.0.0-beta.234": + version: 2.0.0-beta.234 + resolution: "vuepress-shared@npm:2.0.0-beta.234" dependencies: "@vuepress/client": 2.0.0-beta.66 "@vuepress/shared": 2.0.0-beta.66 @@ -10025,7 +10025,7 @@ __metadata: "@vueuse/core": ^10.2.1 cheerio: 1.0.0-rc.12 dayjs: ^1.11.9 - execa: ^7.1.1 + execa: ^7.2.0 fflate: ^0.8.0 gray-matter: ^4.0.3 semver: ^7.5.4 @@ -10043,7 +10043,7 @@ __metadata: optional: true vuepress-webpack: optional: true - checksum: cfc0efe32d1cca1795b502d719801396d64e2d1cc16ed9a5eb4efa4f690c882120367b9a248101355d011a2feadc30abedc5be697a1afdb0176e816a40db935e + checksum: 769c0e75d0d63aab40c35c05ad2e25c8ad651e4c01955094d8e2e447e1ce5dbfa78e7d39f91192f8f0f3d16a5cf451dbfa476a1908eb5fb6666761872f75721b languageName: node linkType: hard From 2c1605f3a3584623038598498979d7437414cde3 Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 31 Jul 2023 01:18:16 +0000 Subject: [PATCH 088/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230731?= =?UTF-8?q?.0314=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 81b70167d0..d15064e2e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230728.0708", + "version": "4.7.7+20230731.0314", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 4a8fb6369c..f74d4fd8ce 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -417,7 +417,7 @@ }, "vuepress-plugin-sitemap2": { "url": "https://plugin-sitemap2.vuejs.press/", - "version": "2.0.0-beta.233" + "version": "2.0.0-beta.234" }, "webpack": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From 8b4fea406e087cd2bc6de929fea53d83e4d7987c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 04:41:28 +0000 Subject: [PATCH 089/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`@primer/?= =?UTF-8?q?octicons`=20to=20v19.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vuepress/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/.vuepress/package.json b/docs/.vuepress/package.json index 83b3395188..c7d3f9a4e1 100644 --- a/docs/.vuepress/package.json +++ b/docs/.vuepress/package.json @@ -2,7 +2,7 @@ "name": "lss-manager-v4-docs", "license": "CC-BY-NC-SA-4.0", "dependencies": { - "@primer/octicons": "19.4.0", + "@primer/octicons": "19.5.0", "@vuepress/client": "2.0.0-beta.66", "@vuepress/plugin-pwa": "2.0.0-beta.66", "@vuepress/plugin-pwa-popup": "2.0.0-beta.66", diff --git a/yarn.lock b/yarn.lock index 01612d9155..0bc14cbc65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2070,12 +2070,12 @@ __metadata: languageName: node linkType: hard -"@primer/octicons@npm:19.4.0": - version: 19.4.0 - resolution: "@primer/octicons@npm:19.4.0" +"@primer/octicons@npm:19.5.0": + version: 19.5.0 + resolution: "@primer/octicons@npm:19.5.0" dependencies: object-assign: ^4.1.1 - checksum: 774b7881266d41870f932a7d0d3c6536b706fe269719ad1ea3ee2c59a895c150fb08724347636be99cc6567ea4ca14534170a5db9d2e2ccec0ebaaf673e8873f + checksum: ef3f30cd0ff82fcb95a4db610669b78bdc24dd8d57489158ab0f8dd96e7f8f6ec6f2bb6429a3e0c0f62c617a762d4a85a2492723d304f1ff87d89d511e3bdbd6 languageName: node linkType: hard @@ -6977,7 +6977,7 @@ __metadata: version: 0.0.0-use.local resolution: "lss-manager-v4-docs@workspace:docs/.vuepress" dependencies: - "@primer/octicons": 19.4.0 + "@primer/octicons": 19.5.0 "@vuepress/client": 2.0.0-beta.66 "@vuepress/plugin-pwa": 2.0.0-beta.66 "@vuepress/plugin-pwa-popup": 2.0.0-beta.66 From 64f0c33b36f5bae73322e6529e2b92ce5e9a13dc Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 31 Jul 2023 05:11:10 +0000 Subject: [PATCH 090/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230731?= =?UTF-8?q?.0707=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d15064e2e6..7acebe9ad6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230731.0314", + "version": "4.7.7+20230731.0707", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index f74d4fd8ce..b0de7b527c 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -27,7 +27,7 @@ "@primer/octicons": { "icon": "https://primer.style/design/icons/icon-512x512.png", "url": "https://primer.style/octicons", - "version": "19.4.0" + "version": "19.5.0" }, "@types/he": { "icon": "https://avatars.githubusercontent.com/u/3637556", From c897a4997f2c29e23127aefece76c17f929fe8c0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 04:21:20 +0000 Subject: [PATCH 091/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20Node.js?= =?UTF-8?q?=20to=20v18.17.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7acebe9ad6..a71daad50c 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "webpack": "5.88.2" }, "engines": { - "node": "18.16.1" + "node": "18.17.0" }, "packageManager": "yarn@3.6.1", "workspaces": [ From d1bac252f2fc10d0922770c6df49961ce833bac8 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 1 Aug 2023 04:45:41 +0000 Subject: [PATCH 092/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230801?= =?UTF-8?q?.0642=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/browsers.json | 4 ++-- yarn.lock | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a71daad50c..cf679c4415 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230731.0707", + "version": "4.7.7+20230801.0642", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/browsers.json b/src/generated/browsers.json index c517a15838..5f2f8d6832 100644 --- a/src/generated/browsers.json +++ b/src/generated/browsers.json @@ -6,8 +6,8 @@ }, "edge": { "download": "https://microsoft.com/edge", - "latest": 114, - "supported": 108 + "latest": 115, + "supported": 109 }, "firefox": { "download": "https://firefox.com", diff --git a/yarn.lock b/yarn.lock index 0bc14cbc65..f2cf5c5b62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4019,9 +4019,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001473, caniuse-lite@npm:^1.0.30001503": - version: 1.0.30001517 - resolution: "caniuse-lite@npm:1.0.30001517" - checksum: e4e87436ae1c4408cf4438aac22902b31eb03f3f5bad7f33bc518d12ffb35f3fd9395ccf7efc608ee046f90ce324ec6f7f26f8a8172b8c43c26a06ecee612a29 + version: 1.0.30001518 + resolution: "caniuse-lite@npm:1.0.30001518" + checksum: 1b63272f6e3d628ac52e2547e0b75fc477004d4b19b63e34b2c045de7f2e48909f9ea513978fc5a46c4ab5ac6c9daf9cc5e6a78466e90684fb824c3f2105e8f5 languageName: node linkType: hard From f76c3337312892f717f83ebb3fe901f34c5ed9fe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 05:00:36 +0000 Subject: [PATCH 093/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`sass`=20?= =?UTF-8?q?to=20v1.64.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index cf679c4415..e4945f0d2c 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "js-yaml": "4.1.0", "moment-timezone": "0.5.43", "prettier": "3.0.0", - "sass": "1.64.1", + "sass": "1.64.2", "sass-loader": "13.3.2", "terser": "5.19.2", "ts-loader": "9.4.4", diff --git a/yarn.lock b/yarn.lock index f2cf5c5b62..320f976f8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7055,7 +7055,7 @@ __metadata: pinia: 2.1.6 prettier: 3.0.0 qrcode: 1.5.3 - sass: 1.64.1 + sass: 1.64.2 sass-loader: 13.3.2 semver: 7.5.4 showdown: 2.1.0 @@ -8630,7 +8630,20 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.64.1, sass@npm:^1.63.6": +"sass@npm:1.64.2": + version: 1.64.2 + resolution: "sass@npm:1.64.2" + dependencies: + chokidar: ">=3.0.0 <4.0.0" + immutable: ^4.0.0 + source-map-js: ">=0.6.2 <2.0.0" + bin: + sass: sass.js + checksum: 43a5c9b9b3b6ba27feb5c45eba90edc437b15a30fd443f5d2623bbd59fe4a922f2a6a9990296c6a6c2b5bce7f401922c5049357415f50b745952c2d478bc5526 + languageName: node + linkType: hard + +"sass@npm:^1.63.6": version: 1.64.1 resolution: "sass@npm:1.64.1" dependencies: From bb7d82ae84d463c12c81012f7a81afc9a6bff8d0 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 1 Aug 2023 05:22:57 +0000 Subject: [PATCH 094/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230801?= =?UTF-8?q?.0719=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e4945f0d2c..24a08508e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230801.0642", + "version": "4.7.7+20230801.0719", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index b0de7b527c..222af0773a 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -300,7 +300,7 @@ "sass": { "icon": "https://sass-lang.com/assets/img/logos/logo.svg", "url": "https://github.com/sass/dart-sass", - "version": "1.64.1" + "version": "1.64.2" }, "sass-loader": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From 96d1938a43f7e1ef9db4835f8a403bdad3489664 Mon Sep 17 00:00:00 2001 From: jan Date: Tue, 1 Aug 2023 12:13:01 +0200 Subject: [PATCH 095/182] =?UTF-8?q?=F0=9F=9A=91=20[redesign]=20fix=20award?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/redesign/parsers/awards.ts | 67 ++++++++++++------------- src/modules/redesign/parsers/profile.ts | 12 +++-- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/modules/redesign/parsers/awards.ts b/src/modules/redesign/parsers/awards.ts index d4845de43e..1129cf4961 100644 --- a/src/modules/redesign/parsers/awards.ts +++ b/src/modules/redesign/parsers/awards.ts @@ -13,39 +13,38 @@ export interface AwardsWindow { } export default >(({ doc }) => ({ - awards: Array.from(doc.querySelectorAll('.panel')).map( - award => ({ - caption: - award - .querySelector( - '.panel-heading .panel-title' - ) - ?.textContent?.trim() ?? '', - image: - award.querySelector('.panel-body img')?.src ?? - '', - desc: - Array.from( - award.querySelector('.panel-body') - ?.childNodes ?? [] + awards: Array.from( + doc.querySelectorAll( + '#collection .collection:not(.always-hidden)' + ) + ).map(award => ({ + caption: + award + .querySelector('.grid-item-header .panel-title') + ?.textContent?.trim() ?? '', + image: + award.querySelector('.grid-item-img img')?.src ?? + '', + desc: + Array.from( + award.querySelector('.grid-item-text') + ?.childNodes ?? [] + ) + .find( + ({ nodeType, nextSibling }) => + nodeType === 3 && + nextSibling?.nodeType === 1 && + (nextSibling as HTMLElement).matches( + 'div.progress, div.label-award-gold' + ) ) - .find( - ({ nodeType, nextSibling }) => - nodeType === 3 && - nextSibling?.nodeType === 1 && - (nextSibling as HTMLElement).matches( - 'div.progress, div.label-award-gold' - ) - ) - ?.textContent?.trim() ?? '', - finished: - !!award.querySelector('.label-award-gold'), - progress: - award - .querySelector('.progress') - ?.nextSibling?.textContent?.trim() - .match(/\d+/gu) - ?.map(n => parseInt(n)) ?? null, - }) - ), + ?.textContent?.trim() ?? '', + finished: !!award.querySelector('.label-award-gold'), + progress: + award + .querySelector('.progress') + ?.nextSibling?.textContent?.trim() + .match(/\d+/gu) + ?.map(n => parseInt(n)) ?? null, + })), })); diff --git a/src/modules/redesign/parsers/profile.ts b/src/modules/redesign/parsers/profile.ts index 1817059b8c..d457ca0ba0 100644 --- a/src/modules/redesign/parsers/profile.ts +++ b/src/modules/redesign/parsers/profile.ts @@ -105,20 +105,22 @@ export default >(({ LSSM, doc, href = '' }) => { text: profileText?.textContent?.trim() ?? '', image: profileText?.querySelector('img')?.src ?? '', awards: Array.from( - doc.querySelectorAll('#profile_awards > .col-sm-3 > .panel') + doc.querySelectorAll( + '#profile_awards > .grid-container > .grid-item' + ) ).map(award => ({ caption: award .querySelector( - '.panel-heading .panel-title' + '.grid-item-header .panel-title' ) ?.textContent?.trim() ?? '', image: - award.querySelector('.panel-body img')?.src ?? - '', + award.querySelector('.grid-item-img img') + ?.src ?? '', desc: award - .querySelector('.panel-body') + .querySelector('.grid-item-text') ?.textContent?.trim() ?? '', })), has_map: !!doc.querySelector('#profile_map'), From 9483746486ce727eb503009645fda25c81c04e64 Mon Sep 17 00:00:00 2001 From: Tobias Date: Tue, 1 Aug 2023 23:11:58 +0200 Subject: [PATCH 096/182] =?UTF-8?q?=E2=9C=A8=20[Core]=20=F0=9F=9A=9A?= =?UTF-8?q?=F0=9F=8C=8ACP=20AU?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en_AU.ts | 3 + src/i18n/en_AU/buildings.ts | 31 +++++- src/i18n/en_AU/vehicles.ts | 99 +++++++++++++++++++ .../extendedCallWindow/i18n/en_AU.json | 15 ++- .../extendedCallWindow/i18n/en_AU.root.json | 2 +- .../missionHelper/i18n/de_DE.root.json | 2 +- src/modules/missionHelper/i18n/en_AU.json | 19 +++- .../missionHelper/i18n/en_AU.root.json | 10 ++ 8 files changed, 172 insertions(+), 9 deletions(-) diff --git a/src/i18n/en_AU.ts b/src/i18n/en_AU.ts index 5857d6dc47..f3620311d3 100644 --- a/src/i18n/en_AU.ts +++ b/src/i18n/en_AU.ts @@ -117,6 +117,9 @@ export default { 'SES & Water Rescue': { vehicles: { SES: [20, 21, 40, 41, 42], + FAR: [46,47,48], + DR: [49,50,51,52], + SAR: [53,54], VMR: [38, 39], }, color: '#02a18c', diff --git a/src/i18n/en_AU/buildings.ts b/src/i18n/en_AU/buildings.ts index c20d2e978a..1a158362d4 100644 --- a/src/i18n/en_AU/buildings.ts +++ b/src/i18n/en_AU/buildings.ts @@ -423,10 +423,35 @@ export default { credits: [10_000, 50_000, ...Array(3).fill(100_000)], coins: [10, 15, ...Array(3).fill(20)], }, - extensions: [], - levelcost: ['1. 10.000', '2. 50.000', '3.-5. 100.000'], + extensions: [ + { + caption: 'Flood and Rescue Extension', + credits: 250_000, + coins: 25, + duration: '3 Days', + givesParkingLots: 3, + unlocksVehicleTypes: [46,47,48], + }, + { + caption: 'Disaster Response Equipment Extension', + credits: 250_000, + coins: 25, + duration: '3 Days', + givesParkingLots: 3, + unlocksVehicleTypes: [49,50,51,52], + }, + { + caption: 'Search and Rescue Extension', + credits: 200_000, + coins: 25, + duration: '3 Days', + givesParkingLots: 2, + unlocksVehicleTypes: [53,54], + }, + ], + levelcost: ['1. 10.000', '2. 50.000', '3.-25. 100.000'], maxBuildings: 'No Limit', - maxLevel: 5, + maxLevel: 25, special: 'You will get 10 people and an SES vehicle for free.', startPersonnel: 10, startVehicles: ['SES Vehicle'], diff --git a/src/i18n/en_AU/vehicles.ts b/src/i18n/en_AU/vehicles.ts index addf21d149..ee648348c0 100644 --- a/src/i18n/en_AU/vehicles.ts +++ b/src/i18n/en_AU/vehicles.ts @@ -685,4 +685,103 @@ export default { icon: 'car-side', possibleBuildings: [0, 18], }, + 46: { + caption: 'SES FOV', + color: '#791515', + credits: 15_000, + coins: 15, + staff: { + min: 2, + max: 3, + training: { + 'SES & Water Rescue': { + gw_wasserrettung: { + all: true, + }, + }, + }, + }, + icon: 'car-side', + possibleBuildings: [15], + }, + 47: { + caption: 'SES Sandbag Trailer', + color: '#791515', + credits: 10_000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [15], + special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', + }, + 48: { + caption: 'SES Pump Trailer', + color: '#791515', + credits: 10_000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [15], + special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', + }, + 49: { + caption: 'SES Emergency Lighting Trailer', + color: '#791515', + credits: 10_000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [15], + special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', + }, + 50: { + caption: 'SES Aireshelta Trailer', + color: '#791515', + credits: 10_000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [15], + special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', + }, + 51: { + caption: 'SES Comms Repeater Trailer', + color: '#791515', + credits: 10_000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [15], + special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', + }, + 52: { + caption: 'SES Solar/Wind Power Trailer', + color: '#791515', + credits: 10_000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [15], + special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', + }, + 53: { + caption: 'SES Quad Rescue 6x6', + color: '#791515', + credits: 10_000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [15], + special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', + }, + 54: { + caption: 'SES Search and Rescue Trailer', + color: '#791515', + credits: 10_000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [15], + special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', + }, } satisfies Record; diff --git a/src/modules/extendedCallWindow/i18n/en_AU.json b/src/modules/extendedCallWindow/i18n/en_AU.json index 7fd390dc32..f86644b5d2 100644 --- a/src/modules/extendedCallWindow/i18n/en_AU.json +++ b/src/modules/extendedCallWindow/i18n/en_AU.json @@ -42,7 +42,9 @@ "swat_armored": "TOG Armoured Vehicle", "swat_suv": "TOG SUV", "wasser_amount": "Litres of water", - "water_drop_helicopter": "Fire Helicopter" + "water_drop_helicopter": "Fire Helicopter", + "water_damage_pump": "Water Pumps", + "water_damage_pump_value": "Pump Capacity" }, "headers": { "attribute": "Name", @@ -63,6 +65,7 @@ "driving": "En-route", "missing": "Missing on mission", "selected": "Selected", + "pump": "l/min pumping process", "staff": [{ "texts": ["TOG Personnel"], "vehicles": [15, 18] }], "staffPrefix": ["We need"], "tip": { @@ -164,6 +167,16 @@ { "texts": ["Emergency Stairs"], "vehicles": [45] }, { "texts": ["MVR Quad", "MVR Quads"], "vehicles": [38] }, { "texts": ["MVR Boat", "MVR Boats"], "vehicles": [39] }, + + { "texts": ["SES Search and Rescue Trailer", "SES Search and Rescue Trailers"], "vehicles": [54] }, + { "texts": ["SES Sandbag Trailer", "SES Sandbag Trailers"], "vehicles": [47] }, + { "texts": ["SES Pump Trailer", "SES Pump Trailers"], "vehicles": [48] }, + { "texts": ["SES Solar/Wind Power Trailer", "SES Solar/Wind Power Trailers"], "vehicles": [52] }, + { "texts": ["SES Emergency Lighting Trailer", "SES Emergency Lighting Trailers"], "vehicles": [49] }, + { "texts": ["SES Aireshelta Trailer", "SES Aireshelta Trailers"], "vehicles": [50] }, + { "texts": ["SES Comms Repeater Trailer", "SES Comms Repeater Trailers"], "vehicles": [51] }, + { "texts": ["SES Quad Rescue 6x6 Trailer", "SES Quad Rescue 6x6 Trailers"], "vehicles": [53] }, + { "texts": ["SES FOV", "SES FOVs"], "vehicles": [46] }, { "texts": ["SES Storm Trailer", "SES Storm Trailers"], "vehicles": [42] diff --git a/src/modules/extendedCallWindow/i18n/en_AU.root.json b/src/modules/extendedCallWindow/i18n/en_AU.root.json index 39faa68056..91df052aea 100644 --- a/src/modules/extendedCallWindow/i18n/en_AU.root.json +++ b/src/modules/extendedCallWindow/i18n/en_AU.root.json @@ -228,7 +228,7 @@ "name": "Bushfire Vehicles", "vehicleTypes": [19, 28, 29, 30, 31, 32, 33] }, - { "name": "Water", "vehicleTypes": [20, 21] } + { "name": "Water", "vehicleTypes": [20, 21,46,47,48,49,50,51,52,53,54] } ], "noCustoms": "own vehicle categories excluded" } diff --git a/src/modules/missionHelper/i18n/de_DE.root.json b/src/modules/missionHelper/i18n/de_DE.root.json index 1b6c30f8a2..a6d1f27b54 100644 --- a/src/modules/missionHelper/i18n/de_DE.root.json +++ b/src/modules/missionHelper/i18n/de_DE.root.json @@ -15,7 +15,7 @@ "min_pump_speed": { "badge": true, "in": "requirements", - "text": "Min.Pumpenleistung: {n}" + "text": "Min. Pumpenleistung: {n}" }, "pump_mission_mode": { "badge": true, diff --git a/src/modules/missionHelper/i18n/en_AU.json b/src/modules/missionHelper/i18n/en_AU.json index 59f91731e9..27465a22c1 100644 --- a/src/modules/missionHelper/i18n/en_AU.json +++ b/src/modules/missionHelper/i18n/en_AU.json @@ -13,7 +13,8 @@ "police": "Police Mission", "riot_police_specialization": "Riot Police Missions", "title": "Generating Categories", - "water_rescue": "SES Missions" + "water_rescue": "SES Missions", + "water_damage_and_flood_water_rescue": "Flood Rescue Mission" }, "patients": { "critical_care": "Intensive Care Chance", @@ -41,7 +42,10 @@ "rescue_stations": "Ambulance Station | Ambulance Stations", "riot_police": "Riot Police Extension | Riot Police Extensions", "title": "Prerequisite | Prerequisites", - "wasserrettung": "SES Unit | SES Units" + "wasserrettung": "SES Unit | SES Units", + "water_damage_pump_count": "Flood and Rescue Extension | Flood and Rescue Extensions", + "disaster_response_count": "Disaster Response Equipment Extension | Disaster Response Equipment Extensions", + "search_and_rescue": "Search and Rescue Extension | Search and Rescue Extensions" }, "prisoners": { "max_possible_prisoners": "Maximum Prisoners", @@ -89,7 +93,16 @@ "swat_armored_vehicle": "TOG Armoured Vehicle | TOG Armoured Vehicles", "swat_suv": "TOG SUV | TOG SUVs", "water_rescue": "SES Vehicle | SES Vehicles", - "water_tankers": "Bulk Water Tanker | Bulk Water Tankers" + "pump": "SES Pump Trailer | SES Pump Trailers", + "water_tankers": "Bulk Water Tanker | Bulk Water Tankers", + "flood_equipment": "SES Sandbag Trailer | SES Sandbag Trailers", + "communication_repeater": "SES Comms Repeater Trailer | SES Comms Repeater Trailers", + "elw_water_rescue": "SES FOV | SES FOVs", + "light_supply": "SES Emergency Lighting Trailer | SES Emergency Lighting Trailers", + "energy_supply": "SES Solar/Wind Power Trailer | SES Solar/Wind Power Trailers", + "airshelta": "SES Aireshelta Trailer | SES Aireshelta Trailers", + "quad": "SES Quad Rescue 6x6 Trailer | SES Quad Rescue 6x6 Trailers", + "search_and_rescue": "SES Search and Rescue Trailer | SES Search and Rescue Trailers" }, "multifunctionals": { "battalion_chief_vehicles": { diff --git a/src/modules/missionHelper/i18n/en_AU.root.json b/src/modules/missionHelper/i18n/en_AU.root.json index 5a5aca932e..0f8547e76c 100644 --- a/src/modules/missionHelper/i18n/en_AU.root.json +++ b/src/modules/missionHelper/i18n/en_AU.root.json @@ -17,6 +17,16 @@ "in": "additional", "text": "Required TOG Personnel" }, + "pump_water_amount": { + "badge": true, + "in": "additional", + "text": "Water to pump (in Litres): {n}" + }, + "min_pump_speed": { + "badge": true, + "in": "requirements", + "text": "Min. Pump Capacity: {n}" + }, "title": "Special requirements", "water_needed": { "badge": true, From a63eb1ae78917732fa9383d6a6783d495fb8ceba Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 1 Aug 2023 21:16:25 +0000 Subject: [PATCH 097/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230801?= =?UTF-8?q?.2313=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/i18n/en_AU.ts | 6 +- src/i18n/en_AU/buildings.ts | 6 +- .../extendedCallWindow/i18n/en_AU.json | 62 +++++++++++++++---- .../extendedCallWindow/i18n/en_AU.root.json | 5 +- src/modules/missionHelper/i18n/en_AU.json | 30 ++++----- .../missionHelper/i18n/en_AU.root.json | 16 ++--- 7 files changed, 84 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index 24a08508e9..f79b10aa6f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230801.0719", + "version": "4.7.7+20230801.2313", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/i18n/en_AU.ts b/src/i18n/en_AU.ts index f3620311d3..a8e62492f4 100644 --- a/src/i18n/en_AU.ts +++ b/src/i18n/en_AU.ts @@ -117,9 +117,9 @@ export default { 'SES & Water Rescue': { vehicles: { SES: [20, 21, 40, 41, 42], - FAR: [46,47,48], - DR: [49,50,51,52], - SAR: [53,54], + FAR: [46, 47, 48], + DR: [49, 50, 51, 52], + SAR: [53, 54], VMR: [38, 39], }, color: '#02a18c', diff --git a/src/i18n/en_AU/buildings.ts b/src/i18n/en_AU/buildings.ts index 1a158362d4..49ec561b22 100644 --- a/src/i18n/en_AU/buildings.ts +++ b/src/i18n/en_AU/buildings.ts @@ -430,7 +430,7 @@ export default { coins: 25, duration: '3 Days', givesParkingLots: 3, - unlocksVehicleTypes: [46,47,48], + unlocksVehicleTypes: [46, 47, 48], }, { caption: 'Disaster Response Equipment Extension', @@ -438,7 +438,7 @@ export default { coins: 25, duration: '3 Days', givesParkingLots: 3, - unlocksVehicleTypes: [49,50,51,52], + unlocksVehicleTypes: [49, 50, 51, 52], }, { caption: 'Search and Rescue Extension', @@ -446,7 +446,7 @@ export default { coins: 25, duration: '3 Days', givesParkingLots: 2, - unlocksVehicleTypes: [53,54], + unlocksVehicleTypes: [53, 54], }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-25. 100.000'], diff --git a/src/modules/extendedCallWindow/i18n/en_AU.json b/src/modules/extendedCallWindow/i18n/en_AU.json index f86644b5d2..c8f2875587 100644 --- a/src/modules/extendedCallWindow/i18n/en_AU.json +++ b/src/modules/extendedCallWindow/i18n/en_AU.json @@ -42,9 +42,9 @@ "swat_armored": "TOG Armoured Vehicle", "swat_suv": "TOG SUV", "wasser_amount": "Litres of water", - "water_drop_helicopter": "Fire Helicopter", "water_damage_pump": "Water Pumps", - "water_damage_pump_value": "Pump Capacity" + "water_damage_pump_value": "Pump Capacity", + "water_drop_helicopter": "Fire Helicopter" }, "headers": { "attribute": "Name", @@ -64,8 +64,8 @@ "enhancedMissingVehicles": { "driving": "En-route", "missing": "Missing on mission", - "selected": "Selected", "pump": "l/min pumping process", + "selected": "Selected", "staff": [{ "texts": ["TOG Personnel"], "vehicles": [15, 18] }], "staffPrefix": ["We need"], "tip": { @@ -167,15 +167,53 @@ { "texts": ["Emergency Stairs"], "vehicles": [45] }, { "texts": ["MVR Quad", "MVR Quads"], "vehicles": [38] }, { "texts": ["MVR Boat", "MVR Boats"], "vehicles": [39] }, - - { "texts": ["SES Search and Rescue Trailer", "SES Search and Rescue Trailers"], "vehicles": [54] }, - { "texts": ["SES Sandbag Trailer", "SES Sandbag Trailers"], "vehicles": [47] }, - { "texts": ["SES Pump Trailer", "SES Pump Trailers"], "vehicles": [48] }, - { "texts": ["SES Solar/Wind Power Trailer", "SES Solar/Wind Power Trailers"], "vehicles": [52] }, - { "texts": ["SES Emergency Lighting Trailer", "SES Emergency Lighting Trailers"], "vehicles": [49] }, - { "texts": ["SES Aireshelta Trailer", "SES Aireshelta Trailers"], "vehicles": [50] }, - { "texts": ["SES Comms Repeater Trailer", "SES Comms Repeater Trailers"], "vehicles": [51] }, - { "texts": ["SES Quad Rescue 6x6 Trailer", "SES Quad Rescue 6x6 Trailers"], "vehicles": [53] }, + { + "texts": [ + "SES Search and Rescue Trailer", + "SES Search and Rescue Trailers" + ], + "vehicles": [54] + }, + { + "texts": ["SES Sandbag Trailer", "SES Sandbag Trailers"], + "vehicles": [47] + }, + { + "texts": ["SES Pump Trailer", "SES Pump Trailers"], + "vehicles": [48] + }, + { + "texts": [ + "SES Solar/Wind Power Trailer", + "SES Solar/Wind Power Trailers" + ], + "vehicles": [52] + }, + { + "texts": [ + "SES Emergency Lighting Trailer", + "SES Emergency Lighting Trailers" + ], + "vehicles": [49] + }, + { + "texts": ["SES Aireshelta Trailer", "SES Aireshelta Trailers"], + "vehicles": [50] + }, + { + "texts": [ + "SES Comms Repeater Trailer", + "SES Comms Repeater Trailers" + ], + "vehicles": [51] + }, + { + "texts": [ + "SES Quad Rescue 6x6 Trailer", + "SES Quad Rescue 6x6 Trailers" + ], + "vehicles": [53] + }, { "texts": ["SES FOV", "SES FOVs"], "vehicles": [46] }, { "texts": ["SES Storm Trailer", "SES Storm Trailers"], diff --git a/src/modules/extendedCallWindow/i18n/en_AU.root.json b/src/modules/extendedCallWindow/i18n/en_AU.root.json index 91df052aea..08b257c2d4 100644 --- a/src/modules/extendedCallWindow/i18n/en_AU.root.json +++ b/src/modules/extendedCallWindow/i18n/en_AU.root.json @@ -228,7 +228,10 @@ "name": "Bushfire Vehicles", "vehicleTypes": [19, 28, 29, 30, 31, 32, 33] }, - { "name": "Water", "vehicleTypes": [20, 21,46,47,48,49,50,51,52,53,54] } + { + "name": "Water", + "vehicleTypes": [20, 21, 46, 47, 48, 49, 50, 51, 52, 53, 54] + } ], "noCustoms": "own vehicle categories excluded" } diff --git a/src/modules/missionHelper/i18n/en_AU.json b/src/modules/missionHelper/i18n/en_AU.json index 27465a22c1..8915676591 100644 --- a/src/modules/missionHelper/i18n/en_AU.json +++ b/src/modules/missionHelper/i18n/en_AU.json @@ -13,8 +13,8 @@ "police": "Police Mission", "riot_police_specialization": "Riot Police Missions", "title": "Generating Categories", - "water_rescue": "SES Missions", - "water_damage_and_flood_water_rescue": "Flood Rescue Mission" + "water_damage_and_flood_water_rescue": "Flood Rescue Mission", + "water_rescue": "SES Missions" }, "patients": { "critical_care": "Intensive Care Chance", @@ -32,6 +32,7 @@ "airport": "Airport Extension | Airport Extensions", "brush_extension": "Bushfire extension | Bushfire extensions", "coastal_rescue_count": "Volunteer Marine Rescue Station | Volunteer Marine Rescue Stations", + "disaster_response_count": "Disaster Response Equipment Extension | Disaster Response Equipment Extensions", "fire_aviation_count": "Fire Airbase | Fire Airbases", "fire_stations": "Fire Station | Fire Stations", "max_police_stations": "Maximum Police Stations", @@ -41,11 +42,10 @@ "police_stations": "Police Station | Police Stations", "rescue_stations": "Ambulance Station | Ambulance Stations", "riot_police": "Riot Police Extension | Riot Police Extensions", + "search_and_rescue": "Search and Rescue Extension | Search and Rescue Extensions", "title": "Prerequisite | Prerequisites", "wasserrettung": "SES Unit | SES Units", - "water_damage_pump_count": "Flood and Rescue Extension | Flood and Rescue Extensions", - "disaster_response_count": "Disaster Response Equipment Extension | Disaster Response Equipment Extensions", - "search_and_rescue": "Search and Rescue Extension | Search and Rescue Extensions" + "water_damage_pump_count": "Flood and Rescue Extension | Flood and Rescue Extensions" }, "prisoners": { "max_possible_prisoners": "Maximum Prisoners", @@ -62,14 +62,19 @@ }, "vehicles": { "captions": { + "airshelta": "SES Aireshelta Trailer | SES Aireshelta Trailers", "ambulances": "Ambulance | Ambulances", "arff": "ULFV Crash Tender | ULFV Crash Tenders", "battalion_chief_vehicles": "Support Vehicle | Support Vehicles", "boats": "Boat | Boats", "brush_truck": "Brush Truck | Brush Trucks", "coastal_rescue": "MVR Quad | MVR Quads", + "communication_repeater": "SES Comms Repeater Trailer | SES Comms Repeater Trailers", + "elw_water_rescue": "SES FOV | SES FOVs", + "energy_supply": "SES Solar/Wind Power Trailer | SES Solar/Wind Power Trailers", "fire_aviation": "Airborne Firefighting Vehicle | Airborne Firefighting Vehicles", "firetrucks": "Fire Engine | Fire Engines", + "flood_equipment": "SES Sandbag Trailer | SES Sandbag Trailers", "gw_wasserrettung": "SES Unit | SES Units", "hazmat_vehicles": "HAZMAT Truck | HAZMAT Trucks", "heavy_rescue_vehicles": "Major Rescue Vehicle or SES Rescue Truck | Major Rescue Vehicles or SES Rescue Trucks", @@ -77,6 +82,7 @@ "k9": "K-9 Unit | K-9 Units", "kdow_orgl": "Paramedic Supervisor | Paramedic Supervisors", "large_coastal_boat": "MVR Boat | MVR Boats", + "light_supply": "SES Emergency Lighting Trailer | SES Emergency Lighting Trailers", "mobile_air_vehicles": "BASU Unit | BASU Units", "mobile_command_vehicles": "Mobile Command Vehicle or SES Mobile Command Vehicle | Mobile Command Vehicles or SES Mobile Command Vehicles", "platform_trucks": "Ladder Platform Truck | Ladder Platform Trucks", @@ -84,25 +90,19 @@ "police_helicopters": "Police Helicopter | Police Helicopters", "police_horse": "Mounted Police Unit | Mounted Police Units", "police_service_group_leader": "Senior Sergeant | Senior Sergeants", + "pump": "SES Pump Trailer | SES Pump Trailers", + "quad": "SES Quad Rescue 6x6 Trailer | SES Quad Rescue 6x6 Trailers", "rettungstreppe": "Emergency Stair | Emergency Stairs", "riot_police": "Riot Police Group Vehicle | Riot Police Group Vehicles", "riot_police_equipment": "Riot Police Equipment Vehicle | Riot Police Equipment Vehicles", "riot_police_suv": "Riot Police SUV | Riot Police SUVs", "riv": "RIV | RIVs", "road_rescue": "SES Storm Trailer | SES Storm Trailers", + "search_and_rescue": "SES Search and Rescue Trailer | SES Search and Rescue Trailers", "swat_armored_vehicle": "TOG Armoured Vehicle | TOG Armoured Vehicles", "swat_suv": "TOG SUV | TOG SUVs", "water_rescue": "SES Vehicle | SES Vehicles", - "pump": "SES Pump Trailer | SES Pump Trailers", - "water_tankers": "Bulk Water Tanker | Bulk Water Tankers", - "flood_equipment": "SES Sandbag Trailer | SES Sandbag Trailers", - "communication_repeater": "SES Comms Repeater Trailer | SES Comms Repeater Trailers", - "elw_water_rescue": "SES FOV | SES FOVs", - "light_supply": "SES Emergency Lighting Trailer | SES Emergency Lighting Trailers", - "energy_supply": "SES Solar/Wind Power Trailer | SES Solar/Wind Power Trailers", - "airshelta": "SES Aireshelta Trailer | SES Aireshelta Trailers", - "quad": "SES Quad Rescue 6x6 Trailer | SES Quad Rescue 6x6 Trailers", - "search_and_rescue": "SES Search and Rescue Trailer | SES Search and Rescue Trailers" + "water_tankers": "Bulk Water Tanker | Bulk Water Tankers" }, "multifunctionals": { "battalion_chief_vehicles": { diff --git a/src/modules/missionHelper/i18n/en_AU.root.json b/src/modules/missionHelper/i18n/en_AU.root.json index 0f8547e76c..27f8bdf18e 100644 --- a/src/modules/missionHelper/i18n/en_AU.root.json +++ b/src/modules/missionHelper/i18n/en_AU.root.json @@ -12,20 +12,20 @@ "in": "additional", "text": "Average min . Police Personnel" }, - "swat_personnel": { - "badge": false, - "in": "additional", - "text": "Required TOG Personnel" + "min_pump_speed": { + "badge": true, + "in": "requirements", + "text": "Min. Pump Capacity: {n}" }, "pump_water_amount": { "badge": true, "in": "additional", "text": "Water to pump (in Litres): {n}" }, - "min_pump_speed": { - "badge": true, - "in": "requirements", - "text": "Min. Pump Capacity: {n}" + "swat_personnel": { + "badge": false, + "in": "additional", + "text": "Required TOG Personnel" }, "title": "Special requirements", "water_needed": { From a6a6080e16261312bacebae0481a0f745ebfbe43 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 2 Aug 2023 21:46:22 +0200 Subject: [PATCH 098/182] =?UTF-8?q?=E2=9C=A8=20[Core]=20=F0=9F=9A=9A?= =?UTF-8?q?=F0=9F=8C=8ACP=20GB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and fix something in AU --- src/i18n/en_AU/vehicles.ts | 42 +++++++++++++++++-- src/i18n/en_GB.ts | 2 +- src/i18n/en_GB/buildings.ts | 21 +++++++++- src/i18n/en_GB/vehicles.ts | 35 ++++++++++++++++ .../extendedCallWindow/i18n/en_GB.json | 5 ++- .../extendedCallWindow/i18n/en_GB.root.json | 2 +- src/modules/missionHelper/i18n/en_GB.json | 2 + .../missionHelper/i18n/en_GB.root.json | 10 +++++ 8 files changed, 112 insertions(+), 7 deletions(-) diff --git a/src/i18n/en_AU/vehicles.ts b/src/i18n/en_AU/vehicles.ts index ee648348c0..54f1c7e7f9 100644 --- a/src/i18n/en_AU/vehicles.ts +++ b/src/i18n/en_AU/vehicles.ts @@ -10,6 +10,8 @@ export default { icon: 'car-side', possibleBuildings: [0, 18], waterTank: 2000, + pumpCapacity: 2000, + pumpType: 'fire', }, 1: { caption: 'Medium Tanker', @@ -20,6 +22,8 @@ export default { icon: 'car-side', possibleBuildings: [0, 18], waterTank: 3000, + pumpCapacity: 1500, + pumpType: 'fire', }, 2: { caption: 'Ladder Platform', @@ -69,6 +73,8 @@ export default { icon: 'car-side', possibleBuildings: [0, 18], waterTank: 11_000, + pumpCapacity: 2000, + pumpType: 'fire', special: 'Required once you have built 7 firehouses', }, 7: { @@ -157,6 +163,9 @@ export default { staff: { min: 1, max: 6 }, icon: 'car-side', possibleBuildings: [0, 18], + waterTank: 2000, + pumpCapacity: 1500, + pumpType: 'fire', special: 'To purchase with credits it requires the rank: Captain,
    Lower ranked members can purchase the vehicle for 25 Coins.
    Rescue Pumper acts as a MRU and a Fire Truck.', }, @@ -168,6 +177,9 @@ export default { staff: { min: 1, max: 5 }, icon: 'car-side', possibleBuildings: [0, 18], + waterTank: 2000, + pumpCapacity: 1500, + pumpType: 'fire', special: 'To purchase with credits it requires the rank: Captain,
    Lower ranked members can purchase the vehicle for 25 Coins.
    Aerial Pumper acts as a Turntable Ladder and a Fire Truck.', }, @@ -278,6 +290,8 @@ export default { icon: 'car-side', possibleBuildings: [0, 18], waterTank: 4000, + pumpCapacity: 1500, + pumpType: 'fire', }, 20: { caption: 'SES Vehicle', @@ -435,7 +449,9 @@ export default { staff: { min: 4, max: 5 }, icon: 'car-side', possibleBuildings: [0, 18], - waterTank: 3000, + waterTank: 2000, + pumpCapacity: 1500, + pumpType: 'fire', }, 31: { caption: 'Fire Helicopter', @@ -624,6 +640,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [15], + isTrailer: true, + tractiveVehicles: [20,40], special: 'Can be towed by SES Vehicle or SES Rescue Truck', }, 43: { @@ -644,7 +662,7 @@ export default { }, icon: 'car-side', possibleBuildings: [0, 18], - waterTank: 6000, + waterTank: 14000, }, 44: { caption: 'RIV', @@ -664,7 +682,7 @@ export default { }, icon: 'car-side', possibleBuildings: [0, 18], - waterTank: 600, + waterTank: 2000, }, 45: { caption: 'Emergency Stairs', @@ -712,6 +730,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [15], + isTrailer: true, + tractiveVehicles: [20,40,46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 48: { @@ -722,6 +742,10 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [15], + isTrailer: true, + tractiveVehicles: [20,40,46], + pumpCapacity: 5000, + pumpType: 'fire', special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 49: { @@ -732,6 +756,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [15], + isTrailer: true, + tractiveVehicles: [20,40,46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 50: { @@ -742,6 +768,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [15], + isTrailer: true, + tractiveVehicles: [20,40,46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 51: { @@ -752,6 +780,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [15], + isTrailer: true, + tractiveVehicles: [20,40,46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 52: { @@ -762,6 +792,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [15], + isTrailer: true, + tractiveVehicles: [20,40,46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 53: { @@ -772,6 +804,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [15], + isTrailer: true, + tractiveVehicles: [20,40,46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 54: { @@ -782,6 +816,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [15], + isTrailer: true, + tractiveVehicles: [20,40,46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, } satisfies Record; diff --git a/src/i18n/en_GB.ts b/src/i18n/en_GB.ts index df634f19fe..d36dd9121f 100644 --- a/src/i18n/en_GB.ts +++ b/src/i18n/en_GB.ts @@ -88,7 +88,7 @@ export default { 'Fire Fighting Vehicles': { vehicles: { 'Pumps': [0, 1, 16, 26, 17], - 'Special Vehicles': [4, 7, 14, 18, 6, 2, 39], + 'Special Vehicles': [4, 7, 14, 18, 6, 2, 39, 84], 'Command Vehicles': [15, 3], 'Pods and Prime Movers': [ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, diff --git a/src/i18n/en_GB/buildings.ts b/src/i18n/en_GB/buildings.ts index 85c14a728b..462647cead 100644 --- a/src/i18n/en_GB/buildings.ts +++ b/src/i18n/en_GB/buildings.ts @@ -100,7 +100,16 @@ export default { parkingLotReservations: [[81, 81]], isVehicleExtension: true, }, - null, + { + caption: 'Water Damage Pump Extension', + credits: 100_000, + coins: 15, + duration: '5 Days', + unlocksVehicleTypes: [84], + givesParkingLots: 2, + parkingLotReservations: [[84, 84]], + isVehicleExtension: true, + }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-24. 100.000'], maxBuildings: '6.000 together with small fire stations', @@ -624,6 +633,16 @@ export default { parkingLotReservations: [[81, 81]], isVehicleExtension: true, }, + { + caption: 'Water Damage Pump Extension', + credits: 100_000, + coins: 15, + duration: '5 Days', + unlocksVehicleTypes: [84], + givesParkingLots: 2, + parkingLotReservations: [[84, 84]], + isVehicleExtension: true, + }, ], levelcost: [ '1. 10.000', diff --git a/src/i18n/en_GB/vehicles.ts b/src/i18n/en_GB/vehicles.ts index e4dcc24f5b..ce94c05d6f 100644 --- a/src/i18n/en_GB/vehicles.ts +++ b/src/i18n/en_GB/vehicles.ts @@ -10,6 +10,8 @@ export default { icon: 'car-side', possibleBuildings: [0, 18], special: 'A standard pump used for fighting fires.', + pumpCapacity: 2000, + pumpType: 'fire', }, 1: { caption: 'Light 4X4 Pump (L4P)', @@ -20,6 +22,8 @@ export default { icon: 'car-side', possibleBuildings: [0, 18], special: 'A smaller pump used in rural areas, will act as a pump.', + pumpCapacity: 1500, + pumpType: 'fire', }, 2: { caption: 'Aerial Appliance', @@ -53,6 +57,8 @@ export default { possibleBuildings: [0, 18], special: 'Required once you have built 4 fire stations. A big lorry with specialist rescue equipment, useful for Road Traffic Collisions.', + pumpCapacity: 1500, + pumpType: 'fire', }, 5: { caption: 'Ambulance', @@ -74,6 +80,8 @@ export default { possibleBuildings: [0, 18], special: 'Required once you have built 7 fire stations. Used for conveying water to a fire, useful for rural fires.', + pumpCapacity: 2000, + pumpType: 'fire', }, 7: { caption: 'HazMat Unit', @@ -393,6 +401,8 @@ export default { possibleBuildings: [0, 18], special: 'Unlocked at Fire Apparatus Operator or Sergeant Rank. Works as a Water Carrier and Water Ladder. Used in rural areas to save money.', + pumpCapacity: 2000, + pumpType: 'fire', }, 27: { caption: 'PRV', @@ -572,6 +582,8 @@ export default { possibleBuildings: [0, 18], special: 'Acts as a Bulk Foam Unit and a Water Carrier. Used on hazardous fires and electrical fires. Requires Foam Extension.', + pumpCapacity: 2000, + pumpType: 'fire', }, 37: { caption: 'WrL CAFS', @@ -636,6 +648,8 @@ export default { icon: 'car-side', possibleBuildings: [0, 18], special: 'Acts as a Water Carrier. Requires Swap Body Parking Space.', + pumpCapacity: 2000, + pumpType: 'fire', }, 42: { caption: 'Bulk Foam Pod', @@ -772,6 +786,8 @@ export default { }, icon: 'car-side', possibleBuildings: [0, 18], + pumpCapacity: 4000, + pumpType: 'fire', special: 'Requires special education for personnel on Prime Mover (High Volume Pump Training). Acts as a Water Carrier. Requires Swap Body Parking Space.', }, @@ -958,6 +974,8 @@ export default { }, icon: 'car-side', possibleBuildings: [27, 28], + pumpCapacity: 2500, + pumpType: 'fire', special: 'Needed towing vehicle (CRV, Coastguard Commander, Coastguard Mud Rescue Unit, Coastguard Rope Rescue Unit, Support Unit, 4x4 Vehicle). Helps to deal with flooding.', }, @@ -1326,4 +1344,21 @@ export default { icon: 'car-side', possibleBuildings: [2, 20], }, + 84: { + caption: 'Pump Trailer', + color: '#aa0000', + credits: 20_000, + coins: 15, + staff: { + min: 0, + max: 0, + }, + icon: 'car-side', + special: "Needed towing vehicle (Water Ladder, Light 4X4 Pump (L4P), Rescue Support Unit (RSU))", + pumpCapacity: 4000, + pumpType: 'fire', + possibleBuildings: [0, 18], + isTrailer: true, + tractiveVehicles: [0,1,4], + }, } satisfies Record; diff --git a/src/modules/extendedCallWindow/i18n/en_GB.json b/src/modules/extendedCallWindow/i18n/en_GB.json index 37f673b0f2..cb045799e9 100644 --- a/src/modules/extendedCallWindow/i18n/en_GB.json +++ b/src/modules/extendedCallWindow/i18n/en_GB.json @@ -41,7 +41,9 @@ "rth_only": "HEMS", "rtw": "Ambulance", "rw": "Rescue Support Unit or Rescue Pump", - "swat_suv": "Armed Response Vehicle (ARV)" + "swat_suv": "Armed Response Vehicle (ARV)", + "water_damage_pump": "Water Pumps", + "water_damage_pump_value": "Pump Capacity" }, "headers": { "attribute": "Name", @@ -62,6 +64,7 @@ "driving": "En-route", "missing": "Missing on mission", "selected": "Selected", + "pump": "l/min pumping process", "staff": [ { "texts": ["Armed Response Personnel (In Armed Vehicles)"], diff --git a/src/modules/extendedCallWindow/i18n/en_GB.root.json b/src/modules/extendedCallWindow/i18n/en_GB.root.json index 5d88948f2a..655242324a 100644 --- a/src/modules/extendedCallWindow/i18n/en_GB.root.json +++ b/src/modules/extendedCallWindow/i18n/en_GB.root.json @@ -221,7 +221,7 @@ "name": "Other Fire Apparatus", "vehicleTypes": [ 2, 3, 4, 6, 7, 14, 15, 18, 23, 26, 35, 36, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50 + 43, 44, 45, 46, 47, 48, 49, 50, 84 ] }, { diff --git a/src/modules/missionHelper/i18n/en_GB.json b/src/modules/missionHelper/i18n/en_GB.json index 974eaa8a34..72ca93ebda 100644 --- a/src/modules/missionHelper/i18n/en_GB.json +++ b/src/modules/missionHelper/i18n/en_GB.json @@ -15,6 +15,7 @@ "police": "Police Mission", "riot_police_specialization": "Police & Public Order Missions (Specialization)", "title": "Generating Categories", + "water_damage_and_flood": "Water Damage and Flood Mission", "water_rescue_2": "Coastguard Missions" }, "patients": { @@ -60,6 +61,7 @@ "riot_police": "Police & Public Order Extension | Police & Public Order Extensions", "title": "Prerequisite | Prerequisites", "wasserrettung": "Technical Rescue Extension | Technical Rescue Extensions", + "water_damage_pump_count": "Water Damage Pump Extension | Water Damage Pump Extensions", "water_rescue_2": "Coastguard Rescue Station | Coastguard Rescue Stations" }, "prisoners": { diff --git a/src/modules/missionHelper/i18n/en_GB.root.json b/src/modules/missionHelper/i18n/en_GB.root.json index a1fbf690bc..29c1fc81f6 100644 --- a/src/modules/missionHelper/i18n/en_GB.root.json +++ b/src/modules/missionHelper/i18n/en_GB.root.json @@ -12,6 +12,16 @@ "in": "additional", "text": "Required Armed Response Personnel" }, + "min_pump_speed": { + "badge": true, + "in": "requirements", + "text": "Min. Pump Capacity: {n}" + }, + "pump_water_amount": { + "badge": true, + "in": "additional", + "text": "Water to pump (in Litres): {n}" + }, "title": "Special requirements" }, "settings": { From 8f758e0c1b10c755b3bea3860c08b54ecacb0b7f Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 2 Aug 2023 23:16:20 +0200 Subject: [PATCH 099/182] =?UTF-8?q?=E2=9C=A8=20[Core]=20=F0=9F=9A=9A?= =?UTF-8?q?=F0=9F=8C=8ACP=20US?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en_US.ts | 1 + src/i18n/en_US/schoolings.ts | 6 + src/i18n/en_US/vehicles.ts | 114 ++++++++++++++++-- .../extendedCallWindow/i18n/en_US.json | 24 +++- .../extendedCallWindow/i18n/en_US.root.json | 2 +- src/modules/missionHelper/i18n/en_US.json | 11 +- .../missionHelper/i18n/en_US.root.json | 10 ++ 7 files changed, 156 insertions(+), 12 deletions(-) diff --git a/src/i18n/en_US.ts b/src/i18n/en_US.ts index f17d089f84..e0f476c0e0 100644 --- a/src/i18n/en_US.ts +++ b/src/i18n/en_US.ts @@ -94,6 +94,7 @@ export default { 'Airport Vehicles': [17], 'Boats': [21, 22, 24], 'Fire Aviation': [35, 36, 37, 75, 76], + 'Trailer': [91,92,93,94,95], }, color: '#ff2d2d', }, diff --git a/src/i18n/en_US/schoolings.ts b/src/i18n/en_US/schoolings.ts index 31a9d97d76..c6a84b14da 100644 --- a/src/i18n/en_US/schoolings.ts +++ b/src/i18n/en_US/schoolings.ts @@ -110,6 +110,12 @@ export default { staffList: 'Smoke Jumper Training', key: 'smoke_jumper', }, + { + caption: 'Traffic Control Training', + duration: '3 Days', + staffList: 'Traffic Control Training', + key: 'traffic_control', + }, ], 'Police': [ { diff --git a/src/i18n/en_US/vehicles.ts b/src/i18n/en_US/vehicles.ts index 65e944d062..b79cc1ece9 100644 --- a/src/i18n/en_US/vehicles.ts +++ b/src/i18n/en_US/vehicles.ts @@ -11,6 +11,8 @@ export default { possibleBuildings: [0, 13], waterTank: 750, foamTank: 25, + pumpCapacity: 2000, + pumpType: 'fire', }, 1: { caption: 'Type 2 fire engine', @@ -22,6 +24,8 @@ export default { possibleBuildings: [0, 13], waterTank: 500, foamTank: 25, + pumpCapacity: 1500, + pumpType: 'fire', }, 2: { caption: 'Platform truck', @@ -51,6 +55,8 @@ export default { staff: { min: 1, max: 4 }, icon: 'car-side', possibleBuildings: [0, 13], + pumpCapacity: 1500, + pumpType: 'fire', special: 'Required once you have built 4 firehouses', }, 5: { @@ -81,6 +87,9 @@ export default { icon: 'car-side', possibleBuildings: [0, 13], waterTank: 3000, + pumpCapacity: 2000, + pumpType: 'fire', + waterBonus: 25, special: 'Required once you have built 7 firehouses', }, 8: { @@ -111,6 +120,7 @@ export default { }, icon: 'car-side', possibleBuildings: [0, 13], + foamTank: 50, special: 'Required once you have built 11 firehouses', }, 10: { @@ -283,7 +293,7 @@ export default { credits: 19_000, coins: 25, staff: { - min: 1, + min: 3, max: 5, training: { 'Fire Station': { @@ -306,6 +316,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [0, 11, 12], + isTrailer: true, + tractiveVehicles: [8,3,1,31,39,4], special: 'Accessory boat that can be towed with the Utility Unit. Requires Swift Water Rescue trained personnel to operate.
    The boat trailer cannot be assigned personnel,
    either assign your trained personnel to the towing vehicle, or assign them to a separate unit en route.', }, @@ -457,6 +469,9 @@ export default { possibleBuildings: [0, 13], waterTank: 2500, foamTank: 25, + waterBonus: 25, + pumpCapacity: 1500, + pumpType: 'fire', }, 34: { caption: 'Crew Carrier', @@ -534,7 +549,7 @@ export default { coins: 10, staff: { min: 3, max: 5 }, icon: 'car-side', - possibleBuildings: [0], + possibleBuildings: [0,13], waterTank: 750, }, 39: { @@ -544,7 +559,7 @@ export default { coins: 5, staff: { min: 1, max: 2 }, icon: 'car-side', - possibleBuildings: [0], + possibleBuildings: [0,13], waterTank: 150, }, 40: { @@ -564,7 +579,9 @@ export default { }, }, icon: 'car-side', - possibleBuildings: [0], + possibleBuildings: [0,13], + isTrailer: true, + tractiveVehicles: [41], special: "Dozer Trailer that can be towed with the Crew cap semi. Requires Heavy Machinery Operating and Truck Driver's License trained personnel to operate.
    The dozer trailer cannot be assigned personnel,
    either assign your trained personnel to the towing vehicle, or assign them to a separate unit en route.", }, @@ -844,6 +861,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [3], + isTrailer: true, + tractiveVehicles: [41], special: 'Needed towing vehicle (Crew cab semi). Works like the Mass Casualty Unit but without transport.', }, @@ -855,6 +874,8 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [3], + isTrailer: true, + tractiveVehicles: [15,28,29], special: 'Needed towing vehicle (Fly-Car, EMS Rescue, EMS Chief). Works like the Mass Casualty Unit but without transport.', }, @@ -939,7 +960,7 @@ export default { coins: 15, staff: { min: 2, max: 3 }, icon: 'car-side', - possibleBuildings: [0], + possibleBuildings: [0,13], foamTank: 2500, }, 65: { @@ -949,8 +970,10 @@ export default { coins: 10, staff: { min: 0, max: 0 }, icon: 'car-side', - possibleBuildings: [0], + possibleBuildings: [0,13], foamTank: 650, + isTrailer: true, + tractiveVehicles: [8,39,3,12], special: 'Needed towing vehicle (Utility unit, Type 6 engine, Battalion chief unit, mcv)', }, @@ -1107,7 +1130,9 @@ export default { }, icon: 'car-side', possibleBuildings: [0, 13, 26], - special: '', + isTrailer: true, + tractiveVehicles: [66,67,68,8,3,1], + special: 'Needed towing vehicle (Lifeguard Truck, Lifeguard Rescue, Lifeguard Supervisor, Utility unit, Battalion chief unit, Type 2 fire engine)', }, 74: { caption: 'Wildfire MCC', @@ -1175,6 +1200,8 @@ export default { icon: 'car-side', possibleBuildings: [0, 13], waterTank: 10_000, + isTrailer: true, + tractiveVehicles: [41], special: 'Towed by Crew cab semi', }, 78: { @@ -1186,6 +1213,8 @@ export default { icon: 'car-side', possibleBuildings: [0, 13], waterTank: 1000, + isTrailer: true, + tractiveVehicles: [3,8,34,31,32,39,18], special: 'Towed by Battalion chief unit, Utility unit, Type 2 fire engine, Crew Carrier, Type 5 engine, Type 7 engine, ', }, @@ -1314,6 +1343,8 @@ export default { coins: 15, staff: { min: 0, max: 0 }, icon: 'car-side', + isTrailer: true, + tractiveVehicles: [10,26,47], special: 'Needed towing vehicle (Patrol car, SWAT SUV, Police Supervisor / Sheriff Unit)', possibleBuildings: [5, 15], @@ -1352,6 +1383,8 @@ export default { max: 0, }, icon: 'car-side', + isTrailer: true, + tractiveVehicles: [47,56], special: "Needed towing vehicle (Police Supervisor / Sheriff Unit, Warden's Truck)", possibleBuildings: [5, 15], @@ -1397,4 +1430,71 @@ export default { icon: 'car-side', possibleBuildings: [5, 15], }, + 91: { + caption: 'Flood Equipment Trailer', + color: '#9f1616', + credits: 15000, + coins: 15, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [0, 13], + isTrailer: true, + tractiveVehicles: [8,3,1,31,39,4], + pumpCapacity: 5000, + pumpType: 'fire', + special: + 'Needed towing vehicle (Utility unit, Battalion chief unit, Type 2 fire engine, Type 5 engine, Type 6 engine, Heavy rescue vehicle)', + }, + 92: { + caption: 'Mobile Air Trailer', + color: '#9f1616', + credits: 10000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [0, 13], + isTrailer: true, + tractiveVehicles: [0,1,8,4,3], + special: + 'Needed towing vehicle (Utility unit, Battalion chief unit, Type 1 fire engine, Type 2 fire engine, Heavy rescue vehicle)', + }, + 93: { + caption: 'Light Tower Trailer', + color: '#9f1616', + credits: 10000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [0, 13], + isTrailer: true, + tractiveVehicles: [0,1,8,4,3], + special: + 'Needed towing vehicle (Utility unit, Battalion chief unit, Type 1 fire engine, Type 2 fire engine, Heavy rescue vehicle)', + }, + 94: { + caption: 'Energy Generator Trailer', + color: '#9f1616', + credits: 10000, + coins: 10, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [0, 13], + isTrailer: true, + tractiveVehicles: [0,1,8,4,3], + special: + 'Needed towing vehicle (Utility unit, Battalion chief unit, Type 1 fire engine, Type 2 fire engine, Heavy rescue vehicle)', + }, + 95: { + caption: 'Double Light Boat Trailer', + color: '#9f1616', + credits: 60000, + coins: 25, + staff: { min: 0, max: 0 }, + icon: 'car-side', + possibleBuildings: [0, 13], + isTrailer: true, + tractiveVehicles: [8,3,1,31,39,4], + special: + 'Needed towing vehicle (Utility unit, Battalion chief unit, Type 2 fire engine, Type 5 engine, Type 6 engine, Heavy rescue vehicle)', + }, } satisfies Record; diff --git a/src/modules/extendedCallWindow/i18n/en_US.json b/src/modules/extendedCallWindow/i18n/en_US.json index 1b943d6f99..3b06ded949 100644 --- a/src/modules/extendedCallWindow/i18n/en_US.json +++ b/src/modules/extendedCallWindow/i18n/en_US.json @@ -66,6 +66,8 @@ "swat_armored_vehicle": "SWAT Armoured Vehicle", "swat_suv": "SWAT SUV", "wasser_amount": "Gallons of water", + "water_damage_pump": "Water Pumps", + "water_damage_pump_value": "Pump Capacity", "water_drop_helicopter": "Water drop helicopter" }, "headers": { @@ -88,6 +90,7 @@ "foam": "gal. foam", "missing": "Missing on mission", "selected": "Selected", + "pump": "gal/min pumping process", "staff": [ { "texts": ["SWAT Personnel"], "vehicles": [16, 26] }, { @@ -125,7 +128,7 @@ "texts": ["Heavy Rescue Vehicle", "Heavy Rescue Vehicles"], "vehicles": [4, 8, 18, 21, 28, 61, 67] }, - { "texts": ["Mobile Air"], "vehicles": [6] }, + { "texts": ["Mobile Air"], "vehicles": [6,92] }, { "texts": ["Water Tanker", "Water Tankers"], "vehicles": [7, 33, 64, 65, 77, 78] @@ -159,7 +162,7 @@ "texts": ["Large rescue boat", "Large rescue boats"], "vehicles": [25] }, - { "texts": ["Light Boat", "Light Boats"], "vehicles": [21, 22] }, + { "texts": ["Light Boat", "Light Boats"], "vehicles": [21, 22,95] }, { "texts": ["Wildland fire vehicle", "Wildland fire vehicles"], "vehicles": [30, 31, 32, 35, 36, 37, 38, 39, 40] @@ -289,6 +292,23 @@ { "texts": ["Riot Police Trailer", "Riot Police Trailers"], "vehicles": [85] + }, + { + "texts": ["Flood Equipment"], + "vehicles": [91] + }, + { + "texts": ["Energy Supplie", "Energy Supplies"], + "vehicles": [94] + }, + { + "texts": [ + "SES Emergency Lighting Trailer", + "SES Emergency Lighting Trailers", + "Light Tower Trailer", + "Light Tower Trailers" + ], + "vehicles": [93] } ], "water": "gal. water" diff --git a/src/modules/extendedCallWindow/i18n/en_US.root.json b/src/modules/extendedCallWindow/i18n/en_US.root.json index 142aec89eb..c006f89b28 100644 --- a/src/modules/extendedCallWindow/i18n/en_US.root.json +++ b/src/modules/extendedCallWindow/i18n/en_US.root.json @@ -221,7 +221,7 @@ "name": "Other Fire Apparatus", "vehicleTypes": [ 2, 3, 4, 6, 7, 8, 9, 12, 17, 21, 22, 24, 30, 31, 32, 34, 35, - 36, 37, 38, 39, 40, 41, 62, 63, 64, 65 + 36, 37, 38, 39, 40, 41, 62, 63, 64, 65,91,92,93,94,95 ] }, { diff --git a/src/modules/missionHelper/i18n/en_US.json b/src/modules/missionHelper/i18n/en_US.json index 881006a7ac..65081fd454 100644 --- a/src/modules/missionHelper/i18n/en_US.json +++ b/src/modules/missionHelper/i18n/en_US.json @@ -18,6 +18,7 @@ "police": "Police Missions", "riot_police_specialization": "Riot Police Missions (Specialization)", "title": "Generating Categories", + "water_damage_and_flood": "Water Damage and Flood Mission", "water_police_specialization": "Water Police Missions (Specialization)", "water_rescue": "Water Rescue Missions", "water_rescue_specialization": "Water Rescue Missions (Specialization)" @@ -68,8 +69,11 @@ "smoke_jumper": "Smoke Jumper Team | SmokeJumper Teams", "sniper": "Sharpshooter", "title": "Prerequisite | Prerequisites", + "traffic_control": "Traffic Control", "wasserrettung": "Water Rescue Station | Water Rescue Stations", - "water_police_count": "Water Police Expansion | Water Police Expansions" + "water_police_count": "Water Police Expansion | Water Police Expansions", + "disaster_response_count": "Disater Response Extension | Disater Response Extensions", + "water_damage_pump_count": "Flood Control Extension | Flood Control Extensions" }, "prisoners": { "max_possible_prisoners": "Maximum Prisoners", @@ -140,7 +144,10 @@ "swat_armored_vehicle": "SWAT Armoured Vehicle | SWAT Armoured Vehicles", "swat_suv": "SWAT SUV | SWAT SUVs", "water_rescue": "Lifeguard Truck | Lifeguard Trucks", - "water_tankers": "Water Tanker | Water Tankers" + "water_tankers": "Water Tanker | Water Tankers", + "flood_equipment": "Flood Equipment | Flood Equipments", + "light_supply": "Light Tower Trailer | Light Tower Trailers", + "energy_supply": "Energy Supplie | Energy Supplies" }, "multifunctionals": { "battalion_chief_vehicles": { diff --git a/src/modules/missionHelper/i18n/en_US.root.json b/src/modules/missionHelper/i18n/en_US.root.json index 5e2800eeda..42678a296c 100644 --- a/src/modules/missionHelper/i18n/en_US.root.json +++ b/src/modules/missionHelper/i18n/en_US.root.json @@ -27,6 +27,16 @@ "in": "additional", "text": "Required SWAT Personnel" }, + "min_pump_speed": { + "badge": true, + "in": "requirements", + "text": "Min. Pump Capacity: {n}" + }, + "pump_water_amount": { + "badge": true, + "in": "additional", + "text": "Water to pump (in Gallons): {n}" + }, "title": "Special requirements", "water_needed": { "badge": true, From 64b4672208cffb150e42fceb7ce802fe298cf72b Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 2 Aug 2023 21:22:14 +0000 Subject: [PATCH 100/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230802?= =?UTF-8?q?.2318=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/i18n/en_AU/vehicles.ts | 20 ++++---- src/i18n/en_GB/vehicles.ts | 5 +- src/i18n/en_US.ts | 2 +- src/i18n/en_US/vehicles.ts | 47 ++++++++++--------- .../extendedCallWindow/i18n/en_GB.json | 2 +- .../extendedCallWindow/i18n/en_US.json | 14 +++--- .../extendedCallWindow/i18n/en_US.root.json | 2 +- .../missionHelper/i18n/en_GB.root.json | 10 ++-- src/modules/missionHelper/i18n/en_US.json | 14 +++--- .../missionHelper/i18n/en_US.root.json | 20 ++++---- 11 files changed, 70 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index f79b10aa6f..3d997df18a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230801.2313", + "version": "4.7.7+20230802.2318", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/i18n/en_AU/vehicles.ts b/src/i18n/en_AU/vehicles.ts index 54f1c7e7f9..9bad8f1757 100644 --- a/src/i18n/en_AU/vehicles.ts +++ b/src/i18n/en_AU/vehicles.ts @@ -641,7 +641,7 @@ export default { icon: 'car-side', possibleBuildings: [15], isTrailer: true, - tractiveVehicles: [20,40], + tractiveVehicles: [20, 40], special: 'Can be towed by SES Vehicle or SES Rescue Truck', }, 43: { @@ -662,7 +662,7 @@ export default { }, icon: 'car-side', possibleBuildings: [0, 18], - waterTank: 14000, + waterTank: 14_000, }, 44: { caption: 'RIV', @@ -731,7 +731,7 @@ export default { icon: 'car-side', possibleBuildings: [15], isTrailer: true, - tractiveVehicles: [20,40,46], + tractiveVehicles: [20, 40, 46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 48: { @@ -743,7 +743,7 @@ export default { icon: 'car-side', possibleBuildings: [15], isTrailer: true, - tractiveVehicles: [20,40,46], + tractiveVehicles: [20, 40, 46], pumpCapacity: 5000, pumpType: 'fire', special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', @@ -757,7 +757,7 @@ export default { icon: 'car-side', possibleBuildings: [15], isTrailer: true, - tractiveVehicles: [20,40,46], + tractiveVehicles: [20, 40, 46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 50: { @@ -769,7 +769,7 @@ export default { icon: 'car-side', possibleBuildings: [15], isTrailer: true, - tractiveVehicles: [20,40,46], + tractiveVehicles: [20, 40, 46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 51: { @@ -781,7 +781,7 @@ export default { icon: 'car-side', possibleBuildings: [15], isTrailer: true, - tractiveVehicles: [20,40,46], + tractiveVehicles: [20, 40, 46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 52: { @@ -793,7 +793,7 @@ export default { icon: 'car-side', possibleBuildings: [15], isTrailer: true, - tractiveVehicles: [20,40,46], + tractiveVehicles: [20, 40, 46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 53: { @@ -805,7 +805,7 @@ export default { icon: 'car-side', possibleBuildings: [15], isTrailer: true, - tractiveVehicles: [20,40,46], + tractiveVehicles: [20, 40, 46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, 54: { @@ -817,7 +817,7 @@ export default { icon: 'car-side', possibleBuildings: [15], isTrailer: true, - tractiveVehicles: [20,40,46], + tractiveVehicles: [20, 40, 46], special: 'Can be towed by SES Vehicle, SES FOV, SES Rescue Truck', }, } satisfies Record; diff --git a/src/i18n/en_GB/vehicles.ts b/src/i18n/en_GB/vehicles.ts index ce94c05d6f..56236b8ff8 100644 --- a/src/i18n/en_GB/vehicles.ts +++ b/src/i18n/en_GB/vehicles.ts @@ -1354,11 +1354,12 @@ export default { max: 0, }, icon: 'car-side', - special: "Needed towing vehicle (Water Ladder, Light 4X4 Pump (L4P), Rescue Support Unit (RSU))", + special: + 'Needed towing vehicle (Water Ladder, Light 4X4 Pump (L4P), Rescue Support Unit (RSU))', pumpCapacity: 4000, pumpType: 'fire', possibleBuildings: [0, 18], isTrailer: true, - tractiveVehicles: [0,1,4], + tractiveVehicles: [0, 1, 4], }, } satisfies Record; diff --git a/src/i18n/en_US.ts b/src/i18n/en_US.ts index e0f476c0e0..5e885a5ac7 100644 --- a/src/i18n/en_US.ts +++ b/src/i18n/en_US.ts @@ -94,7 +94,7 @@ export default { 'Airport Vehicles': [17], 'Boats': [21, 22, 24], 'Fire Aviation': [35, 36, 37, 75, 76], - 'Trailer': [91,92,93,94,95], + 'Trailer': [91, 92, 93, 94, 95], }, color: '#ff2d2d', }, diff --git a/src/i18n/en_US/vehicles.ts b/src/i18n/en_US/vehicles.ts index b79cc1ece9..530221f36c 100644 --- a/src/i18n/en_US/vehicles.ts +++ b/src/i18n/en_US/vehicles.ts @@ -317,7 +317,7 @@ export default { icon: 'car-side', possibleBuildings: [0, 11, 12], isTrailer: true, - tractiveVehicles: [8,3,1,31,39,4], + tractiveVehicles: [8, 3, 1, 31, 39, 4], special: 'Accessory boat that can be towed with the Utility Unit. Requires Swift Water Rescue trained personnel to operate.
    The boat trailer cannot be assigned personnel,
    either assign your trained personnel to the towing vehicle, or assign them to a separate unit en route.', }, @@ -549,7 +549,7 @@ export default { coins: 10, staff: { min: 3, max: 5 }, icon: 'car-side', - possibleBuildings: [0,13], + possibleBuildings: [0, 13], waterTank: 750, }, 39: { @@ -559,7 +559,7 @@ export default { coins: 5, staff: { min: 1, max: 2 }, icon: 'car-side', - possibleBuildings: [0,13], + possibleBuildings: [0, 13], waterTank: 150, }, 40: { @@ -579,7 +579,7 @@ export default { }, }, icon: 'car-side', - possibleBuildings: [0,13], + possibleBuildings: [0, 13], isTrailer: true, tractiveVehicles: [41], special: @@ -875,7 +875,7 @@ export default { icon: 'car-side', possibleBuildings: [3], isTrailer: true, - tractiveVehicles: [15,28,29], + tractiveVehicles: [15, 28, 29], special: 'Needed towing vehicle (Fly-Car, EMS Rescue, EMS Chief). Works like the Mass Casualty Unit but without transport.', }, @@ -960,7 +960,7 @@ export default { coins: 15, staff: { min: 2, max: 3 }, icon: 'car-side', - possibleBuildings: [0,13], + possibleBuildings: [0, 13], foamTank: 2500, }, 65: { @@ -970,10 +970,10 @@ export default { coins: 10, staff: { min: 0, max: 0 }, icon: 'car-side', - possibleBuildings: [0,13], + possibleBuildings: [0, 13], foamTank: 650, isTrailer: true, - tractiveVehicles: [8,39,3,12], + tractiveVehicles: [8, 39, 3, 12], special: 'Needed towing vehicle (Utility unit, Type 6 engine, Battalion chief unit, mcv)', }, @@ -1131,8 +1131,9 @@ export default { icon: 'car-side', possibleBuildings: [0, 13, 26], isTrailer: true, - tractiveVehicles: [66,67,68,8,3,1], - special: 'Needed towing vehicle (Lifeguard Truck, Lifeguard Rescue, Lifeguard Supervisor, Utility unit, Battalion chief unit, Type 2 fire engine)', + tractiveVehicles: [66, 67, 68, 8, 3, 1], + special: + 'Needed towing vehicle (Lifeguard Truck, Lifeguard Rescue, Lifeguard Supervisor, Utility unit, Battalion chief unit, Type 2 fire engine)', }, 74: { caption: 'Wildfire MCC', @@ -1214,7 +1215,7 @@ export default { possibleBuildings: [0, 13], waterTank: 1000, isTrailer: true, - tractiveVehicles: [3,8,34,31,32,39,18], + tractiveVehicles: [3, 8, 34, 31, 32, 39, 18], special: 'Towed by Battalion chief unit, Utility unit, Type 2 fire engine, Crew Carrier, Type 5 engine, Type 7 engine, ', }, @@ -1344,7 +1345,7 @@ export default { staff: { min: 0, max: 0 }, icon: 'car-side', isTrailer: true, - tractiveVehicles: [10,26,47], + tractiveVehicles: [10, 26, 47], special: 'Needed towing vehicle (Patrol car, SWAT SUV, Police Supervisor / Sheriff Unit)', possibleBuildings: [5, 15], @@ -1384,7 +1385,7 @@ export default { }, icon: 'car-side', isTrailer: true, - tractiveVehicles: [47,56], + tractiveVehicles: [47, 56], special: "Needed towing vehicle (Police Supervisor / Sheriff Unit, Warden's Truck)", possibleBuildings: [5, 15], @@ -1433,13 +1434,13 @@ export default { 91: { caption: 'Flood Equipment Trailer', color: '#9f1616', - credits: 15000, + credits: 15_000, coins: 15, staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [0, 13], isTrailer: true, - tractiveVehicles: [8,3,1,31,39,4], + tractiveVehicles: [8, 3, 1, 31, 39, 4], pumpCapacity: 5000, pumpType: 'fire', special: @@ -1448,52 +1449,52 @@ export default { 92: { caption: 'Mobile Air Trailer', color: '#9f1616', - credits: 10000, + credits: 10_000, coins: 10, staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [0, 13], isTrailer: true, - tractiveVehicles: [0,1,8,4,3], + tractiveVehicles: [0, 1, 8, 4, 3], special: 'Needed towing vehicle (Utility unit, Battalion chief unit, Type 1 fire engine, Type 2 fire engine, Heavy rescue vehicle)', }, 93: { caption: 'Light Tower Trailer', color: '#9f1616', - credits: 10000, + credits: 10_000, coins: 10, staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [0, 13], isTrailer: true, - tractiveVehicles: [0,1,8,4,3], + tractiveVehicles: [0, 1, 8, 4, 3], special: 'Needed towing vehicle (Utility unit, Battalion chief unit, Type 1 fire engine, Type 2 fire engine, Heavy rescue vehicle)', }, 94: { caption: 'Energy Generator Trailer', color: '#9f1616', - credits: 10000, + credits: 10_000, coins: 10, staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [0, 13], isTrailer: true, - tractiveVehicles: [0,1,8,4,3], + tractiveVehicles: [0, 1, 8, 4, 3], special: 'Needed towing vehicle (Utility unit, Battalion chief unit, Type 1 fire engine, Type 2 fire engine, Heavy rescue vehicle)', }, 95: { caption: 'Double Light Boat Trailer', color: '#9f1616', - credits: 60000, + credits: 60_000, coins: 25, staff: { min: 0, max: 0 }, icon: 'car-side', possibleBuildings: [0, 13], isTrailer: true, - tractiveVehicles: [8,3,1,31,39,4], + tractiveVehicles: [8, 3, 1, 31, 39, 4], special: 'Needed towing vehicle (Utility unit, Battalion chief unit, Type 2 fire engine, Type 5 engine, Type 6 engine, Heavy rescue vehicle)', }, diff --git a/src/modules/extendedCallWindow/i18n/en_GB.json b/src/modules/extendedCallWindow/i18n/en_GB.json index cb045799e9..17ef643d1a 100644 --- a/src/modules/extendedCallWindow/i18n/en_GB.json +++ b/src/modules/extendedCallWindow/i18n/en_GB.json @@ -63,8 +63,8 @@ "enhancedMissingVehicles": { "driving": "En-route", "missing": "Missing on mission", - "selected": "Selected", "pump": "l/min pumping process", + "selected": "Selected", "staff": [ { "texts": ["Armed Response Personnel (In Armed Vehicles)"], diff --git a/src/modules/extendedCallWindow/i18n/en_US.json b/src/modules/extendedCallWindow/i18n/en_US.json index 3b06ded949..6e5a4c6937 100644 --- a/src/modules/extendedCallWindow/i18n/en_US.json +++ b/src/modules/extendedCallWindow/i18n/en_US.json @@ -89,8 +89,8 @@ "driving": "En-route", "foam": "gal. foam", "missing": "Missing on mission", - "selected": "Selected", "pump": "gal/min pumping process", + "selected": "Selected", "staff": [ { "texts": ["SWAT Personnel"], "vehicles": [16, 26] }, { @@ -128,7 +128,7 @@ "texts": ["Heavy Rescue Vehicle", "Heavy Rescue Vehicles"], "vehicles": [4, 8, 18, 21, 28, 61, 67] }, - { "texts": ["Mobile Air"], "vehicles": [6,92] }, + { "texts": ["Mobile Air"], "vehicles": [6, 92] }, { "texts": ["Water Tanker", "Water Tankers"], "vehicles": [7, 33, 64, 65, 77, 78] @@ -162,7 +162,10 @@ "texts": ["Large rescue boat", "Large rescue boats"], "vehicles": [25] }, - { "texts": ["Light Boat", "Light Boats"], "vehicles": [21, 22,95] }, + { + "texts": ["Light Boat", "Light Boats"], + "vehicles": [21, 22, 95] + }, { "texts": ["Wildland fire vehicle", "Wildland fire vehicles"], "vehicles": [30, 31, 32, 35, 36, 37, 38, 39, 40] @@ -293,10 +296,7 @@ "texts": ["Riot Police Trailer", "Riot Police Trailers"], "vehicles": [85] }, - { - "texts": ["Flood Equipment"], - "vehicles": [91] - }, + { "texts": ["Flood Equipment"], "vehicles": [91] }, { "texts": ["Energy Supplie", "Energy Supplies"], "vehicles": [94] diff --git a/src/modules/extendedCallWindow/i18n/en_US.root.json b/src/modules/extendedCallWindow/i18n/en_US.root.json index c006f89b28..90f709c306 100644 --- a/src/modules/extendedCallWindow/i18n/en_US.root.json +++ b/src/modules/extendedCallWindow/i18n/en_US.root.json @@ -221,7 +221,7 @@ "name": "Other Fire Apparatus", "vehicleTypes": [ 2, 3, 4, 6, 7, 8, 9, 12, 17, 21, 22, 24, 30, 31, 32, 34, 35, - 36, 37, 38, 39, 40, 41, 62, 63, 64, 65,91,92,93,94,95 + 36, 37, 38, 39, 40, 41, 62, 63, 64, 65, 91, 92, 93, 94, 95 ] }, { diff --git a/src/modules/missionHelper/i18n/en_GB.root.json b/src/modules/missionHelper/i18n/en_GB.root.json index 29c1fc81f6..a0f9ef6657 100644 --- a/src/modules/missionHelper/i18n/en_GB.root.json +++ b/src/modules/missionHelper/i18n/en_GB.root.json @@ -7,11 +7,6 @@ "in": "additional", "text": "Average min . Fire Personnel" }, - "swat_personnel": { - "badge": false, - "in": "additional", - "text": "Required Armed Response Personnel" - }, "min_pump_speed": { "badge": true, "in": "requirements", @@ -22,6 +17,11 @@ "in": "additional", "text": "Water to pump (in Litres): {n}" }, + "swat_personnel": { + "badge": false, + "in": "additional", + "text": "Required Armed Response Personnel" + }, "title": "Special requirements" }, "settings": { diff --git a/src/modules/missionHelper/i18n/en_US.json b/src/modules/missionHelper/i18n/en_US.json index 65081fd454..1b6c890425 100644 --- a/src/modules/missionHelper/i18n/en_US.json +++ b/src/modules/missionHelper/i18n/en_US.json @@ -50,6 +50,7 @@ "coastal_rescue_small_count": "Lifeguard Posts or Coastal Rescue Stations", "dea_count": "DEA Expansion | DEA Expansions", "detention_unit_count": "detention unit extension | detention unit extensions", + "disaster_response_count": "Disater Response Extension | Disater Response Extensions", "federalpolice_stations": "Federal Police Station | Federal Police Stations", "fire_aviation_count": "Firefighting Plane Station | Firefighting Plane Stations", "fire_boat_docks": "fire boat dock | fire boat docks", @@ -71,9 +72,8 @@ "title": "Prerequisite | Prerequisites", "traffic_control": "Traffic Control", "wasserrettung": "Water Rescue Station | Water Rescue Stations", - "water_police_count": "Water Police Expansion | Water Police Expansions", - "disaster_response_count": "Disater Response Extension | Disater Response Extensions", - "water_damage_pump_count": "Flood Control Extension | Flood Control Extensions" + "water_damage_pump_count": "Flood Control Extension | Flood Control Extensions", + "water_police_count": "Water Police Expansion | Water Police Expansions" }, "prisoners": { "max_possible_prisoners": "Maximum Prisoners", @@ -113,6 +113,7 @@ "detention_unit": "Police Prisoner Van | Police Prisoner Van", "elw_police": "Police MCV | Police MCVs", "elw3": "Wildland MCC | Wildland MCCs", + "energy_supply": "Energy Supplie | Energy Supplies", "fbi": "FBI Unit | FBI Units", "fbi_bomb": "FBI Bomb Technician Vehicle | FBI Bomb Technician Vehicles", "fbi_drone": "FBI Surveillance Drone | FBI Surveillance Drones", @@ -121,6 +122,7 @@ "fire_aviation": "Airborne Firefighting Vehicle | Airborne Firefighting Vehicles", "fire_investigation": "Fire Investigation Unit | Fire Investigation Units", "firetrucks": "Fire Engine | Fire Engines", + "flood_equipment": "Flood Equipment | Flood Equipments", "foam": "Foam Tender | Foam Tenders", "game_warden": "Warden Truck | Warden Trucks", "gw_wasserrettung": "Lifeguard Truck | Lifeguard Trucks", @@ -132,6 +134,7 @@ "large_coastal_boat": "Large Coastal Boat | Large Coastal Boats", "large_fire_boat": "Large Fire Boat | Large Fire Boats", "large_rescue_boat": "Large Rescue Boat | Large Rescue Boats", + "light_supply": "Light Tower Trailer | Light Tower Trailers", "mobile_air_vehicles": "Mobile Air Unit | Mobile Air Units", "mobile_command_vehicles": "Mobile Command Vehicle | Mobile Command Vehicles", "platform_trucks": "Platform Truck | Platform Trucks", @@ -144,10 +147,7 @@ "swat_armored_vehicle": "SWAT Armoured Vehicle | SWAT Armoured Vehicles", "swat_suv": "SWAT SUV | SWAT SUVs", "water_rescue": "Lifeguard Truck | Lifeguard Trucks", - "water_tankers": "Water Tanker | Water Tankers", - "flood_equipment": "Flood Equipment | Flood Equipments", - "light_supply": "Light Tower Trailer | Light Tower Trailers", - "energy_supply": "Energy Supplie | Energy Supplies" + "water_tankers": "Water Tanker | Water Tankers" }, "multifunctionals": { "battalion_chief_vehicles": { diff --git a/src/modules/missionHelper/i18n/en_US.root.json b/src/modules/missionHelper/i18n/en_US.root.json index 42678a296c..0ea25e0782 100644 --- a/src/modules/missionHelper/i18n/en_US.root.json +++ b/src/modules/missionHelper/i18n/en_US.root.json @@ -17,16 +17,6 @@ "in": "requirements", "text": "Foam: {n} gallon | Foam: {n} gallons" }, - "smoke_jumper_personnel": { - "badge": false, - "in": "additional", - "text": "Required Smoke Jumpers (in Smoke Jumper Planes)" - }, - "swat_personnel": { - "badge": false, - "in": "additional", - "text": "Required SWAT Personnel" - }, "min_pump_speed": { "badge": true, "in": "requirements", @@ -37,6 +27,16 @@ "in": "additional", "text": "Water to pump (in Gallons): {n}" }, + "smoke_jumper_personnel": { + "badge": false, + "in": "additional", + "text": "Required Smoke Jumpers (in Smoke Jumper Planes)" + }, + "swat_personnel": { + "badge": false, + "in": "additional", + "text": "Required SWAT Personnel" + }, "title": "Special requirements", "water_needed": { "badge": true, From 5b0d68c31bb333752d05c30aac238ee94bd82a14 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 2 Aug 2023 23:51:24 +0200 Subject: [PATCH 101/182] =?UTF-8?q?=F0=9F=90=9B[buildings]=20add=20the=20n?= =?UTF-8?q?ew=20extensions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en_US/buildings.ts | 53 +++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/src/i18n/en_US/buildings.ts b/src/i18n/en_US/buildings.ts index 95e53c6d06..1a23b2d968 100644 --- a/src/i18n/en_US/buildings.ts +++ b/src/i18n/en_US/buildings.ts @@ -94,7 +94,27 @@ export default { duration: '7 Days', isVehicleExtension: true, givesParkingLots: 1, - unlocksVehicleTypes: [21, 22], + unlocksVehicleTypes: [21, 22, 95], + }, + { + caption: 'Flood Control Extension', + credits: 200_000, + coins: 25, + duration: '5 Days', + isVehicleExtension: true, + givesParkingLots: 2, + unlocksVehicleTypes: [91], + parkingLotReservations: [[91], [91]], + }, + { + caption: 'Disaster Response Extension', + credits: 200_000, + coins: 25, + duration: '5 Days', + isVehicleExtension: true, + givesParkingLots: 2, + unlocksVehicleTypes: [93,94], + parkingLotReservations: [[93,94], [93,94]], }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], @@ -634,6 +654,15 @@ export default { givesParkingLots: 0, unlocksVehicleTypes: [64, 65], }, + { + caption: 'Lifeguard Extension', + credits: 100_000, + coins: 15, + duration: '5 Days', + isVehicleExtension: true, + givesParkingLots: 0, + unlocksVehicleTypes: [66, 67, 68, 73], + }, { caption: 'Water Rescue Expansion', credits: 100_000, @@ -641,7 +670,27 @@ export default { duration: '7 Days', isVehicleExtension: true, givesParkingLots: 1, - unlocksVehicleTypes: [21, 22], + unlocksVehicleTypes: [21, 22, 95], + }, + { + caption: 'Flood Control Extension', + credits: 200_000, + coins: 25, + duration: '5 Days', + isVehicleExtension: true, + givesParkingLots: 2, + unlocksVehicleTypes: [91], + parkingLotReservations: [[91], [91]], + }, + { + caption: 'Disaster Response Extension', + credits: 200_000, + coins: 25, + duration: '5 Days', + isVehicleExtension: true, + givesParkingLots: 2, + unlocksVehicleTypes: [93,94], + parkingLotReservations: [[93,94], [93,94]], }, ], levelcost: [ From 6946abdee1b26a3aad9dffdf09647ebc83d3e955 Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 2 Aug 2023 21:56:00 +0000 Subject: [PATCH 102/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230802?= =?UTF-8?q?.2352=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/i18n/en_US/buildings.ts | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3d997df18a..6f68cfc890 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230802.2318", + "version": "4.7.7+20230802.2352", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/i18n/en_US/buildings.ts b/src/i18n/en_US/buildings.ts index 1a23b2d968..5c1fb5d294 100644 --- a/src/i18n/en_US/buildings.ts +++ b/src/i18n/en_US/buildings.ts @@ -113,8 +113,11 @@ export default { duration: '5 Days', isVehicleExtension: true, givesParkingLots: 2, - unlocksVehicleTypes: [93,94], - parkingLotReservations: [[93,94], [93,94]], + unlocksVehicleTypes: [93, 94], + parkingLotReservations: [ + [93, 94], + [93, 94], + ], }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], @@ -689,8 +692,11 @@ export default { duration: '5 Days', isVehicleExtension: true, givesParkingLots: 2, - unlocksVehicleTypes: [93,94], - parkingLotReservations: [[93,94], [93,94]], + unlocksVehicleTypes: [93, 94], + parkingLotReservations: [ + [93, 94], + [93, 94], + ], }, ], levelcost: [ From 32c1d4d29ed87b7e4cd6cc34df66124c4956cc6f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 00:57:09 +0000 Subject: [PATCH 103/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20typescrip?= =?UTF-8?q?t-eslint=20to=20v6.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 6f68cfc890..692df0f698 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "@types/ua-parser-js": "0.7.36", "@types/vue-select": "3.16.2", "@types/webpack-env": "1.18.1", - "@typescript-eslint/eslint-plugin": "6.2.0", - "@typescript-eslint/parser": "6.2.0", + "@typescript-eslint/eslint-plugin": "6.2.1", + "@typescript-eslint/parser": "6.2.1", "all-contributors-cli": "6.26.1", "copy-dir": "1.3.0", "css-loader": "6.8.1", diff --git a/yarn.lock b/yarn.lock index 320f976f8b..6700fc950d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2515,15 +2515,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.2.0": - version: 6.2.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.2.0" +"@typescript-eslint/eslint-plugin@npm:6.2.1": + version: 6.2.1 + resolution: "@typescript-eslint/eslint-plugin@npm:6.2.1" dependencies: "@eslint-community/regexpp": ^4.5.1 - "@typescript-eslint/scope-manager": 6.2.0 - "@typescript-eslint/type-utils": 6.2.0 - "@typescript-eslint/utils": 6.2.0 - "@typescript-eslint/visitor-keys": 6.2.0 + "@typescript-eslint/scope-manager": 6.2.1 + "@typescript-eslint/type-utils": 6.2.1 + "@typescript-eslint/utils": 6.2.1 + "@typescript-eslint/visitor-keys": 6.2.1 debug: ^4.3.4 graphemer: ^1.4.0 ignore: ^5.2.4 @@ -2537,44 +2537,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 1ef46b1c2e3e2013f66b4982dcfb9e198a3824cc1503b843e553201a108a3cb6e4adfb2c486158c89d993e5e4b9d99aeb2af28297e43da98c4750dae8f5131b5 + checksum: e73f3fe36519d895037d223f3ddf200b97e17bcde9390984118c38733add1edf996357c809ec2db92cec61bc7c9e5a3d9a583e0d0f92fa9c3919b68716a27b37 languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.2.0": - version: 6.2.0 - resolution: "@typescript-eslint/parser@npm:6.2.0" +"@typescript-eslint/parser@npm:6.2.1": + version: 6.2.1 + resolution: "@typescript-eslint/parser@npm:6.2.1" dependencies: - "@typescript-eslint/scope-manager": 6.2.0 - "@typescript-eslint/types": 6.2.0 - "@typescript-eslint/typescript-estree": 6.2.0 - "@typescript-eslint/visitor-keys": 6.2.0 + "@typescript-eslint/scope-manager": 6.2.1 + "@typescript-eslint/types": 6.2.1 + "@typescript-eslint/typescript-estree": 6.2.1 + "@typescript-eslint/visitor-keys": 6.2.1 debug: ^4.3.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: ba79674f2d4599a24c7afa8f18ec28243b80df39f82a4a6b7a4ce7c584ec37d4ade40a3aa058d597a5cbf71647a40d0995866748d14cf4b52d8ad4420d10f669 + checksum: cf4768cbfc696ce1d4b15ae55b3d2b52761e91a4a80e738cf3a75c501c2257d735cd6e462567965069d0d693a8cf5463ab9e8b97c36c6ed1fccd3c1c09855bdb languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.2.0": - version: 6.2.0 - resolution: "@typescript-eslint/scope-manager@npm:6.2.0" +"@typescript-eslint/scope-manager@npm:6.2.1": + version: 6.2.1 + resolution: "@typescript-eslint/scope-manager@npm:6.2.1" dependencies: - "@typescript-eslint/types": 6.2.0 - "@typescript-eslint/visitor-keys": 6.2.0 - checksum: 75a650a3ede78bf841a3bf3f4880b94a06aa4c420f399a6fb9faee19a2e5998f7e330a13f78e07c4958413345bab58b0593f09fa163a77e8f6353012e795660c + "@typescript-eslint/types": 6.2.1 + "@typescript-eslint/visitor-keys": 6.2.1 + checksum: 3bb461678c7e729895c5ac16781ec7d66efc6ffa944bb49693ce8e9560f9a6cac70929157c0fc0875b2829ae19a5cdabb97973ddcfb7e81c16e22cdd5d39e3fd languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.2.0": - version: 6.2.0 - resolution: "@typescript-eslint/type-utils@npm:6.2.0" +"@typescript-eslint/type-utils@npm:6.2.1": + version: 6.2.1 + resolution: "@typescript-eslint/type-utils@npm:6.2.1" dependencies: - "@typescript-eslint/typescript-estree": 6.2.0 - "@typescript-eslint/utils": 6.2.0 + "@typescript-eslint/typescript-estree": 6.2.1 + "@typescript-eslint/utils": 6.2.1 debug: ^4.3.4 ts-api-utils: ^1.0.1 peerDependencies: @@ -2582,23 +2582,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 9adb542fb3c49bf5c1fecca98549bee3fcfd28a0ceee5227817a1ceb0841b912e322f58ba1b3ca98a47fc998cbec0a3d69cacb9cf9ac4be1d133b11bb9d53aae + checksum: 7f8d80f03e6ddc1838307a2a4df61dc4bd8400efb9dcc7316063ae293fce54afad238404a0c25cd2cdaceee73ae514f254b850bd7ff11e2def700d5d6b90af05 languageName: node linkType: hard -"@typescript-eslint/types@npm:6.2.0": - version: 6.2.0 - resolution: "@typescript-eslint/types@npm:6.2.0" - checksum: 81878866cf7f49dbc335cce05adfbd994f348e2ebe9538fd6e934fa82e44186c16b2112b8d5f9f4c528ea127be157185be5e35e4913db4880d20ac495785baaf +"@typescript-eslint/types@npm:6.2.1": + version: 6.2.1 + resolution: "@typescript-eslint/types@npm:6.2.1" + checksum: 388d32f15a9db8ad5d80794caf9ab280d6e5a428efdf4f6a6dfc4069afe4d19da32d628acf638e4c5b92ee77a9a18eecf728a778a3b91cc8a24484af579fc9cf languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.2.0": - version: 6.2.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.2.0" +"@typescript-eslint/typescript-estree@npm:6.2.1": + version: 6.2.1 + resolution: "@typescript-eslint/typescript-estree@npm:6.2.1" dependencies: - "@typescript-eslint/types": 6.2.0 - "@typescript-eslint/visitor-keys": 6.2.0 + "@typescript-eslint/types": 6.2.1 + "@typescript-eslint/visitor-keys": 6.2.1 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -2607,34 +2607,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 5bfd5bf09feff6c4807cfa65cf407dd0249f7d487d6820941dd05999ee35cacdabaacadf23c92b90b57920025e93088e93924bc8df41f393ac0366538eb2902f + checksum: 3d9beeb5e36b8827de5c160ed8e5c111dd66ca00671b183409b051e242b291480679b900bb74aaf4895dcae49497037567d3fcbbe67fa9930786ddd01c685f04 languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.2.0": - version: 6.2.0 - resolution: "@typescript-eslint/utils@npm:6.2.0" +"@typescript-eslint/utils@npm:6.2.1": + version: 6.2.1 + resolution: "@typescript-eslint/utils@npm:6.2.1" dependencies: "@eslint-community/eslint-utils": ^4.4.0 "@types/json-schema": ^7.0.12 "@types/semver": ^7.5.0 - "@typescript-eslint/scope-manager": 6.2.0 - "@typescript-eslint/types": 6.2.0 - "@typescript-eslint/typescript-estree": 6.2.0 + "@typescript-eslint/scope-manager": 6.2.1 + "@typescript-eslint/types": 6.2.1 + "@typescript-eslint/typescript-estree": 6.2.1 semver: ^7.5.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 54f062412a8ce23554ca4063d275327981640426b1ecd1073d30dd8b9464ff7af68b8f9f6272033bad9307815d56f2f922faa8a995421efdccd6165dd62557e1 + checksum: d16356a633f39d988a9af159da15e28c6a28fa47abce372061c79cf186d193d148e1c32862c9702ff87e2a06f7a2f82773e4b56320a39f432f4b1a989f8005ad languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.2.0": - version: 6.2.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.2.0" +"@typescript-eslint/visitor-keys@npm:6.2.1": + version: 6.2.1 + resolution: "@typescript-eslint/visitor-keys@npm:6.2.1" dependencies: - "@typescript-eslint/types": 6.2.0 + "@typescript-eslint/types": 6.2.1 eslint-visitor-keys: ^3.4.1 - checksum: b400c657c7e5c65b289304f6f5cee6536f23b3441306f82aff2d2e047e13770330715d4f7b29e734b0b2dab6030e41028894d5cd441696115bfea43ad18b2c54 + checksum: c05a1c45129f2cf9a8c49dadc3da10b675232e59b69dfe9fdc0bfb45d3be077ceff78097baf50e502dab3e71ce9fd799d2015e356a4be2787ee10c6c7a44ea8a languageName: node linkType: hard @@ -7019,8 +7019,8 @@ __metadata: "@types/ua-parser-js": 0.7.36 "@types/vue-select": 3.16.2 "@types/webpack-env": 1.18.1 - "@typescript-eslint/eslint-plugin": 6.2.0 - "@typescript-eslint/parser": 6.2.0 + "@typescript-eslint/eslint-plugin": 6.2.1 + "@typescript-eslint/parser": 6.2.1 acorn: 8.10.0 acorn-walk: 8.2.0 all-contributors-cli: 6.26.1 From 9dd55ffca7f671543d611b1fa46cf51921759104 Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 3 Aug 2023 03:17:07 +0000 Subject: [PATCH 104/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230803?= =?UTF-8?q?.0514=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 692df0f698..baa0aeb908 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230802.2352", + "version": "4.7.7+20230803.0514", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 222af0773a..5d84d86d0b 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -110,11 +110,11 @@ }, "@typescript-eslint/eslint-plugin": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "6.2.0" + "version": "6.2.1" }, "@typescript-eslint/parser": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "6.2.0" + "version": "6.2.1" }, "@vuepress/client": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", From ffe7a3b58defa28fe6441d84defbb557d8ed5187 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 03:18:12 +0000 Subject: [PATCH 105/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20fontaweso?= =?UTF-8?q?me=20to=20v6.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 ++++---- yarn.lock | 54 ++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index baa0aeb908..9d179390f7 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,10 @@ "postinstall": "husky install" }, "dependencies": { - "@fortawesome/fontawesome-free": "6.4.0", - "@fortawesome/fontawesome-svg-core": "6.4.0", - "@fortawesome/free-regular-svg-icons": "6.4.0", - "@fortawesome/free-solid-svg-icons": "6.4.0", + "@fortawesome/fontawesome-free": "6.4.2", + "@fortawesome/fontawesome-svg-core": "6.4.2", + "@fortawesome/free-regular-svg-icons": "6.4.2", + "@fortawesome/free-solid-svg-icons": "6.4.2", "@fortawesome/vue-fontawesome": "2.0.10", "acorn": "8.10.0", "acorn-walk": "8.2.0", diff --git a/yarn.lock b/yarn.lock index 6700fc950d..735998c9ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1567,44 +1567,44 @@ __metadata: languageName: node linkType: hard -"@fortawesome/fontawesome-common-types@npm:6.4.0": - version: 6.4.0 - resolution: "@fortawesome/fontawesome-common-types@npm:6.4.0" - checksum: a9b79136caa615352bd921cfe2710516321b402cd76c3f0ae68e579a7e3d7645c5a5c0ecd7516c0b207adeeffd1d2174978638d8c0d3c8c937d66fca4f2ff556 +"@fortawesome/fontawesome-common-types@npm:6.4.2": + version: 6.4.2 + resolution: "@fortawesome/fontawesome-common-types@npm:6.4.2" + checksum: 4a22932bd0cac65be1d35b739624f366b6c247b60eb5b8f66218957f54ce1cae56e2a20ea88789ede45d1e1c0c1014f160e01c1752122ec174ad0823e60f94bf languageName: node linkType: hard -"@fortawesome/fontawesome-free@npm:6.4.0": - version: 6.4.0 - resolution: "@fortawesome/fontawesome-free@npm:6.4.0" - checksum: 0197cd7df96de375862fea561d69427deebb918cadc26074cc8d490180d536e7e58853d138ca74d081b46b2cbdec2783d01cdaccb8bd723d6ef6b4cc8455b84b +"@fortawesome/fontawesome-free@npm:6.4.2": + version: 6.4.2 + resolution: "@fortawesome/fontawesome-free@npm:6.4.2" + checksum: 14be8fbb8faa62473c01fe70590e39cdc76a0083b791537fd3d2215a790d2722d917242b1f7948e160876934a8d3823c764af9b8d4ef6dc1ecad55b585e5b776 languageName: node linkType: hard -"@fortawesome/fontawesome-svg-core@npm:6.4.0": - version: 6.4.0 - resolution: "@fortawesome/fontawesome-svg-core@npm:6.4.0" +"@fortawesome/fontawesome-svg-core@npm:6.4.2": + version: 6.4.2 + resolution: "@fortawesome/fontawesome-svg-core@npm:6.4.2" dependencies: - "@fortawesome/fontawesome-common-types": 6.4.0 - checksum: 5d4e6c15f814f5ce29053b666d0c7d194dc8ba173d128a38cc5856403a09d4e817e54956d30ed8d48d621f2f5ebcc71756f4e8fe5c5a091c636fc728fcb2362b + "@fortawesome/fontawesome-common-types": 6.4.2 + checksum: 0c0ecd9058883b128127e2b281c983ba6272be38a17577aaa2293ada58e9b1538357fe44430ded508d49ae3f5cc55aa720a0448d2b9d99689bb912d786f034e5 languageName: node linkType: hard -"@fortawesome/free-regular-svg-icons@npm:6.4.0": - version: 6.4.0 - resolution: "@fortawesome/free-regular-svg-icons@npm:6.4.0" +"@fortawesome/free-regular-svg-icons@npm:6.4.2": + version: 6.4.2 + resolution: "@fortawesome/free-regular-svg-icons@npm:6.4.2" dependencies: - "@fortawesome/fontawesome-common-types": 6.4.0 - checksum: a52689349b858a73b179532a207f98d9ee0f28b31e22eaffa6ce23cf3bfec8cc52bcd35770a0943a2dd1328bafbfdea6809231abee7a8601796bc0fb9759d25f + "@fortawesome/fontawesome-common-types": 6.4.2 + checksum: fdb78fced6087f83b45fc1d73de874c69956aa07e7376b8f79b3b0b76e9f800d06c4586b5431acea4e8b5ebc40866f2c4e87fc02986cae7b066c1ea9d150d7e1 languageName: node linkType: hard -"@fortawesome/free-solid-svg-icons@npm:6.4.0": - version: 6.4.0 - resolution: "@fortawesome/free-solid-svg-icons@npm:6.4.0" +"@fortawesome/free-solid-svg-icons@npm:6.4.2": + version: 6.4.2 + resolution: "@fortawesome/free-solid-svg-icons@npm:6.4.2" dependencies: - "@fortawesome/fontawesome-common-types": 6.4.0 - checksum: efdd1688620be3d52aacaeac36c955571962e174ae981fc697b6e92fb0996b00166d02e7729a59ea93713a514e2c8d564ab1aa79c9653b4cfed0263e4874d070 + "@fortawesome/fontawesome-common-types": 6.4.2 + checksum: 4a365004990d5b1c970fb30c11b284b0b807903d0ecb193eb9b5a5e41ea7c0b8fff5c60480c580a1e44535cf23c5d9c90cb698189741e40ea3e10ac66290709c languageName: node linkType: hard @@ -6998,10 +6998,10 @@ __metadata: version: 0.0.0-use.local resolution: "lss-manager-v4@workspace:." dependencies: - "@fortawesome/fontawesome-free": 6.4.0 - "@fortawesome/fontawesome-svg-core": 6.4.0 - "@fortawesome/free-regular-svg-icons": 6.4.0 - "@fortawesome/free-solid-svg-icons": 6.4.0 + "@fortawesome/fontawesome-free": 6.4.2 + "@fortawesome/fontawesome-svg-core": 6.4.2 + "@fortawesome/free-regular-svg-icons": 6.4.2 + "@fortawesome/free-solid-svg-icons": 6.4.2 "@fortawesome/vue-fontawesome": 2.0.10 "@types/he": 1.2.0 "@types/i18n-js": 3.8.4 From 8a71136f1d8b149e081e50725e3a44329da59718 Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 3 Aug 2023 03:50:55 +0000 Subject: [PATCH 106/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230803?= =?UTF-8?q?.0547=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/faIcons.json | 2 +- src/generated/libraries.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9d179390f7..1b6721c228 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230803.0514", + "version": "4.7.7+20230803.0547", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/faIcons.json b/src/generated/faIcons.json index decb7bb8f7..a4f0fca04c 100644 --- a/src/generated/faIcons.json +++ b/src/generated/faIcons.json @@ -1 +1 @@ -{"solid":["0","1","2","3","4","5","6","7","8","9","a","address-book","contact-book","address-card","contact-card","vcard","align-center","align-justify","align-left","align-right","anchor","anchor-circle-check","anchor-circle-exclamation","anchor-circle-xmark","anchor-lock","angle-down","angle-left","angle-right","angle-up","angles-down","angle-double-down","angles-left","angle-double-left","angles-right","angle-double-right","angles-up","angle-double-up","ankh","apple-whole","apple-alt","archway","arrow-down","arrow-down-1-9","sort-numeric-asc","sort-numeric-down","arrow-down-9-1","sort-numeric-desc","sort-numeric-down-alt","arrow-down-a-z","sort-alpha-asc","sort-alpha-down","arrow-down-long","long-arrow-down","arrow-down-short-wide","sort-amount-desc","sort-amount-down-alt","arrow-down-up-across-line","arrow-down-up-lock","arrow-down-wide-short","sort-amount-asc","sort-amount-down","arrow-down-z-a","sort-alpha-desc","sort-alpha-down-alt","arrow-left","arrow-left-long","long-arrow-left","arrow-pointer","mouse-pointer","arrow-right","arrow-right-arrow-left","exchange","arrow-right-from-bracket","sign-out","arrow-right-long","long-arrow-right","arrow-right-to-bracket","sign-in","arrow-right-to-city","arrow-rotate-left","arrow-left-rotate","arrow-rotate-back","arrow-rotate-backward","undo","arrow-rotate-right","arrow-right-rotate","arrow-rotate-forward","redo","arrow-trend-down","arrow-trend-up","arrow-turn-down","level-down","arrow-turn-up","level-up","arrow-up","arrow-up-1-9","sort-numeric-up","arrow-up-9-1","sort-numeric-up-alt","arrow-up-a-z","sort-alpha-up","arrow-up-from-bracket","arrow-up-from-ground-water","arrow-up-from-water-pump","arrow-up-long","long-arrow-up","arrow-up-right-dots","arrow-up-right-from-square","external-link","arrow-up-short-wide","sort-amount-up-alt","arrow-up-wide-short","sort-amount-up","arrow-up-z-a","sort-alpha-up-alt","arrows-down-to-line","arrows-down-to-people","arrows-left-right","arrows-h","arrows-left-right-to-line","arrows-rotate","refresh","sync","arrows-spin","arrows-split-up-and-left","arrows-to-circle","arrows-to-dot","arrows-to-eye","arrows-turn-right","arrows-turn-to-dots","arrows-up-down","arrows-v","arrows-up-down-left-right","arrows","arrows-up-to-line","asterisk","at","atom","audio-description","austral-sign","award","b","baby","baby-carriage","carriage-baby","backward","backward-fast","fast-backward","backward-step","step-backward","bacon","bacteria","bacterium","bag-shopping","shopping-bag","bahai","haykal","baht-sign","ban","cancel","ban-smoking","smoking-ban","bandage","band-aid","bangladeshi-taka-sign","barcode","bars","navicon","bars-progress","tasks-alt","bars-staggered","reorder","stream","baseball","baseball-ball","baseball-bat-ball","basket-shopping","shopping-basket","basketball","basketball-ball","bath","bathtub","battery-empty","battery-0","battery-full","battery","battery-5","battery-half","battery-3","battery-quarter","battery-2","battery-three-quarters","battery-4","bed","bed-pulse","procedures","beer-mug-empty","beer","bell","bell-concierge","concierge-bell","bell-slash","bezier-curve","bicycle","binoculars","biohazard","bitcoin-sign","blender","blender-phone","blog","bold","bolt","zap","bolt-lightning","bomb","bone","bong","book","book-atlas","atlas","book-bible","bible","book-bookmark","book-journal-whills","journal-whills","book-medical","book-open","book-open-reader","book-reader","book-quran","quran","book-skull","book-dead","book-tanakh","tanakh","bookmark","border-all","border-none","border-top-left","border-style","bore-hole","bottle-droplet","bottle-water","bowl-food","bowl-rice","bowling-ball","box","box-archive","archive","box-open","box-tissue","boxes-packing","boxes-stacked","boxes","boxes-alt","braille","brain","brazilian-real-sign","bread-slice","bridge","bridge-circle-check","bridge-circle-exclamation","bridge-circle-xmark","bridge-lock","bridge-water","briefcase","briefcase-medical","broom","broom-ball","quidditch","quidditch-broom-ball","brush","bucket","bug","bug-slash","bugs","building","building-circle-arrow-right","building-circle-check","building-circle-exclamation","building-circle-xmark","building-columns","bank","institution","museum","university","building-flag","building-lock","building-ngo","building-shield","building-un","building-user","building-wheat","bullhorn","bullseye","burger","hamburger","burst","bus","bus-simple","bus-alt","business-time","briefcase-clock","c","cable-car","tram","cake-candles","birthday-cake","cake","calculator","calendar","calendar-check","calendar-day","calendar-days","calendar-alt","calendar-minus","calendar-plus","calendar-week","calendar-xmark","calendar-times","camera","camera-alt","camera-retro","camera-rotate","campground","candy-cane","cannabis","capsules","car","automobile","car-battery","battery-car","car-burst","car-crash","car-on","car-rear","car-alt","car-side","car-tunnel","caravan","caret-down","caret-left","caret-right","caret-up","carrot","cart-arrow-down","cart-flatbed","dolly-flatbed","cart-flatbed-suitcase","luggage-cart","cart-plus","cart-shopping","shopping-cart","cash-register","cat","cedi-sign","cent-sign","certificate","chair","chalkboard","blackboard","chalkboard-user","chalkboard-teacher","champagne-glasses","glass-cheers","charging-station","chart-area","area-chart","chart-bar","bar-chart","chart-column","chart-gantt","chart-line","line-chart","chart-pie","pie-chart","chart-simple","check","check-double","check-to-slot","vote-yea","cheese","chess","chess-bishop","chess-board","chess-king","chess-knight","chess-pawn","chess-queen","chess-rook","chevron-down","chevron-left","chevron-right","chevron-up","child","child-combatant","child-rifle","child-dress","child-reaching","children","church","circle","circle-arrow-down","arrow-circle-down","circle-arrow-left","arrow-circle-left","circle-arrow-right","arrow-circle-right","circle-arrow-up","arrow-circle-up","circle-check","check-circle","circle-chevron-down","chevron-circle-down","circle-chevron-left","chevron-circle-left","circle-chevron-right","chevron-circle-right","circle-chevron-up","chevron-circle-up","circle-dollar-to-slot","donate","circle-dot","dot-circle","circle-down","arrow-alt-circle-down","circle-exclamation","exclamation-circle","circle-h","hospital-symbol","circle-half-stroke","adjust","circle-info","info-circle","circle-left","arrow-alt-circle-left","circle-minus","minus-circle","circle-nodes","circle-notch","circle-pause","pause-circle","circle-play","play-circle","circle-plus","plus-circle","circle-question","question-circle","circle-radiation","radiation-alt","circle-right","arrow-alt-circle-right","circle-stop","stop-circle","circle-up","arrow-alt-circle-up","circle-user","user-circle","circle-xmark","times-circle","xmark-circle","city","clapperboard","clipboard","clipboard-check","clipboard-list","clipboard-question","clipboard-user","clock","clock-four","clock-rotate-left","history","clone","closed-captioning","cloud","cloud-arrow-down","cloud-download","cloud-download-alt","cloud-arrow-up","cloud-upload","cloud-upload-alt","cloud-bolt","thunderstorm","cloud-meatball","cloud-moon","cloud-moon-rain","cloud-rain","cloud-showers-heavy","cloud-showers-water","cloud-sun","cloud-sun-rain","clover","code","code-branch","code-commit","code-compare","code-fork","code-merge","code-pull-request","coins","colon-sign","comment","comment-dollar","comment-dots","commenting","comment-medical","comment-slash","comment-sms","sms","comments","comments-dollar","compact-disc","compass","compass-drafting","drafting-compass","compress","computer","computer-mouse","mouse","cookie","cookie-bite","copy","copyright","couch","cow","credit-card","credit-card-alt","crop","crop-simple","crop-alt","cross","crosshairs","crow","crown","crutch","cruzeiro-sign","cube","cubes","cubes-stacked","d","database","delete-left","backspace","democrat","desktop","desktop-alt","dharmachakra","diagram-next","diagram-predecessor","diagram-project","project-diagram","diagram-successor","diamond","diamond-turn-right","directions","dice","dice-d20","dice-d6","dice-five","dice-four","dice-one","dice-six","dice-three","dice-two","disease","display","divide","dna","dog","dollar-sign","dollar","usd","dolly","dolly-box","dong-sign","door-closed","door-open","dove","down-left-and-up-right-to-center","compress-alt","down-long","long-arrow-alt-down","download","dragon","draw-polygon","droplet","tint","droplet-slash","tint-slash","drum","drum-steelpan","drumstick-bite","dumbbell","dumpster","dumpster-fire","dungeon","e","ear-deaf","deaf","deafness","hard-of-hearing","ear-listen","assistive-listening-systems","earth-africa","globe-africa","earth-americas","earth","earth-america","globe-americas","earth-asia","globe-asia","earth-europe","globe-europe","earth-oceania","globe-oceania","egg","eject","elevator","ellipsis","ellipsis-h","ellipsis-vertical","ellipsis-v","envelope","envelope-circle-check","envelope-open","envelope-open-text","envelopes-bulk","mail-bulk","equals","eraser","ethernet","euro-sign","eur","euro","exclamation","expand","explosion","eye","eye-dropper","eye-dropper-empty","eyedropper","eye-low-vision","low-vision","eye-slash","f","face-angry","angry","face-dizzy","dizzy","face-flushed","flushed","face-frown","frown","face-frown-open","frown-open","face-grimace","grimace","face-grin","grin","face-grin-beam","grin-beam","face-grin-beam-sweat","grin-beam-sweat","face-grin-hearts","grin-hearts","face-grin-squint","grin-squint","face-grin-squint-tears","grin-squint-tears","face-grin-stars","grin-stars","face-grin-tears","grin-tears","face-grin-tongue","grin-tongue","face-grin-tongue-squint","grin-tongue-squint","face-grin-tongue-wink","grin-tongue-wink","face-grin-wide","grin-alt","face-grin-wink","grin-wink","face-kiss","kiss","face-kiss-beam","kiss-beam","face-kiss-wink-heart","kiss-wink-heart","face-laugh","laugh","face-laugh-beam","laugh-beam","face-laugh-squint","laugh-squint","face-laugh-wink","laugh-wink","face-meh","meh","face-meh-blank","meh-blank","face-rolling-eyes","meh-rolling-eyes","face-sad-cry","sad-cry","face-sad-tear","sad-tear","face-smile","smile","face-smile-beam","smile-beam","face-smile-wink","smile-wink","face-surprise","surprise","face-tired","tired","fan","faucet","faucet-drip","fax","feather","feather-pointed","feather-alt","ferry","file","file-arrow-down","file-download","file-arrow-up","file-upload","file-audio","file-circle-check","file-circle-exclamation","file-circle-minus","file-circle-plus","file-circle-question","file-circle-xmark","file-code","file-contract","file-csv","file-excel","file-export","arrow-right-from-file","file-image","file-import","arrow-right-to-file","file-invoice","file-invoice-dollar","file-lines","file-alt","file-text","file-medical","file-pdf","file-pen","file-edit","file-powerpoint","file-prescription","file-shield","file-signature","file-video","file-waveform","file-medical-alt","file-word","file-zipper","file-archive","fill","fill-drip","film","filter","filter-circle-dollar","funnel-dollar","filter-circle-xmark","fingerprint","fire","fire-burner","fire-extinguisher","fire-flame-curved","fire-alt","fire-flame-simple","burn","fish","fish-fins","flag","flag-checkered","flag-usa","flask","flask-vial","floppy-disk","save","florin-sign","folder","folder-blank","folder-closed","folder-minus","folder-open","folder-plus","folder-tree","font","font-awesome","font-awesome-flag","font-awesome-logo-full","football","football-ball","forward","forward-fast","fast-forward","forward-step","step-forward","franc-sign","frog","futbol","futbol-ball","soccer-ball","g","gamepad","gas-pump","gauge","dashboard","gauge-med","tachometer-alt-average","gauge-high","tachometer-alt","tachometer-alt-fast","gauge-simple","gauge-simple-med","tachometer-average","gauge-simple-high","tachometer","tachometer-fast","gavel","legal","gear","cog","gears","cogs","gem","genderless","ghost","gift","gifts","glass-water","glass-water-droplet","glasses","globe","golf-ball-tee","golf-ball","gopuram","graduation-cap","mortar-board","greater-than","greater-than-equal","grip","grip-horizontal","grip-lines","grip-lines-vertical","grip-vertical","group-arrows-rotate","guarani-sign","guitar","gun","h","hammer","hamsa","hand","hand-paper","hand-back-fist","hand-rock","hand-dots","allergies","hand-fist","fist-raised","hand-holding","hand-holding-dollar","hand-holding-usd","hand-holding-droplet","hand-holding-water","hand-holding-hand","hand-holding-heart","hand-holding-medical","hand-lizard","hand-middle-finger","hand-peace","hand-point-down","hand-point-left","hand-point-right","hand-point-up","hand-pointer","hand-scissors","hand-sparkles","hand-spock","handcuffs","hands","sign-language","signing","hands-asl-interpreting","american-sign-language-interpreting","asl-interpreting","hands-american-sign-language-interpreting","hands-bound","hands-bubbles","hands-wash","hands-clapping","hands-holding","hands-holding-child","hands-holding-circle","hands-praying","praying-hands","handshake","handshake-angle","hands-helping","handshake-simple","handshake-alt","handshake-simple-slash","handshake-alt-slash","handshake-slash","hanukiah","hard-drive","hdd","hashtag","hat-cowboy","hat-cowboy-side","hat-wizard","head-side-cough","head-side-cough-slash","head-side-mask","head-side-virus","heading","header","headphones","headphones-simple","headphones-alt","headset","heart","heart-circle-bolt","heart-circle-check","heart-circle-exclamation","heart-circle-minus","heart-circle-plus","heart-circle-xmark","heart-crack","heart-broken","heart-pulse","heartbeat","helicopter","helicopter-symbol","helmet-safety","hard-hat","hat-hard","helmet-un","highlighter","hill-avalanche","hill-rockslide","hippo","hockey-puck","holly-berry","horse","horse-head","hospital","hospital-alt","hospital-wide","hospital-user","hot-tub-person","hot-tub","hotdog","hotel","hourglass","hourglass-empty","hourglass-end","hourglass-3","hourglass-half","hourglass-2","hourglass-start","hourglass-1","house","home","home-alt","home-lg-alt","house-chimney","home-lg","house-chimney-crack","house-damage","house-chimney-medical","clinic-medical","house-chimney-user","house-chimney-window","house-circle-check","house-circle-exclamation","house-circle-xmark","house-crack","house-fire","house-flag","house-flood-water","house-flood-water-circle-arrow-right","house-laptop","laptop-house","house-lock","house-medical","house-medical-circle-check","house-medical-circle-exclamation","house-medical-circle-xmark","house-medical-flag","house-signal","house-tsunami","house-user","home-user","hryvnia-sign","hryvnia","hurricane","i","i-cursor","ice-cream","icicles","icons","heart-music-camera-bolt","id-badge","id-card","drivers-license","id-card-clip","id-card-alt","igloo","image","image-portrait","portrait","images","inbox","indent","indian-rupee-sign","indian-rupee","inr","industry","infinity","info","italic","j","jar","jar-wheat","jedi","jet-fighter","fighter-jet","jet-fighter-up","joint","jug-detergent","k","kaaba","key","keyboard","khanda","kip-sign","kit-medical","first-aid","kitchen-set","kiwi-bird","l","land-mine-on","landmark","landmark-dome","landmark-alt","landmark-flag","language","laptop","laptop-code","laptop-file","laptop-medical","lari-sign","layer-group","leaf","left-long","long-arrow-alt-left","left-right","arrows-alt-h","lemon","less-than","less-than-equal","life-ring","lightbulb","lines-leaning","link","chain","link-slash","chain-broken","chain-slash","unlink","lira-sign","list","list-squares","list-check","tasks","list-ol","list-1-2","list-numeric","list-ul","list-dots","litecoin-sign","location-arrow","location-crosshairs","location","location-dot","map-marker-alt","location-pin","map-marker","location-pin-lock","lock","lock-open","locust","lungs","lungs-virus","m","magnet","magnifying-glass","search","magnifying-glass-arrow-right","magnifying-glass-chart","magnifying-glass-dollar","search-dollar","magnifying-glass-location","search-location","magnifying-glass-minus","search-minus","magnifying-glass-plus","search-plus","manat-sign","map","map-location","map-marked","map-location-dot","map-marked-alt","map-pin","marker","mars","mars-and-venus","mars-and-venus-burst","mars-double","mars-stroke","mars-stroke-right","mars-stroke-h","mars-stroke-up","mars-stroke-v","martini-glass","glass-martini-alt","martini-glass-citrus","cocktail","martini-glass-empty","glass-martini","mask","mask-face","mask-ventilator","masks-theater","theater-masks","mattress-pillow","maximize","expand-arrows-alt","medal","memory","menorah","mercury","message","comment-alt","meteor","microchip","microphone","microphone-lines","microphone-alt","microphone-lines-slash","microphone-alt-slash","microphone-slash","microscope","mill-sign","minimize","compress-arrows-alt","minus","subtract","mitten","mobile","mobile-android","mobile-phone","mobile-button","mobile-retro","mobile-screen","mobile-android-alt","mobile-screen-button","mobile-alt","money-bill","money-bill-1","money-bill-alt","money-bill-1-wave","money-bill-wave-alt","money-bill-transfer","money-bill-trend-up","money-bill-wave","money-bill-wheat","money-bills","money-check","money-check-dollar","money-check-alt","monument","moon","mortar-pestle","mosque","mosquito","mosquito-net","motorcycle","mound","mountain","mountain-city","mountain-sun","mug-hot","mug-saucer","coffee","music","n","naira-sign","network-wired","neuter","newspaper","not-equal","notdef","note-sticky","sticky-note","notes-medical","o","object-group","object-ungroup","oil-can","oil-well","om","otter","outdent","dedent","p","pager","paint-roller","paintbrush","paint-brush","palette","pallet","panorama","paper-plane","paperclip","parachute-box","paragraph","passport","paste","file-clipboard","pause","paw","peace","pen","pen-clip","pen-alt","pen-fancy","pen-nib","pen-ruler","pencil-ruler","pen-to-square","edit","pencil","pencil-alt","people-arrows","people-arrows-left-right","people-carry-box","people-carry","people-group","people-line","people-pulling","people-robbery","people-roof","pepper-hot","percent","percentage","person","male","person-arrow-down-to-line","person-arrow-up-from-line","person-biking","biking","person-booth","person-breastfeeding","person-burst","person-cane","person-chalkboard","person-circle-check","person-circle-exclamation","person-circle-minus","person-circle-plus","person-circle-question","person-circle-xmark","person-digging","digging","person-dots-from-line","diagnoses","person-dress","female","person-dress-burst","person-drowning","person-falling","person-falling-burst","person-half-dress","person-harassing","person-hiking","hiking","person-military-pointing","person-military-rifle","person-military-to-person","person-praying","pray","person-pregnant","person-rays","person-rifle","person-running","running","person-shelter","person-skating","skating","person-skiing","skiing","person-skiing-nordic","skiing-nordic","person-snowboarding","snowboarding","person-swimming","swimmer","person-through-window","person-walking","walking","person-walking-arrow-loop-left","person-walking-arrow-right","person-walking-dashed-line-arrow-right","person-walking-luggage","person-walking-with-cane","blind","peseta-sign","peso-sign","phone","phone-flip","phone-alt","phone-slash","phone-volume","volume-control-phone","photo-film","photo-video","piggy-bank","pills","pizza-slice","place-of-worship","plane","plane-arrival","plane-circle-check","plane-circle-exclamation","plane-circle-xmark","plane-departure","plane-lock","plane-slash","plane-up","plant-wilt","plate-wheat","play","plug","plug-circle-bolt","plug-circle-check","plug-circle-exclamation","plug-circle-minus","plug-circle-plus","plug-circle-xmark","plus","add","plus-minus","podcast","poo","poo-storm","poo-bolt","poop","power-off","prescription","prescription-bottle","prescription-bottle-medical","prescription-bottle-alt","print","pump-medical","pump-soap","puzzle-piece","q","qrcode","question","quote-left","quote-left-alt","quote-right","quote-right-alt","r","radiation","radio","rainbow","ranking-star","receipt","record-vinyl","rectangle-ad","ad","rectangle-list","list-alt","rectangle-xmark","rectangle-times","times-rectangle","window-close","recycle","registered","repeat","reply","mail-reply","reply-all","mail-reply-all","republican","restroom","retweet","ribbon","right-from-bracket","sign-out-alt","right-left","exchange-alt","right-long","long-arrow-alt-right","right-to-bracket","sign-in-alt","ring","road","road-barrier","road-bridge","road-circle-check","road-circle-exclamation","road-circle-xmark","road-lock","road-spikes","robot","rocket","rotate","sync-alt","rotate-left","rotate-back","rotate-backward","undo-alt","rotate-right","redo-alt","rotate-forward","route","rss","feed","ruble-sign","rouble","rub","ruble","rug","ruler","ruler-combined","ruler-horizontal","ruler-vertical","rupee-sign","rupee","rupiah-sign","s","sack-dollar","sack-xmark","sailboat","satellite","satellite-dish","scale-balanced","balance-scale","scale-unbalanced","balance-scale-left","scale-unbalanced-flip","balance-scale-right","school","school-circle-check","school-circle-exclamation","school-circle-xmark","school-flag","school-lock","scissors","cut","screwdriver","screwdriver-wrench","tools","scroll","scroll-torah","torah","sd-card","section","seedling","sprout","server","shapes","triangle-circle-square","share","arrow-turn-right","mail-forward","share-from-square","share-square","share-nodes","share-alt","sheet-plastic","shekel-sign","ils","shekel","sheqel","sheqel-sign","shield","shield-blank","shield-cat","shield-dog","shield-halved","shield-alt","shield-heart","shield-virus","ship","shirt","t-shirt","tshirt","shoe-prints","shop","store-alt","shop-lock","shop-slash","store-alt-slash","shower","shrimp","shuffle","random","shuttle-space","space-shuttle","sign-hanging","sign","signal","signal-5","signal-perfect","signature","signs-post","map-signs","sim-card","sink","sitemap","skull","skull-crossbones","slash","sleigh","sliders","sliders-h","smog","smoking","snowflake","snowman","snowplow","soap","socks","solar-panel","sort","unsorted","sort-down","sort-desc","sort-up","sort-asc","spa","spaghetti-monster-flying","pastafarianism","spell-check","spider","spinner","splotch","spoon","utensil-spoon","spray-can","spray-can-sparkles","air-freshener","square","square-arrow-up-right","external-link-square","square-caret-down","caret-square-down","square-caret-left","caret-square-left","square-caret-right","caret-square-right","square-caret-up","caret-square-up","square-check","check-square","square-envelope","envelope-square","square-full","square-h","h-square","square-minus","minus-square","square-nfi","square-parking","parking","square-pen","pen-square","pencil-square","square-person-confined","square-phone","phone-square","square-phone-flip","phone-square-alt","square-plus","plus-square","square-poll-horizontal","poll-h","square-poll-vertical","poll","square-root-variable","square-root-alt","square-rss","rss-square","square-share-nodes","share-alt-square","square-up-right","external-link-square-alt","square-virus","square-xmark","times-square","xmark-square","staff-snake","rod-asclepius","rod-snake","staff-aesculapius","stairs","stamp","stapler","star","star-and-crescent","star-half","star-half-stroke","star-half-alt","star-of-david","star-of-life","sterling-sign","gbp","pound-sign","stethoscope","stop","stopwatch","stopwatch-20","store","store-slash","street-view","strikethrough","stroopwafel","subscript","suitcase","suitcase-medical","medkit","suitcase-rolling","sun","sun-plant-wilt","superscript","swatchbook","synagogue","syringe","t","table","table-cells","th","table-cells-large","th-large","table-columns","columns","table-list","th-list","table-tennis-paddle-ball","ping-pong-paddle-ball","table-tennis","tablet","tablet-android","tablet-button","tablet-screen-button","tablet-alt","tablets","tachograph-digital","digital-tachograph","tag","tags","tape","tarp","tarp-droplet","taxi","cab","teeth","teeth-open","temperature-arrow-down","temperature-down","temperature-arrow-up","temperature-up","temperature-empty","temperature-0","thermometer-0","thermometer-empty","temperature-full","temperature-4","thermometer-4","thermometer-full","temperature-half","temperature-2","thermometer-2","thermometer-half","temperature-high","temperature-low","temperature-quarter","temperature-1","thermometer-1","thermometer-quarter","temperature-three-quarters","temperature-3","thermometer-3","thermometer-three-quarters","tenge-sign","tenge","tent","tent-arrow-down-to-line","tent-arrow-left-right","tent-arrow-turn-left","tent-arrows-down","tents","terminal","text-height","text-slash","remove-format","text-width","thermometer","thumbs-down","thumbs-up","thumbtack","thumb-tack","ticket","ticket-simple","ticket-alt","timeline","toggle-off","toggle-on","toilet","toilet-paper","toilet-paper-slash","toilet-portable","toilets-portable","toolbox","tooth","torii-gate","tornado","tower-broadcast","broadcast-tower","tower-cell","tower-observation","tractor","trademark","traffic-light","trailer","train","train-subway","subway","train-tram","transgender","transgender-alt","trash","trash-arrow-up","trash-restore","trash-can","trash-alt","trash-can-arrow-up","trash-restore-alt","tree","tree-city","triangle-exclamation","exclamation-triangle","warning","trophy","trowel","trowel-bricks","truck","truck-arrow-right","truck-droplet","truck-fast","shipping-fast","truck-field","truck-field-un","truck-front","truck-medical","ambulance","truck-monster","truck-moving","truck-pickup","truck-plane","truck-ramp-box","truck-loading","tty","teletype","turkish-lira-sign","try","turkish-lira","turn-down","level-down-alt","turn-up","level-up-alt","tv","television","tv-alt","u","umbrella","umbrella-beach","underline","universal-access","unlock","unlock-keyhole","unlock-alt","up-down","arrows-alt-v","up-down-left-right","arrows-alt","up-long","long-arrow-alt-up","up-right-and-down-left-from-center","expand-alt","up-right-from-square","external-link-alt","upload","user","user-astronaut","user-check","user-clock","user-doctor","user-md","user-gear","user-cog","user-graduate","user-group","user-friends","user-injured","user-large","user-alt","user-large-slash","user-alt-slash","user-lock","user-minus","user-ninja","user-nurse","user-pen","user-edit","user-plus","user-secret","user-shield","user-slash","user-tag","user-tie","user-xmark","user-times","users","users-between-lines","users-gear","users-cog","users-line","users-rays","users-rectangle","users-slash","users-viewfinder","utensils","cutlery","v","van-shuttle","shuttle-van","vault","vector-square","venus","venus-double","venus-mars","vest","vest-patches","vial","vial-circle-check","vial-virus","vials","video","video-camera","video-slash","vihara","virus","virus-covid","virus-covid-slash","virus-slash","viruses","voicemail","volcano","volleyball","volleyball-ball","volume-high","volume-up","volume-low","volume-down","volume-off","volume-xmark","volume-mute","volume-times","vr-cardboard","w","walkie-talkie","wallet","wand-magic","magic","wand-magic-sparkles","magic-wand-sparkles","wand-sparkles","warehouse","water","water-ladder","ladder-water","swimming-pool","wave-square","weight-hanging","weight-scale","weight","wheat-awn","wheat-alt","wheat-awn-circle-exclamation","wheelchair","wheelchair-move","wheelchair-alt","whiskey-glass","glass-whiskey","wifi","wifi-3","wifi-strong","wind","window-maximize","window-minimize","window-restore","wine-bottle","wine-glass","wine-glass-empty","wine-glass-alt","won-sign","krw","won","worm","wrench","x","x-ray","xmark","close","multiply","remove","times","xmarks-lines","y","yen-sign","cny","jpy","rmb","yen","yin-yang","z"],"brands":["42-group","innosoft","500px","accessible-icon","accusoft","adn","adversal","affiliatetheme","airbnb","algolia","alipay","amazon","amazon-pay","amilia","android","angellist","angrycreative","angular","app-store","app-store-ios","apper","apple","apple-pay","artstation","asymmetrik","atlassian","audible","autoprefixer","avianex","aviato","aws","bandcamp","battle-net","behance","bilibili","bimobject","bitbucket","bitcoin","bity","black-tie","blackberry","blogger","blogger-b","bluetooth","bluetooth-b","bootstrap","bots","btc","buffer","buromobelexperte","buy-n-large","buysellads","canadian-maple-leaf","cc-amazon-pay","cc-amex","cc-apple-pay","cc-diners-club","cc-discover","cc-jcb","cc-mastercard","cc-paypal","cc-stripe","cc-visa","centercode","centos","chrome","chromecast","cloudflare","cloudscale","cloudsmith","cloudversify","cmplid","codepen","codiepie","confluence","connectdevelop","contao","cotton-bureau","cpanel","creative-commons","creative-commons-by","creative-commons-nc","creative-commons-nc-eu","creative-commons-nc-jp","creative-commons-nd","creative-commons-pd","creative-commons-pd-alt","creative-commons-remix","creative-commons-sa","creative-commons-sampling","creative-commons-sampling-plus","creative-commons-share","creative-commons-zero","critical-role","css3","css3-alt","cuttlefish","d-and-d","d-and-d-beyond","dailymotion","dashcube","deezer","delicious","deploydog","deskpro","dev","deviantart","dhl","diaspora","digg","digital-ocean","discord","discourse","dochub","docker","draft2digital","dribbble","dropbox","drupal","dyalog","earlybirds","ebay","edge","edge-legacy","elementor","ello","ember","empire","envira","erlang","ethereum","etsy","evernote","expeditedssl","facebook","facebook-f","facebook-messenger","fantasy-flight-games","fedex","fedora","figma","firefox","firefox-browser","first-order","first-order-alt","firstdraft","flickr","flipboard","fly","font-awesome","font-awesome-flag","font-awesome-logo-full","fonticons","fonticons-fi","fort-awesome","fort-awesome-alt","forumbee","foursquare","free-code-camp","freebsd","fulcrum","galactic-republic","galactic-senate","get-pocket","gg","gg-circle","git","git-alt","github","github-alt","gitkraken","gitlab","gitter","glide","glide-g","gofore","golang","goodreads","goodreads-g","google","google-drive","google-pay","google-play","google-plus","google-plus-g","google-wallet","gratipay","grav","gripfire","grunt","guilded","gulp","hacker-news","hackerrank","hashnode","hips","hire-a-helper","hive","hooli","hornbill","hotjar","houzz","html5","hubspot","ideal","imdb","instagram","instalod","intercom","internet-explorer","invision","ioxhost","itch-io","itunes","itunes-note","java","jedi-order","jenkins","jira","joget","joomla","js","jsfiddle","kaggle","keybase","keycdn","kickstarter","kickstarter-k","korvue","laravel","lastfm","leanpub","less","line","linkedin","linkedin-in","linode","linux","lyft","magento","mailchimp","mandalorian","markdown","mastodon","maxcdn","mdb","medapps","medium","medium-m","medrt","meetup","megaport","mendeley","meta","microblog","microsoft","mix","mixcloud","mixer","mizuni","modx","monero","napster","neos","nfc-directional","nfc-symbol","nimblr","node","node-js","npm","ns8","nutritionix","octopus-deploy","odnoklassniki","odysee","old-republic","opencart","openid","opera","optin-monster","orcid","osi","padlet","page4","pagelines","palfed","patreon","paypal","perbyte","periscope","phabricator","phoenix-framework","phoenix-squadron","php","pied-piper","pied-piper-alt","pied-piper-hat","pied-piper-pp","pinterest","pinterest-p","pix","playstation","product-hunt","pushed","python","qq","quinscape","quora","r-project","raspberry-pi","ravelry","react","reacteurope","readme","rebel","red-river","reddit","reddit-alien","redhat","renren","replyd","researchgate","resolving","rev","rocketchat","rockrms","rust","safari","salesforce","sass","schlix","screenpal","scribd","searchengin","sellcast","sellsy","servicestack","shirtsinbulk","shopify","shopware","simplybuilt","sistrix","sith","sitrox","sketch","skyatlas","skype","slack","slack-hash","slideshare","snapchat","snapchat-ghost","soundcloud","sourcetree","space-awesome","speakap","speaker-deck","spotify","square-behance","behance-square","square-dribbble","dribbble-square","square-facebook","facebook-square","square-font-awesome","square-font-awesome-stroke","font-awesome-alt","square-git","git-square","square-github","github-square","square-gitlab","gitlab-square","square-google-plus","google-plus-square","square-hacker-news","hacker-news-square","square-instagram","instagram-square","square-js","js-square","square-lastfm","lastfm-square","square-odnoklassniki","odnoklassniki-square","square-pied-piper","pied-piper-square","square-pinterest","pinterest-square","square-reddit","reddit-square","square-snapchat","snapchat-square","square-steam","steam-square","square-tumblr","tumblr-square","square-twitter","twitter-square","square-viadeo","viadeo-square","square-vimeo","vimeo-square","square-whatsapp","whatsapp-square","square-xing","xing-square","square-youtube","youtube-square","squarespace","stack-exchange","stack-overflow","stackpath","staylinked","steam","steam-symbol","sticker-mule","strava","stripe","stripe-s","stubber","studiovinari","stumbleupon","stumbleupon-circle","superpowers","supple","suse","swift","symfony","teamspeak","telegram","telegram-plane","tencent-weibo","the-red-yeti","themeco","themeisle","think-peaks","tiktok","trade-federation","trello","tumblr","twitch","twitter","typo3","uber","ubuntu","uikit","umbraco","uncharted","uniregistry","unity","unsplash","untappd","ups","usb","usps","ussunnah","vaadin","viacoin","viadeo","viber","vimeo","vimeo-v","vine","vk","vnv","vuejs","watchman-monitoring","waze","weebly","weibo","weixin","whatsapp","whmcs","wikipedia-w","windows","wirsindhandwerk","wsh","wix","wizards-of-the-coast","wodu","wolf-pack-battalion","wordpress","wordpress-simple","wpbeginner","wpexplorer","wpforms","wpressr","rendact","xbox","xing","y-combinator","yahoo","yammer","yandex","yandex-international","yarn","yelp","yoast","youtube","zhihu"],"regular":["address-book","contact-book","address-card","contact-card","vcard","bell","bell-slash","bookmark","building","calendar","calendar-check","calendar-days","calendar-alt","calendar-minus","calendar-plus","calendar-xmark","calendar-times","chart-bar","bar-chart","chess-bishop","chess-king","chess-knight","chess-pawn","chess-queen","chess-rook","circle","circle-check","check-circle","circle-dot","dot-circle","circle-down","arrow-alt-circle-down","circle-left","arrow-alt-circle-left","circle-pause","pause-circle","circle-play","play-circle","circle-question","question-circle","circle-right","arrow-alt-circle-right","circle-stop","stop-circle","circle-up","arrow-alt-circle-up","circle-user","user-circle","circle-xmark","times-circle","xmark-circle","clipboard","clock","clock-four","clone","closed-captioning","comment","comment-dots","commenting","comments","compass","copy","copyright","credit-card","credit-card-alt","envelope","envelope-open","eye","eye-slash","face-angry","angry","face-dizzy","dizzy","face-flushed","flushed","face-frown","frown","face-frown-open","frown-open","face-grimace","grimace","face-grin","grin","face-grin-beam","grin-beam","face-grin-beam-sweat","grin-beam-sweat","face-grin-hearts","grin-hearts","face-grin-squint","grin-squint","face-grin-squint-tears","grin-squint-tears","face-grin-stars","grin-stars","face-grin-tears","grin-tears","face-grin-tongue","grin-tongue","face-grin-tongue-squint","grin-tongue-squint","face-grin-tongue-wink","grin-tongue-wink","face-grin-wide","grin-alt","face-grin-wink","grin-wink","face-kiss","kiss","face-kiss-beam","kiss-beam","face-kiss-wink-heart","kiss-wink-heart","face-laugh","laugh","face-laugh-beam","laugh-beam","face-laugh-squint","laugh-squint","face-laugh-wink","laugh-wink","face-meh","meh","face-meh-blank","meh-blank","face-rolling-eyes","meh-rolling-eyes","face-sad-cry","sad-cry","face-sad-tear","sad-tear","face-smile","smile","face-smile-beam","smile-beam","face-smile-wink","smile-wink","face-surprise","surprise","face-tired","tired","file","file-audio","file-code","file-excel","file-image","file-lines","file-alt","file-text","file-pdf","file-powerpoint","file-video","file-word","file-zipper","file-archive","flag","floppy-disk","save","folder","folder-blank","folder-closed","folder-open","font-awesome","font-awesome-flag","font-awesome-logo-full","futbol","futbol-ball","soccer-ball","gem","hand","hand-paper","hand-back-fist","hand-rock","hand-lizard","hand-peace","hand-point-down","hand-point-left","hand-point-right","hand-point-up","hand-pointer","hand-scissors","hand-spock","handshake","hard-drive","hdd","heart","hospital","hospital-alt","hospital-wide","hourglass","hourglass-empty","hourglass-half","hourglass-2","id-badge","id-card","drivers-license","image","images","keyboard","lemon","life-ring","lightbulb","map","message","comment-alt","money-bill-1","money-bill-alt","moon","newspaper","note-sticky","sticky-note","object-group","object-ungroup","paper-plane","paste","file-clipboard","pen-to-square","edit","rectangle-list","list-alt","rectangle-xmark","rectangle-times","times-rectangle","window-close","registered","share-from-square","share-square","snowflake","square","square-caret-down","caret-square-down","square-caret-left","caret-square-left","square-caret-right","caret-square-right","square-caret-up","caret-square-up","square-check","check-square","square-full","square-minus","minus-square","square-plus","plus-square","star","star-half","star-half-stroke","star-half-alt","sun","thumbs-down","thumbs-up","trash-can","trash-alt","user","window-maximize","window-minimize","window-restore"]} \ No newline at end of file +{"solid":["0","1","2","3","4","5","6","7","8","9","a","address-book","contact-book","address-card","contact-card","vcard","align-center","align-justify","align-left","align-right","anchor","anchor-circle-check","anchor-circle-exclamation","anchor-circle-xmark","anchor-lock","angle-down","angle-left","angle-right","angle-up","angles-down","angle-double-down","angles-left","angle-double-left","angles-right","angle-double-right","angles-up","angle-double-up","ankh","apple-whole","apple-alt","archway","arrow-down","arrow-down-1-9","sort-numeric-asc","sort-numeric-down","arrow-down-9-1","sort-numeric-desc","sort-numeric-down-alt","arrow-down-a-z","sort-alpha-asc","sort-alpha-down","arrow-down-long","long-arrow-down","arrow-down-short-wide","sort-amount-desc","sort-amount-down-alt","arrow-down-up-across-line","arrow-down-up-lock","arrow-down-wide-short","sort-amount-asc","sort-amount-down","arrow-down-z-a","sort-alpha-desc","sort-alpha-down-alt","arrow-left","arrow-left-long","long-arrow-left","arrow-pointer","mouse-pointer","arrow-right","arrow-right-arrow-left","exchange","arrow-right-from-bracket","sign-out","arrow-right-long","long-arrow-right","arrow-right-to-bracket","sign-in","arrow-right-to-city","arrow-rotate-left","arrow-left-rotate","arrow-rotate-back","arrow-rotate-backward","undo","arrow-rotate-right","arrow-right-rotate","arrow-rotate-forward","redo","arrow-trend-down","arrow-trend-up","arrow-turn-down","level-down","arrow-turn-up","level-up","arrow-up","arrow-up-1-9","sort-numeric-up","arrow-up-9-1","sort-numeric-up-alt","arrow-up-a-z","sort-alpha-up","arrow-up-from-bracket","arrow-up-from-ground-water","arrow-up-from-water-pump","arrow-up-long","long-arrow-up","arrow-up-right-dots","arrow-up-right-from-square","external-link","arrow-up-short-wide","sort-amount-up-alt","arrow-up-wide-short","sort-amount-up","arrow-up-z-a","sort-alpha-up-alt","arrows-down-to-line","arrows-down-to-people","arrows-left-right","arrows-h","arrows-left-right-to-line","arrows-rotate","refresh","sync","arrows-spin","arrows-split-up-and-left","arrows-to-circle","arrows-to-dot","arrows-to-eye","arrows-turn-right","arrows-turn-to-dots","arrows-up-down","arrows-v","arrows-up-down-left-right","arrows","arrows-up-to-line","asterisk","at","atom","audio-description","austral-sign","award","b","baby","baby-carriage","carriage-baby","backward","backward-fast","fast-backward","backward-step","step-backward","bacon","bacteria","bacterium","bag-shopping","shopping-bag","bahai","haykal","baht-sign","ban","cancel","ban-smoking","smoking-ban","bandage","band-aid","bangladeshi-taka-sign","barcode","bars","navicon","bars-progress","tasks-alt","bars-staggered","reorder","stream","baseball","baseball-ball","baseball-bat-ball","basket-shopping","shopping-basket","basketball","basketball-ball","bath","bathtub","battery-empty","battery-0","battery-full","battery","battery-5","battery-half","battery-3","battery-quarter","battery-2","battery-three-quarters","battery-4","bed","bed-pulse","procedures","beer-mug-empty","beer","bell","bell-concierge","concierge-bell","bell-slash","bezier-curve","bicycle","binoculars","biohazard","bitcoin-sign","blender","blender-phone","blog","bold","bolt","zap","bolt-lightning","bomb","bone","bong","book","book-atlas","atlas","book-bible","bible","book-bookmark","book-journal-whills","journal-whills","book-medical","book-open","book-open-reader","book-reader","book-quran","quran","book-skull","book-dead","book-tanakh","tanakh","bookmark","border-all","border-none","border-top-left","border-style","bore-hole","bottle-droplet","bottle-water","bowl-food","bowl-rice","bowling-ball","box","box-archive","archive","box-open","box-tissue","boxes-packing","boxes-stacked","boxes","boxes-alt","braille","brain","brazilian-real-sign","bread-slice","bridge","bridge-circle-check","bridge-circle-exclamation","bridge-circle-xmark","bridge-lock","bridge-water","briefcase","briefcase-medical","broom","broom-ball","quidditch","quidditch-broom-ball","brush","bucket","bug","bug-slash","bugs","building","building-circle-arrow-right","building-circle-check","building-circle-exclamation","building-circle-xmark","building-columns","bank","institution","museum","university","building-flag","building-lock","building-ngo","building-shield","building-un","building-user","building-wheat","bullhorn","bullseye","burger","hamburger","burst","bus","bus-simple","bus-alt","business-time","briefcase-clock","c","cable-car","tram","cake-candles","birthday-cake","cake","calculator","calendar","calendar-check","calendar-day","calendar-days","calendar-alt","calendar-minus","calendar-plus","calendar-week","calendar-xmark","calendar-times","camera","camera-alt","camera-retro","camera-rotate","campground","candy-cane","cannabis","capsules","car","automobile","car-battery","battery-car","car-burst","car-crash","car-on","car-rear","car-alt","car-side","car-tunnel","caravan","caret-down","caret-left","caret-right","caret-up","carrot","cart-arrow-down","cart-flatbed","dolly-flatbed","cart-flatbed-suitcase","luggage-cart","cart-plus","cart-shopping","shopping-cart","cash-register","cat","cedi-sign","cent-sign","certificate","chair","chalkboard","blackboard","chalkboard-user","chalkboard-teacher","champagne-glasses","glass-cheers","charging-station","chart-area","area-chart","chart-bar","bar-chart","chart-column","chart-gantt","chart-line","line-chart","chart-pie","pie-chart","chart-simple","check","check-double","check-to-slot","vote-yea","cheese","chess","chess-bishop","chess-board","chess-king","chess-knight","chess-pawn","chess-queen","chess-rook","chevron-down","chevron-left","chevron-right","chevron-up","child","child-combatant","child-rifle","child-dress","child-reaching","children","church","circle","circle-arrow-down","arrow-circle-down","circle-arrow-left","arrow-circle-left","circle-arrow-right","arrow-circle-right","circle-arrow-up","arrow-circle-up","circle-check","check-circle","circle-chevron-down","chevron-circle-down","circle-chevron-left","chevron-circle-left","circle-chevron-right","chevron-circle-right","circle-chevron-up","chevron-circle-up","circle-dollar-to-slot","donate","circle-dot","dot-circle","circle-down","arrow-alt-circle-down","circle-exclamation","exclamation-circle","circle-h","hospital-symbol","circle-half-stroke","adjust","circle-info","info-circle","circle-left","arrow-alt-circle-left","circle-minus","minus-circle","circle-nodes","circle-notch","circle-pause","pause-circle","circle-play","play-circle","circle-plus","plus-circle","circle-question","question-circle","circle-radiation","radiation-alt","circle-right","arrow-alt-circle-right","circle-stop","stop-circle","circle-up","arrow-alt-circle-up","circle-user","user-circle","circle-xmark","times-circle","xmark-circle","city","clapperboard","clipboard","clipboard-check","clipboard-list","clipboard-question","clipboard-user","clock","clock-four","clock-rotate-left","history","clone","closed-captioning","cloud","cloud-arrow-down","cloud-download","cloud-download-alt","cloud-arrow-up","cloud-upload","cloud-upload-alt","cloud-bolt","thunderstorm","cloud-meatball","cloud-moon","cloud-moon-rain","cloud-rain","cloud-showers-heavy","cloud-showers-water","cloud-sun","cloud-sun-rain","clover","code","code-branch","code-commit","code-compare","code-fork","code-merge","code-pull-request","coins","colon-sign","comment","comment-dollar","comment-dots","commenting","comment-medical","comment-slash","comment-sms","sms","comments","comments-dollar","compact-disc","compass","compass-drafting","drafting-compass","compress","computer","computer-mouse","mouse","cookie","cookie-bite","copy","copyright","couch","cow","credit-card","credit-card-alt","crop","crop-simple","crop-alt","cross","crosshairs","crow","crown","crutch","cruzeiro-sign","cube","cubes","cubes-stacked","d","database","delete-left","backspace","democrat","desktop","desktop-alt","dharmachakra","diagram-next","diagram-predecessor","diagram-project","project-diagram","diagram-successor","diamond","diamond-turn-right","directions","dice","dice-d20","dice-d6","dice-five","dice-four","dice-one","dice-six","dice-three","dice-two","disease","display","divide","dna","dog","dollar-sign","dollar","usd","dolly","dolly-box","dong-sign","door-closed","door-open","dove","down-left-and-up-right-to-center","compress-alt","down-long","long-arrow-alt-down","download","dragon","draw-polygon","droplet","tint","droplet-slash","tint-slash","drum","drum-steelpan","drumstick-bite","dumbbell","dumpster","dumpster-fire","dungeon","e","ear-deaf","deaf","deafness","hard-of-hearing","ear-listen","assistive-listening-systems","earth-africa","globe-africa","earth-americas","earth","earth-america","globe-americas","earth-asia","globe-asia","earth-europe","globe-europe","earth-oceania","globe-oceania","egg","eject","elevator","ellipsis","ellipsis-h","ellipsis-vertical","ellipsis-v","envelope","envelope-circle-check","envelope-open","envelope-open-text","envelopes-bulk","mail-bulk","equals","eraser","ethernet","euro-sign","eur","euro","exclamation","expand","explosion","eye","eye-dropper","eye-dropper-empty","eyedropper","eye-low-vision","low-vision","eye-slash","f","face-angry","angry","face-dizzy","dizzy","face-flushed","flushed","face-frown","frown","face-frown-open","frown-open","face-grimace","grimace","face-grin","grin","face-grin-beam","grin-beam","face-grin-beam-sweat","grin-beam-sweat","face-grin-hearts","grin-hearts","face-grin-squint","grin-squint","face-grin-squint-tears","grin-squint-tears","face-grin-stars","grin-stars","face-grin-tears","grin-tears","face-grin-tongue","grin-tongue","face-grin-tongue-squint","grin-tongue-squint","face-grin-tongue-wink","grin-tongue-wink","face-grin-wide","grin-alt","face-grin-wink","grin-wink","face-kiss","kiss","face-kiss-beam","kiss-beam","face-kiss-wink-heart","kiss-wink-heart","face-laugh","laugh","face-laugh-beam","laugh-beam","face-laugh-squint","laugh-squint","face-laugh-wink","laugh-wink","face-meh","meh","face-meh-blank","meh-blank","face-rolling-eyes","meh-rolling-eyes","face-sad-cry","sad-cry","face-sad-tear","sad-tear","face-smile","smile","face-smile-beam","smile-beam","face-smile-wink","smile-wink","face-surprise","surprise","face-tired","tired","fan","faucet","faucet-drip","fax","feather","feather-pointed","feather-alt","ferry","file","file-arrow-down","file-download","file-arrow-up","file-upload","file-audio","file-circle-check","file-circle-exclamation","file-circle-minus","file-circle-plus","file-circle-question","file-circle-xmark","file-code","file-contract","file-csv","file-excel","file-export","arrow-right-from-file","file-image","file-import","arrow-right-to-file","file-invoice","file-invoice-dollar","file-lines","file-alt","file-text","file-medical","file-pdf","file-pen","file-edit","file-powerpoint","file-prescription","file-shield","file-signature","file-video","file-waveform","file-medical-alt","file-word","file-zipper","file-archive","fill","fill-drip","film","filter","filter-circle-dollar","funnel-dollar","filter-circle-xmark","fingerprint","fire","fire-burner","fire-extinguisher","fire-flame-curved","fire-alt","fire-flame-simple","burn","fish","fish-fins","flag","flag-checkered","flag-usa","flask","flask-vial","floppy-disk","save","florin-sign","folder","folder-blank","folder-closed","folder-minus","folder-open","folder-plus","folder-tree","font","font-awesome","font-awesome-flag","font-awesome-logo-full","football","football-ball","forward","forward-fast","fast-forward","forward-step","step-forward","franc-sign","frog","futbol","futbol-ball","soccer-ball","g","gamepad","gas-pump","gauge","dashboard","gauge-med","tachometer-alt-average","gauge-high","tachometer-alt","tachometer-alt-fast","gauge-simple","gauge-simple-med","tachometer-average","gauge-simple-high","tachometer","tachometer-fast","gavel","legal","gear","cog","gears","cogs","gem","genderless","ghost","gift","gifts","glass-water","glass-water-droplet","glasses","globe","golf-ball-tee","golf-ball","gopuram","graduation-cap","mortar-board","greater-than","greater-than-equal","grip","grip-horizontal","grip-lines","grip-lines-vertical","grip-vertical","group-arrows-rotate","guarani-sign","guitar","gun","h","hammer","hamsa","hand","hand-paper","hand-back-fist","hand-rock","hand-dots","allergies","hand-fist","fist-raised","hand-holding","hand-holding-dollar","hand-holding-usd","hand-holding-droplet","hand-holding-water","hand-holding-hand","hand-holding-heart","hand-holding-medical","hand-lizard","hand-middle-finger","hand-peace","hand-point-down","hand-point-left","hand-point-right","hand-point-up","hand-pointer","hand-scissors","hand-sparkles","hand-spock","handcuffs","hands","sign-language","signing","hands-asl-interpreting","american-sign-language-interpreting","asl-interpreting","hands-american-sign-language-interpreting","hands-bound","hands-bubbles","hands-wash","hands-clapping","hands-holding","hands-holding-child","hands-holding-circle","hands-praying","praying-hands","handshake","handshake-angle","hands-helping","handshake-simple","handshake-alt","handshake-simple-slash","handshake-alt-slash","handshake-slash","hanukiah","hard-drive","hdd","hashtag","hat-cowboy","hat-cowboy-side","hat-wizard","head-side-cough","head-side-cough-slash","head-side-mask","head-side-virus","heading","header","headphones","headphones-simple","headphones-alt","headset","heart","heart-circle-bolt","heart-circle-check","heart-circle-exclamation","heart-circle-minus","heart-circle-plus","heart-circle-xmark","heart-crack","heart-broken","heart-pulse","heartbeat","helicopter","helicopter-symbol","helmet-safety","hard-hat","hat-hard","helmet-un","highlighter","hill-avalanche","hill-rockslide","hippo","hockey-puck","holly-berry","horse","horse-head","hospital","hospital-alt","hospital-wide","hospital-user","hot-tub-person","hot-tub","hotdog","hotel","hourglass","hourglass-empty","hourglass-end","hourglass-3","hourglass-half","hourglass-2","hourglass-start","hourglass-1","house","home","home-alt","home-lg-alt","house-chimney","home-lg","house-chimney-crack","house-damage","house-chimney-medical","clinic-medical","house-chimney-user","house-chimney-window","house-circle-check","house-circle-exclamation","house-circle-xmark","house-crack","house-fire","house-flag","house-flood-water","house-flood-water-circle-arrow-right","house-laptop","laptop-house","house-lock","house-medical","house-medical-circle-check","house-medical-circle-exclamation","house-medical-circle-xmark","house-medical-flag","house-signal","house-tsunami","house-user","home-user","hryvnia-sign","hryvnia","hurricane","i","i-cursor","ice-cream","icicles","icons","heart-music-camera-bolt","id-badge","id-card","drivers-license","id-card-clip","id-card-alt","igloo","image","image-portrait","portrait","images","inbox","indent","indian-rupee-sign","indian-rupee","inr","industry","infinity","info","italic","j","jar","jar-wheat","jedi","jet-fighter","fighter-jet","jet-fighter-up","joint","jug-detergent","k","kaaba","key","keyboard","khanda","kip-sign","kit-medical","first-aid","kitchen-set","kiwi-bird","l","land-mine-on","landmark","landmark-dome","landmark-alt","landmark-flag","language","laptop","laptop-code","laptop-file","laptop-medical","lari-sign","layer-group","leaf","left-long","long-arrow-alt-left","left-right","arrows-alt-h","lemon","less-than","less-than-equal","life-ring","lightbulb","lines-leaning","link","chain","link-slash","chain-broken","chain-slash","unlink","lira-sign","list","list-squares","list-check","tasks","list-ol","list-1-2","list-numeric","list-ul","list-dots","litecoin-sign","location-arrow","location-crosshairs","location","location-dot","map-marker-alt","location-pin","map-marker","location-pin-lock","lock","lock-open","locust","lungs","lungs-virus","m","magnet","magnifying-glass","search","magnifying-glass-arrow-right","magnifying-glass-chart","magnifying-glass-dollar","search-dollar","magnifying-glass-location","search-location","magnifying-glass-minus","search-minus","magnifying-glass-plus","search-plus","manat-sign","map","map-location","map-marked","map-location-dot","map-marked-alt","map-pin","marker","mars","mars-and-venus","mars-and-venus-burst","mars-double","mars-stroke","mars-stroke-right","mars-stroke-h","mars-stroke-up","mars-stroke-v","martini-glass","glass-martini-alt","martini-glass-citrus","cocktail","martini-glass-empty","glass-martini","mask","mask-face","mask-ventilator","masks-theater","theater-masks","mattress-pillow","maximize","expand-arrows-alt","medal","memory","menorah","mercury","message","comment-alt","meteor","microchip","microphone","microphone-lines","microphone-alt","microphone-lines-slash","microphone-alt-slash","microphone-slash","microscope","mill-sign","minimize","compress-arrows-alt","minus","subtract","mitten","mobile","mobile-android","mobile-phone","mobile-button","mobile-retro","mobile-screen","mobile-android-alt","mobile-screen-button","mobile-alt","money-bill","money-bill-1","money-bill-alt","money-bill-1-wave","money-bill-wave-alt","money-bill-transfer","money-bill-trend-up","money-bill-wave","money-bill-wheat","money-bills","money-check","money-check-dollar","money-check-alt","monument","moon","mortar-pestle","mosque","mosquito","mosquito-net","motorcycle","mound","mountain","mountain-city","mountain-sun","mug-hot","mug-saucer","coffee","music","n","naira-sign","network-wired","neuter","newspaper","not-equal","notdef","note-sticky","sticky-note","notes-medical","o","object-group","object-ungroup","oil-can","oil-well","om","otter","outdent","dedent","p","pager","paint-roller","paintbrush","paint-brush","palette","pallet","panorama","paper-plane","paperclip","parachute-box","paragraph","passport","paste","file-clipboard","pause","paw","peace","pen","pen-clip","pen-alt","pen-fancy","pen-nib","pen-ruler","pencil-ruler","pen-to-square","edit","pencil","pencil-alt","people-arrows","people-arrows-left-right","people-carry-box","people-carry","people-group","people-line","people-pulling","people-robbery","people-roof","pepper-hot","percent","percentage","person","male","person-arrow-down-to-line","person-arrow-up-from-line","person-biking","biking","person-booth","person-breastfeeding","person-burst","person-cane","person-chalkboard","person-circle-check","person-circle-exclamation","person-circle-minus","person-circle-plus","person-circle-question","person-circle-xmark","person-digging","digging","person-dots-from-line","diagnoses","person-dress","female","person-dress-burst","person-drowning","person-falling","person-falling-burst","person-half-dress","person-harassing","person-hiking","hiking","person-military-pointing","person-military-rifle","person-military-to-person","person-praying","pray","person-pregnant","person-rays","person-rifle","person-running","running","person-shelter","person-skating","skating","person-skiing","skiing","person-skiing-nordic","skiing-nordic","person-snowboarding","snowboarding","person-swimming","swimmer","person-through-window","person-walking","walking","person-walking-arrow-loop-left","person-walking-arrow-right","person-walking-dashed-line-arrow-right","person-walking-luggage","person-walking-with-cane","blind","peseta-sign","peso-sign","phone","phone-flip","phone-alt","phone-slash","phone-volume","volume-control-phone","photo-film","photo-video","piggy-bank","pills","pizza-slice","place-of-worship","plane","plane-arrival","plane-circle-check","plane-circle-exclamation","plane-circle-xmark","plane-departure","plane-lock","plane-slash","plane-up","plant-wilt","plate-wheat","play","plug","plug-circle-bolt","plug-circle-check","plug-circle-exclamation","plug-circle-minus","plug-circle-plus","plug-circle-xmark","plus","add","plus-minus","podcast","poo","poo-storm","poo-bolt","poop","power-off","prescription","prescription-bottle","prescription-bottle-medical","prescription-bottle-alt","print","pump-medical","pump-soap","puzzle-piece","q","qrcode","question","quote-left","quote-left-alt","quote-right","quote-right-alt","r","radiation","radio","rainbow","ranking-star","receipt","record-vinyl","rectangle-ad","ad","rectangle-list","list-alt","rectangle-xmark","rectangle-times","times-rectangle","window-close","recycle","registered","repeat","reply","mail-reply","reply-all","mail-reply-all","republican","restroom","retweet","ribbon","right-from-bracket","sign-out-alt","right-left","exchange-alt","right-long","long-arrow-alt-right","right-to-bracket","sign-in-alt","ring","road","road-barrier","road-bridge","road-circle-check","road-circle-exclamation","road-circle-xmark","road-lock","road-spikes","robot","rocket","rotate","sync-alt","rotate-left","rotate-back","rotate-backward","undo-alt","rotate-right","redo-alt","rotate-forward","route","rss","feed","ruble-sign","rouble","rub","ruble","rug","ruler","ruler-combined","ruler-horizontal","ruler-vertical","rupee-sign","rupee","rupiah-sign","s","sack-dollar","sack-xmark","sailboat","satellite","satellite-dish","scale-balanced","balance-scale","scale-unbalanced","balance-scale-left","scale-unbalanced-flip","balance-scale-right","school","school-circle-check","school-circle-exclamation","school-circle-xmark","school-flag","school-lock","scissors","cut","screwdriver","screwdriver-wrench","tools","scroll","scroll-torah","torah","sd-card","section","seedling","sprout","server","shapes","triangle-circle-square","share","arrow-turn-right","mail-forward","share-from-square","share-square","share-nodes","share-alt","sheet-plastic","shekel-sign","ils","shekel","sheqel","sheqel-sign","shield","shield-blank","shield-cat","shield-dog","shield-halved","shield-alt","shield-heart","shield-virus","ship","shirt","t-shirt","tshirt","shoe-prints","shop","store-alt","shop-lock","shop-slash","store-alt-slash","shower","shrimp","shuffle","random","shuttle-space","space-shuttle","sign-hanging","sign","signal","signal-5","signal-perfect","signature","signs-post","map-signs","sim-card","sink","sitemap","skull","skull-crossbones","slash","sleigh","sliders","sliders-h","smog","smoking","snowflake","snowman","snowplow","soap","socks","solar-panel","sort","unsorted","sort-down","sort-desc","sort-up","sort-asc","spa","spaghetti-monster-flying","pastafarianism","spell-check","spider","spinner","splotch","spoon","utensil-spoon","spray-can","spray-can-sparkles","air-freshener","square","square-arrow-up-right","external-link-square","square-caret-down","caret-square-down","square-caret-left","caret-square-left","square-caret-right","caret-square-right","square-caret-up","caret-square-up","square-check","check-square","square-envelope","envelope-square","square-full","square-h","h-square","square-minus","minus-square","square-nfi","square-parking","parking","square-pen","pen-square","pencil-square","square-person-confined","square-phone","phone-square","square-phone-flip","phone-square-alt","square-plus","plus-square","square-poll-horizontal","poll-h","square-poll-vertical","poll","square-root-variable","square-root-alt","square-rss","rss-square","square-share-nodes","share-alt-square","square-up-right","external-link-square-alt","square-virus","square-xmark","times-square","xmark-square","staff-snake","rod-asclepius","rod-snake","staff-aesculapius","stairs","stamp","stapler","star","star-and-crescent","star-half","star-half-stroke","star-half-alt","star-of-david","star-of-life","sterling-sign","gbp","pound-sign","stethoscope","stop","stopwatch","stopwatch-20","store","store-slash","street-view","strikethrough","stroopwafel","subscript","suitcase","suitcase-medical","medkit","suitcase-rolling","sun","sun-plant-wilt","superscript","swatchbook","synagogue","syringe","t","table","table-cells","th","table-cells-large","th-large","table-columns","columns","table-list","th-list","table-tennis-paddle-ball","ping-pong-paddle-ball","table-tennis","tablet","tablet-android","tablet-button","tablet-screen-button","tablet-alt","tablets","tachograph-digital","digital-tachograph","tag","tags","tape","tarp","tarp-droplet","taxi","cab","teeth","teeth-open","temperature-arrow-down","temperature-down","temperature-arrow-up","temperature-up","temperature-empty","temperature-0","thermometer-0","thermometer-empty","temperature-full","temperature-4","thermometer-4","thermometer-full","temperature-half","temperature-2","thermometer-2","thermometer-half","temperature-high","temperature-low","temperature-quarter","temperature-1","thermometer-1","thermometer-quarter","temperature-three-quarters","temperature-3","thermometer-3","thermometer-three-quarters","tenge-sign","tenge","tent","tent-arrow-down-to-line","tent-arrow-left-right","tent-arrow-turn-left","tent-arrows-down","tents","terminal","text-height","text-slash","remove-format","text-width","thermometer","thumbs-down","thumbs-up","thumbtack","thumb-tack","ticket","ticket-simple","ticket-alt","timeline","toggle-off","toggle-on","toilet","toilet-paper","toilet-paper-slash","toilet-portable","toilets-portable","toolbox","tooth","torii-gate","tornado","tower-broadcast","broadcast-tower","tower-cell","tower-observation","tractor","trademark","traffic-light","trailer","train","train-subway","subway","train-tram","transgender","transgender-alt","trash","trash-arrow-up","trash-restore","trash-can","trash-alt","trash-can-arrow-up","trash-restore-alt","tree","tree-city","triangle-exclamation","exclamation-triangle","warning","trophy","trowel","trowel-bricks","truck","truck-arrow-right","truck-droplet","truck-fast","shipping-fast","truck-field","truck-field-un","truck-front","truck-medical","ambulance","truck-monster","truck-moving","truck-pickup","truck-plane","truck-ramp-box","truck-loading","tty","teletype","turkish-lira-sign","try","turkish-lira","turn-down","level-down-alt","turn-up","level-up-alt","tv","television","tv-alt","u","umbrella","umbrella-beach","underline","universal-access","unlock","unlock-keyhole","unlock-alt","up-down","arrows-alt-v","up-down-left-right","arrows-alt","up-long","long-arrow-alt-up","up-right-and-down-left-from-center","expand-alt","up-right-from-square","external-link-alt","upload","user","user-astronaut","user-check","user-clock","user-doctor","user-md","user-gear","user-cog","user-graduate","user-group","user-friends","user-injured","user-large","user-alt","user-large-slash","user-alt-slash","user-lock","user-minus","user-ninja","user-nurse","user-pen","user-edit","user-plus","user-secret","user-shield","user-slash","user-tag","user-tie","user-xmark","user-times","users","users-between-lines","users-gear","users-cog","users-line","users-rays","users-rectangle","users-slash","users-viewfinder","utensils","cutlery","v","van-shuttle","shuttle-van","vault","vector-square","venus","venus-double","venus-mars","vest","vest-patches","vial","vial-circle-check","vial-virus","vials","video","video-camera","video-slash","vihara","virus","virus-covid","virus-covid-slash","virus-slash","viruses","voicemail","volcano","volleyball","volleyball-ball","volume-high","volume-up","volume-low","volume-down","volume-off","volume-xmark","volume-mute","volume-times","vr-cardboard","w","walkie-talkie","wallet","wand-magic","magic","wand-magic-sparkles","magic-wand-sparkles","wand-sparkles","warehouse","water","water-ladder","ladder-water","swimming-pool","wave-square","weight-hanging","weight-scale","weight","wheat-awn","wheat-alt","wheat-awn-circle-exclamation","wheelchair","wheelchair-move","wheelchair-alt","whiskey-glass","glass-whiskey","wifi","wifi-3","wifi-strong","wind","window-maximize","window-minimize","window-restore","wine-bottle","wine-glass","wine-glass-empty","wine-glass-alt","won-sign","krw","won","worm","wrench","x","x-ray","xmark","close","multiply","remove","times","xmarks-lines","y","yen-sign","cny","jpy","rmb","yen","yin-yang","z"],"brands":["42-group","innosoft","500px","accessible-icon","accusoft","adn","adversal","affiliatetheme","airbnb","algolia","alipay","amazon","amazon-pay","amilia","android","angellist","angrycreative","angular","app-store","app-store-ios","apper","apple","apple-pay","artstation","asymmetrik","atlassian","audible","autoprefixer","avianex","aviato","aws","bandcamp","battle-net","behance","bilibili","bimobject","bitbucket","bitcoin","bity","black-tie","blackberry","blogger","blogger-b","bluetooth","bluetooth-b","bootstrap","bots","btc","buffer","buromobelexperte","buy-n-large","buysellads","canadian-maple-leaf","cc-amazon-pay","cc-amex","cc-apple-pay","cc-diners-club","cc-discover","cc-jcb","cc-mastercard","cc-paypal","cc-stripe","cc-visa","centercode","centos","chrome","chromecast","cloudflare","cloudscale","cloudsmith","cloudversify","cmplid","codepen","codiepie","confluence","connectdevelop","contao","cotton-bureau","cpanel","creative-commons","creative-commons-by","creative-commons-nc","creative-commons-nc-eu","creative-commons-nc-jp","creative-commons-nd","creative-commons-pd","creative-commons-pd-alt","creative-commons-remix","creative-commons-sa","creative-commons-sampling","creative-commons-sampling-plus","creative-commons-share","creative-commons-zero","critical-role","css3","css3-alt","cuttlefish","d-and-d","d-and-d-beyond","dailymotion","dashcube","debian","deezer","delicious","deploydog","deskpro","dev","deviantart","dhl","diaspora","digg","digital-ocean","discord","discourse","dochub","docker","draft2digital","dribbble","dropbox","drupal","dyalog","earlybirds","ebay","edge","edge-legacy","elementor","ello","ember","empire","envira","erlang","ethereum","etsy","evernote","expeditedssl","facebook","facebook-f","facebook-messenger","fantasy-flight-games","fedex","fedora","figma","firefox","firefox-browser","first-order","first-order-alt","firstdraft","flickr","flipboard","fly","font-awesome","font-awesome-flag","font-awesome-logo-full","fonticons","fonticons-fi","fort-awesome","fort-awesome-alt","forumbee","foursquare","free-code-camp","freebsd","fulcrum","galactic-republic","galactic-senate","get-pocket","gg","gg-circle","git","git-alt","github","github-alt","gitkraken","gitlab","gitter","glide","glide-g","gofore","golang","goodreads","goodreads-g","google","google-drive","google-pay","google-play","google-plus","google-plus-g","google-wallet","gratipay","grav","gripfire","grunt","guilded","gulp","hacker-news","hackerrank","hashnode","hips","hire-a-helper","hive","hooli","hornbill","hotjar","houzz","html5","hubspot","ideal","imdb","instagram","instalod","intercom","internet-explorer","invision","ioxhost","itch-io","itunes","itunes-note","java","jedi-order","jenkins","jira","joget","joomla","js","jsfiddle","kaggle","keybase","keycdn","kickstarter","kickstarter-k","korvue","laravel","lastfm","leanpub","less","line","linkedin","linkedin-in","linode","linux","lyft","magento","mailchimp","mandalorian","markdown","mastodon","maxcdn","mdb","medapps","medium","medium-m","medrt","meetup","megaport","mendeley","meta","microblog","microsoft","mix","mixcloud","mixer","mizuni","modx","monero","napster","neos","nfc-directional","nfc-symbol","nimblr","node","node-js","npm","ns8","nutritionix","octopus-deploy","odnoklassniki","odysee","old-republic","opencart","openid","opera","optin-monster","orcid","osi","padlet","page4","pagelines","palfed","patreon","paypal","perbyte","periscope","phabricator","phoenix-framework","phoenix-squadron","php","pied-piper","pied-piper-alt","pied-piper-hat","pied-piper-pp","pinterest","pinterest-p","pix","playstation","product-hunt","pushed","python","qq","quinscape","quora","r-project","raspberry-pi","ravelry","react","reacteurope","readme","rebel","red-river","reddit","reddit-alien","redhat","renren","replyd","researchgate","resolving","rev","rocketchat","rockrms","rust","safari","salesforce","sass","schlix","screenpal","scribd","searchengin","sellcast","sellsy","servicestack","shirtsinbulk","shopify","shopware","simplybuilt","sistrix","sith","sitrox","sketch","skyatlas","skype","slack","slack-hash","slideshare","snapchat","snapchat-ghost","soundcloud","sourcetree","space-awesome","speakap","speaker-deck","spotify","square-behance","behance-square","square-dribbble","dribbble-square","square-facebook","facebook-square","square-font-awesome","square-font-awesome-stroke","font-awesome-alt","square-git","git-square","square-github","github-square","square-gitlab","gitlab-square","square-google-plus","google-plus-square","square-hacker-news","hacker-news-square","square-instagram","instagram-square","square-js","js-square","square-lastfm","lastfm-square","square-odnoklassniki","odnoklassniki-square","square-pied-piper","pied-piper-square","square-pinterest","pinterest-square","square-reddit","reddit-square","square-snapchat","snapchat-square","square-steam","steam-square","square-threads","square-tumblr","tumblr-square","square-twitter","twitter-square","square-viadeo","viadeo-square","square-vimeo","vimeo-square","square-whatsapp","whatsapp-square","square-x-twitter","square-xing","xing-square","square-youtube","youtube-square","squarespace","stack-exchange","stack-overflow","stackpath","staylinked","steam","steam-symbol","sticker-mule","strava","stripe","stripe-s","stubber","studiovinari","stumbleupon","stumbleupon-circle","superpowers","supple","suse","swift","symfony","teamspeak","telegram","telegram-plane","tencent-weibo","the-red-yeti","themeco","themeisle","think-peaks","threads","tiktok","trade-federation","trello","tumblr","twitch","twitter","typo3","uber","ubuntu","uikit","umbraco","uncharted","uniregistry","unity","unsplash","untappd","ups","usb","usps","ussunnah","vaadin","viacoin","viadeo","viber","vimeo","vimeo-v","vine","vk","vnv","vuejs","watchman-monitoring","waze","weebly","weibo","weixin","whatsapp","whmcs","wikipedia-w","windows","wirsindhandwerk","wsh","wix","wizards-of-the-coast","wodu","wolf-pack-battalion","wordpress","wordpress-simple","wpbeginner","wpexplorer","wpforms","wpressr","rendact","x-twitter","xbox","xing","y-combinator","yahoo","yammer","yandex","yandex-international","yarn","yelp","yoast","youtube","zhihu"],"regular":["address-book","contact-book","address-card","contact-card","vcard","bell","bell-slash","bookmark","building","calendar","calendar-check","calendar-days","calendar-alt","calendar-minus","calendar-plus","calendar-xmark","calendar-times","chart-bar","bar-chart","chess-bishop","chess-king","chess-knight","chess-pawn","chess-queen","chess-rook","circle","circle-check","check-circle","circle-dot","dot-circle","circle-down","arrow-alt-circle-down","circle-left","arrow-alt-circle-left","circle-pause","pause-circle","circle-play","play-circle","circle-question","question-circle","circle-right","arrow-alt-circle-right","circle-stop","stop-circle","circle-up","arrow-alt-circle-up","circle-user","user-circle","circle-xmark","times-circle","xmark-circle","clipboard","clock","clock-four","clone","closed-captioning","comment","comment-dots","commenting","comments","compass","copy","copyright","credit-card","credit-card-alt","envelope","envelope-open","eye","eye-slash","face-angry","angry","face-dizzy","dizzy","face-flushed","flushed","face-frown","frown","face-frown-open","frown-open","face-grimace","grimace","face-grin","grin","face-grin-beam","grin-beam","face-grin-beam-sweat","grin-beam-sweat","face-grin-hearts","grin-hearts","face-grin-squint","grin-squint","face-grin-squint-tears","grin-squint-tears","face-grin-stars","grin-stars","face-grin-tears","grin-tears","face-grin-tongue","grin-tongue","face-grin-tongue-squint","grin-tongue-squint","face-grin-tongue-wink","grin-tongue-wink","face-grin-wide","grin-alt","face-grin-wink","grin-wink","face-kiss","kiss","face-kiss-beam","kiss-beam","face-kiss-wink-heart","kiss-wink-heart","face-laugh","laugh","face-laugh-beam","laugh-beam","face-laugh-squint","laugh-squint","face-laugh-wink","laugh-wink","face-meh","meh","face-meh-blank","meh-blank","face-rolling-eyes","meh-rolling-eyes","face-sad-cry","sad-cry","face-sad-tear","sad-tear","face-smile","smile","face-smile-beam","smile-beam","face-smile-wink","smile-wink","face-surprise","surprise","face-tired","tired","file","file-audio","file-code","file-excel","file-image","file-lines","file-alt","file-text","file-pdf","file-powerpoint","file-video","file-word","file-zipper","file-archive","flag","floppy-disk","save","folder","folder-blank","folder-closed","folder-open","font-awesome","font-awesome-flag","font-awesome-logo-full","futbol","futbol-ball","soccer-ball","gem","hand","hand-paper","hand-back-fist","hand-rock","hand-lizard","hand-peace","hand-point-down","hand-point-left","hand-point-right","hand-point-up","hand-pointer","hand-scissors","hand-spock","handshake","hard-drive","hdd","heart","hospital","hospital-alt","hospital-wide","hourglass","hourglass-empty","hourglass-half","hourglass-2","id-badge","id-card","drivers-license","image","images","keyboard","lemon","life-ring","lightbulb","map","message","comment-alt","money-bill-1","money-bill-alt","moon","newspaper","note-sticky","sticky-note","object-group","object-ungroup","paper-plane","paste","file-clipboard","pen-to-square","edit","rectangle-list","list-alt","rectangle-xmark","rectangle-times","times-rectangle","window-close","registered","share-from-square","share-square","snowflake","square","square-caret-down","caret-square-down","square-caret-left","caret-square-left","square-caret-right","caret-square-right","square-caret-up","caret-square-up","square-check","check-square","square-full","square-minus","minus-square","square-plus","plus-square","star","star-half","star-half-stroke","star-half-alt","sun","thumbs-down","thumbs-up","trash-can","trash-alt","user","window-maximize","window-minimize","window-restore"]} \ No newline at end of file diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 5d84d86d0b..5bfff456d3 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -2,22 +2,22 @@ "@fortawesome/fontawesome-free": { "icon": "https://avatars.githubusercontent.com/u/1505683", "url": "https://fontawesome.com", - "version": "6.4.0" + "version": "6.4.2" }, "@fortawesome/fontawesome-svg-core": { "icon": "https://avatars.githubusercontent.com/u/1505683", "url": "https://fontawesome.com", - "version": "6.4.0" + "version": "6.4.2" }, "@fortawesome/free-regular-svg-icons": { "icon": "https://avatars.githubusercontent.com/u/1505683", "url": "https://fontawesome.com", - "version": "6.4.0" + "version": "6.4.2" }, "@fortawesome/free-solid-svg-icons": { "icon": "https://avatars.githubusercontent.com/u/1505683", "url": "https://fontawesome.com", - "version": "6.4.0" + "version": "6.4.2" }, "@fortawesome/vue-fontawesome": { "icon": "https://avatars.githubusercontent.com/u/1505683", From 256a9ce40a3e529bd9f1050b6bc7e78e9b3cb4e8 Mon Sep 17 00:00:00 2001 From: jan Date: Thu, 3 Aug 2023 17:41:23 +0200 Subject: [PATCH 107/182] =?UTF-8?q?=F0=9F=90=9B=20[mh]=20disable=20unused?= =?UTF-8?q?=20setting=20on=20UK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/missionHelper/settings.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/missionHelper/settings.ts b/src/modules/missionHelper/settings.ts index 2c41c510c8..a30164a426 100644 --- a/src/modules/missionHelper/settings.ts +++ b/src/modules/missionHelper/settings.ts @@ -376,16 +376,16 @@ export default ((MODULE_ID, LSSM, $m) => { }, } : null), - ...(locale !== 'fr_FR' - ? { + ...(['fr_FR', 'en_GB'].includes(locale) + ? null // note that it is disabled on above locales + : { 'optionalAlternatives.allow_police_motorcycle_instead_of_fustw': { type: 'toggle', default: false, dependsOn: '.vehicles.content', }, - } - : null), + }), 'hide_on_Krankentransport': { type: 'toggle', default: false, From 24b143f70595ef678f57978feabb430b377ede3e Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 3 Aug 2023 15:47:42 +0000 Subject: [PATCH 108/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230803?= =?UTF-8?q?.1743=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/browsers.json | 8 ++++---- yarn.lock | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 1b6721c228..e1c29a392a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230803.0547", + "version": "4.7.7+20230803.1743", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/browsers.json b/src/generated/browsers.json index 5f2f8d6832..f4fe097f0e 100644 --- a/src/generated/browsers.json +++ b/src/generated/browsers.json @@ -11,12 +11,12 @@ }, "firefox": { "download": "https://firefox.com", - "latest": 115, - "supported": 109 + "latest": 116, + "supported": 110 }, "opera": { "download": "https://opera.com", - "latest": 100, - "supported": 94 + "latest": 101, + "supported": 95 } } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 735998c9ff..382ba20ca5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4019,9 +4019,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001473, caniuse-lite@npm:^1.0.30001503": - version: 1.0.30001518 - resolution: "caniuse-lite@npm:1.0.30001518" - checksum: 1b63272f6e3d628ac52e2547e0b75fc477004d4b19b63e34b2c045de7f2e48909f9ea513978fc5a46c4ab5ac6c9daf9cc5e6a78466e90684fb824c3f2105e8f5 + version: 1.0.30001519 + resolution: "caniuse-lite@npm:1.0.30001519" + checksum: 66085133ede05d947e30b62fed2cbae18e5767afda8b0de38840883e1cfe5846bf1568ddbafd31647544e59112355abedaf9c867ac34541bfc20d69e7a19d94c languageName: node linkType: hard From 48284e8835d3689c907ba890173a66aef989b6a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 00:45:56 +0000 Subject: [PATCH 109/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-p?= =?UTF-8?q?lugin-vue`=20to=20v9.16.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index e1c29a392a..a34a9188a3 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "eslint-plugin-regexp": "1.15.0", "eslint-plugin-tsdoc": "0.2.17", "eslint-plugin-unicorn": "48.0.1", - "eslint-plugin-vue": "9.15.1", + "eslint-plugin-vue": "9.16.1", "html-loader": "4.2.0", "husky": "8.0.3", "js-yaml": "4.1.0", diff --git a/yarn.lock b/yarn.lock index 382ba20ca5..6609d0d606 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1525,7 +1525,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.3.0, @eslint-community/eslint-utils@npm:^4.4.0": +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" dependencies: @@ -5150,20 +5150,20 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-vue@npm:9.15.1": - version: 9.15.1 - resolution: "eslint-plugin-vue@npm:9.15.1" +"eslint-plugin-vue@npm:9.16.1": + version: 9.16.1 + resolution: "eslint-plugin-vue@npm:9.16.1" dependencies: - "@eslint-community/eslint-utils": ^4.3.0 + "@eslint-community/eslint-utils": ^4.4.0 natural-compare: ^1.4.0 - nth-check: ^2.0.1 - postcss-selector-parser: ^6.0.9 - semver: ^7.3.5 - vue-eslint-parser: ^9.3.0 + nth-check: ^2.1.1 + postcss-selector-parser: ^6.0.13 + semver: ^7.5.4 + vue-eslint-parser: ^9.3.1 xml-name-validator: ^4.0.0 peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 - checksum: b1cdb16e43e681938c25f1d3f2d5d0d76a99172efdcfa0fa98cdb21122d520e12ae2f8ff2b40bf47a5b9f476f54199494a2851d99edc5bad0a25156ef38eeac4 + checksum: b2f9d0deefb124faacbd1aaf3f593962cd13547f8816782987299cb089693cec5e6e4036227242ad1dc17b6772fb579bc2042942486017a00c3c05eefeea36bd languageName: node linkType: hard @@ -7039,7 +7039,7 @@ __metadata: eslint-plugin-regexp: 1.15.0 eslint-plugin-tsdoc: 0.2.17 eslint-plugin-unicorn: 48.0.1 - eslint-plugin-vue: 9.15.1 + eslint-plugin-vue: 9.16.1 he: 1.2.0 highcharts: 11.1.0 highcharts-vue: 1.4.3 @@ -7597,7 +7597,7 @@ __metadata: languageName: node linkType: hard -"nth-check@npm:^2.0.1": +"nth-check@npm:^2.0.1, nth-check@npm:^2.1.1": version: 2.1.1 resolution: "nth-check@npm:2.1.1" dependencies: @@ -8056,7 +8056,7 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.9": +"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": version: 6.0.13 resolution: "postcss-selector-parser@npm:6.0.13" dependencies: @@ -9810,7 +9810,7 @@ __metadata: languageName: node linkType: hard -"vue-eslint-parser@npm:^9.3.0": +"vue-eslint-parser@npm:^9.3.1": version: 9.3.1 resolution: "vue-eslint-parser@npm:9.3.1" dependencies: From 533a7cd07803d61235ff8d1b48d6093c9d749abd Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 4 Aug 2023 01:58:19 +0000 Subject: [PATCH 110/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230804?= =?UTF-8?q?.0354=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a34a9188a3..a116106810 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230803.1743", + "version": "4.7.7+20230804.0354", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 5bfff456d3..7427ba3ca6 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -228,7 +228,7 @@ "eslint-plugin-vue": { "icon": "https://vuejs.org/logo.svg", "url": "https://eslint.vuejs.org", - "version": "9.15.1" + "version": "9.16.1" }, "he": { "url": "https://mths.be/he", From 81d80c2bba332e85caa6e298c299598908730407 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 01:59:43 +0000 Subject: [PATCH 111/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-c?= =?UTF-8?q?onfig-prettier`=20to=20v8.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a116106810..ea91e0c0fc 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "copy-dir": "1.3.0", "css-loader": "6.8.1", "eslint": "8.45.0", - "eslint-config-prettier": "8.9.0", + "eslint-config-prettier": "8.10.0", "eslint-import-resolver-typescript": "3.5.5", "eslint-plugin-compat": "4.1.4", "eslint-plugin-import": "2.27.5", diff --git a/yarn.lock b/yarn.lock index 6609d0d606..7442aa928f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4952,14 +4952,14 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:8.9.0": - version: 8.9.0 - resolution: "eslint-config-prettier@npm:8.9.0" +"eslint-config-prettier@npm:8.10.0": + version: 8.10.0 + resolution: "eslint-config-prettier@npm:8.10.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: a675d0dabd76b700ef2d062b5ec6a634e105a8e8c070f95281fd2ccb614527fac60b4c758132058c50f0521fd19313f1f5be45ce9ebf081f2e5f77ae6eb7d8db + checksum: 153266badd477e49b0759816246b2132f1dbdb6c7f313ca60a9af5822fd1071c2bc5684a3720d78b725452bbac04bb130878b2513aea5e72b1b792de5a69fec8 languageName: node linkType: hard @@ -7029,7 +7029,7 @@ __metadata: css-loader: 6.8.1 emoji-toolkit: 7.0.1 eslint: 8.45.0 - eslint-config-prettier: 8.9.0 + eslint-config-prettier: 8.10.0 eslint-import-resolver-typescript: 3.5.5 eslint-plugin-compat: 4.1.4 eslint-plugin-import: 2.27.5 From 41b38457bf84914dd46654e7fe1e5f6d3e1c881d Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 4 Aug 2023 04:42:39 +0000 Subject: [PATCH 112/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230804?= =?UTF-8?q?.0638=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ea91e0c0fc..e4910a32b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230804.0354", + "version": "4.7.7+20230804.0638", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 7427ba3ca6..1e2c29992a 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -186,7 +186,7 @@ }, "eslint-config-prettier": { "icon": "https://prettier.io/icon.png", - "version": "8.9.0" + "version": "8.10.0" }, "eslint-import-resolver-typescript": { "version": "3.5.5" From ad1b3f37566088f41dd5ecbbb245516849eaa4f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 04:43:52 +0000 Subject: [PATCH 113/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`prettier?= =?UTF-8?q?`=20to=20v3.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e4910a32b4..a5b1c27e35 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "husky": "8.0.3", "js-yaml": "4.1.0", "moment-timezone": "0.5.43", - "prettier": "3.0.0", + "prettier": "3.0.1", "sass": "1.64.2", "sass-loader": "13.3.2", "terser": "5.19.2", diff --git a/yarn.lock b/yarn.lock index 7442aa928f..62c1144411 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7053,7 +7053,7 @@ __metadata: moment: 2.29.4 moment-timezone: 0.5.43 pinia: 2.1.6 - prettier: 3.0.0 + prettier: 3.0.1 qrcode: 1.5.3 sass: 1.64.2 sass-loader: 13.3.2 @@ -8110,12 +8110,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.0.0": - version: 3.0.0 - resolution: "prettier@npm:3.0.0" +"prettier@npm:3.0.1": + version: 3.0.1 + resolution: "prettier@npm:3.0.1" bin: prettier: bin/prettier.cjs - checksum: 6a832876a1552dc58330d2467874e5a0b46b9ccbfc5d3531eb69d15684743e7f83dc9fbd202db6270446deba9c82b79d24383d09924c462b457136a759425e33 + checksum: e1f3f16c7fe0495de3faa182597871f74927d787cce3c52095a66ff5d7eacc05173371d5f58bf12141a0a1b6bfe739a338531d6cf18b92c7256c1319f2c84e73 languageName: node linkType: hard From 0e8902b34e6ec6d7b55b40b00cd96468cf6ec2df Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 4 Aug 2023 05:16:04 +0000 Subject: [PATCH 114/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230804?= =?UTF-8?q?.0713=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a5b1c27e35..24793b328f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230804.0638", + "version": "4.7.7+20230804.0713", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 1e2c29992a..15c92cd62c 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -291,7 +291,7 @@ "prettier": { "icon": "https://prettier.io/icon.png", "url": "https://prettier.io", - "version": "3.0.0" + "version": "3.0.1" }, "qrcode": { "url": "http://github.com/soldair/node-qrcode", From 5a3573a5752ffd92fa72e85c946b3e51ba90caa5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 05:17:08 +0000 Subject: [PATCH 115/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-p?= =?UTF-8?q?lugin-import`=20to=20v2.28.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 73 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 24793b328f..d3552f0c08 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "eslint-config-prettier": "8.10.0", "eslint-import-resolver-typescript": "3.5.5", "eslint-plugin-compat": "4.1.4", - "eslint-plugin-import": "2.27.5", + "eslint-plugin-import": "2.28.0", "eslint-plugin-jsdoc": "46.4.5", "eslint-plugin-markdownlint": "0.4.1", "eslint-plugin-prettier": "5.0.0", diff --git a/yarn.lock b/yarn.lock index 62c1144411..3d2bc362da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3671,6 +3671,19 @@ __metadata: languageName: node linkType: hard +"array.prototype.findlastindex@npm:^1.2.2": + version: 1.2.2 + resolution: "array.prototype.findlastindex@npm:1.2.2" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + es-shim-unscopables: ^1.0.0 + get-intrinsic: ^1.1.3 + checksum: 8a166359f69a2a751c843f26b9c8cd03d0dc396a92cdcb85f4126b5f1cecdae5b2c0c616a71ea8aff026bde68165b44950b3664404bb73db0673e288495ba264 + languageName: node + linkType: hard + "array.prototype.flat@npm:^1.3.1": version: 1.3.1 resolution: "array.prototype.flat@npm:1.3.1" @@ -4769,7 +4782,7 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4": +"es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2": version: 1.22.1 resolution: "es-abstract@npm:1.22.1" dependencies: @@ -4993,7 +5006,7 @@ __metadata: languageName: node linkType: hard -"eslint-module-utils@npm:^2.7.4": +"eslint-module-utils@npm:^2.7.4, eslint-module-utils@npm:^2.8.0": version: 2.8.0 resolution: "eslint-module-utils@npm:2.8.0" dependencies: @@ -5023,28 +5036,31 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:2.27.5": - version: 2.27.5 - resolution: "eslint-plugin-import@npm:2.27.5" +"eslint-plugin-import@npm:2.28.0": + version: 2.28.0 + resolution: "eslint-plugin-import@npm:2.28.0" dependencies: array-includes: ^3.1.6 + array.prototype.findlastindex: ^1.2.2 array.prototype.flat: ^1.3.1 array.prototype.flatmap: ^1.3.1 debug: ^3.2.7 doctrine: ^2.1.0 eslint-import-resolver-node: ^0.3.7 - eslint-module-utils: ^2.7.4 + eslint-module-utils: ^2.8.0 has: ^1.0.3 - is-core-module: ^2.11.0 + is-core-module: ^2.12.1 is-glob: ^4.0.3 minimatch: ^3.1.2 + object.fromentries: ^2.0.6 + object.groupby: ^1.0.0 object.values: ^1.1.6 - resolve: ^1.22.1 - semver: ^6.3.0 - tsconfig-paths: ^3.14.1 + resolve: ^1.22.3 + semver: ^6.3.1 + tsconfig-paths: ^3.14.2 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: f500571a380167e25d72a4d925ef9a7aae8899eada57653e5f3051ec3d3c16d08271fcefe41a30a9a2f4fefc232f066253673ee4ea77b30dba65ae173dade85d + checksum: f9eba311b93ca1bb89311856b1f7285bd79e0181d7eb70fe115053ff77e2235fea749b30f538b78927dc65769340b5be61f4c9581d1c82bcdcccb2061f440ad1 languageName: node linkType: hard @@ -6293,7 +6309,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.1.0, is-core-module@npm:^2.11.0, is-core-module@npm:^2.12.0": +"is-core-module@npm:^2.1.0, is-core-module@npm:^2.11.0, is-core-module@npm:^2.12.0, is-core-module@npm:^2.12.1": version: 2.12.1 resolution: "is-core-module@npm:2.12.1" dependencies: @@ -7032,7 +7048,7 @@ __metadata: eslint-config-prettier: 8.10.0 eslint-import-resolver-typescript: 3.5.5 eslint-plugin-compat: 4.1.4 - eslint-plugin-import: 2.27.5 + eslint-plugin-import: 2.28.0 eslint-plugin-jsdoc: 46.4.5 eslint-plugin-markdownlint: 0.4.1 eslint-plugin-prettier: 5.0.0 @@ -7639,6 +7655,29 @@ __metadata: languageName: node linkType: hard +"object.fromentries@npm:^2.0.6": + version: 2.0.6 + resolution: "object.fromentries@npm:2.0.6" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + checksum: 453c6d694180c0c30df451b60eaf27a5b9bca3fb43c37908fd2b78af895803dc631242bcf05582173afa40d8d0e9c96e16e8874b39471aa53f3ac1f98a085d85 + languageName: node + linkType: hard + +"object.groupby@npm:^1.0.0": + version: 1.0.0 + resolution: "object.groupby@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.21.2 + get-intrinsic: ^1.2.1 + checksum: 64b00b287d57580111c958e7ff375c9b61811fa356f2cf0d35372d43cab61965701f00fac66c19fd8f49c4dfa28744bee6822379c69a73648ad03e09fcdeae70 + languageName: node + linkType: hard + "object.values@npm:^1.1.6": version: 1.1.6 resolution: "object.values@npm:1.1.6" @@ -8402,7 +8441,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.22.1": +"resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.22.1, resolve@npm:^1.22.3": version: 1.22.3 resolution: "resolve@npm:1.22.3" dependencies: @@ -8425,7 +8464,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin": +"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin, resolve@patch:resolve@^1.22.3#~builtin": version: 1.22.3 resolution: "resolve@patch:resolve@npm%3A1.22.3#~builtin::version=1.22.3&hash=c3c19d" dependencies: @@ -8726,7 +8765,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^6.3.0, semver@npm:^6.3.1": +"semver@npm:^6.3.1": version: 6.3.1 resolution: "semver@npm:6.3.1" bin: @@ -9412,7 +9451,7 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:^3.14.1": +"tsconfig-paths@npm:^3.14.2": version: 3.14.2 resolution: "tsconfig-paths@npm:3.14.2" dependencies: From 7e0b608e054d452ca69c2a51c6874b73cd5f95c4 Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 4 Aug 2023 05:50:22 +0000 Subject: [PATCH 116/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230804?= =?UTF-8?q?.0746=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d3552f0c08..d330b8188c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230804.0713", + "version": "4.7.7+20230804.0746", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 15c92cd62c..3013728495 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -197,7 +197,7 @@ }, "eslint-plugin-import": { "url": "https://github.com/import-js/eslint-plugin-import", - "version": "2.27.5" + "version": "2.28.0" }, "eslint-plugin-jsdoc": { "version": "46.4.5" From 221a184144025accd045c9040d11bcc927591eac Mon Sep 17 00:00:00 2001 From: jan Date: Fri, 4 Aug 2023 14:52:27 +0200 Subject: [PATCH 117/182] =?UTF-8?q?=E2=9C=A8=20[ce/us]=20add=20userSelecti?= =?UTF-8?q?on=20to=20mission=20replies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chatExtras/assets/userSelection.ts | 16 +++++- src/modules/chatExtras/main.ts | 56 +++++++++++-------- src/modules/chatExtras/register.json | 6 +- .../shareAlliancePost/assets/missionWindow.ts | 6 +- 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/src/modules/chatExtras/assets/userSelection.ts b/src/modules/chatExtras/assets/userSelection.ts index a9f1cfd47a..1128459642 100644 --- a/src/modules/chatExtras/assets/userSelection.ts +++ b/src/modules/chatExtras/assets/userSelection.ts @@ -14,7 +14,7 @@ export default (LSSM: Vue) => { // chatInput is the input field in the chat panel const chatInput = document.querySelector( - '#alliance_chat_message' + '#alliance_chat_message, #mission_reply_content' // chat input, mission reply input ); if (!chatInput) return; @@ -142,11 +142,22 @@ export default (LSSM: Vue) => { chatInput.dispatchEvent(new Event('input')); }); + // disable submitting the form when choicePopup is open + chatInput.closest('form')?.addEventListener('submit', e => { + if (!choicePopup.dataset.inputMode) return; + e.preventDefault(); + e.stopPropagation(); + e.stopImmediatePropagation(); + return false; + }); + // function to clear the choices const clearChoices = () => { choicePopup.dataset.inputMode = ''; delete choicePopup.dataset.pointer; chatInput.removeAttribute('autocomplete'); + // this small timeout is required to prevent SAP from sending the message in mission window on enter + setTimeout(() => delete chatInput.dataset.userChoiceOpen, 100); choiceElements.forEach(el => (el.dataset.choice = '')); }; @@ -221,6 +232,7 @@ export default (LSSM: Vue) => { // whisper-mode: currently at entering username if ( + chatInput.id !== 'mission_reply_content' && // whispering in mission replies is not possible chatInput.value.match(/^\/w [^ ]+/u) && selectionStart >= 3 && (selectionStart <= chatInput.value.indexOf(' ', 3) || @@ -236,6 +248,7 @@ export default (LSSM: Vue) => { choicePopup.dataset.inputMode = 'whisper'; chatInput.autocomplete = 'off'; + chatInput.dataset.userChoiceOpen = 'true'; fillChoices(users, usernameInput); } else if (chatInput.value.match(/@[^ ]*/u)) { @@ -262,6 +275,7 @@ export default (LSSM: Vue) => { choicePopup.dataset.inputMode = 'mention'; choicePopup.dataset.pointer = pointer.toString(); chatInput.autocomplete = 'off'; + chatInput.dataset.userChoiceOpen = 'true'; fillChoices(users, usernameInput); } else { diff --git a/src/modules/chatExtras/main.ts b/src/modules/chatExtras/main.ts index 3e91eacb63..fcb0a33874 100644 --- a/src/modules/chatExtras/main.ts +++ b/src/modules/chatExtras/main.ts @@ -61,30 +61,38 @@ export default (async ({ LSSM, getSetting }) => { ).then(({ default: userSelection }) => userSelection(LSSM)); } }); - } - - getSetting('lightDesignChatHistory').then(lightChatDesignActive => { - if (lightChatDesignActive) { - import( - /* webpackChunkName: "modules/chatExtras/lightDesignChatHistory" */ './assets/lightDesignChatHistory' - ).then(({ default: addLightChatDesign }) => { - if (location.pathname.includes('alliance_chats')) - addLightChatDesign(false, ''); + } else if (window.location.pathname === 'alliance_chats') { + getSetting('lightDesignChatHistory').then(lightChatDesignActive => { + if (lightChatDesignActive) { + import( + /* webpackChunkName: "modules/chatExtras/lightDesignChatHistory" */ './assets/lightDesignChatHistory' + ).then(({ default: addLightChatDesign }) => { + if (location.pathname.includes('alliance_chats')) + addLightChatDesign(false, ''); - LSSM.$stores.event.addListener({ - name: 'redesign-finished-loading', - listener(e: CustomEvent) { - if (e.detail.type === 'chat') { - (window[PREFIX] as Vue).$nextTick(() => - addLightChatDesign( - location.pathname === '/', - e.detail.modalName - ) - ); - } - }, + LSSM.$stores.event.addListener({ + name: 'redesign-finished-loading', + listener(e: CustomEvent) { + if (e.detail.type === 'chat') { + (window[PREFIX] as Vue).$nextTick(() => + addLightChatDesign( + location.pathname === '/', + e.detail.modalName + ) + ); + } + }, + }); }); - }); - } - }); + } + }); + } else if (window.location.pathname.startsWith('/missions/')) { + getSetting('userSelection').then(userSelection => { + if (userSelection) { + import( + /* webpackChunkName: "modules/chatExtras/userSelection" */ './assets/userSelection' + ).then(({ default: userSelection }) => userSelection(LSSM)); + } + }); + } }) as ModuleMainFunction; diff --git a/src/modules/chatExtras/register.json b/src/modules/chatExtras/register.json index 1c3fb74472..739d295d92 100644 --- a/src/modules/chatExtras/register.json +++ b/src/modules/chatExtras/register.json @@ -1 +1,5 @@ -{ "github": 34, "location": "^(/alliance_chats)?/?$", "settings": true } \ No newline at end of file +{ + "github": 34, + "location": "^(/alliance_chats|/missions/\\d+)?/?$", + "settings": true +} \ No newline at end of file diff --git a/src/modules/shareAlliancePost/assets/missionWindow.ts b/src/modules/shareAlliancePost/assets/missionWindow.ts index ddccb1730e..376bc4a266 100644 --- a/src/modules/shareAlliancePost/assets/missionWindow.ts +++ b/src/modules/shareAlliancePost/assets/missionWindow.ts @@ -391,7 +391,11 @@ export default async ({ replyField.before(addon); replyField.addEventListener('keydown', e => { - if (e.key !== 'Enter') return; + if ( + e.key !== 'Enter' || + replyField.dataset.userChoiceOpen === 'true' + ) + return; e.preventDefault(); replyField.nextElementSibling ?.querySelector('button[type="submit"]') From 39cd626528e9f1b5c487819447bb0540785b734e Mon Sep 17 00:00:00 2001 From: jan Date: Fri, 4 Aug 2023 20:34:15 +0200 Subject: [PATCH 118/182] =?UTF-8?q?=F0=9F=90=9B=20[redesign]=20fix=20descr?= =?UTF-8?q?iption=20of=20completed=20awards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/redesign/parsers/awards.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/redesign/parsers/awards.ts b/src/modules/redesign/parsers/awards.ts index 1129cf4961..501e4e32da 100644 --- a/src/modules/redesign/parsers/awards.ts +++ b/src/modules/redesign/parsers/awards.ts @@ -35,7 +35,7 @@ export default >(({ doc }) => ({ nodeType === 3 && nextSibling?.nodeType === 1 && (nextSibling as HTMLElement).matches( - 'div.progress, div.label-award-gold' + 'div.progress, div.line' ) ) ?.textContent?.trim() ?? '', From 2c0682019990dab9826f3d4fba72499c704dd71d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 22:52:39 +0000 Subject: [PATCH 119/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Lock=20file=20main?= =?UTF-8?q?tenance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yarn.lock | 184 +++++++++++++++++++++++++----------------------------- 1 file changed, 85 insertions(+), 99 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3d2bc362da..3425a422f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1644,66 +1644,58 @@ __metadata: linkType: hard "@interactjs/actions@npm:^1.9.20": - version: 1.10.17 - resolution: "@interactjs/actions@npm:1.10.17" + version: 1.10.18 + resolution: "@interactjs/actions@npm:1.10.18" dependencies: - "@interactjs/interact": 1.10.17 + "@interactjs/interact": 1.10.18 peerDependencies: - "@interactjs/core": 1.10.17 - "@interactjs/utils": 1.10.17 + "@interactjs/core": 1.10.18 + "@interactjs/utils": 1.10.18 dependenciesMeta: "@interactjs/interact": optional: true - checksum: 1ce4e459642e89160a268600253c4d9771a4cd1b0417711aaf3e7bd59f6799325826db8f767f3ae49d5045577aecd72b124d0c94da9a8fae491e8e087b9b6c4e + checksum: cb01d338782ce84b5a303e9919a5f5d37448999f6c561175d21a3a248b0a4b93b5f76a84ed4436de9e3bb0bcfb4027fdb3a1b9fe97833ac3b565f4d42b564f04 languageName: node linkType: hard "@interactjs/auto-start@npm:^1.9.20": - version: 1.10.17 - resolution: "@interactjs/auto-start@npm:1.10.17" + version: 1.10.18 + resolution: "@interactjs/auto-start@npm:1.10.18" dependencies: - "@interactjs/interact": 1.10.17 + "@interactjs/interact": 1.10.18 peerDependencies: - "@interactjs/core": 1.10.17 - "@interactjs/utils": 1.10.17 + "@interactjs/core": 1.10.18 + "@interactjs/utils": 1.10.18 dependenciesMeta: "@interactjs/interact": optional: true - checksum: 5e8e6b3284fa75a246405a387cc62998e88a7ceec319524101df0bd83eb9814df642b48e835519a3fb955a60b1c8854dc65d5d852923933c44002d6427261571 + checksum: 84c720c0393fdca87364cda67eb8dc7a88462e13846af1e6185274969783ba04aa9d6c6edd405bc3d83d68377b4a82a01e1019a41394fdc8943a979b5b3883c8 languageName: node linkType: hard -"@interactjs/core@npm:1.10.17": - version: 1.10.17 - resolution: "@interactjs/core@npm:1.10.17" +"@interactjs/core@npm:1.10.18": + version: 1.10.18 + resolution: "@interactjs/core@npm:1.10.18" peerDependencies: - "@interactjs/utils": 1.10.17 - checksum: 99c245211ae6e9c04519eb6952c4a58a7d02c8954685e3f47688ccbbaedce052d73620a84eef139f373d77187bf2e01e5ea36f36d544d42ad65486eb94e1cb44 + "@interactjs/utils": 1.10.18 + checksum: c34e77dbf3ed5af9ad96257b00399c046d614fea1c9c17fd27def3c5c0c0dedf74f3a62b0203ab251bb1a83c75853d1ddac600f6440319ebcc6eac3a526073d0 languageName: node linkType: hard -"@interactjs/interact@npm:1.10.17, @interactjs/interact@npm:^1.9.20": - version: 1.10.17 - resolution: "@interactjs/interact@npm:1.10.17" +"@interactjs/interact@npm:1.10.18, @interactjs/interact@npm:^1.9.20": + version: 1.10.18 + resolution: "@interactjs/interact@npm:1.10.18" dependencies: - "@interactjs/core": 1.10.17 - "@interactjs/types": 1.10.17 - "@interactjs/utils": 1.10.17 - checksum: 694001ed11bcd0cb97ed1fc7fe63b68ed57b24abdb0f8d2adb3bc3f361ef1fa60b484826cefb0c66861dfa924e160c9b4c4d0db824573d65b8f4eb50ac47fb97 + "@interactjs/core": 1.10.18 + "@interactjs/utils": 1.10.18 + checksum: e4c9e5a8690e681b93d01005138c44aea7af85331adc39bfede8d7eab5aea662b9dad7a00ab6535949c956afd54056c4f28327d4e75b72da0d4f4bb91ad32b98 languageName: node linkType: hard -"@interactjs/types@npm:1.10.17": - version: 1.10.17 - resolution: "@interactjs/types@npm:1.10.17" - checksum: 7e2d5e9448c714b4b2e00a423c33c259719bec3be87914cba1c80058eaecc8d5a587dcb29dcbb837d8832a4cf0eb26d9456f00d800f66717984952fb731891ec - languageName: node - linkType: hard - -"@interactjs/utils@npm:1.10.17": - version: 1.10.17 - resolution: "@interactjs/utils@npm:1.10.17" - checksum: 0eeb2d82ec11249c8a3b48d3617733c80b9c10836e1a99436cf70ae778a548e44133d6c77c6984c0d34129746efbc313232b1512279477e2df830dac4ac2bba0 +"@interactjs/utils@npm:1.10.18": + version: 1.10.18 + resolution: "@interactjs/utils@npm:1.10.18" + checksum: cbc0fba5d0d50e2396a89b26fdac6807b90ef1d053c7851b159f3fd1edb137415d48ab14b060429875609ee4ae37f91c2aebaf8054463acd222b15f20ae48f22 languageName: node linkType: hard @@ -1988,9 +1980,9 @@ __metadata: linkType: hard "@mdn/browser-compat-data@npm:^5.2.34, @mdn/browser-compat-data@npm:^5.2.47": - version: 5.3.6 - resolution: "@mdn/browser-compat-data@npm:5.3.6" - checksum: 71ddfc1296d83b3ae5b70797c876fb024be4977190defef3a7fa408e90760776dada840a0df473a2b0fe78e442554edb2f2b102a5b22e36798be2db0b28c5593 + version: 5.3.8 + resolution: "@mdn/browser-compat-data@npm:5.3.8" + checksum: b9a950ec7fff105264d102a90c1d603df5a3a89ba7542669511705d804905d26bcb3ede4500e62e22dad0e357ae02a1f66b945f6e63c232068997804997c4e21 languageName: node linkType: hard @@ -2204,12 +2196,12 @@ __metadata: linkType: hard "@types/eslint@npm:*": - version: 8.44.1 - resolution: "@types/eslint@npm:8.44.1" + version: 8.44.2 + resolution: "@types/eslint@npm:8.44.2" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: 8b45be72d3c22a1ee0b1cc7e7fb0e34e32bbf959e6b7e0e46d160c17894aedf159c1db5c85750f10068884c741eebc37a1cc7ea659de23a8df0c9a3203e2ff9d + checksum: 25b3ef61bae96350026593c9914c8a61ee02fde48ab8d568a73ee45032f13c0028c62e47a5ff78715af488dfe8e8bba913f7d30f859f60c7f9e639d328e80482 languageName: node linkType: hard @@ -2370,9 +2362,9 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 20.4.5 - resolution: "@types/node@npm:20.4.5" - checksum: 36a0304a8dc346a1b2d2edac4c4633eecf70875793d61a5274d0df052d7a7af7a8e34f29884eac4fbd094c4f0201477dcb39c0ecd3307ca141688806538d1138 + version: 20.4.7 + resolution: "@types/node@npm:20.4.7" + checksum: a40d7003f66b56220a2028179e49f950b46fa6dbf860a4a6ecbd6ba7976f05b2f0b31ced39689ec88a7d9e32d07e088c6a06d270b99d5bc13a28291ac2f30ca7 languageName: node linkType: hard @@ -3209,30 +3201,30 @@ __metadata: linkType: hard "@vueuse/core@npm:^10.2.1": - version: 10.2.1 - resolution: "@vueuse/core@npm:10.2.1" + version: 10.3.0 + resolution: "@vueuse/core@npm:10.3.0" dependencies: "@types/web-bluetooth": ^0.0.17 - "@vueuse/metadata": 10.2.1 - "@vueuse/shared": 10.2.1 + "@vueuse/metadata": 10.3.0 + "@vueuse/shared": 10.3.0 vue-demi: ">=0.14.5" - checksum: 1a7a7ad8372a2ff87ceddee2663a29a911dcd8a1a40b0e63436bc3b0f0786598f70e40e02e69d3cacfb634e35fdcd98136e049431a73516109ff062d8004cd54 + checksum: 54af7ab9f2aff8cc795dfc9d846aa9a27dc0949d7a6eec79697819e7dc8cb17b1682f267e7501382afa45736b6877363e640e381b7ac1fd6bc18dc860911afd8 languageName: node linkType: hard -"@vueuse/metadata@npm:10.2.1": - version: 10.2.1 - resolution: "@vueuse/metadata@npm:10.2.1" - checksum: 1672c0e6e6a54fe397c04b83bf4b78a8db410df272010f5db829e9f72ed285d526ca8bb4d7a3373b17aac2fb37c83d866f6077e667f54afc1ae20bf1ab1a5478 +"@vueuse/metadata@npm:10.3.0": + version: 10.3.0 + resolution: "@vueuse/metadata@npm:10.3.0" + checksum: fb5cb1ff730129ddd831e37cd6e7fed2ebc12211ed63c5075ecef7311852063a8eb152bb213459e36f7b69711f8da35835e2c0ece018c43700febf591ed96937 languageName: node linkType: hard -"@vueuse/shared@npm:10.2.1": - version: 10.2.1 - resolution: "@vueuse/shared@npm:10.2.1" +"@vueuse/shared@npm:10.3.0": + version: 10.3.0 + resolution: "@vueuse/shared@npm:10.3.0" dependencies: vue-demi: ">=0.14.5" - checksum: eeb19c0448d3f238615e24c738d2a6ebdc8b7d840405dd8704b5d0a3cd84ac3a8d5ec87856b501fac89f0f3bb868e7339d46e5fc3ece02c07160aedd41e507b2 + checksum: 2392ce5c798ff2aa09c82de11fef3a6cc1eb3d198598e0f19f803645003003e06c90bc4cde5367200f8458a31344edcd4ab571b84a4f7d21ee8083b9309c9bf3 languageName: node linkType: hard @@ -3452,13 +3444,13 @@ __metadata: linkType: hard "agentkeepalive@npm:^4.2.1": - version: 4.3.0 - resolution: "agentkeepalive@npm:4.3.0" + version: 4.4.0 + resolution: "agentkeepalive@npm:4.4.0" dependencies: debug: ^4.1.0 depd: ^2.0.0 humanize-ms: ^1.2.1 - checksum: 982453aa44c11a06826c836025e5162c846e1200adb56f2d075400da7d32d87021b3b0a58768d949d824811f5654223d5a8a3dad120921a2439625eb847c6260 + checksum: 36e0919a7503dacc863dc216ea6ca176c454724a63fd3d7b215089a1a2c89ee97db377b3af2454f79e5a8e7bb87e5975317734e9b0f9d5898c2269e3d8be05c7 languageName: node linkType: hard @@ -3924,16 +3916,16 @@ __metadata: linkType: hard "browserslist@npm:^4.14.5, browserslist@npm:^4.21.5, browserslist@npm:^4.21.9": - version: 4.21.9 - resolution: "browserslist@npm:4.21.9" + version: 4.21.10 + resolution: "browserslist@npm:4.21.10" dependencies: - caniuse-lite: ^1.0.30001503 - electron-to-chromium: ^1.4.431 - node-releases: ^2.0.12 + caniuse-lite: ^1.0.30001517 + electron-to-chromium: ^1.4.477 + node-releases: ^2.0.13 update-browserslist-db: ^1.0.11 bin: browserslist: cli.js - checksum: 80d3820584e211484ad1b1a5cfdeca1dd00442f47be87e117e1dda34b628c87e18b81ae7986fa5977b3e6a03154f6d13cd763baa6b8bf5dd9dd19f4926603698 + checksum: 1e27c0f111a35d1dd0e8fc2c61781b0daefabc2c9471b0b10537ce54843014bceb2a1ce4571af1a82b2bf1e6e6e05d38865916689a158f03bc2c7a4ec2577db8 languageName: node linkType: hard @@ -4031,7 +4023,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001473, caniuse-lite@npm:^1.0.30001503": +"caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001473, caniuse-lite@npm:^1.0.30001517": version: 1.0.30001519 resolution: "caniuse-lite@npm:1.0.30001519" checksum: 66085133ede05d947e30b62fed2cbae18e5767afda8b0de38840883e1cfe5846bf1568ddbafd31647544e59112355abedaf9c867ac34541bfc20d69e7a19d94c @@ -4288,13 +4280,20 @@ __metadata: languageName: node linkType: hard -"comment-parser@npm:1.3.1, comment-parser@npm:^1.1.2": +"comment-parser@npm:1.3.1": version: 1.3.1 resolution: "comment-parser@npm:1.3.1" checksum: 421e6a113a3afd548500e7174ab46a2049dccf92e82bbaa3b209031b1bdf97552aabfa1ae2a120c0b62df17e1ba70e0d8b05d68504fee78e1ef974c59bcfe718 languageName: node linkType: hard +"comment-parser@npm:^1.1.2": + version: 1.4.0 + resolution: "comment-parser@npm:1.4.0" + checksum: e086da3b14af9455177f1ab801bc54de9139a77fcef55dbfb751ae68d687ac83b0effb83d113ccf8cd217d9d93ce2b472002953cac342092a3fadfb9f5cd8e38 + languageName: node + linkType: hard + "common-tags@npm:^1.8.0": version: 1.8.2 resolution: "common-tags@npm:1.8.2" @@ -4666,10 +4665,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.431": - version: 1.4.477 - resolution: "electron-to-chromium@npm:1.4.477" - checksum: 1bf6117b2b58d4f18eff4f019fdffd0a68988142e095d8e59a66dbd0b6587e963b405aefc925b229959de20e3e8483849bcc41e3edb4366a359f825bc0a97377 +"electron-to-chromium@npm:^1.4.477": + version: 1.4.485 + resolution: "electron-to-chromium@npm:1.4.485" + checksum: 6f9efc92c18c4c8a16ba6d6004823d7ec893b98a0a0eae372e8cf1fbb61bdd04b9e2edd692dcb2e9d59cec06e3ef899262c52f1eb1e5d0202ee3d0b594fb4bd2 languageName: node linkType: hard @@ -6151,9 +6150,9 @@ __metadata: linkType: hard "immutable@npm:^4.0.0": - version: 4.3.1 - resolution: "immutable@npm:4.3.1" - checksum: a3a5ba29bd43f3f9a2e4d599763d7455d11a0ea57e50bf43f2836672fc80003e90d69f2a4f5b589f1f3d6986faf97f08ce1e253583740dd33c00adebab88b217 + version: 4.3.2 + resolution: "immutable@npm:4.3.2" + checksum: bb1d0f3eb8ebef04aa9e2c698ba1a248976a4dc0257fa2f1bffaaae575f891395fe9ef39eaf49856d6c4edd31704e300ec563ed44ea9d7c7996186deab91d0ff languageName: node linkType: hard @@ -7539,7 +7538,7 @@ __metadata: languageName: node linkType: hard -"node-releases@npm:^2.0.12": +"node-releases@npm:^2.0.13": version: 2.0.13 resolution: "node-releases@npm:2.0.13" checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3 @@ -8311,11 +8310,11 @@ __metadata: linkType: hard "regenerator-transform@npm:^0.15.1": - version: 0.15.1 - resolution: "regenerator-transform@npm:0.15.1" + version: 0.15.2 + resolution: "regenerator-transform@npm:0.15.2" dependencies: "@babel/runtime": ^7.8.4 - checksum: 2d15bdeadbbfb1d12c93f5775493d85874dbe1d405bec323da5c61ec6e701bc9eea36167483e1a5e752de9b2df59ab9a2dfff6bf3784f2b28af2279a673d29a4 + checksum: 20b6f9377d65954980fe044cfdd160de98df415b4bff38fbade67b3337efaf078308c4fed943067cd759827cc8cfeca9cb28ccda1f08333b85d6a2acbd022c27 languageName: node linkType: hard @@ -8561,8 +8560,8 @@ __metadata: linkType: hard "rollup@npm:^3.25.2, rollup@npm:^3.26.2": - version: 3.27.0 - resolution: "rollup@npm:3.27.0" + version: 3.27.2 + resolution: "rollup@npm:3.27.2" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -8570,7 +8569,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: f60c2c288d039dc14e1f6e7fd673b7fcb11928b5a781675791b37a741f63b7af110fc5d040d60d603175b6e03ff978bed83db018dd2ac542ef809fe1a5b32dae + checksum: 524477e73885bafd2df395c12db330f3893e1f8eca67e811fb1423a4f6318451987e978607c75f8115bd9ce7fa834460969b0c39b797d45da87fa42fef9bafa8 languageName: node linkType: hard @@ -8669,7 +8668,7 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.64.2": +"sass@npm:1.64.2, sass@npm:^1.63.6": version: 1.64.2 resolution: "sass@npm:1.64.2" dependencies: @@ -8682,19 +8681,6 @@ __metadata: languageName: node linkType: hard -"sass@npm:^1.63.6": - version: 1.64.1 - resolution: "sass@npm:1.64.1" - dependencies: - chokidar: ">=3.0.0 <4.0.0" - immutable: ^4.0.0 - source-map-js: ">=0.6.2 <2.0.0" - bin: - sass: sass.js - checksum: e908f96f3d5fa5869e2f2aec97548c93d6ef390680af89870fcae8bdbaee2392ac650fbeae8d2ef8e4c99cb9f81e6b3624e1cb659af6d6e746332a22233b5ad8 - languageName: node - linkType: hard - "sax@npm:^1.2.4": version: 1.2.4 resolution: "sax@npm:1.2.4" @@ -9785,8 +9771,8 @@ __metadata: linkType: hard "vite@npm:~4.4.2": - version: 4.4.7 - resolution: "vite@npm:4.4.7" + version: 4.4.8 + resolution: "vite@npm:4.4.8" dependencies: esbuild: ^0.18.10 fsevents: ~2.3.2 @@ -9820,7 +9806,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 787c4d891da18d0a0545bee07dec73c3201979dcf2b1ea3dc13fdd2d3b9ad76d413bcc0e68502183e309007a612c1f4116adefe0093d95fbbb9cf1c1755f7e41 + checksum: e8ffe688f8a7396b1357778f00cb06d1f3dadad200823c47a1955cf52774a0cbff5ac4d6a8f8d09e26c1d4e588e5815956f9eba02ae301e77a36c3d181a1bc86 languageName: node linkType: hard From 0310754cb8138e72f1c8777d764219d214ea330c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 00:24:03 +0000 Subject: [PATCH 120/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint`?= =?UTF-8?q?=20to=20v8.46.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index d330b8188c..8cdd8bf522 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "all-contributors-cli": "6.26.1", "copy-dir": "1.3.0", "css-loader": "6.8.1", - "eslint": "8.45.0", + "eslint": "8.46.0", "eslint-config-prettier": "8.10.0", "eslint-import-resolver-typescript": "3.5.5", "eslint-plugin-compat": "4.1.4", diff --git a/yarn.lock b/yarn.lock index 3425a422f0..95795ea138 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1536,14 +1536,14 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.5.0, @eslint-community/regexpp@npm:^4.5.1": +"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.5.0, @eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1": version: 4.6.2 resolution: "@eslint-community/regexpp@npm:4.6.2" checksum: a3c341377b46b54fa228f455771b901d1a2717f95d47dcdf40199df30abc000ba020f747f114f08560d119e979d882a94cf46cfc51744544d54b00319c0f2724 languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.0": +"@eslint/eslintrc@npm:^2.1.1": version: 2.1.1 resolution: "@eslint/eslintrc@npm:2.1.1" dependencies: @@ -1560,10 +1560,10 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:8.44.0": - version: 8.44.0 - resolution: "@eslint/js@npm:8.44.0" - checksum: fc539583226a28f5677356e9f00d2789c34253f076643d2e32888250e509a4e13aafe0880cb2425139051de0f3a48d25bfc5afa96b7304f203b706c17340e3cf +"@eslint/js@npm:^8.46.0": + version: 8.46.0 + resolution: "@eslint/js@npm:8.46.0" + checksum: 7aed479832302882faf5bec37e9d068f270f84c19b3fb529646a7c1b031e73a312f730569c78806492bc09cfce3d7651dfab4ce09a56cbb06bc6469449e56377 languageName: node linkType: hard @@ -3473,7 +3473,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.10.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:~6.12.6": +"ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:~6.12.6": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -5192,7 +5192,7 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^7.1.1, eslint-scope@npm:^7.2.0": +"eslint-scope@npm:^7.1.1, eslint-scope@npm:^7.2.2": version: 7.2.2 resolution: "eslint-scope@npm:7.2.2" dependencies: @@ -5202,33 +5202,33 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1": +"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.2": version: 3.4.2 resolution: "eslint-visitor-keys@npm:3.4.2" checksum: 9e0e7e4aaea705c097ae37c97410e5f167d4d2193be2edcb1f0760762ede3df01545e4820ae314f42dcec687745f2c6dcaf6d83575c4a2a241eb0c8517d724f2 languageName: node linkType: hard -"eslint@npm:8.45.0": - version: 8.45.0 - resolution: "eslint@npm:8.45.0" +"eslint@npm:8.46.0": + version: 8.46.0 + resolution: "eslint@npm:8.46.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 - "@eslint-community/regexpp": ^4.4.0 - "@eslint/eslintrc": ^2.1.0 - "@eslint/js": 8.44.0 + "@eslint-community/regexpp": ^4.6.1 + "@eslint/eslintrc": ^2.1.1 + "@eslint/js": ^8.46.0 "@humanwhocodes/config-array": ^0.11.10 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 - ajv: ^6.10.0 + ajv: ^6.12.4 chalk: ^4.0.0 cross-spawn: ^7.0.2 debug: ^4.3.2 doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 - eslint-scope: ^7.2.0 - eslint-visitor-keys: ^3.4.1 - espree: ^9.6.0 + eslint-scope: ^7.2.2 + eslint-visitor-keys: ^3.4.2 + espree: ^9.6.1 esquery: ^1.4.2 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 @@ -5252,11 +5252,11 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 3e6dcce5cc43c5e301662db88ee26d1d188b22c177b9f104d7eefd1191236980bd953b3670fe2fac287114b26d7c5420ab48407d7ea1c3a446d6313c000009da + checksum: 7a7d36b1a3bbc12e08fbb5bc36fd482a7a5a1797e62e762499dd45601b9e45aaa53a129f31ce0b4444551a9639b8b681ad535f379893dd1e3ae37b31dccd82aa languageName: node linkType: hard -"espree@npm:^9.3.1, espree@npm:^9.6.0": +"espree@npm:^9.3.1, espree@npm:^9.6.0, espree@npm:^9.6.1": version: 9.6.1 resolution: "espree@npm:9.6.1" dependencies: @@ -7043,7 +7043,7 @@ __metadata: copy-dir: 1.3.0 css-loader: 6.8.1 emoji-toolkit: 7.0.1 - eslint: 8.45.0 + eslint: 8.46.0 eslint-config-prettier: 8.10.0 eslint-import-resolver-typescript: 3.5.5 eslint-plugin-compat: 4.1.4 From 996c36c51097daeb17d6d897c85745deb8094360 Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 7 Aug 2023 05:24:14 +0000 Subject: [PATCH 121/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230807?= =?UTF-8?q?.0721=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8cdd8bf522..d19b5230b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230804.0746", + "version": "4.7.7+20230807.0721", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 3013728495..83ae651217 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -182,7 +182,7 @@ "eslint": { "icon": "https://eslint.org/icon-512.png", "url": "https://eslint.org", - "version": "8.45.0" + "version": "8.46.0" }, "eslint-config-prettier": { "icon": "https://prettier.io/icon.png", From b9dd3fad237bc06b44939a9ce257476f8add515a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 05:25:17 +0000 Subject: [PATCH 122/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`@types/n?= =?UTF-8?q?ode`=20to=20v18.17.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d19b5230b7..9e0a51745a 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@types/js-yaml": "4.0.5", "@types/leaflet": "1.9.3", "@types/lodash": "4.14.196", - "@types/node": "18.17.1", + "@types/node": "18.17.3", "@types/pdfmake": "0.2.2", "@types/prettier": "2.7.3", "@types/qrcode": "1.5.1", diff --git a/yarn.lock b/yarn.lock index 95795ea138..34dc3d6026 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2368,10 +2368,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:18.17.1": - version: 18.17.1 - resolution: "@types/node@npm:18.17.1" - checksum: 56201bda9a2d05d68602df63b4e67b0545ac8c6d0280bd5fb31701350a978a577a027501fbf49db99bf177f2242ebd1244896bfd35e89042d5bd7dfebff28d4e +"@types/node@npm:18.17.3": + version: 18.17.3 + resolution: "@types/node@npm:18.17.3" + checksum: 884fb68936b2b0ff90863fcf80610dd2f3d9fe1947897248b0138df05fe41ee6ce62941b37b565e3b3fd77601cd3977a64de858654c6ab9064413b171740d6ba languageName: node linkType: hard @@ -7024,7 +7024,7 @@ __metadata: "@types/js-yaml": 4.0.5 "@types/leaflet": 1.9.3 "@types/lodash": 4.14.196 - "@types/node": 18.17.1 + "@types/node": 18.17.3 "@types/pdfmake": 0.2.2 "@types/prettier": 2.7.3 "@types/qrcode": 1.5.1 From ba739d04dfcaff6e9850b6ca431d2444dcb4e832 Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 7 Aug 2023 05:56:12 +0000 Subject: [PATCH 123/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230807?= =?UTF-8?q?.0752=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9e0a51745a..7603790f8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230807.0721", + "version": "4.7.7+20230807.0752", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 83ae651217..6667353bea 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -62,7 +62,7 @@ "@types/node": { "icon": "https://avatars.githubusercontent.com/u/3637556", "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node", - "version": "18.17.1" + "version": "18.17.3" }, "@types/pdfmake": { "icon": "https://avatars.githubusercontent.com/u/3637556", From f2522c05fd5731baf7811fc1bded16cb3b9288f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 05:57:37 +0000 Subject: [PATCH 124/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-c?= =?UTF-8?q?onfig-prettier`=20to=20v9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7603790f8a..a80d96995c 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "copy-dir": "1.3.0", "css-loader": "6.8.1", "eslint": "8.46.0", - "eslint-config-prettier": "8.10.0", + "eslint-config-prettier": "9.0.0", "eslint-import-resolver-typescript": "3.5.5", "eslint-plugin-compat": "4.1.4", "eslint-plugin-import": "2.28.0", diff --git a/yarn.lock b/yarn.lock index 34dc3d6026..9632312eb5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4964,14 +4964,14 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:8.10.0": - version: 8.10.0 - resolution: "eslint-config-prettier@npm:8.10.0" +"eslint-config-prettier@npm:9.0.0": + version: 9.0.0 + resolution: "eslint-config-prettier@npm:9.0.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: 153266badd477e49b0759816246b2132f1dbdb6c7f313ca60a9af5822fd1071c2bc5684a3720d78b725452bbac04bb130878b2513aea5e72b1b792de5a69fec8 + checksum: 362e991b6cb343f79362bada2d97c202e5303e6865888918a7445c555fb75e4c078b01278e90be98aa98ae22f8597d8e93d48314bec6824f540f7efcab3ce451 languageName: node linkType: hard @@ -7044,7 +7044,7 @@ __metadata: css-loader: 6.8.1 emoji-toolkit: 7.0.1 eslint: 8.46.0 - eslint-config-prettier: 8.10.0 + eslint-config-prettier: 9.0.0 eslint-import-resolver-typescript: 3.5.5 eslint-plugin-compat: 4.1.4 eslint-plugin-import: 2.28.0 From aee94269c57ba9a6792a167a3f771cf7305b4930 Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 7 Aug 2023 06:59:33 +0000 Subject: [PATCH 125/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230807?= =?UTF-8?q?.0856=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a80d96995c..e6c7a2bfd3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230807.0752", + "version": "4.7.7+20230807.0856", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 6667353bea..77140bd565 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -186,7 +186,7 @@ }, "eslint-config-prettier": { "icon": "https://prettier.io/icon.png", - "version": "8.10.0" + "version": "9.0.0" }, "eslint-import-resolver-typescript": { "version": "3.5.5" From e9db7ba78208d1c163edd116533644c0bf42ed33 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 07:00:41 +0000 Subject: [PATCH 126/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-p?= =?UTF-8?q?lugin-jsdoc`=20to=20v46.4.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 33 +++++++++++++-------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index e6c7a2bfd3..435112f57f 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "eslint-import-resolver-typescript": "3.5.5", "eslint-plugin-compat": "4.1.4", "eslint-plugin-import": "2.28.0", - "eslint-plugin-jsdoc": "46.4.5", + "eslint-plugin-jsdoc": "46.4.6", "eslint-plugin-markdownlint": "0.4.1", "eslint-plugin-prettier": "5.0.0", "eslint-plugin-regexp": "1.15.0", diff --git a/yarn.lock b/yarn.lock index 9632312eb5..038234f5e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1360,14 +1360,14 @@ __metadata: languageName: node linkType: hard -"@es-joy/jsdoccomment@npm:~0.39.4": - version: 0.39.4 - resolution: "@es-joy/jsdoccomment@npm:0.39.4" +"@es-joy/jsdoccomment@npm:~0.40.1": + version: 0.40.1 + resolution: "@es-joy/jsdoccomment@npm:0.40.1" dependencies: - comment-parser: 1.3.1 + comment-parser: 1.4.0 esquery: ^1.5.0 jsdoc-type-pratt-parser: ~4.0.0 - checksum: efae229ae998840fdcb4faf44574bcc0a070e4aa6df69c01afedaeaddf6d2ea857a68b463df45f9437231201201f092402968c0c53c34e3c09842fef0da7f2d4 + checksum: 6098394cd97ad0532dde4f3171980e700e4199c231969311efd2362c2b5a4eefa9d59a0bc1fe513afbb5cc456ef7633491a2984d64252e7bd8ebe22489120610 languageName: node linkType: hard @@ -4280,14 +4280,7 @@ __metadata: languageName: node linkType: hard -"comment-parser@npm:1.3.1": - version: 1.3.1 - resolution: "comment-parser@npm:1.3.1" - checksum: 421e6a113a3afd548500e7174ab46a2049dccf92e82bbaa3b209031b1bdf97552aabfa1ae2a120c0b62df17e1ba70e0d8b05d68504fee78e1ef974c59bcfe718 - languageName: node - linkType: hard - -"comment-parser@npm:^1.1.2": +"comment-parser@npm:1.4.0, comment-parser@npm:^1.1.2": version: 1.4.0 resolution: "comment-parser@npm:1.4.0" checksum: e086da3b14af9455177f1ab801bc54de9139a77fcef55dbfb751ae68d687ac83b0effb83d113ccf8cd217d9d93ce2b472002953cac342092a3fadfb9f5cd8e38 @@ -5063,13 +5056,13 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jsdoc@npm:46.4.5": - version: 46.4.5 - resolution: "eslint-plugin-jsdoc@npm:46.4.5" +"eslint-plugin-jsdoc@npm:46.4.6": + version: 46.4.6 + resolution: "eslint-plugin-jsdoc@npm:46.4.6" dependencies: - "@es-joy/jsdoccomment": ~0.39.4 + "@es-joy/jsdoccomment": ~0.40.1 are-docs-informative: ^0.0.2 - comment-parser: 1.3.1 + comment-parser: 1.4.0 debug: ^4.3.4 escape-string-regexp: ^4.0.0 esquery: ^1.5.0 @@ -5078,7 +5071,7 @@ __metadata: spdx-expression-parse: ^3.0.1 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: aa470a07b8bb9fbded04d0a0c2e38236b1404a88ecac7d614942b4a6fc2b619b048dea781b4a28dfc30010ca27df1fef94b2c53ab80286789793de0f4c55a835 + checksum: 67b90a251008fbe4ff61a9d959b49f1f6fda542bf6e56745a231f6140477a3debacd549f18dbba7c0e2908f559f9ca1ce9c19d17736355311a36f7cf42eb28c1 languageName: node linkType: hard @@ -7048,7 +7041,7 @@ __metadata: eslint-import-resolver-typescript: 3.5.5 eslint-plugin-compat: 4.1.4 eslint-plugin-import: 2.28.0 - eslint-plugin-jsdoc: 46.4.5 + eslint-plugin-jsdoc: 46.4.6 eslint-plugin-markdownlint: 0.4.1 eslint-plugin-prettier: 5.0.0 eslint-plugin-regexp: 1.15.0 From d06a15a67c0b12333e125794b628c04cc6b8ce1e Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 7 Aug 2023 07:26:32 +0000 Subject: [PATCH 127/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230807?= =?UTF-8?q?.0923=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 435112f57f..b9278ed2a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230807.0856", + "version": "4.7.7+20230807.0923", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 77140bd565..c12ea93f09 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -200,7 +200,7 @@ "version": "2.28.0" }, "eslint-plugin-jsdoc": { - "version": "46.4.5" + "version": "46.4.6" }, "eslint-plugin-markdownlint": { "url": "https://gitlab.com/pawelbbdrozd/eslint-plugin-markdownlint/-/blob/main/README.md", From a1e74836b8ed84a3f19ff948ee55e9ca060fc532 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:23:31 +0000 Subject: [PATCH 128/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20typescrip?= =?UTF-8?q?t-eslint=20to=20v6.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index b9278ed2a6..bc58a87135 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "@types/ua-parser-js": "0.7.36", "@types/vue-select": "3.16.2", "@types/webpack-env": "1.18.1", - "@typescript-eslint/eslint-plugin": "6.2.1", - "@typescript-eslint/parser": "6.2.1", + "@typescript-eslint/eslint-plugin": "6.3.0", + "@typescript-eslint/parser": "6.3.0", "all-contributors-cli": "6.26.1", "copy-dir": "1.3.0", "css-loader": "6.8.1", diff --git a/yarn.lock b/yarn.lock index 038234f5e5..dad0c1c468 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2507,15 +2507,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.2.1": - version: 6.2.1 - resolution: "@typescript-eslint/eslint-plugin@npm:6.2.1" +"@typescript-eslint/eslint-plugin@npm:6.3.0": + version: 6.3.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.3.0" dependencies: "@eslint-community/regexpp": ^4.5.1 - "@typescript-eslint/scope-manager": 6.2.1 - "@typescript-eslint/type-utils": 6.2.1 - "@typescript-eslint/utils": 6.2.1 - "@typescript-eslint/visitor-keys": 6.2.1 + "@typescript-eslint/scope-manager": 6.3.0 + "@typescript-eslint/type-utils": 6.3.0 + "@typescript-eslint/utils": 6.3.0 + "@typescript-eslint/visitor-keys": 6.3.0 debug: ^4.3.4 graphemer: ^1.4.0 ignore: ^5.2.4 @@ -2529,44 +2529,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: e73f3fe36519d895037d223f3ddf200b97e17bcde9390984118c38733add1edf996357c809ec2db92cec61bc7c9e5a3d9a583e0d0f92fa9c3919b68716a27b37 + checksum: 1493c6c661993640eef56893a7919cb964165cb46653c62468e71ce02a5ec8c654dd7e9767587aea67ec16c026a5630011bc7ea6c04e2fa8a4afee7f26a51358 languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.2.1": - version: 6.2.1 - resolution: "@typescript-eslint/parser@npm:6.2.1" +"@typescript-eslint/parser@npm:6.3.0": + version: 6.3.0 + resolution: "@typescript-eslint/parser@npm:6.3.0" dependencies: - "@typescript-eslint/scope-manager": 6.2.1 - "@typescript-eslint/types": 6.2.1 - "@typescript-eslint/typescript-estree": 6.2.1 - "@typescript-eslint/visitor-keys": 6.2.1 + "@typescript-eslint/scope-manager": 6.3.0 + "@typescript-eslint/types": 6.3.0 + "@typescript-eslint/typescript-estree": 6.3.0 + "@typescript-eslint/visitor-keys": 6.3.0 debug: ^4.3.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: cf4768cbfc696ce1d4b15ae55b3d2b52761e91a4a80e738cf3a75c501c2257d735cd6e462567965069d0d693a8cf5463ab9e8b97c36c6ed1fccd3c1c09855bdb + checksum: ec739adbe4a972a696b4a4625dc5c2f5b4e072968decdcafd0a9b972d0167007230951a6450becb52e187b1b90a2858debba26f73162e293f7846b373888b8e9 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.2.1": - version: 6.2.1 - resolution: "@typescript-eslint/scope-manager@npm:6.2.1" +"@typescript-eslint/scope-manager@npm:6.3.0": + version: 6.3.0 + resolution: "@typescript-eslint/scope-manager@npm:6.3.0" dependencies: - "@typescript-eslint/types": 6.2.1 - "@typescript-eslint/visitor-keys": 6.2.1 - checksum: 3bb461678c7e729895c5ac16781ec7d66efc6ffa944bb49693ce8e9560f9a6cac70929157c0fc0875b2829ae19a5cdabb97973ddcfb7e81c16e22cdd5d39e3fd + "@typescript-eslint/types": 6.3.0 + "@typescript-eslint/visitor-keys": 6.3.0 + checksum: 1690465f620f2b4517d45516864ef107258b2b608293d72606d0f115e11a8c1416b3d57e1b67f1daa1838f0239f71464aead57fe77c53ebd54b0aeee5fd4cf5e languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.2.1": - version: 6.2.1 - resolution: "@typescript-eslint/type-utils@npm:6.2.1" +"@typescript-eslint/type-utils@npm:6.3.0": + version: 6.3.0 + resolution: "@typescript-eslint/type-utils@npm:6.3.0" dependencies: - "@typescript-eslint/typescript-estree": 6.2.1 - "@typescript-eslint/utils": 6.2.1 + "@typescript-eslint/typescript-estree": 6.3.0 + "@typescript-eslint/utils": 6.3.0 debug: ^4.3.4 ts-api-utils: ^1.0.1 peerDependencies: @@ -2574,23 +2574,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 7f8d80f03e6ddc1838307a2a4df61dc4bd8400efb9dcc7316063ae293fce54afad238404a0c25cd2cdaceee73ae514f254b850bd7ff11e2def700d5d6b90af05 + checksum: cf2ab9d576bc9f3c0554318d20cb92671e4f46a07c24271fc47f144139b3843dab54592ee2e0962f81ad588f57a0b0a7c09d7e1047c720143a54bb1ec3ac4007 languageName: node linkType: hard -"@typescript-eslint/types@npm:6.2.1": - version: 6.2.1 - resolution: "@typescript-eslint/types@npm:6.2.1" - checksum: 388d32f15a9db8ad5d80794caf9ab280d6e5a428efdf4f6a6dfc4069afe4d19da32d628acf638e4c5b92ee77a9a18eecf728a778a3b91cc8a24484af579fc9cf +"@typescript-eslint/types@npm:6.3.0": + version: 6.3.0 + resolution: "@typescript-eslint/types@npm:6.3.0" + checksum: 3c133e4c1b06d009739f1a4387831eb99758ba45b06b6f632fe9cf14c2839fc92dcbdbb6d94ca42c1cb5ab4ca1b31a5ead50a72e0a084b62e4de15255c451160 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.2.1": - version: 6.2.1 - resolution: "@typescript-eslint/typescript-estree@npm:6.2.1" +"@typescript-eslint/typescript-estree@npm:6.3.0": + version: 6.3.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.3.0" dependencies: - "@typescript-eslint/types": 6.2.1 - "@typescript-eslint/visitor-keys": 6.2.1 + "@typescript-eslint/types": 6.3.0 + "@typescript-eslint/visitor-keys": 6.3.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -2599,34 +2599,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 3d9beeb5e36b8827de5c160ed8e5c111dd66ca00671b183409b051e242b291480679b900bb74aaf4895dcae49497037567d3fcbbe67fa9930786ddd01c685f04 + checksum: b2bb03411a5d079a9fd3310eec0af3b81a99827569cb3957724071aa54ac6c88449fbd1ebb72d7a356d5994d7e9542b5292a385ca3c3b0bc8049bb61a40a8ae9 languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.2.1": - version: 6.2.1 - resolution: "@typescript-eslint/utils@npm:6.2.1" +"@typescript-eslint/utils@npm:6.3.0": + version: 6.3.0 + resolution: "@typescript-eslint/utils@npm:6.3.0" dependencies: "@eslint-community/eslint-utils": ^4.4.0 "@types/json-schema": ^7.0.12 "@types/semver": ^7.5.0 - "@typescript-eslint/scope-manager": 6.2.1 - "@typescript-eslint/types": 6.2.1 - "@typescript-eslint/typescript-estree": 6.2.1 + "@typescript-eslint/scope-manager": 6.3.0 + "@typescript-eslint/types": 6.3.0 + "@typescript-eslint/typescript-estree": 6.3.0 semver: ^7.5.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: d16356a633f39d988a9af159da15e28c6a28fa47abce372061c79cf186d193d148e1c32862c9702ff87e2a06f7a2f82773e4b56320a39f432f4b1a989f8005ad + checksum: 98a078a3948e8b6a45dec8f3be9bcb72dc98faa2fe84336b1925efb7caa06c05a2fbf7290cddb420465b415cc05252548e2b839b9311f99bce84cf856fd32888 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.2.1": - version: 6.2.1 - resolution: "@typescript-eslint/visitor-keys@npm:6.2.1" +"@typescript-eslint/visitor-keys@npm:6.3.0": + version: 6.3.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.3.0" dependencies: - "@typescript-eslint/types": 6.2.1 + "@typescript-eslint/types": 6.3.0 eslint-visitor-keys: ^3.4.1 - checksum: c05a1c45129f2cf9a8c49dadc3da10b675232e59b69dfe9fdc0bfb45d3be077ceff78097baf50e502dab3e71ce9fd799d2015e356a4be2787ee10c6c7a44ea8a + checksum: fc3148c3284de3f42724736f312a4fd0c3c2029617ae2ea9a84cf6601d31f600ee6563f9288de162028ffffde85b58d92feaafbe75a2da863ff2c4e3a0b5ed8c languageName: node linkType: hard @@ -7027,8 +7027,8 @@ __metadata: "@types/ua-parser-js": 0.7.36 "@types/vue-select": 3.16.2 "@types/webpack-env": 1.18.1 - "@typescript-eslint/eslint-plugin": 6.2.1 - "@typescript-eslint/parser": 6.2.1 + "@typescript-eslint/eslint-plugin": 6.3.0 + "@typescript-eslint/parser": 6.3.0 acorn: 8.10.0 acorn-walk: 8.2.0 all-contributors-cli: 6.26.1 From 28e1b2efaa55dbbab1a2b4bfd2051d9c600d2977 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 8 Aug 2023 03:14:55 +0000 Subject: [PATCH 129/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230808?= =?UTF-8?q?.0511=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index bc58a87135..668576adf7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230807.0923", + "version": "4.7.7+20230808.0511", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index c12ea93f09..e938769da6 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -110,11 +110,11 @@ }, "@typescript-eslint/eslint-plugin": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "6.2.1" + "version": "6.3.0" }, "@typescript-eslint/parser": { "icon": "https://typescript-eslint.io/img/typescript.svg", - "version": "6.2.1" + "version": "6.3.0" }, "@vuepress/client": { "icon": "https://v2.vuepress.vuejs.org/images/hero.png", From 5b05be56b92a4ed259e03083a7225134608ceaea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 22:08:02 +0000 Subject: [PATCH 130/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`@types/n?= =?UTF-8?q?ode`=20to=20v18.17.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 668576adf7..f4809728cf 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@types/js-yaml": "4.0.5", "@types/leaflet": "1.9.3", "@types/lodash": "4.14.196", - "@types/node": "18.17.3", + "@types/node": "18.17.4", "@types/pdfmake": "0.2.2", "@types/prettier": "2.7.3", "@types/qrcode": "1.5.1", diff --git a/yarn.lock b/yarn.lock index dad0c1c468..829d035501 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2368,10 +2368,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:18.17.3": - version: 18.17.3 - resolution: "@types/node@npm:18.17.3" - checksum: 884fb68936b2b0ff90863fcf80610dd2f3d9fe1947897248b0138df05fe41ee6ce62941b37b565e3b3fd77601cd3977a64de858654c6ab9064413b171740d6ba +"@types/node@npm:18.17.4": + version: 18.17.4 + resolution: "@types/node@npm:18.17.4" + checksum: d4c458202d82c999f38d85ca9ae8a2d3e521645c7f1b908cd6a0303d0e13c7d5eb3f888c41f584ba029ecf802d0a0005b7816c149400371a3c035abc4bd9a4c5 languageName: node linkType: hard @@ -7017,7 +7017,7 @@ __metadata: "@types/js-yaml": 4.0.5 "@types/leaflet": 1.9.3 "@types/lodash": 4.14.196 - "@types/node": 18.17.3 + "@types/node": 18.17.4 "@types/pdfmake": 0.2.2 "@types/prettier": 2.7.3 "@types/qrcode": 1.5.1 From 82b2405bcfeb07d143b7b2006cb8b62f3640e3a9 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 8 Aug 2023 22:28:36 +0000 Subject: [PATCH 131/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230809?= =?UTF-8?q?.0024=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f4809728cf..5e5f53b26b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230808.0511", + "version": "4.7.7+20230809.0024", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index e938769da6..c26a1d3e15 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -62,7 +62,7 @@ "@types/node": { "icon": "https://avatars.githubusercontent.com/u/3637556", "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node", - "version": "18.17.3" + "version": "18.17.4" }, "@types/pdfmake": { "icon": "https://avatars.githubusercontent.com/u/3637556", From 60d43cde87466106b704075fcf000eed146fa3a9 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 9 Aug 2023 22:05:30 +0200 Subject: [PATCH 132/182] =?UTF-8?q?=E2=9C=8F=EF=B8=8F[main]=20remove=20max?= =?UTF-8?q?buildings=20from=20police=20and=20fire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/cs_CZ/buildings.ts | 12 ++++-------- src/i18n/de_DE/buildings.ts | 12 ++++-------- src/i18n/en_AU/buildings.ts | 12 ++++-------- src/i18n/en_GB/buildings.ts | 12 ++++-------- src/i18n/en_US/buildings.ts | 12 ++++-------- src/i18n/es_ES/buildings.ts | 12 ++++-------- src/i18n/fi_FI/buildings.ts | 4 ++-- src/i18n/fr_FR/buildings.ts | 12 ++++-------- src/i18n/it_IT/buildings.ts | 12 ++++-------- src/i18n/nb_NO/buildings.ts | 14 +++++--------- src/i18n/nl_NL/buildings.ts | 12 ++++-------- src/i18n/pl_PL/buildings.ts | 16 ++++++---------- src/i18n/sv_SE/buildings.ts | 16 ++++++---------- 13 files changed, 55 insertions(+), 103 deletions(-) diff --git a/src/i18n/cs_CZ/buildings.ts b/src/i18n/cs_CZ/buildings.ts index 681eb16029..981b73b771 100644 --- a/src/i18n/cs_CZ/buildings.ts +++ b/src/i18n/cs_CZ/buildings.ts @@ -41,7 +41,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], - maxBuildings: '6.000 together with small fire stations', + maxBuildings: 'No limit', maxLevel: 24, special: 'From the 24th fire station onwards, the cost of building a new fire station increases according to the following formula: 100.000+200.000*LOG2(Number of existing fire stations − 22). The Coins price remains constant!', @@ -50,7 +50,6 @@ export default { startParkingLots: 1, schoolingTypes: ['Školní a výcvikové zařízení HZS'], icon: 'fire-flame-curved', - maxBuildingsFunction: (): number => 6000, }, 1: { caption: 'Školní a výcvikové zařízení HZS', @@ -258,7 +257,7 @@ export default { ), ], levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], - maxBuildings: '1.700 together with small police stations', + maxBuildings: 'No limit', maxLevel: 39, special: 'From the 24th police station onwards, the costs for the new construction of a police station increase according to the following formula: 100.000+200.000*LOG2(Number of existing police stations − 22). The Coins price remains constant!', @@ -266,7 +265,6 @@ export default { startParkingLots: 1, startCells: 0, startVehicles: ['Policejní automobil'], - maxBuildingsFunction: (): number => 1700, schoolingTypes: ['Policejní Akademie'], icon: 'building-shield', }, @@ -425,14 +423,13 @@ export default { '3.-5. 100.000', 'Conversion to normal station: difference price to normal station', ], - maxBuildings: '6.000 together with fire stations', + maxBuildings: 'No limit', maxLevel: 5, special: 'From the 24th fire station onwards, the cost of building a new fire station increases according to the following formula: (100.000+200.000*LOG2(Number of existing fire stations − 22)) / 2. max. 1 Million Credits. The Coins price remains constant!', startPersonnel: 10, startVehicles: ['CAS 20', 'CAS 30'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, schoolingTypes: ['Školní a výcvikové zařízení HZS'], icon: 'fire-flame-curved', }, @@ -452,14 +449,13 @@ export default { '3.-4. 100.000', 'Conversion to normal station: difference price to normal station', ], - maxBuildings: '1.700 with police stations together', + maxBuildings: 'No limit', maxLevel: 4, special: 'From the 24th police station onwards, the costs for the new construction of a police station are calculated according to the following formula: (100.000+200.000*LOG2(Number of existing police stations − 22)) / 2. The Coins price remains constant!', startPersonnel: 2, startVehicles: ['Policejní automobil'], startParkingLots: 1, - maxBuildingsFunction: (): number => 1700, schoolingTypes: ['Policejní Akademie'], icon: 'building-shield', }, diff --git a/src/i18n/de_DE/buildings.ts b/src/i18n/de_DE/buildings.ts index 6f0d647870..89e56b5647 100644 --- a/src/i18n/de_DE/buildings.ts +++ b/src/i18n/de_DE/buildings.ts @@ -211,7 +211,7 @@ export default { }, }, levelcost: ['1. 10.000', '2. 50.000', '3.-19. 100.000'], - maxBuildings: '6.000 mit kleinen Feuerwachen zusammen', + maxBuildings: 'Keine Grenze', maxLevel: 19, special: 'Ab der 24. Feuerwache steigen die Kosten für den Neubau einer Wache nach folgender Formel: 100.000+200.000*LOG2(Anzahl der vorhandenen Feuerwachen − 22). Der Coins-Preis bleibt konstant!', @@ -231,7 +231,6 @@ export default { '(HLF 20 und HLF 10 ab Dienstgrad "Gruppenführer(in)" => Baukosten 20.000 höher)', ], schoolingTypes: ['Feuerwehr'], - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 1: { @@ -570,7 +569,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-14. 100.000'], - maxBuildings: '1.700 mit kleinen Polizeiwachen zusammen', + maxBuildings: 'Keine Grenze', maxLevel: 14, special: 'Ab der 24. Polizeiwache steigen die Kosten für den Neubau einer Wache nach folgender Formel: 100.000+200.000*LOG2(Anzahl der vorhandenen Polizeiwache − 22). Der Coins-Preis bleibt konstant!', @@ -579,7 +578,6 @@ export default { startCells: 0, startVehicles: ['FuStW'], schoolingTypes: ['Polizei'], - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 7: { @@ -1313,7 +1311,7 @@ export default { '3.-5. 100.000', 'Umbau zur normalen Wache: Differenz-Preis zur normalen Wache', ], - maxBuildings: '6.000 mit Feuerwachen zusammen', + maxBuildings: 'Keine Grenze', maxLevel: 5, special: 'Ab der 24. Feuerwache steigen die Kosten für den Neubau einer Wache nach folgender Formel: (50.000+100.000*LOG2(Anzahl der vorhandenen Feuerwachen − 22)) / 2. max. 1 Million Credits. Der Coins-Preis bleibt konstant!', @@ -1333,7 +1331,6 @@ export default { '(HLF 20 und HLF 10 ab Dienstgrad "Gruppenführer(in)" => Baukosten 15.000 höher)', ], schoolingTypes: ['Feuerwehr'], - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 19: { @@ -1409,7 +1406,7 @@ export default { '3.-5. 100.000', 'Umbau zur normalen Wache: Differenz-Preis zur normalen Wache', ], - maxBuildings: '1.700 mit Polizeiwachen zusammen', + maxBuildings: 'Keine Grenze', maxLevel: 5, special: 'Ab der 24. Polizeiwache berechnen sich die Kosten für den Neubau einer Wache nach folgender Formel: (50.000+100.000*LOG2(Anzahl der vorhandenen Polizeiwachen − 22)) / 2. Der Coins-Preis bleibt konstant!', @@ -1418,7 +1415,6 @@ export default { startCells: 0, startVehicles: ['FuStW'], schoolingTypes: ['Polizei'], - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 20: { diff --git a/src/i18n/en_AU/buildings.ts b/src/i18n/en_AU/buildings.ts index 49ec561b22..4fd87ca878 100644 --- a/src/i18n/en_AU/buildings.ts +++ b/src/i18n/en_AU/buildings.ts @@ -50,7 +50,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-16. 100.000'], - maxBuildings: '6.000 together with small fire stations', + maxBuildings: 'No limit', maxLevel: 16, special: 'From the 24th fire station onwards, the cost of building a new fire station increases according to the following formula: 100.000+200.000*LOG2(Number of existing fire stations − 22). The Coins price remains constant!', @@ -58,7 +58,6 @@ export default { startVehicles: ['Pumper', 'Medium Tanker', ' Heavy Tanker'], schoolingTypes: ['Fire Station'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 1: { @@ -311,7 +310,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-16. 100.000'], - maxBuildings: '1.700 together with small police stations', + maxBuildings: 'No limit', maxLevel: 16, special: 'From the 24th police station onwards, the costs for the new construction of a police station increase according to the following formula: 100.000+200.000*LOG2(Number of existing police stations − 22). The Coins price remains constant!', @@ -320,7 +319,6 @@ export default { schoolingTypes: ['Police'], startParkingLots: 1, startCells: 0, - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 7: { @@ -543,7 +541,7 @@ export default { '3.-5. 100.000', 'Conversion to normal guard: difference price to normal guard', ], - maxBuildings: '6.000 together with fire stations', + maxBuildings: 'No limit', maxLevel: 5, special: 'From the 24th fire station onwards, the cost of building a new fire station increases according to the following formula: (50.000+100.000*LOG2(Number of existing fire stations − 22)) / 2. max. 1 Million Credits. The Coins price remains constant!', @@ -551,7 +549,6 @@ export default { startVehicles: ['Pumper', 'Medium Tanker', ' Heavy Tanker'], schoolingTypes: ['Fire Station'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 19: { @@ -605,7 +602,7 @@ export default { '3.-4. 100.000', 'Conversion to normal guard: difference price to normal guard', ], - maxBuildings: '1.700 mit Polizeiwachen zusammen', + maxBuildings: 'No limit', maxLevel: 4, special: 'From the 24th police station onwards, the costs for the new construction of a police station are calculated according to the following formula: (50.000+100.000*LOG2(Number of existing police stations − 22)) / 2. The Coins price remains constant!', @@ -614,7 +611,6 @@ export default { schoolingTypes: ['Police'], startParkingLots: 1, startCells: 0, - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 20: { diff --git a/src/i18n/en_GB/buildings.ts b/src/i18n/en_GB/buildings.ts index 462647cead..aa7409e4f6 100644 --- a/src/i18n/en_GB/buildings.ts +++ b/src/i18n/en_GB/buildings.ts @@ -112,7 +112,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-24. 100.000'], - maxBuildings: '6.000 together with small fire stations', + maxBuildings: 'No limit', maxLevel: 24, special: 'From the 24th fire station onwards, the cost of building a new fire station increases according to the following formula: 100.000+200.000*LOG2(Number of existing fire stations − 22). The Coins price remains constant!', @@ -120,7 +120,6 @@ export default { startVehicles: ['Water Ladder', 'Light 4X4 Pump (L4P)'], schoolingTypes: ['Fire Station'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 1: { @@ -394,7 +393,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-19. 100.000'], - maxBuildings: '1.700 together with small police stations', + maxBuildings: 'No limit', maxLevel: 19, special: 'From the 24th police station onwards, the costs for the new construction of a police station increase according to the following formula: 100.000+200.000*LOG2(Number of existing police stations − 22). The Coins price remains constant!', @@ -403,7 +402,6 @@ export default { schoolingTypes: ['Police'], startParkingLots: 1, startCells: 0, - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 7: { @@ -650,7 +648,7 @@ export default { '3.-5. 100.000', 'Conversion to normal stations: difference price to normal stations', ], - maxBuildings: '6.000 together with fire stations', + maxBuildings: 'No limit', maxLevel: 5, special: 'From the 24th fire station onwards, the cost of building a new fire station increases according to the following formula: (50.000+100.000*LOG2(Number of existing fire stations − 22)) / 2. max. 1 Million Credits. The Coins price remains constant!', @@ -658,7 +656,6 @@ export default { startVehicles: ['Water Ladder', 'Light 4X4 Pump (L4P)'], schoolingTypes: ['Fire Station'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 19: { @@ -726,7 +723,7 @@ export default { '3.-5. 100.000', 'Conversion to normal station: difference price to normal station', ], - maxBuildings: '1.700 together with police stations', + maxBuildings: 'no limit', maxLevel: 5, special: 'From the 24th police station onwards, the costs for the new construction of a police station are calculated according to the following formula: (50.000+100.000*LOG2(Number of existing police stations − 22)) / 2. The Coins price remains constant!', @@ -735,7 +732,6 @@ export default { schoolingTypes: ['Police'], startParkingLots: 1, startCells: 0, - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 20: { diff --git a/src/i18n/en_US/buildings.ts b/src/i18n/en_US/buildings.ts index 5c1fb5d294..d732cc3d5c 100644 --- a/src/i18n/en_US/buildings.ts +++ b/src/i18n/en_US/buildings.ts @@ -121,7 +121,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], - maxBuildings: '6.000 together with small fire stations', + maxBuildings: 'no limit', maxLevel: 39, special: 'From the 24th fire station onwards, the cost of building a new fire station increases according to the following formula: 100.000+200.000*LOG2(Number of existing fire stations − 22). The Coins price remains constant!', @@ -129,7 +129,6 @@ export default { startVehicles: ['Type 1 fire engine', 'Type 2 fire engine'], schoolingTypes: ['Fire Station'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 1: { @@ -413,7 +412,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], - maxBuildings: '1.700 together with small police stations', + maxBuildings: 'no limit', maxLevel: 39, special: 'From the 24th police station onwards, the costs for the new construction of a police station increase according to the following formula: 100.000+200.000*LOG2(Number of existing police stations − 22). The Coins price remains constant!', @@ -422,7 +421,6 @@ export default { schoolingTypes: ['Police'], startParkingLots: 1, startCells: 0, - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 6: { @@ -705,7 +703,7 @@ export default { '3.-5. 100.000', 'Conversion to normal guard: difference price to normal guard', ], - maxBuildings: '6.000 together with fire stations', + maxBuildings: 'no limit', maxLevel: 5, special: 'From the 24th fire station onwards, the cost of building a new fire station increases according to the following formula: (50.000+100.000*LOG2(Number of existing fire stations − 22)) / 2. max. 1 Million Credits. The Coins price remains constant!', @@ -713,7 +711,6 @@ export default { startVehicles: ['Type 1 fire engine', 'Type 2 fire engine'], schoolingTypes: ['Fire Station'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 14: { @@ -848,7 +845,7 @@ export default { '3.-4. 100.000', 'Conversion to normal guard: difference price to normal guard', ], - maxBuildings: '1.700 together with small police stations', + maxBuildings: 'no limit', maxLevel: 4, special: 'From the 24th police station onwards, the costs for the new construction of a police station are calculated according to the following formula: (50.000+100.000*LOG2(Number of existing police stations − 22)) / 2. The Coins price remains constant!', @@ -857,7 +854,6 @@ export default { schoolingTypes: ['Police'], startCells: 0, startParkingLots: 1, - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 16: { diff --git a/src/i18n/es_ES/buildings.ts b/src/i18n/es_ES/buildings.ts index 69fa7484b7..67678c3458 100644 --- a/src/i18n/es_ES/buildings.ts +++ b/src/i18n/es_ES/buildings.ts @@ -36,7 +36,7 @@ export default { ], levelcost: ['1. 10.000', '2. 50.000', '3.-24. 100.000'], maxBuildings: - '6.000 edificios junto con pequeñas estaciones de bomberos', + 'sin límite', maxLevel: 25, special: 'A partir del 24º parque de bomberos en adelante, el coste de construcción de un nuevo parque de bomberos aumenta según la siguiente fórmula: 100.000+200.000*LOG2(Number of existing fire stations − 22). ¡El precio de las monedas es constante!', @@ -44,7 +44,6 @@ export default { startVehicles: ['Camión BUP', 'Camión BUL', 'Vehículo de rescate'], schoolingTypes: ['Parque de bomberos'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 1: { @@ -269,7 +268,7 @@ export default { ], levelcost: ['1. 10.000', '2. 50.000', '3.-14. 100.000'], maxBuildings: - '1.700 comisarías de policía junto con pequeñas comisarías', + 'sin límite', maxLevel: 14, special: 'A partir de la comisaría 24 en adelante, los costes de la nueva construcción de una comisaría aumentan según la siguiente fórmula: 100.000+200.000*LOG2(Number of existing police stations − 22). ¡El precio de las monedas es constante!', @@ -278,7 +277,6 @@ export default { startCells: 0, startVehicles: ['Coche patrulla'], schoolingTypes: ['Policía'], - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 7: { @@ -440,14 +438,13 @@ export default { 'Convertir a parque de bombero normal: precio de la diferencia a parque de bombero normal', ], maxBuildings: - '6.000 parques de bomberos junto con parques de bomberos pequeños', + 'sin límite', maxLevel: 5, special: 'A partir del 24º parque de bomberos en adelante, el coste de construcción de un nuevo parque de bomberos aumenta según la siguiente fórmula: (50.000+100.000*LOG2(Number of existing fire stations − 22)) / 2. max. 1 Million Credits. ¡El precio de las monedas es constante!', startPersonnel: 10, startVehicles: ['Camión BUP', 'Camión BUL', 'Vehículo de rescate'], schoolingTypes: ['Parque de bomberos'], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, icon: 'fire-flame-curved', }, @@ -485,7 +482,7 @@ export default { 'Convertir a comisaria de policía normal: precio de la diferencia a comisaría de policía normal', ], maxBuildings: - '1.700 comisarías de polcía junto con comisarías de policías pequeños', + 'sin límite', maxLevel: 4, special: 'A partir de la comisaría 24º en adelante, los costes de la nueva construcción de una comisaría se calculan de acuerdo con la siguiente fórmula: (50.000+100.000*LOG2(Number of existing police stations − 22)) / 2. ¡El precio de las monedas es constante!', @@ -494,7 +491,6 @@ export default { schoolingTypes: ['Policía'], startParkingLots: 1, startCells: 0, - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 20: { diff --git a/src/i18n/fi_FI/buildings.ts b/src/i18n/fi_FI/buildings.ts index 9b23b6489e..966535856e 100644 --- a/src/i18n/fi_FI/buildings.ts +++ b/src/i18n/fi_FI/buildings.ts @@ -48,7 +48,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-24. 100.000'], - maxBuildings: '6000 yhdessä pienten paloasemien kanssa', + maxBuildings: 'Ei rajoitusta', maxLevel: 24, special: 'Paloasemien hinta 25. paloaseman jälkeen lasketaan: 100000+(200000 * log2(asemien määrä-22))', @@ -432,7 +432,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-5. 100.000'], - maxBuildings: '6000 yhdessä paloasemien kanssa', + maxBuildings: 'Ei rajoitusta', maxLevel: 5, special: 'Voi rakentaa vain yhden laajennuksen. Paloasemien hinta 25. paloaseman jälkeen lasketaan: 100000+(200000 * log2(asemien määrä-22))', diff --git a/src/i18n/fr_FR/buildings.ts b/src/i18n/fr_FR/buildings.ts index 0d8967f9bb..dd14f85646 100644 --- a/src/i18n/fr_FR/buildings.ts +++ b/src/i18n/fr_FR/buildings.ts @@ -66,7 +66,7 @@ export default { }, ], levelcost: ['1. 10 000', '2. 50 000', '3-24. 100 000'], - maxBuildings: '6 000', + maxBuildings: 'Aucune limite', maxLevel: 24, special: 'Le prix de vos postes augmente lorsque vous en possédez 25. Ainsi, le rythme de progression est constant une fois que vous possédez un grand flux de revenus à ces niveaux de jeu. La formule actuelle pour calculer le prix des postes est la suivante : 100 000+(200 000*LOG2(Number of existing fire stations − 22)).', @@ -74,7 +74,6 @@ export default { startVehicles: ['FPT', 'FPTL', 'FPTSR', 'CCRL', 'CCRM', 'CCRSR'], schoolingTypes: ['Centre de secours'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 1: { @@ -301,14 +300,13 @@ export default { ), ], levelcost: ['1. 10 000', '2. 50 000', '3-14. 100 000'], - maxBuildings: '1 700 postes de police/gendarmerie', + maxBuildings: 'Aucune limite', maxLevel: 14, startPersonnel: 2, startVehicles: ['Véhicule de patrouille'], schoolingTypes: ['Poste de police'], startParkingLots: 1, startCells: 0, - maxBuildingsFunction: (): number => 1700, special: '', icon: 'building-shield', }, @@ -586,7 +584,7 @@ export default { '3-5. 100 000', "Ceci est une petite caserne. Si vous souhaitez construire des extensions ou augmenter le nombre d'emplacements de véhicules, vous devez l'améliorer pour en faire une caserne ordinaire. Ce processus prend 24 heures.", ], - maxBuildings: '6 000 casernes de pompiers', + maxBuildings: 'Aucune limite', maxLevel: 5, special: 'Le prix de vos postes augmente lorsque vous en possédez 25. Ainsi, le rythme de progression est constant une fois que vous possédez un grand flux de revenus à ces niveaux de jeu. La formule actuelle pour calculer le prix des postes est la suivante : (50 000+100 000*LOG2(Number of existing fire stations − 22)).', @@ -594,7 +592,6 @@ export default { startVehicles: ['FPT', 'FPTL', 'FPTSR', 'CCRL', 'CCRM', 'CCRSR'], schoolingTypes: ['Centre de secours'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 19: { @@ -631,7 +628,7 @@ export default { '3-4. 100 000', 'Ceci est un petit poste de police. Si vous souhaitez l’agrandir ou bâtir davantage d’extensions, vous devez le reconstruire pour en faire un poste de police ordinaire. Ce processus prend 24 heures.', ], - maxBuildings: '1 700 postes de police/gendarmerie', + maxBuildings: 'Aucune limite', maxLevel: 4, special: 'Le prix de vos postes augmente lorsque vous en possédez 25. Ainsi, le rythme de progression est constant une fois que vous possédez un grand flux de revenus à ces niveaux de jeu. La formule actuelle pour calculer le prix des postes est la suivante : (50 000+100 000*LOG2(Number of existing fire stations − 22)).', @@ -640,7 +637,6 @@ export default { startCells: 0, startVehicles: ['Véhicule de patrouille'], schoolingTypes: ['Poste de police'], - maxBuildingsFunction: (): number => 1700, icon: 'building-shield', }, 20: { diff --git a/src/i18n/it_IT/buildings.ts b/src/i18n/it_IT/buildings.ts index 4ae9a270de..9532546472 100644 --- a/src/i18n/it_IT/buildings.ts +++ b/src/i18n/it_IT/buildings.ts @@ -68,7 +68,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-24. 100.000'], - maxBuildings: '6.000 includendo le stazioni piccole', + maxBuildings: 'Nessun limite', maxLevel: 16, special: 'Dalla 24° Caserma ,i costi aumentano con questa formula: 100.000+200.000*LOG2(Numero di caserme dei vigili del fuoco esistenti − 22). Il prezzo delle monete rimane costante!', @@ -76,7 +76,6 @@ export default { startVehicles: ['ABP, APS'], schoolingTypes: ['Caserma dei vigili del fuoco'], startParkingLots: 1, - maxBuildingsFunction: (): number => 6000, icon: 'fire-flame-curved', }, 1: { @@ -388,14 +387,13 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-16. 100.000'], - maxBuildings: '1.700 comprese stazioni di polizia piccole', + maxBuildings: 'Nessun limite', maxLevel: 16, special: 'Dalla 24° caserma i costi aumenteranno secondo la seguente formula: 100.000+200.000*LOG2(Number of existing police stations − 22). The Coins price remains constant!', startPersonnel: 2, startVehicles: ['Volante'], schoolingTypes: ['Polizia'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, startCells: 0, icon: 'building-shield', @@ -622,14 +620,13 @@ export default { '3.-5. 100.000', 'Conversione a caserma grande: la differenza tra il costo della caserma piccola e quella grande', ], - maxBuildings: '6.000 includendo le stazioni grandi', + maxBuildings: 'Nessun limite', maxLevel: 5, special: 'A partire dalla 24° caserma i costi aumenteranno secondo la seguente formula: (50.000+100.000*LOG2(Number of existing fire stations − 22)) / 2. max. 1 Million Credits. The Coins price remains constant!', startPersonnel: 10, startVehicles: ['ABP', 'APS'], schoolingTypes: ['Caserma dei vigili del fuoco'], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, icon: 'fire-flame-curved', }, @@ -687,14 +684,13 @@ export default { '3.-4. 100.000', 'Conversione a caserma grande: la differenza tra il costo della caserma piccola e quella grande', ], - maxBuildings: '1.700 includendo le stazioni di polizia', + maxBuildings: 'Nessun limite', maxLevel: 4, special: 'A partire dalla 24° caserma i costi aumenteranno secondo la seguente formula:(50.000+100.000*LOG2(Number of existing police stations − 22)) / 2. The Coins price remains constant!', startPersonnel: 2, startVehicles: ['Volante'], schoolingTypes: ['Polizia'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, icon: 'building-shield', }, diff --git a/src/i18n/nb_NO/buildings.ts b/src/i18n/nb_NO/buildings.ts index 7f0dea349d..10c8e5b047 100644 --- a/src/i18n/nb_NO/buildings.ts +++ b/src/i18n/nb_NO/buildings.ts @@ -47,13 +47,12 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-24. 100.000'], - maxBuildings: '6.000 sammen med små brannstasjoner', + maxBuildings: 'Ingen grense', maxLevel: 24, special: 'Fra og med den 24. brannstasjonen øker kostnadene for å bygge en ny brannstasjon i henhold til følgende formel: 100.000 + 200.000 * LOG 2 (Antall eksisterende brannstasjoner - 22) . Myntprisen forblir konstant!', startPersonnel: 10, startVehicles: ['Mannskapsbil', 'Lett mannskapsbil'], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, schoolingTypes: ['Brannstasjon'], icon: 'fire-flame-curved', @@ -279,13 +278,12 @@ export default { ), ], levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], - maxBuildings: '1.700 sammen med små politistasjoner', + maxBuildings: 'Ingen grense', maxLevel: 39, special: 'Fra og med den 24. politistasjonen øker kostnadene for nybygging av en politistasjon i henhold til følgende formel: 100.000 + 200.000 * LOG 2 (Antall eksisterende politistasjoner - 22) . Myntprisen forblir konstant!', startPersonnel: 2, startVehicles: ['Patruljebil'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, startCells: 0, schoolingTypes: ['Politi'], @@ -461,13 +459,12 @@ export default { '3.-5. 100.000', 'Konvertering til normal vakt: differansepris til normal vakt', ], - maxBuildings: '6.000 sammen med brannstasjoner', + maxBuildings: 'Ingen grense', maxLevel: 5, special: 'Fra og med den 24. brannstasjonen øker kostnadene for å bygge en ny brannstasjon i henhold til følgende formel: (50.000+100.000 * LOG 2 (Antall eksisterende brannstasjoner - 22)) / 2 . maks. 1 million kreditter. Myntprisen forblir konstant!', startPersonnel: 10, startVehicles: ['Mannskapsbil', 'Lett mannskapsbil'], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, schoolingTypes: ['Brannstasjon'], icon: 'fire-flame-curved', @@ -505,13 +502,12 @@ export default { '3.-4. 100.000', 'Konvertering til normal vakt: differansepris til normal vakt', ], - maxBuildings: '1700 med politistasjoner', + maxBuildings: 'Ingen grense', maxLevel: 4, special: 'Fra og med den 24. politistasjonen beregnes kostnadene for nybygging av en politistasjon i henhold til følgende formel: (50.000+100.000 * LOG 2 (Antall eksisterende politistasjoner - 22 )) / 2 . Myntprisen forblir konstant!', startPersonnel: 2, startVehicles: ['Patruljebil'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, startCells: 0, schoolingTypes: ['Politi'], @@ -609,7 +605,7 @@ export default { }, extensions: [], levelcost: ['For dyrt'], - maxBuildings: 'Keine Grenze', + maxBuildings: 'Ingen grense', maxLevel: 5, special: 'FOR DYRT, IKKE KJØP DEN, IKKE UTVIDD DEN', startPersonnel: 0, diff --git a/src/i18n/nl_NL/buildings.ts b/src/i18n/nl_NL/buildings.ts index 27254fbe01..cd74f6f1cb 100644 --- a/src/i18n/nl_NL/buildings.ts +++ b/src/i18n/nl_NL/buildings.ts @@ -115,7 +115,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-24. 100.000'], - maxBuildings: '6.000', + maxBuildings: 'Geen limiet', maxLevel: 24, special: 'Vanaf de 25e brandweerkazerne stijgen de kosten voor de bouw van een nieuwe brandweerkazerne volgens de volgende formule: 100.000+200.000*LOG2(Aantal brandweerposten − 22). De Coins prijs blijft gelijk!', @@ -133,7 +133,6 @@ export default { 'TS 6/7', ], schoolingTypes: ['Brandweer'], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, icon: 'fire-flame-curved', }, @@ -325,14 +324,13 @@ export default { ), ], levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], - maxBuildings: '1.700', + maxBuildings: 'Geen limiet', maxLevel: 19, special: 'Vanaf het 25e opkomstbureau stijgen de kosten voor de bouw van een nieuw opkomstbureau volgens de volgende formule: 100.000+200.000*LOG2(Aantal opkomstbureaus − 22). De Coins prijs blijft gelijk!', startPersonnel: 2, startVehicles: ['DA Noodhulp'], schoolingTypes: ['Politie'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, startCells: 0, icon: 'building-shield', @@ -821,7 +819,7 @@ export default { '3.-5. 100.000', 'Upgraden naar normale post : Verschil prijs naar normale post', ], - maxBuildings: '6.000', + maxBuildings: 'Geen limiet', maxLevel: 6, special: 'Vanaf de 25e brandweerkazerne stijgen de kosten voor de bouw van een nieuwe brandweerkazerne volgens de volgende formule: 50.000+100.000*LOG2(Aantal brandweerposten − 22). max. 1 miljoen credits. De Coins prijs blijft gelijk!', @@ -839,7 +837,6 @@ export default { 'TS 6/7', ], schoolingTypes: ['Brandweer'], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, icon: 'fire-flame-curved', }, @@ -876,14 +873,13 @@ export default { '3.-4. 100.000', 'Upgraden naar normale post : Verschil prijs naar normale post', ], - maxBuildings: '1.700', + maxBuildings: 'Geen limiet', maxLevel: 4, special: 'Vanaf het 25e opkomstbureau stijgen de kosten voor de bouw van een nieuw opkomstbureau volgens de volgende formule: 50.000+100.000*LOG2(Aantal opkomstbureaus − 22). De Coins prijs blijft gelijk!', startPersonnel: 2, startVehicles: ['DA Noodhulp'], schoolingTypes: ['Politie'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, startCells: 0, icon: 'building-shield', diff --git a/src/i18n/pl_PL/buildings.ts b/src/i18n/pl_PL/buildings.ts index 8c62f69dfe..ef3ac5d491 100644 --- a/src/i18n/pl_PL/buildings.ts +++ b/src/i18n/pl_PL/buildings.ts @@ -75,7 +75,7 @@ export default { ), ], levelcost: ['1. 10.000', '2. 50.000', '3.-16. 100.000'], - maxBuildings: '6.000 włącznie z Remizami', + maxBuildings: 'Bez limitu', maxLevel: 16, special: 'Przy posiadaniu powyżej 24 budynków straży pożarnej koszt budowy wzrasta według wzoru:100.000+200.000*LOG2(Liczba istniejących straży pożarnej − 22). Cena za Monety pozostaje bez zmian!', @@ -88,7 +88,6 @@ export default { 'GCBARt', 'GLBARt', ], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, schoolingTypes: ['Posterunek straży pożarnej'], icon: 'fire-flame-curved', @@ -358,13 +357,12 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-16. 100.000'], - maxBuildings: '1.700 włącznie z Posterunkami Policji', + maxBuildings: 'Bez limitu', maxLevel: 19, special: 'Przy posiadaniu powyżej 24 budynków policji koszt budowy wzrasta według wzoru:100.000+200.000*LOG2(Liczba istniejących budynków policji − 22). Cena za Monety pozostaje bez zmian!', startPersonnel: 2, startVehicles: ['Radiowóz OPI'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, startCells: 0, schoolingTypes: ['Policja'], @@ -631,7 +629,7 @@ export default { '3.-5. 100.000', 'Ulepszenie do JRG wynosi różnicę w cenie budynków', ], - maxBuildings: '6.000 włącznie z JRG', + maxBuildings: 'Bez limitu', maxLevel: 5, special: 'Przy posiadaniu powyżej 24 budynków straży pożarnej koszt budowy wzrasta według wzoru:50.000+100.000*LOG2(Liczba istniejących straży pożarnej â’ 22), max 1 milion kredytów. Cena za Monety pozostaje bez zmian!', @@ -644,7 +642,6 @@ export default { 'GCBARt', 'GLBARt', ], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, schoolingTypes: ['Posterunek straży pożarnej'], icon: 'fire-flame-curved', @@ -724,13 +721,12 @@ export default { '3.-4. 100.000', 'Cena przebudowy na Komendę Policji wynosi różnicę w cenach budynków ', ], - maxBuildings: '1.700 włącznie z Komendami Policji', + maxBuildings: 'Bez limitu', maxLevel: 4, special: 'Przy posiadaniu powyżej 24 budynków policji koszt budowy wzrasta według wzoru:50.000+100.000*LOG2(Liczba istniejących budynków policji − 22). Cena za Monety pozostaje bez zmian!', startPersonnel: 2, startVehicles: ['Radiowóz OPI'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, startCells: 0, schoolingTypes: ['Policja'], @@ -792,7 +788,7 @@ export default { }, extensions: [], levelcost: ['Zbyt drogie'], - maxBuildings: 'Keine Grenze', + maxBuildings: 'Bez limitu', maxLevel: 5, special: 'ZA DROGI, NIE KUPUJ GO, NIE ROZBUDOWUJ GO, NIE OPŁACA SIĘ', startPersonnel: 0, @@ -812,7 +808,7 @@ export default { }, extensions: [], levelcost: ['1. 10.000', '2. 25.000', '3.-7. 100.000'], - maxBuildings: 'no limit', + maxBuildings: 'Bez limitu', maxLevel: 7, startPersonnel: 6, special: '', diff --git a/src/i18n/sv_SE/buildings.ts b/src/i18n/sv_SE/buildings.ts index 3705b79da6..e583953c75 100644 --- a/src/i18n/sv_SE/buildings.ts +++ b/src/i18n/sv_SE/buildings.ts @@ -47,14 +47,13 @@ export default { }, ], levelcost: ['1. 10.000 ', '2. 50.000', '3.-24. 100.000'], - maxBuildings: '6.000', + maxBuildings: 'Ingen gräns', maxLevel: 24, special: 'Priset på dina positioner ökar när du äger 25. Så hastigheten på progressionen är konstant när du har en stor inkomstström på dessa spelnivåer. Den nuvarande formeln för att beräkna priset på positioner är följande: 100.000+ (200.000 * LOGG 2 (Antal befintliga brandstationer - 22)) .', startPersonnel: 10, startVehicles: ['BAS 1 - Släckbil', 'BAS 2 - Släckbil'], schoolingTypes: ['Brandstation'], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, icon: 'fire-flame-curved', }, @@ -308,12 +307,11 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50 000', '3.-14. 100.000'], - maxBuildings: '1.700 Polisstation', + maxBuildings: 'Ingen gräns', maxLevel: 14, startPersonnel: 2, startVehicles: ['Radiobil'], schoolingTypes: ['Polis'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, startCells: 0, special: '', @@ -500,14 +498,13 @@ export default { '3.-5. 100_000', 'Det här är en liten kasern. Om du vill bygga utbuildings eller öka antalet vehiclesplatser måste du uppgradera den för att göra den till en vanlig kasern. Denna process tar 24 timmar.', ], - maxBuildings: '6.000 brandstationer', + maxBuildings: 'Ingen gräns', maxLevel: 5, special: 'Priset på dina positioner ökar när du äger 25. Så hastigheten på progressionen är konstant när du har en stor inkomstström på dessa spelnivåer. Den nuvarande formeln för att beräkna priset på positioner är följande: (50.000+100.000 * LOGG 2 (Antal befintliga brandstationer - 22)) .', startPersonnel: 10, startVehicles: ['BAS 1 - Släckbil', 'BAS 2 - Släckbil'], schoolingTypes: ['Brandstation'], - maxBuildingsFunction: (): number => 6000, startParkingLots: 1, icon: 'fire-flame-curved', }, @@ -574,14 +571,13 @@ export default { '3.-4. 100.000', 'Det här är en liten polisstation. Om du vill utöka det eller bygga fler extensions måste du bygga om det till en vanlig polisstation. Denna process tar 24 timmar. ', ], - maxBuildings: '1.700 polisstation', + maxBuildings: 'Ingen gräns', maxLevel: 4, special: 'Priset på dina positioner ökar när du äger 25. Så hastigheten på progressionen är konstant när du har en stor inkomstström på dessa spelnivåer. Den nuvarande formeln för att beräkna priset på positioner är följande: (50.000+100.000 * LOGG 2 (Antal befintliga brandstationer - 22)) .', startPersonnel: 2, startVehicles: ['Radiobil'], schoolingTypes: ['Polis'], - maxBuildingsFunction: (): number => 1700, startParkingLots: 1, icon: 'building-shield', }, @@ -648,7 +644,7 @@ export default { }, extensions: [], levelcost: ['För dyrt'], - maxBuildings: 'Keine Grenze', + maxBuildings: 'Ingen gräns', maxLevel: 5, special: 'FÖR DYRT, KÖP DET INTE, BYGG INTE UT DET', startPersonnel: 0, @@ -668,7 +664,7 @@ export default { }, extensions: [], levelcost: ['För dyrt'], - maxBuildings: 'Keine Grenze', + maxBuildings: 'Ingen gräns', maxLevel: 5, special: 'FÖR DYRT, KÖP DET INTE, BYGG INTE UT DET', startPersonnel: 0, From b75d67a1528173f587f5e1fdfdc6a0d529b13fb0 Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 9 Aug 2023 20:10:08 +0000 Subject: [PATCH 133/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230809?= =?UTF-8?q?.2207=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/i18n/es_ES/buildings.ts | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 5e5f53b26b..1c9484534a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230809.0024", + "version": "4.7.7+20230809.2207", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/i18n/es_ES/buildings.ts b/src/i18n/es_ES/buildings.ts index 67678c3458..1d449a1174 100644 --- a/src/i18n/es_ES/buildings.ts +++ b/src/i18n/es_ES/buildings.ts @@ -35,8 +35,7 @@ export default { }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-24. 100.000'], - maxBuildings: - 'sin límite', + maxBuildings: 'sin límite', maxLevel: 25, special: 'A partir del 24º parque de bomberos en adelante, el coste de construcción de un nuevo parque de bomberos aumenta según la siguiente fórmula: 100.000+200.000*LOG2(Number of existing fire stations − 22). ¡El precio de las monedas es constante!', @@ -267,8 +266,7 @@ export default { ), ], levelcost: ['1. 10.000', '2. 50.000', '3.-14. 100.000'], - maxBuildings: - 'sin límite', + maxBuildings: 'sin límite', maxLevel: 14, special: 'A partir de la comisaría 24 en adelante, los costes de la nueva construcción de una comisaría aumentan según la siguiente fórmula: 100.000+200.000*LOG2(Number of existing police stations − 22). ¡El precio de las monedas es constante!', @@ -437,8 +435,7 @@ export default { '3.-5. 100.000', 'Convertir a parque de bombero normal: precio de la diferencia a parque de bombero normal', ], - maxBuildings: - 'sin límite', + maxBuildings: 'sin límite', maxLevel: 5, special: 'A partir del 24º parque de bomberos en adelante, el coste de construcción de un nuevo parque de bomberos aumenta según la siguiente fórmula: (50.000+100.000*LOG2(Number of existing fire stations − 22)) / 2. max. 1 Million Credits. ¡El precio de las monedas es constante!', @@ -481,8 +478,7 @@ export default { '3.-4. 100.000', 'Convertir a comisaria de policía normal: precio de la diferencia a comisaría de policía normal', ], - maxBuildings: - 'sin límite', + maxBuildings: 'sin límite', maxLevel: 4, special: 'A partir de la comisaría 24º en adelante, los costes de la nueva construcción de una comisaría se calculan de acuerdo con la siguiente fórmula: (50.000+100.000*LOG2(Number of existing police stations − 22)) / 2. ¡El precio de las monedas es constante!', From 263541a6c9ba6a4b283853fdbf7a3708e43f97f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 23:29:42 +0000 Subject: [PATCH 134/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`@types/l?= =?UTF-8?q?odash`=20to=20v4.14.197?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 1c9484534a..3c7a529802 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@types/jquery": "3.5.16", "@types/js-yaml": "4.0.5", "@types/leaflet": "1.9.3", - "@types/lodash": "4.14.196", + "@types/lodash": "4.14.197", "@types/node": "18.17.4", "@types/pdfmake": "0.2.2", "@types/prettier": "2.7.3", diff --git a/yarn.lock b/yarn.lock index 829d035501..53a6045aaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2321,10 +2321,10 @@ __metadata: languageName: node linkType: hard -"@types/lodash@npm:4.14.196": - version: 4.14.196 - resolution: "@types/lodash@npm:4.14.196" - checksum: 201d17c3e62ae02a93c99ec78e024b2be9bd75564dd8fd8c26f6ac51a985ab280d28ce2688c3bcdfe785b0991cd9814edff19ee000234c7b45d9a697f09feb6a +"@types/lodash@npm:4.14.197": + version: 4.14.197 + resolution: "@types/lodash@npm:4.14.197" + checksum: 53d7567d1704de76cf33266c78062e0fd722d4b846e5b1417d0b6ef0ee41c0d9c451b92bc34f73d5f1fcc45c7d36511e92f6f47a9279b48157ba60a92ddaa078 languageName: node linkType: hard @@ -7016,7 +7016,7 @@ __metadata: "@types/jquery": 3.5.16 "@types/js-yaml": 4.0.5 "@types/leaflet": 1.9.3 - "@types/lodash": 4.14.196 + "@types/lodash": 4.14.197 "@types/node": 18.17.4 "@types/pdfmake": 0.2.2 "@types/prettier": 2.7.3 From eec669e1614f0eccf9e709940ad1cf430219fa7c Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 10 Aug 2023 04:43:19 +0000 Subject: [PATCH 135/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230810?= =?UTF-8?q?.0640=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3c7a529802..df4dfbf7dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230809.2207", + "version": "4.7.7+20230810.0640", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index c26a1d3e15..54bb3164ac 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -57,7 +57,7 @@ "@types/lodash": { "icon": "https://avatars.githubusercontent.com/u/3637556", "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/lodash", - "version": "4.14.196" + "version": "4.14.197" }, "@types/node": { "icon": "https://avatars.githubusercontent.com/u/3637556", From 3ddc4d021289bcfb1ba9ee22aa907e18e2f3decc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 04:44:20 +0000 Subject: [PATCH 136/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-i?= =?UTF-8?q?mport-resolver-typescript`=20to=20v3.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index df4dfbf7dd..678b9479ea 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "css-loader": "6.8.1", "eslint": "8.46.0", "eslint-config-prettier": "9.0.0", - "eslint-import-resolver-typescript": "3.5.5", + "eslint-import-resolver-typescript": "3.6.0", "eslint-plugin-compat": "4.1.4", "eslint-plugin-import": "2.28.0", "eslint-plugin-jsdoc": "46.4.6", diff --git a/yarn.lock b/yarn.lock index 53a6045aaa..af05addd77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4979,22 +4979,21 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-typescript@npm:3.5.5": - version: 3.5.5 - resolution: "eslint-import-resolver-typescript@npm:3.5.5" +"eslint-import-resolver-typescript@npm:3.6.0": + version: 3.6.0 + resolution: "eslint-import-resolver-typescript@npm:3.6.0" dependencies: debug: ^4.3.4 enhanced-resolve: ^5.12.0 eslint-module-utils: ^2.7.4 + fast-glob: ^3.3.1 get-tsconfig: ^4.5.0 - globby: ^13.1.3 is-core-module: ^2.11.0 is-glob: ^4.0.3 - synckit: ^0.8.5 peerDependencies: eslint: "*" eslint-plugin-import: "*" - checksum: 27e6276fdff5d377c9036362ff736ac29852106e883ff589ea9092dc57d4bc2a67a82d75134221124f05045f9a7e2114a159b2c827d1f9f64d091f7afeab0f58 + checksum: 57b1b3859149f847e0d4174ff979cf35362d60c951df047f01b96f4c3794a7ea0d4e1ec85be25e610d3706902c3acfb964a66b825c1a55e3ce3a124b9a7a13bd languageName: node linkType: hard @@ -5412,7 +5411,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0": +"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1": version: 3.3.1 resolution: "fast-glob@npm:3.3.1" dependencies: @@ -7038,7 +7037,7 @@ __metadata: emoji-toolkit: 7.0.1 eslint: 8.46.0 eslint-config-prettier: 9.0.0 - eslint-import-resolver-typescript: 3.5.5 + eslint-import-resolver-typescript: 3.6.0 eslint-plugin-compat: 4.1.4 eslint-plugin-import: 2.28.0 eslint-plugin-jsdoc: 46.4.6 From ba48cbac9d2a13eac5d18f4d37504fd1c60acf28 Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 10 Aug 2023 05:24:42 +0000 Subject: [PATCH 137/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230810?= =?UTF-8?q?.0720=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 678b9479ea..df35f5607d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230810.0640", + "version": "4.7.7+20230810.0720", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 54bb3164ac..76a600ef06 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -189,7 +189,7 @@ "version": "9.0.0" }, "eslint-import-resolver-typescript": { - "version": "3.5.5" + "version": "3.6.0" }, "eslint-plugin-compat": { "url": "https://github.com/amilajack/eslint-plugin-compat#readme", From 45ec068d796dee0cd8e25e97ab4d77726b6beaa6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 05:26:03 +0000 Subject: [PATCH 138/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`eslint-p?= =?UTF-8?q?lugin-vue`=20to=20v9.17.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index df35f5607d..8ad72ab6a9 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "eslint-plugin-regexp": "1.15.0", "eslint-plugin-tsdoc": "0.2.17", "eslint-plugin-unicorn": "48.0.1", - "eslint-plugin-vue": "9.16.1", + "eslint-plugin-vue": "9.17.0", "html-loader": "4.2.0", "husky": "8.0.3", "js-yaml": "4.1.0", diff --git a/yarn.lock b/yarn.lock index af05addd77..61d1c567f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5157,9 +5157,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-vue@npm:9.16.1": - version: 9.16.1 - resolution: "eslint-plugin-vue@npm:9.16.1" +"eslint-plugin-vue@npm:9.17.0": + version: 9.17.0 + resolution: "eslint-plugin-vue@npm:9.17.0" dependencies: "@eslint-community/eslint-utils": ^4.4.0 natural-compare: ^1.4.0 @@ -5170,7 +5170,7 @@ __metadata: xml-name-validator: ^4.0.0 peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 - checksum: b2f9d0deefb124faacbd1aaf3f593962cd13547f8816782987299cb089693cec5e6e4036227242ad1dc17b6772fb579bc2042942486017a00c3c05eefeea36bd + checksum: 2ef53a03876f7c96828ad10dae7d1c4d87b51e348f58b16de3f2bedbbff9a3410eabfaf65e4890b0b7ae6d1e710c1c370998d5bc64d6ca3095a95713b3a4cf67 languageName: node linkType: hard @@ -7046,7 +7046,7 @@ __metadata: eslint-plugin-regexp: 1.15.0 eslint-plugin-tsdoc: 0.2.17 eslint-plugin-unicorn: 48.0.1 - eslint-plugin-vue: 9.16.1 + eslint-plugin-vue: 9.17.0 he: 1.2.0 highcharts: 11.1.0 highcharts-vue: 1.4.3 From d09ba3273a122b8f92cc1e891a3ab94514a0f4ac Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 10 Aug 2023 06:07:25 +0000 Subject: [PATCH 139/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230810?= =?UTF-8?q?.0803=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8ad72ab6a9..52e9291354 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230810.0720", + "version": "4.7.7+20230810.0803", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 76a600ef06..658e4c416a 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -228,7 +228,7 @@ "eslint-plugin-vue": { "icon": "https://vuejs.org/logo.svg", "url": "https://eslint.vuejs.org", - "version": "9.16.1" + "version": "9.17.0" }, "he": { "url": "https://mths.be/he", From 758d83655d33ac60b5f8730aef5ffb89dd11fe8a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 06:08:41 +0000 Subject: [PATCH 140/182] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20`sass`=20?= =?UTF-8?q?to=20v1.65.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 52e9291354..c6623287f0 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "js-yaml": "4.1.0", "moment-timezone": "0.5.43", "prettier": "3.0.1", - "sass": "1.64.2", + "sass": "1.65.1", "sass-loader": "13.3.2", "terser": "5.19.2", "ts-loader": "9.4.4", diff --git a/yarn.lock b/yarn.lock index 61d1c567f0..ab81dd0dac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7062,7 +7062,7 @@ __metadata: pinia: 2.1.6 prettier: 3.0.1 qrcode: 1.5.3 - sass: 1.64.2 + sass: 1.65.1 sass-loader: 13.3.2 semver: 7.5.4 showdown: 2.1.0 @@ -8660,7 +8660,20 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.64.2, sass@npm:^1.63.6": +"sass@npm:1.65.1": + version: 1.65.1 + resolution: "sass@npm:1.65.1" + dependencies: + chokidar: ">=3.0.0 <4.0.0" + immutable: ^4.0.0 + source-map-js: ">=0.6.2 <2.0.0" + bin: + sass: sass.js + checksum: 33e325fc80cd07489992e0814cd4929496f87493ffe78c423c2dbafa5746a574e6f3bde20c2a3e4ea47b16ee3d6bc5afcf1d36b405227b829d6c4c9ddcc7f8e2 + languageName: node + linkType: hard + +"sass@npm:^1.63.6": version: 1.64.2 resolution: "sass@npm:1.64.2" dependencies: From e5f7d2578191e3d3ee48acd86df902f5c79a7898 Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 10 Aug 2023 07:29:56 +0000 Subject: [PATCH 141/182] =?UTF-8?q?=F0=9F=93=A6=20Version=204.7.7+20230810?= =?UTF-8?q?.0926=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/generated/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c6623287f0..5b6df4eebc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lss-manager-v4", - "version": "4.7.7+20230810.0803", + "version": "4.7.7+20230810.0926", "license": "CC-BY-NC-SA-4.0", "scripts": { "quickbuild": "./build/build.sh --quick", diff --git a/src/generated/libraries.json b/src/generated/libraries.json index 658e4c416a..e1b8844930 100644 --- a/src/generated/libraries.json +++ b/src/generated/libraries.json @@ -300,7 +300,7 @@ "sass": { "icon": "https://sass-lang.com/assets/img/logos/logo.svg", "url": "https://github.com/sass/dart-sass", - "version": "1.64.2" + "version": "1.65.1" }, "sass-loader": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From ed21c676b3b532bbe2cea6438f47e1d88150e199 Mon Sep 17 00:00:00 2001 From: jan Date: Thu, 10 Aug 2023 16:31:15 +0200 Subject: [PATCH 142/182] =?UTF-8?q?=E2=9C=A8=20[em/bc]=20add=20update=20no?= =?UTF-8?q?tice=20to=20classroom=20tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buildingComplexes/buildingComplex.vue | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/modules/extendedMap/components/buildingComplexes/buildingComplex.vue b/src/modules/extendedMap/components/buildingComplexes/buildingComplex.vue index 9fe4c67d67..57434a9764 100644 --- a/src/modules/extendedMap/components/buildingComplexes/buildingComplex.vue +++ b/src/modules/extendedMap/components/buildingComplexes/buildingComplex.vue @@ -949,6 +949,12 @@ >

    {{ $m('overview.classrooms.title') }} + + ({{ $m('overview.protocol.updating') }}) +