+
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 0b63726ba..5e3192733 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -50,6 +50,10 @@ const endpoints = {
const debug = {
DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' ?? false,
}
+const humhub = {
+ HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE === 'true' || false,
+ HUMHUB_API_URL: process.env.HUMHUB_API_URL ?? COMMUNITY_URL + '/community/',
+}
const OPENAI_ACTIVE = process.env.OPENAI_ACTIVE === 'true' ?? false
@@ -59,6 +63,7 @@ const CONFIG = {
...endpoints,
...debug,
OPENAI_ACTIVE,
+ ...humhub,
ADMIN_MODULE_URL,
COMMUNITY_URL,
}
diff --git a/admin/src/config/schema.js b/admin/src/config/schema.js
index 459cbdd08..5e81434e5 100644
--- a/admin/src/config/schema.js
+++ b/admin/src/config/schema.js
@@ -5,6 +5,8 @@ const {
COMMUNITY_URL,
DEBUG,
GRAPHQL_URI,
+ HUMHUB_ACTIVE,
+ HUMHUB_API_URL,
NODE_ENV,
OPENAI_ACTIVE,
PRODUCTION,
@@ -18,6 +20,8 @@ module.exports = Joi.object({
COMMUNITY_URL,
DEBUG,
GRAPHQL_URI,
+ HUMHUB_ACTIVE,
+ HUMHUB_API_URL,
NODE_ENV,
OPENAI_ACTIVE,
PRODUCTION,
diff --git a/admin/src/graphql/adminListContributions.js b/admin/src/graphql/adminListContributions.js
index aa6c0c713..b37988233 100644
--- a/admin/src/graphql/adminListContributions.js
+++ b/admin/src/graphql/adminListContributions.js
@@ -26,6 +26,9 @@ export const adminListContributions = gql`
id
firstName
lastName
+ email
+ username
+ humhubUsername
amount
memo
createdAt
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index fdc8b89f9..ac506b360 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -39,7 +39,8 @@
"validTo": "Enddatum"
},
"contributionMessagesForm": {
- "resubmissionDateInPast": "Wiedervorlage Datum befindet sich in der Vergangenheit!"
+ "resubmissionDateInPast": "Wiedervorlage Datum befindet sich in der Vergangenheit!",
+ "hasRegisteredAt": "hat sich am {createdAt} registriert."
},
"contributions": {
"all": "Alle",
@@ -77,6 +78,7 @@
"deleted_user": "Alle gelöschten Nutzer",
"deny": "Ablehnen",
"description": "Beschreibung",
+ "details": "Details",
"e_mail": "E-Mail",
"edit": "bearbeiten",
"enabled": "aktiviert",
@@ -101,6 +103,9 @@
"verified": "Verifiziert",
"verifiedAt": "Verifiziert am"
},
+ "filter": {
+ "byEmail": "Nach E-Mail filtern"
+ },
"firstname": "Vorname",
"footer": {
"app_version": "App version {version}",
@@ -121,6 +126,10 @@
"describe": "Teilt Koordinaten im Format 'Breitengrad, Längengrad' automatisch auf. Fügen sie hier einfach z.B. ihre Koordinaten von Google Maps, zum Beispiel: 49.28187664243721, 9.740672183943639, ein."
}
},
+ "goTo": {
+ "userSearch": "Zur Nutzersuche gehen",
+ "humhubProfile": "Zum Humhub Profil gehen"
+ },
"help": {
"help": "Hilfe",
"transactionlist": {
@@ -145,7 +154,7 @@
"plus": "+"
},
"message": {
- "request": "Die Anfrage wurde gesendet."
+ "request": "Die Eingabe wurde gespeichert."
},
"moderator": {
"history": "Die Daten wurden geändert. Dies sind die alten Daten.",
@@ -227,6 +236,7 @@
"newUserToSpaceTooltip": "Neue Benutzer automatisch zum Space hinzufügen, falls Space vorhanden"
},
"redeemed": "eingelöst",
+ "registered": "Registriert",
"removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
"reset": "Zurücksetzen",
"save": "Speichern",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 1e596b9b6..8dcaeb8e1 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -39,7 +39,8 @@
"validTo": "End-Date"
},
"contributionMessagesForm": {
- "resubmissionDateInPast": "Resubmission date is in the past!"
+ "resubmissionDateInPast": "Resubmission date is in the past!",
+ "hasRegisteredAt": "registered on {createdAt}."
},
"contributions": {
"all": "All",
@@ -77,6 +78,7 @@
"deleted_user": "All deleted user",
"deny": "Reject",
"description": "Description",
+ "details": "Details",
"e_mail": "E-mail",
"edit": "edit",
"enabled": "enabled",
@@ -101,6 +103,9 @@
"verified": "Verified",
"verifiedAt": "Verified at"
},
+ "filter": {
+ "byEmail": "Filter by email"
+ },
"firstname": "Firstname",
"footer": {
"app_version": "App version {version}",
@@ -121,6 +126,10 @@
"describe": "Automatically splits coordinates in the format 'latitude, longitude'. Simply enter your coordinates from Google Maps here, for example: 49.28187664243721, 9.740672183943639."
}
},
+ "goTo": {
+ "userSearch": "Go to user search",
+ "humhubProfile": "Go to Humhub profile"
+ },
"help": {
"help": "Help",
"transactionlist": {
@@ -145,7 +154,7 @@
"plus": "+"
},
"message": {
- "request": "Request has been sent."
+ "request": "The entry has been saved."
},
"moderator": {
"history": "The data has been changed. This is the old data.",
@@ -227,6 +236,7 @@
"newUserToSpaceTooltip": "The hours should contain a maximum of two decimal places"
},
"redeemed": "redeemed",
+ "registered": "Registered",
"removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
"reset": "Reset",
"save": "Save",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 557ba587f..60843eb08 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -58,6 +58,7 @@
@update-status="updateStatus"
@reload-contribution="reloadContribution"
@update-contributions="refetch"
+ @search-for-email="query = $event"
/>
formatDateOrDash(value),
},
{ key: 'moderatorId', label: t('moderator.moderator') },
- { key: 'editCreation', label: t('chat') },
+ { key: 'editCreation', label: t('details') },
{ key: 'confirm', label: t('save') },
],
// confirmed contributions
@@ -183,7 +184,7 @@ const fields = computed(
formatter: (value) => formatDateOrDash(value),
},
{ key: 'confirmedBy', label: t('moderator.moderator') },
- { key: 'chatCreation', label: t('chat') },
+ { key: 'chatCreation', label: t('details') },
],
// denied contributions
[
@@ -211,7 +212,7 @@ const fields = computed(
formatter: (value) => formatDateOrDash(value),
},
{ key: 'deniedBy', label: t('moderator.moderator') },
- { key: 'chatCreation', label: t('chat') },
+ { key: 'chatCreation', label: t('details') },
],
// deleted contributions
[
@@ -239,7 +240,7 @@ const fields = computed(
formatter: (value) => formatDateOrDash(value),
},
{ key: 'deletedBy', label: t('moderator.moderator') },
- { key: 'chatCreation', label: t('chat') },
+ { key: 'chatCreation', label: t('details') },
],
// all contributions
[
@@ -268,7 +269,7 @@ const fields = computed(
formatter: (value) => formatDateOrDash(value),
},
{ key: 'confirmedBy', label: t('moderator.moderator') },
- { key: 'chatCreation', label: t('chat') },
+ { key: 'chatCreation', label: t('details') },
],
][tabIndex.value],
)
diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index c363eaf1c..6a1de70a8 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -15,6 +15,11 @@ vi.mock('@/composables/useToast', () => ({
toastSuccess: vi.fn(),
}),
}))
+vi.mock('vue-router', () => ({
+ useRoute: () => ({
+ query: {},
+ }),
+}))
// Mock icon components
const mockIconComponent = {
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 72fa15934..78bfc7e90 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -43,8 +43,9 @@
diff --git a/frontend/src/components/Menu/NavItem.vue b/frontend/src/components/Menu/NavItem.vue
new file mode 100644
index 000000000..af8760dce
--- /dev/null
+++ b/frontend/src/components/Menu/NavItem.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 50645ed65..958405b45 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -79,18 +79,10 @@ export default {
height: 150px;
}
-.auth-navbar > .nav-link {
- color: #383838 !important;
-}
-
.navbar-toggler {
font-size: 2.25rem;
}
-.auth-navbar > .router-link-exact-active {
- color: #0e79bc !important;
-}
-
button.navbar-toggler > span.navbar-toggler-icon {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(4, 112, 6, 1)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
}
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 706d0ead5..361681f55 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -10,43 +10,43 @@
@@ -61,7 +61,7 @@
>
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 6cc086e0f..2f414f894 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -35,7 +35,7 @@
class="pt-3 pb-3 test-qr-code"
@click.stop="toggleQrModal"
>
-
+
{{ $t('qrCode') }}
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index c1ee2d490..64bdd993e 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -51,8 +51,8 @@
"contribution": {
"activity": "Tätigkeit",
"alert": {
- "answerQuestion": "Bitte beantworte diese Rückfrage.",
- "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.",
+ "answerQuestion": "Zu diesem Beitrag liegt eine neue Nachricht vor.",
+ "answerQuestionToast": "Du hast neue Nachrichten.",
"communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
"confirm": "bestätigt",
"deleted": "gelöscht",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ed23c4d27..a40034dff 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -51,8 +51,8 @@
"contribution": {
"activity": "Activity",
"alert": {
- "answerQuestion": "Please answer the question.",
- "answerQuestionToast": "You have a question about a post. Please reply to it.",
+ "answerQuestion": "There is a new message for this article.",
+ "answerQuestionToast": "You have new messages.",
"communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
"confirm": "confirmed",
"deleted": "deleted",
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index a24796d18..82576bbd0 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -38,8 +38,8 @@
-
-
-
-
+
+
{{ $t('signin') }}
@@ -166,8 +166,4 @@ async function onSubmit() {
padding-right: 0;
padding-left: 0;
}
-
-a.login-nav-item {
- color: #0e79bc !important;
-}
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 744643c9d..e85293e88 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1104,6 +1104,13 @@
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+"@iconify-json/arcticons@^1.2.20":
+ version "1.2.20"
+ resolved "https://registry.yarnpkg.com/@iconify-json/arcticons/-/arcticons-1.2.20.tgz#11f3dccd50883702ba36f0e87b009e4c1690a1a7"
+ integrity sha512-OhAmLjf8KAGKX9Uo4ionTp1znYScjb65h8YaPtR8vWIkK0A6acHucld7MkgL0aMLvnQ+Npph6K4NYCDZeL5f1g==
+ dependencies:
+ "@iconify/types" "*"
+
"@iconify-json/bi@^1.1.23":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@iconify-json/bi/-/bi-1.2.2.tgz#0f64d20323904f11546cadd0dc75f2fd024a46f8"
@@ -1111,6 +1118,34 @@
dependencies:
"@iconify/types" "*"
+"@iconify-json/fa@^1.2.1":
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/@iconify-json/fa/-/fa-1.2.1.tgz#9ccfad18e1ac1011f088d487aadc35bf45fa2807"
+ integrity sha512-aY2+tQNWq5ch+ShtAz3KKbNrFfwf4BPrXvyN7S4/lcf6Wms+kIxsd7C7KortzHZhoBnbhVN+qo+YUWLW7rLs9Q==
+ dependencies:
+ "@iconify/types" "*"
+
+"@iconify-json/humbleicons@^1.2.6":
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/@iconify-json/humbleicons/-/humbleicons-1.2.6.tgz#00189eaaf590ff80feeba05c1c5793dc7efe4c79"
+ integrity sha512-B5Ayka2mYbT8BxltoOEebe8XPfq0vpt2vzTGt/WJmapsapaLfAm00KdSEgIJ58VcBPWPtPI94FQ/97Yi/RAtAw==
+ dependencies:
+ "@iconify/types" "*"
+
+"@iconify-json/ion@^1.2.2":
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/@iconify-json/ion/-/ion-1.2.2.tgz#ec1afaa19b82c2856eaa6a0ec976209538cd1bae"
+ integrity sha512-GysHYDAyy3K4R2Xxsab3I0ZFmQA4oorfIkwX0g6xfZJNVZcFyAlA4pa1jAJC9Bk3cLiWUtnN8ZyWs6cP3nxlnw==
+ dependencies:
+ "@iconify/types" "*"
+
+"@iconify-json/mdi@^1.2.3":
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/@iconify-json/mdi/-/mdi-1.2.3.tgz#5e4ee9d8c8aaad04381c8cc6c6edbe3327f031b5"
+ integrity sha512-O3cLwbDOK7NNDf2ihaQOH5F9JglnulNDFV7WprU2dSoZu3h3cWH//h74uQAB87brHmvFVxIOkuBX2sZSzYhScg==
+ dependencies:
+ "@iconify/types" "*"
+
"@iconify/types@*", "@iconify/types@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57"
@@ -2521,7 +2556,7 @@ chalk@^2.4.2:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chalk@^4.0.0, chalk@^4.0.2:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2587,6 +2622,15 @@ clipboard-polyfill@^4.0.0-rc1:
resolved "https://registry.yarnpkg.com/clipboard-polyfill/-/clipboard-polyfill-4.1.1.tgz#eaf074f91c0a55aa4c12fcfd4862d2cfb9a0cab9"
integrity sha512-nbvNLrcX0zviek5QHLFRAaLrx8y/s8+RF2stH43tuS+kP5XlHMrcD0UGBWq43Hwp6WuuK7KefRMP56S45ibZkA==
+cliui@^8.0.1:
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+ integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+ dependencies:
+ string-width "^4.2.0"
+ strip-ansi "^6.0.1"
+ wrap-ansi "^7.0.0"
+
clone-deep@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -2672,6 +2716,19 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+concurrently@^9.1.2:
+ version "9.1.2"
+ resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-9.1.2.tgz#22d9109296961eaee773e12bfb1ce9a66bc9836c"
+ integrity sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==
+ dependencies:
+ chalk "^4.1.2"
+ lodash "^4.17.21"
+ rxjs "^7.8.1"
+ shell-quote "^1.8.1"
+ supports-color "^8.1.1"
+ tree-kill "^1.2.2"
+ yargs "^17.7.2"
+
confbox@^0.1.7, confbox@^0.1.8:
version "0.1.8"
resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.8.tgz#820d73d3b3c82d9bd910652c5d4d599ef8ff8b06"
@@ -3421,7 +3478,7 @@ esbuild@^0.21.3:
"@esbuild/win32-ia32" "0.21.5"
"@esbuild/win32-x64" "0.21.5"
-escalade@^3.2.0:
+escalade@^3.1.1, escalade@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
@@ -4034,6 +4091,11 @@ gensync@^1.0.0-beta.2:
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+get-caller-file@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+ integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6:
version "1.2.6"
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.6.tgz#43dd3dd0e7b49b82b2dfcad10dc824bf7fc265d5"
@@ -6052,6 +6114,11 @@ relateurl@^0.2.7:
resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
+require-directory@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+ integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+
require-from-string@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
@@ -6145,6 +6212,13 @@ run-parallel@^1.1.9:
dependencies:
queue-microtask "^1.2.2"
+rxjs@^7.8.1:
+ version "7.8.2"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
+ integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
+ dependencies:
+ tslib "^2.1.0"
+
safe-array-concat@^1.1.2, safe-array-concat@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
@@ -6304,6 +6378,11 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+shell-quote@^1.8.1:
+ version "1.8.2"
+ resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a"
+ integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==
+
shvl@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/shvl/-/shvl-2.0.3.tgz#eb4bd37644f5684bba1fc52c3010c96fb5e6afd1"
@@ -6425,7 +6504,7 @@ std-env@^3.8.0:
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
-string-width@4.2.2, string-width@^4.1.0, string-width@^4.2.3, string-width@^5.1.2:
+string-width@4.2.2, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.1.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
@@ -6625,6 +6704,13 @@ supports-color@^7.0.0, supports-color@^7.1.0:
dependencies:
has-flag "^4.0.0"
+supports-color@^8.1.1:
+ version "8.1.1"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+ integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+ dependencies:
+ has-flag "^4.0.0"
+
supports-hyperlinks@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz#b56150ff0173baacc15f21956450b61f2b18d3ac"
@@ -6801,6 +6887,11 @@ tr46@^5.0.0:
dependencies:
punycode "^2.3.1"
+tree-kill@^1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+ integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+
ts-api-utils@^1.3.0:
version "1.4.3"
resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064"
@@ -7468,7 +7559,7 @@ word-wrap@^1.2.5:
string-width "^4.1.0"
strip-ansi "^6.0.0"
-wrap-ansi@7.0.0, wrap-ansi@^8.1.0:
+wrap-ansi@7.0.0, wrap-ansi@^7.0.0, wrap-ansi@^8.1.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -7505,6 +7596,11 @@ xmlchars@^2.2.0:
resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+y18n@^5.0.5:
+ version "5.0.8"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+ integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
yallist@^3.0.2:
version "3.1.1"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -7529,6 +7625,24 @@ yaml@^1.10.2:
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+yargs-parser@^21.1.1:
+ version "21.1.1"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+ integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
+yargs@^17.7.2:
+ version "17.7.2"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+ integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+ dependencies:
+ cliui "^8.0.1"
+ escalade "^3.1.1"
+ get-caller-file "^2.0.5"
+ require-directory "^2.1.1"
+ string-width "^4.2.3"
+ y18n "^5.0.5"
+ yargs-parser "^21.1.1"
+
yocto-queue@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"