Merge tag 'v1.11.30' into upgrade/element-web-v1.11.30_odelcroi

* Fixes for [CVE-2023-30609](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-30609) / GHSA-xv83-x443-7rmw * Pick sensible default option for phone country dropdown ([\#10627](matrix-org/matrix-react-sdk#10627)). Fixes #3528. * Relate field validation tooltip via aria-describedby ([\#10522](matrix-org/matrix-react-sdk#10522)). Fixes #24963. * Handle more completion types in rte autocomplete ([\#10560](matrix-org/matrix-react-sdk#10560)). Contributed by @alunturner. * Show a tile for an unloaded predecessor room if it has via_servers ([\#10483](matrix-org/matrix-react-sdk#10483)). Contributed by @andybalaam. * Exclude message timestamps from aria live region ([\#10584](matrix-org/matrix-react-sdk#10584)). Fixes #5696. * Make composer format bar an aria toolbar ([\#10583](matrix-org/matrix-react-sdk#10583)). Fixes #11283. * Improve accessibility of font slider ([\#10473](matrix-org/matrix-react-sdk#10473)). Fixes #20168 and #24962. * fix file size display from kB to KB ([\#10561](matrix-org/matrix-react-sdk#10561)). Fixes #24866. Contributed by @NSV1991. * Handle /me in rte ([\#10558](matrix-org/matrix-react-sdk#10558)). Contributed by @alunturner. * bind html with switch for manage extension setting option ([\#10553](matrix-org/matrix-react-sdk#10553)). Contributed by @NSV1991. * Handle command completions in RTE ([\#10521](matrix-org/matrix-react-sdk#10521)). Contributed by @alunturner. * Add room and user avatars to rte ([\#10497](matrix-org/matrix-react-sdk#10497)). Contributed by @alunturner. * Support for MSC3882 revision 1 ([\#10443](matrix-org/matrix-react-sdk#10443)). Contributed by @hughns. * Check profiles before starting a DM ([\#10472](matrix-org/matrix-react-sdk#10472)). Fixes #24830. * Quick settings: Change the copy / labels on the options ([\#10427](matrix-org/matrix-react-sdk#10427)). Fixes #24522. Contributed by @justjanne. * Update rte autocomplete styling ([\#10503](matrix-org/matrix-react-sdk#10503)). Contributed by @alunturner. * Fix create subspace dialog not working ([\#10652](matrix-org/matrix-react-sdk#10652)). Fixes element-hq/element-web#24882 * Fix multiple accessibility defects identified by AXE ([\#10606](matrix-org/matrix-react-sdk#10606)). * Fix view source from edit history dialog always showing latest event ([\#10626](matrix-org/matrix-react-sdk#10626)). Fixes #21859. * #21451 Fix WebGL disabled error message ([\#10589](matrix-org/matrix-react-sdk#10589)). Contributed by @rashmitpankhania. * Properly translate errors in `AddThreepid.ts` so they show up translated to the user but not in our logs ([\#10432](matrix-org/matrix-react-sdk#10432)). Contributed by @MadLittleMods. * Fix overflow on auth pages ([\#10605](matrix-org/matrix-react-sdk#10605)). Fixes #19548. * Fix incorrect avatar background colour when using a custom theme ([\#10598](matrix-org/matrix-react-sdk#10598)). Contributed by @jdauphant. * Remove dependency on `org.matrix.e2e_cross_signing` unstable feature ([\#10593](matrix-org/matrix-react-sdk#10593)). * Update setting description to match reality ([\#10600](matrix-org/matrix-react-sdk#10600)). Fixes #25106. * Fix no identity server in help & about settings ([\#10563](matrix-org/matrix-react-sdk#10563)). Fixes #25077. * Fix: Images no longer reserve their space in the timeline correctly ([\#10571](matrix-org/matrix-react-sdk#10571)). Fixes #25082. Contributed by @kerryarchibald. * Fix issues with inhibited accessible focus outlines ([\#10579](matrix-org/matrix-react-sdk#10579)). Fixes #19742. * Fix read receipts falling from sky ([\#10576](matrix-org/matrix-react-sdk#10576)). Fixes #25081. * Fix avatar text issue in rte ([\#10559](matrix-org/matrix-react-sdk#10559)). Contributed by @alunturner. * fix resizer only work with left mouse click ([\#10546](matrix-org/matrix-react-sdk#10546)). Contributed by @NSV1991. * Fix send two join requests when joining a room from spotlight search ([\#10534](matrix-org/matrix-react-sdk#10534)). Fixes #25054. * Highlight event when any version triggered a highlight ([\#10502](matrix-org/matrix-react-sdk#10502)). Fixes #24923 and #24970. Contributed by @kerryarchibald. * Fix spacing of headings of integration manager on General settings tab ([\#10232](matrix-org/matrix-react-sdk#10232)). Fixes #24085. Contributed by @luixxiul.
tchapgouv · May 3, 2023 · 65960ec · 65960ec
2 parents a2a098d + f59d4c9
commit 65960ec
Show file tree

Hide file tree

Showing 20 changed files with 1,200 additions and 81 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,3 @@
-blank_issues_enabled: false
 contact_links:
     - name: Questions & support
       url: https://tchap.beta.gouv.fr/#contact

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -0,0 +1,30 @@
+name: Backport
+on:
+    pull_request_target:
+        types:
+            - closed
+            - labeled
+        branches:
+            - develop
+
+jobs:
+    backport:
+        name: Backport
+        runs-on: ubuntu-latest
+        # Only react to merged PRs for security reasons.
+        # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
+        if: >
+            github.event.pull_request.merged
+            && (
+              github.event.action == 'closed'
+              || (
+                github.event.action == 'labeled'
+                && contains(github.event.label.name, 'backport')
+              )
+            )
+        steps:
+            - uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac # v2
+              with:
+                  labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
+                  # We can't use GITHUB_TOKEN here or CI won't run on the new PR
+                  github_token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
@@ -0,0 +1,114 @@
+# Separate to the main build workflow for access to develop
+# environment secrets, largely similar to build.yaml.
+name: Build and Deploy develop
+on:
+    push:
+        branches: [develop]
+    repository_dispatch:
+        types: [element-web-notify]
+concurrency:
+    group: ${{ github.repository_owner }}-${{ github.workflow }}-${{ github.ref_name }}
+    cancel-in-progress: true
+jobs:
+    build:
+        name: "Build & Deploy develop.element.io"
+        # Only respect triggers from our develop branch, ignore that of forks
+        if: github.repository == 'vector-im/element-web'
+        runs-on: ubuntu-latest
+        environment: develop
+        env:
+            R2_BUCKET: "element-web-develop"
+            R2_URL: ${{ vars.CF_R2_S3_API }}
+            R2_PUBLIC_URL: "https://element-web-develop.element.io"
+        steps:
+            - uses: actions/checkout@v3
+
+            - uses: actions/setup-node@v3
+              with:
+                  cache: "yarn"
+
+            - name: Install Dependencies
+              run: "./scripts/layered.sh"
+
+            - name: Build, Package & Upload sourcemaps
+              run: "./scripts/ci_package.sh"
+              env:
+                  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+                  SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+                  SENTRY_URL: ${{ secrets.SENTRY_URL }}
+                  SENTRY_ORG: element
+                  SENTRY_PROJECT: riot-web
+                  # We only deploy the latest bundles to Cloudflare Pages and use _redirects to fallback to R2 for
+                  # older ones. This redirect means that 'self' is insufficient in the CSP,
+                  # and we have to add the R2 URL.
+                  # Once Cloudflare redirects support proxying mode we will be able to ditch this.
+                  # See Proxying in support table at https://developers.cloudflare.com/pages/platform/redirects
+                  CSP_EXTRA_SOURCE: ${{ env.R2_PUBLIC_URL }}
+
+            - run: mv dist/element-*.tar.gz dist/develop.tar.gz
+
+            - uses: actions/upload-artifact@v3
+              with:
+                  name: webapp
+                  path: dist/develop.tar.gz
+                  retention-days: 1
+
+            - name: Extract webapp
+              run: |
+                  mkdir _deploy
+                  tar xf dist/develop.tar.gz -C _deploy --strip-components=1
+
+            - name: Copy config
+              run: cp element.io/develop/config.json _deploy/config.json
+
+            - name: Populate 404.html
+              run: echo "404 Not Found" > _deploy/404.html
+
+            - name: Populate _headers
+              run: cp .github/cfp_headers _deploy/_headers
+
+            # Redirect requests for the develop tarball and the historical bundles to R2
+            - name: Populate _redirects
+              run: |
+                  {
+                    echo "/develop.tar.gz $R2_PUBLIC_URL/develop.tar.gz 301"
+                    for bundle in $(aws s3 ls s3://$R2_BUCKET/bundles/ --endpoint-url $R2_URL --region=auto | awk '{print $2}'); do
+                      echo "/bundles/${bundle}* $R2_PUBLIC_URL/bundles/${bundle}:splat 301"
+                    done
+                  } | tee _deploy/_redirects
+              env:
+                  AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+                  AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
+
+            - name: Wait for other steps to succeed
+              uses: t3chguy/wait-on-check-action@05861d3a448898eb33dfce34153bd1ecb9422fb9 # fork
+              with:
+                  ref: ${{ github.sha }}
+                  running-workflow-name: "Build & Deploy develop.element.io"
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  wait-interval: 10
+                  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/ 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 }}
+
+            - name: Deploy to Cloudflare Pages
+              id: cfp
+              uses: cloudflare/pages-action@61eafe73baad0195ab582cb447b2c6e15a0df9ce # v1
+              with:
+                  apiToken: ${{ secrets.CF_PAGES_TOKEN }}
+                  accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}
+                  projectName: element-web-develop
+                  directory: _deploy
+                  gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+
+            - run: |
+                  echo "Deployed to ${{ steps.cfp.outputs.url }}" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml
@@ -0,0 +1,61 @@
+name: Dockerhub
+on:
+    workflow_dispatch: {}
+    push:
+        tags: [v*]
+    schedule:
+        # This job can take a while, and we have usage limits, so just publish develop only twice a day
+        - cron: "0 7/12 * * *"
+concurrency: ${{ github.workflow }}-${{ github.ref_name }}
+jobs:
+    buildx:
+        name: Docker Buildx
+        runs-on: ubuntu-latest
+        environment: dockerhub
+        steps:
+            - uses: actions/checkout@v3
+              with:
+                  fetch-depth: 0 # needed for docker-package to be able to calculate the version
+
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2
+
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2
+              with:
+                  install: true
+
+            - name: Login to Docker Hub
+              uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+            - name: Docker meta
+              id: meta
+              uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96 # v4
+              with:
+                  images: |
+                      vectorim/element-web
+                  tags: |
+                      type=ref,event=branch
+                      type=ref,event=tag
+                  flavor: |
+                      latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
+
+            - name: Build and push
+              uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4
+              with:
+                  context: .
+                  push: true
+                  platforms: linux/amd64,linux/arm64
+                  tags: ${{ steps.meta.outputs.tags }}
+                  labels: ${{ steps.meta.outputs.labels }}
+
+            - name: Update repo description
+              uses: peter-evans/dockerhub-description@202973a37c8a723405c0c5f0a71b6d99db470dae # v3
+              continue-on-error: true
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+                  repository: vectorim/element-web
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -0,0 +1,9 @@
+name: Pull Request
+on:
+    pull_request_target:
+        types: [opened, edited, labeled, unlabeled, synchronize]
+jobs:
+    action:
+        uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -11,6 +11,7 @@ env:
     REPOSITORY: ${{ github.repository }}
     PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
+<<<<<<< HEAD
     # Removing until we fix the crash :
     # Error: matrix-react-sdk/src/autocomplete/CommandProvider.tsx(38,24): error TS2589:
     # Type instantiation is excessively deep and possibly infinite.
@@ -83,6 +84,65 @@ jobs:
     # i18n_lint:
     #     name: "i18n Check"
     #     uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
+=======
+    ts_lint:
+        name: "Typescript Syntax Check"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+
+            - uses: actions/setup-node@v3
+              with:
+                  cache: "yarn"
+
+            - name: Install Dependencies
+              run: "./scripts/layered.sh"
+
+            - name: Typecheck
+              run: "yarn run lint:types"
+
+    tsc-strict:
+        name: Typescript Strict Error Checker
+        if: github.event_name == 'pull_request'
+        runs-on: ubuntu-latest
+        permissions:
+            pull-requests: read
+            checks: write
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Install Deps
+              run: "scripts/layered.sh"
+
+            - name: Get diff lines
+              id: diff
+              uses: Equip-Collaboration/diff-line-numbers@df70b4b83e05105c15f20dc6cc61f1463411b2a6 # v1.0.0
+              with:
+                  include: '["\\.tsx?$"]'
+
+            - name: Detecting files changed
+              id: files
+              uses: futuratrepadeira/changed-files@96d5fd702a6479d573287ef07381ad59acc390ed # v4.0.0
+              with:
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  pattern: '^.*\.tsx?$'
+
+            - uses: t3chguy/typescript-check-action@main
+              with:
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  use-check: false
+                  check-fail-mode: added
+                  output-behaviour: annotate
+                  ts-extra-args: "--strict --noImplicitAny"
+                  files-changed: ${{ steps.files.outputs.files_updated }}
+                  files-added: ${{ steps.files.outputs.files_created }}
+                  files-deleted: ${{ steps.files.outputs.files_deleted }}
+                  line-numbers: ${{ steps.diff.outputs.lineNumbers }}
+
+    i18n_lint:
+        name: "i18n Check"
+        uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
+>>>>>>> v1.11.30
 
     js_lint:
         name: "ESLint"

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -33,7 +33,11 @@ jobs:
               uses: SimenB/github-actions-cpu-cores@410541432439795d30db6501fb1d8178eb41e502 # v1
 
             - name: Run tests with coverage
+<<<<<<< HEAD
               run: "yarn coverage --ci"
+=======
+              run: "yarn coverage --ci --max-workers ${{ steps.cpu-cores.outputs.count }}"
+>>>>>>> v1.11.30
 
             - name: Upload Artifact
               uses: actions/upload-artifact@v2