Skip to content

Commit f1e9606

Browse files
t3chguyt3chguy
authored
Merge branch 'main' into renovate/flake8-7.x
2 parents 1401ba2 + c5529df commit f1e9606

71 files changed

Lines changed: 2277 additions & 1505 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/publish-release-element-module.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
2626
- name: Generate Docker metadata of the existing image
2727
id: meta
28-
uses: docker/metadata-action@v5
28+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5
2929
with:
3030
bake-target: docker-metadata-action
3131
flavor: |
@@ -39,15 +39,15 @@ jobs:
3939
4040
- name: Login to ghcr.io
4141
if: github.event_name != 'pull_request'
42-
uses: docker/login-action@v3
42+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
4343
with:
4444
registry: ghcr.io
4545
username: ${{ github.repository_owner }}
4646
password: ${{ secrets.GITHUB_TOKEN }}
4747

4848
- name: Login to registry.opencode.de
4949
if: github.event_name != 'pull_request'
50-
uses: docker/login-action@v3
50+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
5151
with:
5252
registry: registry.opencode.de
5353
username: ${{ vars.DOCKER_OPENCODE_USERNAME }}
@@ -58,11 +58,11 @@ jobs:
5858
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # @v3.5.0
5959

6060
- name: Set up Docker Buildx
61-
uses: docker/setup-buildx-action@v3
61+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
6262

6363
- name: Build
6464
id: bake-load
65-
uses: docker/bake-action@v6.3.0
65+
uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0
6666
with:
6767
load: true
6868
files: |
@@ -103,7 +103,7 @@ jobs:
103103
104104
- name: Push
105105
id: bake-push
106-
uses: docker/bake-action@v6.3.0
106+
uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0
107107
if: github.event_name != 'pull_request'
108108
with:
109109
push: true

‎.github/workflows/publish-release-npm-package.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,19 @@ jobs:
1717
id-token: write
1818
steps:
1919
- name: 🧮 Checkout code
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2121

2222
- name: 🔧 Yarn cache
23-
uses: actions/setup-node@v4
23+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
2424
with:
2525
cache: "yarn"
2626
registry-url: "https://registry.npmjs.org"
2727
node-version-file: package.json
2828

29+
# Ensure npm 11.5.1 or later is installed
30+
- name: Update npm
31+
run: npm install -g npm@latest
32+
2933
- name: 🔨 Install dependencies
3034
run: "yarn install --frozen-lockfile"
3135

@@ -43,5 +47,3 @@ jobs:
4347
run: npm publish --provenance --access public --tag latest
4448
if: steps.parse.outputs.pkg
4549
working-directory: ${{ steps.parse.outputs.pkg }}
46-
env:
47-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.github/workflows/publish-release-synapse-module.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
steps:
2222
- name: Generate Docker metadata of the existing image
2323
id: meta-existing-tag
24-
uses: docker/metadata-action@v5
24+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5
2525
with:
2626
images: ${{ env.DOCKER_IMAGE }}
2727
tags: |
2828
type=sha,prefix=
2929
3030
- name: Generate Docker metadata of the new image
3131
id: meta-new-tags
32-
uses: docker/metadata-action@v5
32+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5
3333
with:
3434
images: ${{ env.DOCKER_IMAGE }}
3535
labels: |
@@ -46,7 +46,7 @@ jobs:
4646
echo "FROM $SOURCE_IMAGE" > Dockerfile
4747
4848
- name: Login to ghcr.io
49-
uses: docker/login-action@v3
49+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
5050
with:
5151
registry: ghcr.io
5252
username: ${{ github.repository_owner }}
@@ -56,11 +56,11 @@ jobs:
5656
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # @v3.5.0
5757

5858
- name: Set up Docker Buildx
59-
uses: docker/setup-buildx-action@v3
59+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
6060

6161
- name: Build and push
6262
id: build_and_push
63-
uses: docker/build-push-action@v6
63+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
6464
with:
6565
push: true
6666
context: .

‎.github/workflows/reusable-playwright-tests.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
name: Run Playwright end-to-end tests & upload html report
1515
runs-on: ubuntu-24.04-arm
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
1818
with:
1919
repository: ${{ inputs.webapp-artifact && 'element-hq/element-modules' || github.repository }}
2020

21-
- uses: actions/setup-node@v4
21+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
2222
with:
2323
cache: "yarn"
2424
node-version: "lts/*"
@@ -31,7 +31,7 @@ jobs:
3131
run: echo "version=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')" >> "$GITHUB_OUTPUT"
3232

3333
- name: Cache playwright binaries
34-
uses: actions/cache@v4
34+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
3535
id: playwright-cache
3636
with:
3737
path: ~/.cache/ms-playwright
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Fetch webapp
4545
if: inputs.webapp-artifact
46-
uses: actions/download-artifact@v4
46+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
4747
with:
4848
name: ${{ inputs.webapp-artifact }}
4949
path: webapp
@@ -60,7 +60,7 @@ jobs:
6060

6161
- name: Upload blob report to GitHub Actions Artifacts
6262
if: always()
63-
uses: actions/upload-artifact@v4
63+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
6464
with:
6565
name: playwright-html-report
6666
path: playwright-report

‎.github/workflows/sonarqube.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
3939

4040
- name: 📥 Download artifact
41-
uses: actions/download-artifact@v4
41+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
4242
with:
4343
github-token: ${{ secrets.GITHUB_TOKEN }}
4444
run-id: ${{ github.event.workflow_run.id }}
@@ -56,7 +56,7 @@ jobs:
5656
5757
- name: "🩻 SonarCloud Scan"
5858
id: sonarcloud
59-
uses: matrix-org/sonarcloud-workflow-action@v3.3
59+
uses: matrix-org/sonarcloud-workflow-action@6fa326fe328568a4800c431fe864826caff79b41 # v3.3
6060
# workflow_run fails report against the develop commit always, we don't want that for PRs
6161
continue-on-error: ${{ github.event.workflow_run.head_branch != 'develop' }}
6262
with:

‎.github/workflows/static-analysis.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
- lint:prettier
2525
- lint:knip
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2828

29-
- uses: actions/setup-node@v4
29+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
3030
with:
3131
cache: "yarn"
3232
node-version: "lts/*"
3333

34-
- uses: actions/setup-python@v5
34+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
3535
with:
3636
python-version: "3.11"
3737

‎.github/workflows/synapse-module.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
jobs:
1010
build-py:
1111
name: Build Python
12+
permissions:
13+
contents: read
14+
packages: write
1215
runs-on: ubuntu-latest
1316
timeout-minutes: 15
1417
defaults:
@@ -17,21 +20,21 @@ jobs:
1720
env:
1821
DOCKER_IMAGE: ghcr.io/element-hq/synapse-guest-module
1922
steps:
20-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2124

2225
- name: Login to ghcr.io
23-
uses: docker/login-action@v3
26+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
2427
with:
2528
registry: ghcr.io
2629
username: ${{ github.repository_owner }}
2730
password: ${{ secrets.GITHUB_TOKEN }}
2831

2932
- name: Set up Docker Buildx
30-
uses: docker/setup-buildx-action@v3
33+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
3134

3235
- name: Generate Docker metadata
3336
id: meta
34-
uses: docker/metadata-action@v5
37+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5
3538
env:
3639
DOCKER_METADATA_PR_HEAD_SHA: true
3740
with:
@@ -44,7 +47,7 @@ jobs:
4447
type=sha,prefix=
4548
4649
- name: Docker build and push
47-
uses: docker/build-push-action@v6
50+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
4851
id: dockerBuild
4952
with:
5053
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

‎.github/workflows/tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
name: Run tests & upload coverage reports
1515
runs-on: ubuntu-24.04-arm
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
1818

19-
- uses: actions/setup-node@v4
19+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
2020
with:
2121
cache: "yarn"
2222
node-version: "lts/*"
2323

24-
- uses: actions/setup-python@v5
24+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
2525
with:
2626
python-version: "3.11"
2727

@@ -35,7 +35,7 @@ jobs:
3535
run: sed -ie 's/filename="/filename="modules\/restricted-guests\/synapse\//' modules/restricted-guests/synapse/coverage.xml
3636

3737
- name: Upload Artifact
38-
uses: actions/upload-artifact@v4
38+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
3939
with:
4040
name: coverage
4141
path: |

‎knip.ts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,19 @@ export default {
1717
// Unlisted peer dependency for @matrix-org/react-sdk-module-api
1818
"matrix-web-i18n",
1919
],
20-
entry: [
21-
"packages/element-web-playwright-common/src/testcontainers/*",
22-
"packages/element-web-playwright-common/src/fixtures/services.ts",
23-
"packages/element-web-playwright-common/src/stale-screenshot-reporter.ts",
24-
],
20+
workspaces: {
21+
"modules/*/element-web": {
22+
entry: "src/index.ts{x,}",
23+
},
24+
"packages/element-web-playwright-common": {
25+
entry: [
26+
"src/fixtures/index.ts",
27+
"src/fixtures/services.ts",
28+
"src/testcontainers/index.ts",
29+
"src/testcontainers/synapse.ts",
30+
"src/testcontainers/mas-config.ts",
31+
"src/stale-screenshot-reporter.ts",
32+
],
33+
},
34+
},
2535
} satisfies KnipConfig;

‎modules/banner/element-web/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
"test": "echo no tests yet"
1313
},
1414
"devDependencies": {
15+
"@arcmantle/vite-plugin-import-css-sheet": "^1.0.12",
1516
"@element-hq/element-web-module-api": "^1.0.0",
1617
"@types/node": "^22.10.7",
1718
"@types/react": "^19",
1819
"@vitejs/plugin-react": "^5.0.0",
1920
"react": "^19",
2021
"rollup-plugin-external-globals": "^0.13.0",
2122
"typescript": "^5.7.3",
22-
"vite": "^7.0.0",
23-
"vite-plugin-node-polyfills": "^0.23.0",
23+
"vite": "^7.1.11",
24+
"vite-plugin-node-polyfills": "^0.24.0",
2425
"vite-plugin-svgr": "^4.3.0"
2526
},
2627
"dependencies": {

0 commit comments

Comments
 (0)