Skip to content

Commit

Permalink
Merge pull request #490 from tchapgouv/upgrade/element-web-v1.11.25
Browse files Browse the repository at this point in the history
* Move pin drop out of labs (PSG-664)

Signed-off-by: Johannes Marbach <johannesm@element.io>

* Add prettier formatting to .git-blame-ignore-revs

* Update typescript-eslint monorepo to v5.46.0 (#23990)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @types/jest to v29.2.4 (#23989)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @types/node to v16.18.8 (#23994)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Reset matrix-js-sdk back to develop branch

* Reset matrix-react-sdk back to develop branch

* Align code_style.md with prettier (#24124)

* Use Identity Server v2 API for tests (#24086)

* Update dependency worker-loader to v3 (#24033)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency style-loader to v3 (#24027)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency optimize-css-assets-webpack-plugin to v6 (#24010)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Downgrade to style-loader 2 to regain Webpack 4 compatibility (#24150)

* Revert "Update dependency worker-loader to v3 (#24033)"

This reverts commit 07bd0f1.

* Bump json5 from 1.0.1 to 1.0.2 (#24148)

Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Explicitly set worker-loader's publicPath to webapp

* Revert "Explicitly set worker-loader's publicPath to webapp"

This reverts commit f5fea0b.

* Re-update dependency worker-loader to v3 (#24033)

This reverts commit 211de2b.

* Specify the filename for worker-loader to avoid bundling workers

* Configure babel to transform logical assignment (#24160)

This should fix any future problems along the lines of
matrix-org/matrix-js-sdk#3022.

* Bump decode-uri-component from 0.2.0 to 0.2.2 (#23895)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Translations update from Weblate (#24208)

* Added translation using Weblate (Breton)

* Translated using Weblate (Thai)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/th/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/eo/

* Translated using Weblate (Breton)

Currently translated at 3.3% (1 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/br/

* Translated using Weblate (Armenian)

Currently translated at 63.3% (19 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/hy/

Co-authored-by: jmguyader <jeanmarie.guyader@gmail.com>
Co-authored-by: pk'Mysickz <kokoloman001@gmail.com>
Co-authored-by: Christian Paul <info@jaller.de>
Co-authored-by: Aramayis Hovhannisyan <aramayis.hovhannisyan@gmail.com>
Co-authored-by: Weblate <translate@riot.im>

* Upgrade matrix-js-sdk to 23.1.0-rc.1

* Upgrade matrix-react-sdk to 3.64.0-rc.1

* Prepare changelog for v1.11.18-rc.1

* v1.11.18-rc.1

* Update babel monorepo (#24210)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update typescript-eslint monorepo to v5.48.0 (#24212)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Stow more things in element-web-develop.element.io (#23965)

* Upgrade matrix-js-sdk to 23.1.0-rc.2

* Upgrade matrix-react-sdk to 3.64.0-rc.2

* Prepare changelog for v1.11.18-rc.2

* v1.11.18-rc.2

* Update dependency @types/jest to v29.2.5 (#24211)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Upgrade matrix-js-sdk to 23.1.0-rc.3

* Upgrade matrix-react-sdk to 3.64.0-rc.3

* Prepare changelog for v1.11.18-rc.3

* v1.11.18-rc.3

* Update automation for new app team board (#24219)

Old board has been archived, updating automation to move issues to the new board.

* Remove delight automation (#24225)

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt_BR/

* Document updated default `uisi_autorageshake_app` (#24224)

Documentation for matrix-org/matrix-react-sdk#9909

* Upgrade matrix-js-sdk to 23.1.0-rc.4

* Upgrade matrix-react-sdk to 3.64.0-rc.4

* Prepare changelog for v1.11.18-rc.4

* v1.11.18-rc.4

* Upgrade matrix-js-sdk to 23.1.0

* Upgrade matrix-react-sdk to 3.64.0

* Prepare changelog for v1.11.18

* v1.11.18

* Reset matrix-js-sdk back to develop branch

* Reset matrix-react-sdk back to develop branch

* Upgrade matrix-react-sdk to 3.64.1

* Prepare changelog for v1.11.19

* v1.11.19

* Translated using Weblate (Arabic)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ar/

* Reset matrix-react-sdk back to develop branch

* Reset matrix-js-sdk back to develop branch

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/hu/

* Upgrade matrix-js-sdk to 23.1.1

* Upgrade matrix-react-sdk to 3.64.2

* Prepare changelog for v1.11.20

* v1.11.20

* Reset matrix-react-sdk back to develop branch

* Reset matrix-js-sdk back to develop branch

* Reset matrix-react-sdk back to develop branch

* Delete triage-priority-bugs.yml (#24266)

This was moving issues to a non-existent board

* Translated using Weblate (Icelandic)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/is/

* Translations update from Weblate (#24307)

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt_BR/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ar/

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/hu/

* Translated using Weblate (Icelandic)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/is/

Co-authored-by: Feroli <feroli@tuta.io>
Co-authored-by: Weblate <translate@riot.im>
Co-authored-by: Ali-x98 <ahj696@hotmail.com>
Co-authored-by: Balázs Meskó <meskobalazs@gmail.com>
Co-authored-by: Sveinn í Felli <sv1@fellsnet.is>

* Upgrade matrix-js-sdk to 23.2.0-rc.1

* Upgrade matrix-react-sdk to 3.65.0-rc.1

* Prepare changelog for v1.11.21-rc.1

* v1.11.21-rc.1

* Update dependency ua-parser-js to v1.0.33 [SECURITY] (#24311)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Document the decoder ring (#24317)

* Document the decoder ring

Also a few little tidy-ups.

* Prettier

* Translated using Weblate (English (United States))

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/en_US/

* Include Janne in WAT assignment automation

* Update build_develop.yml

* Jitsi requests 'requires_client' capability if auth token is provided (#24294)

* Jitsi requests 'io.element.requires_client' capability if auth token is provided

* Added a comment that Jitsi should request 'requires_client' capability to hide the popup icon in the Element if auth token is provided.

---------

Co-authored-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>

* Upgrade matrix-js-sdk to 23.2.0

* Upgrade matrix-react-sdk to 3.65.0

* Prepare changelog for v1.11.21

* v1.11.21

* Reset matrix-js-sdk back to develop branch

* Reset matrix-react-sdk back to develop branch

* Prepare changelog for v1.11.22

* v1.11.22

* Update build_develop.yml

* Description of QR code sign in labs feature (#23513)

* Translated using Weblate (Japanese)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ja/

* Update config.md - these UIFeature flags died with communities (#24428)

* Upgrade matrix-js-sdk to 23.3.0-rc.1

* Upgrade matrix-react-sdk to 3.66.0-rc.1

* Prepare changelog for v1.11.23-rc.1

* v1.11.23-rc.1

* Update typescript-eslint monorepo to v5.51.0 (#24461)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update jest monorepo to v29.4.0 (#24460)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Add some advice on good PR titles (#24483)

* Add some advice on good PR titles

* Extra 'the'

Co-authored-by: Germain <germains@element.io>

---------

Co-authored-by: Germain <germains@element.io>

* Translated using Weblate (Occitan)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/oc/

* Update alex-page/github-project-automation-plus digest to 7ffb872 (#24496)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* labs.md: add notes about `feature_rust_crypto` (#24488)

* Update docker/build-push-action action to v4 (#24497)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Upgrade matrix-js-sdk to 23.3.0

* Upgrade matrix-react-sdk to 3.66.0

* Prepare changelog for v1.11.23

* v1.11.23

* Reset matrix-js-sdk back to develop branch

* Reset matrix-react-sdk back to develop branch

* Remove element home ad links

* Update dependency mkdirp to v2 (#24462)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update issue automation for A-Jump-To-Date (#24553)

* Don't remove Z-Labs from A-Jump-To-Date
* A-Jump-To-Date should get Z-Labs

* Update dependency @babel/runtime to v7.20.13 (#24458)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* yarn upgrade all eslint packages

* Update webpack hash function for greater OSSL compat (#24584)

* Translated using Weblate (Hebrew)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/

* Remove reference to threads in labs (#24591)

* Update pull_request.yaml

* Upgrade matrix-js-sdk to 23.4.0-rc.1

* Upgrade matrix-react-sdk to 3.67.0-rc.1

* Prepare changelog for v1.11.24-rc.1

* v1.11.24-rc.1

* Update dependency stylelint-config-standard to v30 (#24608)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Upgrade matrix-js-sdk to 23.4.0-rc.2

* Upgrade matrix-react-sdk to 3.67.0-rc.2

* Prepare changelog for v1.11.24-rc.2

* v1.11.24-rc.2

* Update jest monorepo to v29.4.3 (#24603)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Add issue automation for the Verticals Team (#24610)

* send verticals team issues to their project

* Pass current language into Jitsi (#24609

* Pass current language into Jitsi

Jitsi itself now uses the current language of the user. However, this does not yet apply to the welcome page of the Jitsi widget that says "Join conference", which is only hard-coded to
english for now.

Signed-off-by: Oliver Sand <oliver.sand@nordeck.net>

* Map between Element and Jitsi language codes

---------

Signed-off-by: Oliver Sand <oliver.sand@nordeck.net>

* Update definitelyTyped (#24562)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix frame-ancestors docs from none to self to not break Jitsi (#21128)

* Update babel monorepo to v7.21.0 (#24633)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove Firefox and Safari from experimental PWA support (#24630)

* yarn upgrade jest

* Translated using Weblate (Georgian)

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ka/

* Pull reviews bot automation for Web App Team room (#24679)

* Upgrade matrix-js-sdk to 23.4.0

* Upgrade matrix-react-sdk to 3.67.0

* Prepare changelog for v1.11.24

* v1.11.24

* Reset matrix-js-sdk back to develop branch

* Reset matrix-react-sdk back to develop branch

* Update typescript-eslint monorepo to v5.53.0 (#24634)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update yarn.lock (#24696)

* Update yarn.lock

* iterate

* Iterate

* Resolutions

* Iterate

* Apply resolution for @types/react

* Depend on a non-broken version of matrix-react-sdk (#24708)

* Upgrade our eslint config to the latest (#24647)

* Fix lint error in test-utils.ts

* Upgrade eslint config (and separate projects to support it)

* Handle possibility that req.error could be null

* Drop hosting docs

* Bump @matrix-org/react-sdk-module-api to 0.0.4 (#24642)

* Bump @matrix-org/react-sdk-module-api to 0.0.4

* Move to latest matrix-react-sdk and yarn install to change react-sdk-module-api version

* Undo accidental change to matrix-react-sdk version

* One more yarn install

* Update dependency stylelint to v15 (#24607)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update all non-major dependencies (#24005)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove items incorrectly included in changelog for 1.11.24 (#24732)

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (30 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/zh_Hant/

* package.json: Remove --host override (#24736)

Most people probably only want the dev server to listen on localhost.

Additionally, overriding with `--host 0.0.0.0` here prevents passing a different
value for `--host` to yarn. For example:

```
$ yarnpkg start:js --host=::
yarn run v1.22.19
$ webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --mode development --disable-host-check --hot --host=::
Unset VERSION variable - this may affect build output
✖ 「wds」: webpack Dev Server Invalid Options

options.host should be {String|Null} (https://webpack.js.org/configuration/dev-server/#devserverhost)

error Command failed with exit code 1.
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
```

* Upgrade matrix-js-sdk to 23.5.0-rc.1

* Upgrade matrix-react-sdk to 3.68.0-rc.1

* Prepare changelog for v1.11.25-rc.1

* v1.11.25-rc.1

* Upgrade matrix-react-sdk to 3.68.0-rc.2

* Prepare changelog for v1.11.25-rc.2

* v1.11.25-rc.2

* Upgrade matrix-react-sdk to 3.68.0-rc.3

* Prepare changelog for v1.11.25-rc.3

* v1.11.25-rc.3

* Upgrade matrix-js-sdk to 23.5.0

* Upgrade matrix-react-sdk to 3.68.0

* Prepare changelog for v1.11.25

* v1.11.25

* Resolve conflit between Tchap and Element Web 1.11.25 (#475)

* Resolve conflit between Tchap and Element Web 1.11.25
* Add patch-package to package.json
* Move patches temporary to other path
* Remove unnecessary patch
* Fix patch-package position in package.json
* Move back patches-unfixed to patches
* Add merge script
* Adaptation of 15 patches
* Update merge Script
* Adapt Hide Location patch
* Remove patch user-friendlier-encrypted-messages
* activate-cross-signing-and-secure-storage-react - to test : checkDeviceTrust without isCrossSigningSupported
* add-a-help-tab-in-menu-to-redirect-to-external-tchap-faq
* remove old patch activate-cross-signing-and-secure-storage-react
* patch :  auto-accept-tac
* update patch better-help-settings
* update patch : cross signing ui
* patch update : disable-access-options
* update patch : forgot-password, removed one file from patch
* remove old patch :  hide-location-if-no-map-server
* update patch : login
* Adapt patch simplify-exchange-key-message
* update patch : password-policy
* restore Tchap configuration in package json
* remove lint error
* change version to 4.2.0
* remove conf files from eslint
* reactivate patches in package

---------

Co-authored-by: olivier <odelcroi@gmail.com>

* Remove threads buttons (#478)

* Remove threads buttons

* Add patch name to deactivate threads in patches.json and hide a new occurrence of thread in MessageActionBar

* Test: fix bug-web file

* Fix enhancement.yml indent

---------

Co-authored-by: Audrey Lambert <audrey.lambert.42@gmail.com>
* replace reinitialization button in unlock error message (#488)
* add DecryptionFailureBar to patch cross-signing-ui
* update messages
* revert lint config
* move not used yaml
* revert indentation + missing props
* revert parseerOptions project
* remove unused languages

---------

Signed-off-by: Johannes Marbach <johannesm@element.io>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Oliver Sand <oliver.sand@nordeck.net>
Co-authored-by: Johannes Marbach <johannesm@element.io>
Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Andy Balaam <andyb@element.io>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: RiotRobot <releases@riot.im>
Co-authored-by: Travis Ralston <travisr@matrix.org>
Co-authored-by: Robin <robin@robin.town>
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andy Balaam <andy.balaam@matrix.org>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: Element Translate Bot <admin@riot.im>
Co-authored-by: jmguyader <jeanmarie.guyader@gmail.com>
Co-authored-by: pk'Mysickz <kokoloman001@gmail.com>
Co-authored-by: Christian Paul <info@jaller.de>
Co-authored-by: Aramayis Hovhannisyan <aramayis.hovhannisyan@gmail.com>
Co-authored-by: Weblate <translate@riot.im>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: Kat Gerasimova <ekaterinag@element.io>
Co-authored-by: Germain <germains@element.io>
Co-authored-by: Feroli <feroli@tuta.io>
Co-authored-by: Ali-x98 <ahj696@hotmail.com>
Co-authored-by: Balázs Meskó <meskobalazs@gmail.com>
Co-authored-by: Sveinn í Felli <sv1@fellsnet.is>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
Co-authored-by: theamazing0 <ksamvid@gmail.com>
Co-authored-by: maheichyk <mikhail.aheichyk@gmail.com>
Co-authored-by: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
Co-authored-by: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
Co-authored-by: Suguru Hirahara <d4bb0a95-96c1-4662-9d31-a5e520a01a09@hostux.ninja>
Co-authored-by: Walter Bulbazor <prbulbazor@protonmail.com>
Co-authored-by: Half-Shot <will@half-shot.uk>
Co-authored-by: kojedra <kjd83281@omeie.com>
Co-authored-by: David Langley <langley.dave@gmail.com>
Co-authored-by: Oliver Sand <oliver.sand@nordeck.net>
Co-authored-by: Dragonidze <krazanaleo@gmail.com>
Co-authored-by: Open Culture Foundation <hi@ocf.tw>
Co-authored-by: Val Lorentz <progval+github@progval.net>
Co-authored-by: Julien DAUPHANT <julien.dauphant@beta.gouv.fr>
Co-authored-by: Julien DAUPHANT <1238254+jdauphant@users.noreply.github.com>
Co-authored-by: Audrey Lambert <audrey.lambert.42@gmail.com>
  • Loading branch information
2 parents 49345d5 + a57fcd2 commit 6100518
Show file tree
Hide file tree
Showing 141 changed files with 2,349 additions and 4,759 deletions.
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ src/vector/modernizr.js
src/component-index.js
# Auto-generated file
src/modules.ts

# remove those files from eslint
test/.eslintrc.js
test/setupTests.js
72 changes: 72 additions & 0 deletions .eslintrc-module_system.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
module.exports = {
plugins: ["matrix-org"],
extends: ["./.eslintrc.js"],
parserOptions: {
project: ["./tsconfig.module_system.json"],
},
overrides: [
{
files: ["module_system/**/*.{ts,tsx}"],
extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
// NOTE: These rules are frozen and new rules should not be added here.
// New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
rules: {
// Things we do that break the ideal style
"prefer-promise-reject-errors": "off",
"quotes": "off",

// We disable this while we're transitioning
"@typescript-eslint/no-explicit-any": "off",
// We're okay with assertion errors when we ask for them
"@typescript-eslint/no-non-null-assertion": "off",

// Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
"no-restricted-imports": [
"error",
{
paths: [
{
name: "matrix-js-sdk",
message: "Please use matrix-js-sdk/src/matrix instead",
},
{
name: "matrix-js-sdk/",
message: "Please use matrix-js-sdk/src/matrix instead",
},
{
name: "matrix-js-sdk/src",
message: "Please use matrix-js-sdk/src/matrix instead",
},
{
name: "matrix-js-sdk/src/",
message: "Please use matrix-js-sdk/src/matrix instead",
},
{
name: "matrix-js-sdk/src/index",
message: "Please use matrix-js-sdk/src/matrix instead",
},
{
name: "matrix-react-sdk",
message: "Please use matrix-react-sdk/src/index instead",
},
{
name: "matrix-react-sdk/",
message: "Please use matrix-react-sdk/src/index instead",
},
],
patterns: [
{
group: ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
message: "Please use matrix-js-sdk/src/* instead",
},
{
group: ["matrix-react-sdk/lib", "matrix-react-sdk/lib/", "matrix-react-sdk/lib/**"],
message: "Please use matrix-react-sdk/src/* instead",
},
],
},
],
},
},
],
};
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
module.exports = {
plugins: ["matrix-org"],
extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react"],
parserOptions: {
project: ["./tsconfig.json"],
},
env: {
browser: true,
node: true,
Expand Down
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# prettier
7921a6cbf86b035d2b0c1daecb4c24beaf5a5abc
50 changes: 25 additions & 25 deletions .github/ISSUE_TEMPLATE/bug-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,33 @@ name: Bug report for Tchap Web (in browser)
description: File a bug report if you are using Element in a web browser like Firefox, Chrome, Edge, and so on.
labels: [web, v4, bug]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
Please report security issues by email to security@matrix.org
- type: textarea
id: reproduction-steps
attributes:
label: Steps to reproduce
description: Please attach screenshots, videos or logs if you can.
placeholder: Tell us what you see!
value: |
1. Where are you starting? What can you see?
2. What do you click?
3. More steps…
validations:
required: true
- type: textarea
id: result
attributes:
label: Outcome
placeholder: Tell us what went wrong
value: |
#### What did you expect?
Please report security issues by email to security@matrix.org
- type: textarea
id: reproduction-steps
attributes:
label: Steps to reproduce
description: Please attach screenshots, videos or logs if you can.
placeholder: Tell us what you see!
value: |
1. Where are you starting? What can you see?
2. What do you click?
3. More steps…
validations:
required: true
- type: textarea
id: result
attributes:
label: Outcome
placeholder: Tell us what went wrong
value: |
#### What did you expect?
#### What happened instead?
#### What happened instead?
validations:
required: true
- type: input
Expand Down
36 changes: 18 additions & 18 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ body:
value: |
#### What would you like to do?
#### Why would you like to do it?
#### Why would you like to do it?
#### How would you like to achieve it?
validations:
required: true
- type: textarea
id: alternative
attributes:
label: Have you considered any alternatives?
placeholder: A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- type: textarea
id: additional-context
attributes:
label: Additional context
placeholder: Is there anything else you'd like to add?
validations:
required: false
#### How would you like to achieve it?
validations:
required: true
- type: textarea
id: alternative
attributes:
label: Have you considered any alternatives?
placeholder: A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- type: textarea
id: additional-context
attributes:
label: Additional context
placeholder: Is there anything else you'd like to add?
validations:
required: false
8 changes: 4 additions & 4 deletions .github/deactivated_workflows/build_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,21 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}

- name: Wait for other steps to succeed
uses: lewagon/wait-on-check-action@v1.2.0
uses: lewagon/wait-on-check-action@v1.3.1
with:
ref: ${{ github.ref }}
ref: ${{ github.sha }}
running-workflow-name: "Build & Deploy develop.element.io"
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10
check-regexp: ^((?!SonarCloud|SonarQube|issues|board).)*$
check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label).)*$

# We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
# as the expires after 24h and requires auth to download.
# Element Desktop's fetch script uses this tarball to fetch latest develop to build Nightlies.
- name: Deploy to R2
run: |
aws s3 cp dist/develop.tar.gz s3://$R2_BUCKET/develop.tar.gz --endpoint-url $R2_URL --region=auto
aws s3 cp _deploy/bundles s3://$R2_BUCKET/bundles --recursive --endpoint-url $R2_URL --region=auto
aws s3 cp _deploy/ s3://$R2_BUCKET/ --recursive --endpoint-url $R2_URL --region=auto
env:
AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/deactivated_workflows/dockerhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
push: true
Expand Down
74 changes: 74 additions & 0 deletions .github/deactivated_workflows/pending-reviews.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: Pending reviews automation
on:
# We run it on a schedule instead of on pull_request_* events to not create confusing messaging in the PR
schedule:
- cron: "*/10 * * * *"
concurrency: ${{ github.workflow }}
jobs:
bot:
name: Pending reviews bot
runs-on: ubuntu-latest
environment: Matrix
env:
URL: "https://github.com/pulls?q=is%3Apr+is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Avector-im%2Felement-web+repo%3Avector-im%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+"
steps:
- uses: actions/github-script@v6
env:
HS_URL: ${{ secrets.BETABOT_HS_URL }}
ROOM_ID: ${{ secrets.ROOM_ID }}
TOKEN: ${{ secrets.BETABOT_ACCESS_TOKEN }}
with:
# PAT needed as the GITHUB_TOKEN won't be able to see cross-references from other orgs (matrix-org)
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
script: |
const repos = [
"vector-im/element-desktop",
"vector-im/element-web",
"matrix-org/matrix-react-sdk",
"matrix-org/matrix-js-sdk",
];
const teams = [
"matrix-org/element-web-app-team",
"matrix-org/element-web",
"vector-im/element-web-app-team",
"vector-im/element-web",
];
let issueCount = 0;
for (const team of teams) {
const org = team.split("/", 2)[0];
const reposInOrg = repos.filter(repo => repo.startsWith(org + "/"));
const { data } = await github.rest.search.issuesAndPullRequests({
q: `is:pr is:open review:required ${reposInOrg.map(r => `repo:${r}`).join(" ")} team-review-requested:${team}`,
});
issueCount += data.total_count;
}
const { HS_URL, ROOM_ID, TOKEN, URL } = process.env;
const apiUrl = `${HS_URL}/_matrix/client/v3/rooms/${ROOM_ID}/state/re.jki.counter/gh_reviews`;
const headers = {
"Content-Type": "application/json",
"Authorization": `Bearer ${TOKEN}`,
};
const res = await fetch(apiUrl, {
method: "GET",
headers,
});
const data = await res.json();
if (data.value === issueCount) {
console.log("Pending review count already correct");
return;
}
await fetch(apiUrl, {
method: "PUT",
body: JSON.stringify({
"link": URL,
"severity": "warning",
"title": "Pending reviews",
"value": issueCount
}),
headers,
});
2 changes: 0 additions & 2 deletions .github/deactivated_workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
jobs:
action:
uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop
with:
labels: "T-Defect,T-Enhancement,T-Task"
secrets:
ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
22 changes: 17 additions & 5 deletions .github/deactivated_workflows/triage-assigned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,22 @@ jobs:
if: |
contains(github.event.issue.assignees.*.login, 't3chguy') ||
contains(github.event.issue.assignees.*.login, 'andybalaam') ||
contains(github.event.issue.assignees.*.login, 'turt2live')
contains(github.event.issue.assignees.*.login, 'justjanne')
steps:
- uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
- uses: octokit/graphql-action@v2.x
id: add_to_project
with:
project: Web App Team
column: "In Progress"
repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
headers: '{"GraphQL-Features": "projects_next_graphql"}'
query: |
mutation add_to_project($projectid:ID!,$contentid:ID!) {
addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
item {
id
}
}
}
projectid: ${{ env.PROJECT_ID }}
contentid: ${{ github.event.issue.node_id }}
env:
PROJECT_ID: "PVT_kwDOAM0swc4AKjJS"
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
16 changes: 8 additions & 8 deletions .github/deactivated_workflows/triage-incoming.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on:
types: [opened]

jobs:
automate-project-columns:
runs-on: ubuntu-latest
steps:
- uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
with:
project: Tchap all issues
column: New issues
repo-token: ${{ secrets.TRIAGE_TOKEN }}
automate-project-columns:
runs-on: ubuntu-latest
steps:
- uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
with:
project: Issue triage
column: Incoming
repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
Loading

0 comments on commit 6100518

Please sign in to comment.