Skip to content

Commit e9b56c6

Browse files
authored
Merge branch 'develop' into renovate/eslint-plugins
2 parents b4660fd + d46cfe1 commit e9b56c6

File tree

66 files changed

+3775
-359
lines changed

Some content is hidden

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

66 files changed

+3775
-359
lines changed

.github/actions/setup-playwright/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
PREFIX: ${{ runner.os }}-${{ runner.arch }}
2222

2323
- name: Cache playwright binaries
24-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
24+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
2525
if: inputs.write-cache == 'true'
2626
id: cache
2727
with:
@@ -30,7 +30,7 @@ runs:
3030

3131
# When running in merge queue only restore the cache, never write it
3232
- name: Restore playwright binaries cache
33-
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
33+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
3434
if: inputs.write-cache != 'true'
3535
id: cache-restore
3636
with:

.github/workflows/build_desktop_and_deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ jobs:
289289
id-token: write # This is required for requesting the JWT
290290
steps:
291291
- name: Configure AWS credentials
292-
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6
292+
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6
293293
with:
294294
role-to-assume: arn:aws:iam::264135176173:role/Push-ElementDesktop-MSI
295295
role-session-name: githubaction-run-${{ github.run_id }}

.github/workflows/build_desktop_linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104

105105
- name: Cache .hak
106106
id: cache
107-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
107+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
108108
with:
109109
key: ${{ runner.os }}-${{ github.ref_name }}-${{ inputs.sqlcipher }}-${{ inputs.arch }}-${{ hashFiles('apps/desktop/hakHash', 'apps/desktop/electronVersion', 'apps/desktop/dockerbuild/*') }}
110110
path: |

.github/workflows/build_desktop_macos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090

9191
- name: Cache .hak
9292
id: cache
93-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
93+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
9494
with:
9595
key: ${{ runner.os }}-${{ hashFiles('apps/desktop/hakHash', 'apps/desktop/electronVersion') }}
9696
path: |

.github/workflows/build_desktop_windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121

122122
- name: Cache .hak
123123
id: cache
124-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
124+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
125125
with:
126126
key: ${{ runner.os }}-${{ inputs.arch }}-${{ hashFiles('apps/desktop/hakHash', 'apps/desktop/electronVersion') }}
127127
path: |

.github/workflows/npm-publish.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
options:
1111
- playwright-common
1212
- shared-components
13+
- module-api
1314

1415
concurrency: release
1516
jobs:

.github/workflows/tests.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
5757

5858
- name: Jest Cache
59-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
59+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
6060
with:
6161
path: /tmp/jest_cache
6262
key: ${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -100,7 +100,7 @@ jobs:
100100
101101
complete:
102102
name: jest-tests
103-
needs: [jest_ew, vitest_sc]
103+
needs: [jest_ew, vitest]
104104
if: always()
105105
runs-on: ubuntu-24.04
106106
permissions:
@@ -120,8 +120,13 @@ jobs:
120120
sha: ${{ github.sha }}
121121
target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
122122

123-
vitest_sc:
124-
name: Vitest (Shared Components)
123+
vitest:
124+
name: Vitest
125+
strategy:
126+
matrix:
127+
package:
128+
- shared-components
129+
- module-api
125130
runs-on: ubuntu-24.04
126131
steps:
127132
- name: Checkout code
@@ -137,32 +142,32 @@ jobs:
137142
node-version: "lts/*"
138143
cache: "pnpm"
139144

140-
- name: Install Shared Component Deps
141-
working-directory: "packages/shared-components"
145+
- name: Install Deps
142146
run: "pnpm install"
143147

144148
- name: Cache storybook & vitest
145-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
149+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
146150
with:
147151
path: |
148-
packages/shared-components/node_modules/.cache
149-
packages/shared-components/node_modules/.vite/vitest
152+
packages/${{ matrix.package }}/node_modules/.cache
153+
packages/${{ matrix.package }}/node_modules/.vite/vitest
150154
key: ${{ hashFiles('pnpm-lock.yaml') }}
151155

152156
- name: Setup playwright
153157
uses: ./.github/actions/setup-playwright
158+
if: matrix.package == 'shared-components'
154159
with:
155160
write-cache: ${{ github.event_name != 'merge_group' }}
156161

157162
- name: Run tests
158-
working-directory: "packages/shared-components"
163+
working-directory: "packages/${{ matrix.package }}"
159164
run: pnpm test:unit --coverage=$ENABLE_COVERAGE
160165

161166
- name: Upload Artifact
162167
if: env.ENABLE_COVERAGE == 'true'
163168
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
164169
with:
165-
name: coverage-sharedcomponents
170+
name: coverage-${{ matrix.package }}
166171
path: |
167-
packages/shared-components/coverage
168-
!packages/shared-components/coverage/lcov-report
172+
packages/${{ matrix.package }}/coverage
173+
!packages/${{ matrix.package }}/coverage/lcov-report

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ webpack-stats.json
1414
.vscode/
1515
.env
1616
coverage
17-
# Auto-generated file
17+
# Auto-generated files
18+
*.api.md
1819
/apps/web/src/modules.ts
1920
/apps/web/src/modules.js
2021
src/i18n/strings

apps/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"typescript": "5.9.3"
106106
},
107107
"hakDependencies": {
108-
"matrix-seshat": "^4.0.1"
108+
"matrix-seshat": "4.0.1"
109109
},
110110
"packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
111111
}

apps/web/Dockerfile.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
**/.pnpm-store
1111
**/tsconfig.node.tsbuildinfo
1212
**/*.md
13+
!**/*.api.md
1314
**/*.rst
1415

1516
.idea/

0 commit comments

Comments
 (0)