Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/vector-im/element-web in…
Browse files Browse the repository at this point in the history
…to t3chguy/playwright-homeservers
  • Loading branch information
t3chguy committed Jan 10, 2025
2 parents 40d9b3e + f99d7ce commit c75da32
Show file tree
Hide file tree
Showing 36 changed files with 12 additions and 109 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/static_analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,3 @@ jobs:

- name: Run linter
run: "yarn run lint:knip"

- name: Install Deps
run: "scripts/layered.sh"

- name: Dead Code Analysis
run: "yarn run analyse:unused-exports"
13 changes: 4 additions & 9 deletions knip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ export default {
"playwright/**",
"test/**",
"res/decoder-ring/**",
],
project: ["**/*.{js,ts,jsx,tsx}"],
ignore: [
"docs/**",
"res/jitsi_external_api.min.js",
"docs/**",
// Used by jest
"__mocks__/maplibre-gl.js",
],
project: ["**/*.{js,ts,jsx,tsx}"],
ignore: [
// Keep for now
"src/hooks/useLocalStorageState.ts",
"src/components/views/elements/InfoTooltip.tsx",
Expand All @@ -37,13 +37,8 @@ export default {
// False positive
"sw.js",
// Used by webpack
"buffer",
"process",
"util",
// Used by workflows
"ts-prune",
// Required due to bug in bloom-filters https://github.com/Callidon/bloom-filters/issues/75
"@types/seedrandom",
],
ignoreBinaries: [
// Used in scripts & workflows
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
"test:playwright:screenshots:build": "docker build playwright -t element-web-playwright",
"test:playwright:screenshots:run": "docker run --rm --network host -e BASE_URL -e CI -v $(pwd):/work/ -v $(node -e 'console.log(require(`path`).dirname(require.resolve(`matrix-js-sdk/package.json`)))'):/work/node_modules/matrix-js-sdk -v /var/run/docker.sock:/var/run/docker.sock -v /tmp/:/tmp/ -it element-web-playwright --grep @screenshot --project=Chrome",
"coverage": "yarn test --coverage",
"analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts",
"analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp",
"update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js"
},
Expand Down Expand Up @@ -287,7 +286,6 @@
"terser-webpack-plugin": "^5.3.9",
"testcontainers": "^10.16.0",
"ts-node": "^10.9.1",
"ts-prune": "^0.10.3",
"typescript": "5.7.2",
"util": "^0.12.5",
"web-streams-polyfill": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion playwright/testcontainers/synapse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Credentials } from "../plugins/homeserver";
import { deepCopy } from "../plugins/utils/object.ts";
import { HomeserverContainer, StartedHomeserverContainer } from "./HomeserverContainer.ts";

const TAG = "develop@sha256:17cc0a301447430624afb860276e5c13270ddeb99a3f6d1c6d519a20b1a8f650";
const TAG = "develop@sha256:b69222d98abe9625d46f5d3cb01683d5dc173ae339215297138392cfeec935d9";

const DEFAULT_CONFIG = {
server_name: "localhost",
Expand Down
1 change: 0 additions & 1 deletion src/Lifecycle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ dis.register((payload) => {
let sessionLockStolen = false;

// this is exposed solely for unit tests.
// ts-prune-ignore-next
export function setSessionLockNotStolen(): void {
sessionLockStolen = false;
}
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,6 @@
"member_list": {
"filter_placeholder": "Najít člena místnosti",
"invite_button_no_perms_tooltip": "Nemáte oprávnění zvát uživatele",
"invited_list_heading": "Pozvaní",
"power_label": "%(userName)s (oprávnění %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Členové místnosti",
Expand Down Expand Up @@ -1661,7 +1660,6 @@
"custom_level": "Vlastní úroveň",
"default": "Výchozí",
"label": "Úroveň oprávnění",
"mod": "Moderátor",
"moderator": "Moderátor",
"restricted": "Omezené"
},
Expand Down Expand Up @@ -2897,7 +2895,6 @@
"invite": "Pozvat lidi",
"invite_description": "Pozvěte e-mailem nebo uživatelským jménem",
"invite_link": "Sdílet odkaz na pozvánku",
"invite_this_space": "Pozvat do tohoto prostoru",
"joining_space": "Připojování",
"landing_welcome": "Vítejte v <name/>",
"leave_dialog_action": "Opusit prostor",
Expand Down
9 changes: 6 additions & 3 deletions src/i18n/strings/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -1579,9 +1579,14 @@
"toggle_attribution": "Info ein-/ausblenden"
},
"member_list": {
"count": {
"one": "%(count)s Mitglied",
"other": "%(count)s Mitglieder"
},
"filter_placeholder": "Raummitglieder filtern",
"invite_button_no_perms_tooltip": "Du bist nicht berechtigt, Benutzer einzuladen",
"invited_list_heading": "Eingeladen",
"invited_label": "Eingeladen",
"no_matches": "Keine Treffer",
"power_label": "%(userName)s (Berechtigungslevel %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Raummitglieder",
Expand Down Expand Up @@ -1734,7 +1739,6 @@
"custom_level": "Selbstdefiniertes Berechtigungslevel",
"default": "Standard",
"label": "Berechtigungsstufe",
"mod": "Moderator",
"moderator": "Moderator",
"restricted": "Eingeschränkt"
},
Expand Down Expand Up @@ -3065,7 +3069,6 @@
"invite": "Personen einladen",
"invite_description": "Personen mit E-Mail oder Benutzernamen einladen",
"invite_link": "Einladungslink teilen",
"invite_this_space": "In diesen Space einladen",
"joining_space": "Trete bei",
"landing_welcome": "Willkommen bei <name/>",
"leave_dialog_action": "Space verlassen",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,6 @@
},
"member_list": {
"filter_placeholder": "Φιλτράρισμα μελών",
"invited_list_heading": "Προσκλήθηκε",
"power_label": "%(userName)s (δύναμη %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Μέλη δωματίου",
Expand Down Expand Up @@ -1322,7 +1321,6 @@
"custom_level": "Προσαρμοσμένο επίπεδο",
"default": "Προεπιλογή",
"label": "Επίπεδο ισχύος",
"mod": "Συντονιστής",
"moderator": "Συντονιστής",
"restricted": "Περιορισμένο/η"
},
Expand Down Expand Up @@ -2274,7 +2272,6 @@
"invite": "Προσκαλέστε άτομα",
"invite_description": "Πρόσκληση με email ή όνομα χρήστη",
"invite_link": "Κοινή χρήση συνδέσμου πρόσκλησης",
"invite_this_space": "Πρόσκληση σε αυτό το χώρο",
"joining_space": "Συνδέετε",
"landing_welcome": "Καλώς ήρθατε στο <name/>",
"leave_dialog_action": "Αποχώρηση από τον χώρο",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/eo.json
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,6 @@
},
"member_list": {
"filter_placeholder": "Filtri ĉambranojn",
"invited_list_heading": "Invititaj",
"power_label": "%(userName)s (povnivelo je %(powerLevelNumber)s)"
},
"message_edit_dialog_title": "Redaktoj de mesaĝoj",
Expand Down Expand Up @@ -1193,7 +1192,6 @@
"custom_level": "Propra nivelo",
"default": "Ordinara",
"label": "Povnivelo",
"mod": "Reguligisto",
"moderator": "Ĉambrestro",
"restricted": "Limigita"
},
Expand Down Expand Up @@ -2070,7 +2068,6 @@
"invite": "Inviti personojn",
"invite_description": "Inviti per retpoŝtadreso aŭ uzantonomo",
"invite_link": "Diskonigi invitan ligilon",
"invite_this_space": "Inviti al ĉi tiu aro",
"landing_welcome": "Bonvenu al <name/>",
"leave_dialog_action": "Forlasi aron",
"leave_dialog_description": "Vi foriros de <spaceName/>.",
Expand Down
2 changes: 0 additions & 2 deletions src/i18n/strings/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,6 @@
"member_list": {
"filter_placeholder": "Filtrar miembros de la sala",
"invite_button_no_perms_tooltip": "No tienes permisos para invitar usuarios",
"invited_list_heading": "Invitado",
"power_label": "%(userName)s (nivel de permisos %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Miembros de la sala",
Expand Down Expand Up @@ -2654,7 +2653,6 @@
"invite": "Invitar gente",
"invite_description": "Invitar correos electrónicos o nombres de usuario",
"invite_link": "Compartir enlace de invitación",
"invite_this_space": "Invitar al espacio",
"joining_space": "Uniéndote",
"landing_welcome": "Te damos la bienvenida a <name/>",
"leave_dialog_action": "Salir del espacio",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/et.json
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,6 @@
"member_list": {
"filter_placeholder": "Filtreeri jututoa liikmeid",
"invite_button_no_perms_tooltip": "Sul pole õigusi kutse saatmiseks teistele kasutajatele",
"invited_list_heading": "Kutsutud",
"power_label": "%(userName)s (õigused %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Jututoa liikmed",
Expand Down Expand Up @@ -1649,7 +1648,6 @@
"custom_level": "Kohandatud õigused",
"default": "Tavaline",
"label": "Õiguste tase",
"mod": "Moderaator",
"moderator": "Moderaator",
"restricted": "Piiratud õigustega kasutaja"
},
Expand Down Expand Up @@ -2848,7 +2846,6 @@
"invite": "Kutsu teisi kasutajaid",
"invite_description": "Kutsu e-posti aadressi või kasutajanime alusel",
"invite_link": "Jaga kutse linki",
"invite_this_space": "Kutsu siia kogukonnakeskusesse",
"joining_space": "Liitun",
"landing_welcome": "Tete tulemast <name/> liikmeks",
"leave_dialog_action": "Lahku kogukonnakeskusest",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/fa.json
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,6 @@
},
"member_list": {
"filter_placeholder": "فیلتر کردن اعضای اتاق",
"invited_list_heading": "دعوت شد",
"power_label": "%(userName)s (سطح قدرت %(powerLevelNumber)s)"
},
"member_list_back_action_label": "اعضای اتاق",
Expand Down Expand Up @@ -1091,7 +1090,6 @@
"custom_level": "سطح دلخواه",
"default": "پیشفرض",
"label": "سطح قدرت",
"mod": "معاون",
"moderator": "معاون",
"restricted": "ممنوع"
},
Expand Down Expand Up @@ -1823,7 +1821,6 @@
"invite": "دعوت کاربران",
"invite_description": "دعوت با ایمیل یا نام‌کاربری",
"invite_link": "به اشتراک‌گذاری لینک دعوت",
"invite_this_space": "به این فضای کاری دعوت کنید",
"landing_welcome": "به <name/> خوش‌آمدید",
"leave_dialog_action": "ترک محیط",
"mark_suggested": "علامت‌گذاری به عنوان پیشنهاد‌شده",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,6 @@
"member_list": {
"filter_placeholder": "Suodata huoneen jäseniä",
"invite_button_no_perms_tooltip": "Sinulla ei ole lupaa kutsua käyttäjiä",
"invited_list_heading": "Kutsuttu",
"power_label": "%(userName)s (oikeustaso %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Huoneen jäsenet",
Expand Down Expand Up @@ -1452,7 +1451,6 @@
"custom_level": "Mukautettu taso",
"default": "Oletus",
"label": "Oikeuksien taso",
"mod": "Valvoja",
"moderator": "Valvoja",
"restricted": "Rajoitettu"
},
Expand Down Expand Up @@ -2521,7 +2519,6 @@
"invite": "Kutsu ihmisiä",
"invite_description": "Kutsu sähköpostiosoitteella tai käyttäjänimellä",
"invite_link": "Jaa kutsulinkki",
"invite_this_space": "Kutsu tähän avaruuteen",
"joining_space": "Liitytään",
"landing_welcome": "Tervetuloa, tämä on <name/>",
"leave_dialog_action": "Poistu avaruudesta",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1578,7 +1578,6 @@
"member_list": {
"filter_placeholder": "Filtrer les membres du salon",
"invite_button_no_perms_tooltip": "Vous n’avez pas la permission d’inviter des utilisateurs",
"invited_list_heading": "Invités",
"power_label": "%(userName)s (rang %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Membres du salon",
Expand Down Expand Up @@ -1731,7 +1730,6 @@
"custom_level": "Rang personnalisé",
"default": "Par défaut",
"label": "Rang",
"mod": "Modérateur",
"moderator": "Modérateur",
"restricted": "Restreint"
},
Expand Down Expand Up @@ -3061,7 +3059,6 @@
"invite": "Inviter des personnes",
"invite_description": "Inviter par e-mail ou nom d’utilisateur",
"invite_link": "Partager le lien d’invitation",
"invite_this_space": "Inviter dans cet espace",
"joining_space": "En train de rejoindre",
"landing_welcome": "Bienvenue dans <name/>",
"leave_dialog_action": "Quitter l’espace",
Expand Down
2 changes: 0 additions & 2 deletions src/i18n/strings/gl.json
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,6 @@
},
"member_list": {
"filter_placeholder": "Filtrar os participantes da conversa",
"invited_list_heading": "Convidada",
"power_label": "%(userName)s (permiso %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Membros da sala",
Expand Down Expand Up @@ -2422,7 +2421,6 @@
"invite": "Convidar persoas",
"invite_description": "Convida con email ou nome de usuaria",
"invite_link": "Compartir ligazón do convite",
"invite_this_space": "Convidar a este espazo",
"joining_space": "Uníndote",
"landing_welcome": "Benvida a <name/>",
"leave_dialog_action": "Saír do espazo",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/he.json
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,6 @@
},
"member_list": {
"filter_placeholder": "סינון חברי חדר",
"invited_list_heading": "מוזמן",
"power_label": "%(userName)s (רמת הרשאה %(powerLevelNumber)s)"
},
"member_list_back_action_label": "חברי החדר",
Expand Down Expand Up @@ -1152,7 +1151,6 @@
"custom_level": "דרגה מותאמת",
"default": "ברירת מחדל",
"label": "דרגת מנהל",
"mod": "ממתן",
"moderator": "מנהל",
"restricted": "מחוץ לתחום"
},
Expand Down Expand Up @@ -1973,7 +1971,6 @@
"incompatible_server_hierarchy": "השרת שלכם אינו תומך בהצגת היררכית חללי עבודה.",
"invite": "הזמן אנשים",
"invite_link": "שתף קישור להזמנה",
"invite_this_space": "הזמינו למרחב עבודה זה",
"landing_welcome": "ברוכים הבאים אל <name/>",
"no_search_result_hint": "אולי תרצו לנסות חיפוש אחר או לבדוק אם יש שגיאות הקלדה.",
"search_children": "חיפוש %(spaceName)s",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,6 @@
},
"member_list": {
"filter_placeholder": "Szoba tagság szűrése",
"invited_list_heading": "Meghívva",
"power_label": "%(userName)s (szint: %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Szobatagok",
Expand Down Expand Up @@ -1623,7 +1622,6 @@
"custom_level": "Egyedi szint",
"default": "Alapértelmezett",
"label": "Hozzáférési szint",
"mod": "Moderátor",
"moderator": "Moderátor",
"restricted": "Korlátozott"
},
Expand Down Expand Up @@ -2819,7 +2817,6 @@
"invite": "Emberek meghívása",
"invite_description": "Meghívás e-mail-címmel vagy felhasználónévvel",
"invite_link": "Meghívási hivatkozás megosztása",
"invite_this_space": "Meghívás a térbe",
"joining_space": "Belépés",
"landing_welcome": "Üdvözöl a(z) <name/>",
"leave_dialog_action": "Tér elhagyása",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,6 @@
"member_list": {
"filter_placeholder": "Saring anggota ruangan",
"invite_button_no_perms_tooltip": "Anda tidak memiliki izin untuk mengundang pengguna",
"invited_list_heading": "Diundang",
"power_label": "%(userName)s (tingkat daya %(powerLevelNumber)s)"
},
"member_list_back_action_label": "Anggota ruangan",
Expand Down Expand Up @@ -1631,7 +1630,6 @@
"custom_level": "Tingkat kustom",
"default": "Bawaan",
"label": "Tingkat daya",
"mod": "Mod",
"moderator": "Moderator",
"restricted": "Dibatasi"
},
Expand Down Expand Up @@ -2850,7 +2848,6 @@
"invite": "Undang pengguna",
"invite_description": "Undang dengan email atau nama pengguna",
"invite_link": "Bagikan tautan undangan",
"invite_this_space": "Undang ke space ini",
"joining_space": "Bergabung",
"landing_welcome": "Selamat datang di <name/>",
"leave_dialog_action": "Tinggalkan space",
Expand Down
Loading

0 comments on commit c75da32

Please sign in to comment.