Skip to content

Commit 0f777aa

Browse files
committed
Merge branch 'develop' into kaylendog/create-room/opts
2 parents 5c3a6b3 + 09c3afd commit 0f777aa

483 files changed

Lines changed: 12020 additions & 5378 deletions

File tree

Some content is hidden

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

.eslintrc.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
module.exports = {
22
plugins: ["matrix-org", "eslint-plugin-react-compiler"],
3-
extends: [
4-
"plugin:matrix-org/babel",
5-
"plugin:matrix-org/react",
6-
"plugin:matrix-org/a11y",
7-
"plugin:storybook/recommended",
8-
],
3+
extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react", "plugin:matrix-org/a11y"],
94
parserOptions: {
105
project: ["./tsconfig.json"],
116
},

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
4646

47-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
47+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
4848
with:
4949
# Disable cache on Windows as it is slower than not caching
5050
# https://github.com/actions/setup-node/issues/975

.github/workflows/build_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3030

31-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
31+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
3232
with:
3333
cache: "yarn"
3434
node-version: "lts/*"

.github/workflows/docker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
cosign sign --yes ${images}
133133
134134
- name: Update repo description
135-
uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4
135+
uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5
136136
if: github.event_name != 'pull_request'
137137
continue-on-error: true
138138
with:
@@ -141,7 +141,7 @@ jobs:
141141
repository: vectorim/element-web
142142

143143
- name: Repository Dispatch
144-
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
144+
uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f # v4
145145
if: github.event_name != 'pull_request'
146146
with:
147147
repository: element-hq/element-web-pro

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
repository: matrix-org/matrix-js-sdk
3434
path: matrix-js-sdk
3535

36-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
36+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
3737
with:
3838
cache: "yarn"
3939
cache-dependency-path: element-web/yarn.lock

.github/workflows/end-to-end-tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
with:
5555
repository: element-hq/element-web
5656

57-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
57+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
5858
with:
5959
cache: "yarn"
6060
node-version: "lts/*"
@@ -133,7 +133,7 @@ jobs:
133133
name: webapp
134134
path: webapp
135135

136-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
136+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
137137
with:
138138
cache: "yarn"
139139
cache-dependency-path: yarn.lock
@@ -200,7 +200,7 @@ jobs:
200200
persist-credentials: false
201201
repository: element-hq/element-web
202202

203-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
203+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
204204
if: inputs.skip != true
205205
with:
206206
cache: "yarn"
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Publish shared component npm package
2+
on:
3+
workflow_dispatch: {}
4+
5+
concurrency: release
6+
jobs:
7+
publish:
8+
name: "Publish"
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: write
12+
id-token: write
13+
14+
steps:
15+
- name: 🧮 Checkout code
16+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
17+
18+
- name: 🔧 Set up node environment
19+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
20+
with:
21+
cache: "yarn"
22+
node-version-file: ".node-version"
23+
registry-url: "https://registry.npmjs.org"
24+
env:
25+
NODE_AUTH_TOKEN: ${{ secrets.ELEMENT_NPM_TOKEN }}
26+
27+
- name: 🛠️ Setup
28+
# When running `install` it also calls the `prepare` step which generates
29+
# a build
30+
run: yarn --cwd packages/shared-components install --pure-lockfile
31+
32+
- name: 🚀 Publish to npm
33+
working-directory: packages/shared-components
34+
run: npm publish --access public --provenance

.github/workflows/shared-component-visual-tests.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,24 @@ jobs:
2626
persist-credentials: false
2727
repository: element-hq/element-web
2828

29-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
29+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
3030
with:
3131
cache: "yarn"
3232
node-version: "lts/*"
3333

34+
- name: Install element web dependencies
35+
run: yarn install --frozen-lockfile
36+
37+
- name: Build Element Web resources
38+
# Needed to prepare language files
39+
run: "yarn build:res"
40+
3441
- name: Install dependencies
42+
working-directory: packages/shared-components
3543
run: yarn install --frozen-lockfile
3644

3745
- name: Get installed Playwright version
46+
working-directory: packages/shared-components
3847
id: playwright
3948
run: echo "version=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')" >> $GITHUB_OUTPUT
4049

@@ -46,25 +55,22 @@ jobs:
4655
key: ${{ runner.os }}-${{ runner.arch }}-playwright-${{ steps.playwright.outputs.version }}-onlyshell
4756

4857
- name: Install Playwright browsers
58+
working-directory: packages/shared-components
4959
if: steps.playwright-cache.outputs.cache-hit != 'true'
5060
run: "yarn playwright install --with-deps --only-shell"
5161

52-
- name: Build Element Web resources
53-
# Needed to prepare language files
54-
run: "yarn build:res"
55-
5662
- name: Build storybook dependencies
5763
# When the first test is ran, it will fail because the dependencies are not yet built.
5864
# This step is to ensure that the dependencies are built before running the tests.
59-
run: "yarn test:storybook:ci"
65+
run: "yarn --cwd packages/shared-components test:storybook:ci"
6066
continue-on-error: true
6167

6268
- name: Run Visual tests
63-
run: "yarn test:storybook:ci"
69+
run: "yarn --cwd packages/shared-components test:storybook:ci"
6470

6571
- name: Upload received images & diffs
6672
if: always()
6773
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
6874
with:
6975
name: received-images
70-
path: playwright/shared-component-received
76+
path: packages/shared-components/playwright/shared-component-received

.github/workflows/static_analysis.yaml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2626

27-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
27+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
2828
with:
2929
cache: "yarn"
3030
node-version: "lts/*"
@@ -35,6 +35,16 @@ jobs:
3535
- name: Typecheck
3636
run: "yarn run lint:types"
3737

38+
- name: Build Element Web resources
39+
# Needed to prepare language files for shared components
40+
run: "yarn build:res"
41+
42+
- name: Install Shared Component Dependencies
43+
run: "yarn --cwd packages/shared-components install"
44+
45+
- name: Typecheck Shared Components
46+
run: "yarn --cwd packages/shared-components run lint:types"
47+
3848
i18n_lint:
3949
name: "i18n Check"
4050
uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
@@ -69,7 +79,7 @@ jobs:
6979
steps:
7080
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
7181

72-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
82+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
7383
with:
7484
cache: "yarn"
7585
node-version: "lts/*"
@@ -81,13 +91,23 @@ jobs:
8191
- name: Run Linter
8292
run: "yarn run lint:js"
8393

94+
- name: Build Element Web resources
95+
# Needed to prepare language files for shared components
96+
run: "yarn build:res"
97+
98+
- name: Install Shared Component Deps
99+
run: "yarn --cwd packages/shared-components install --frozen-lockfile"
100+
101+
- name: Run Linter
102+
run: "yarn --cwd packages/shared-components run lint:js"
103+
84104
style_lint:
85105
name: "Style Lint"
86106
runs-on: ubuntu-24.04
87107
steps:
88108
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
89109

90-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
110+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
91111
with:
92112
cache: "yarn"
93113
node-version: "lts/*"
@@ -105,7 +125,7 @@ jobs:
105125
steps:
106126
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
107127

108-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
128+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
109129
with:
110130
cache: "yarn"
111131
node-version: "lts/*"
@@ -123,7 +143,7 @@ jobs:
123143
steps:
124144
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
125145

126-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
146+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
127147
with:
128148
cache: "yarn"
129149
node-version: "lts/*"

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/element-web' || github.repository }}
4545

4646
- name: Yarn cache
47-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
47+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
4848
with:
4949
node-version: "lts/*"
5050
cache: "yarn"

0 commit comments

Comments
 (0)