diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index c5bae52986..703fa7434a 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -10,6 +10,7 @@ on: options: - playwright-common - shared-components + - module-api concurrency: release jobs: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ea6016f147..83a0792467 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: complete: name: jest-tests - needs: [jest_ew, vitest_sc] + needs: [jest_ew, vitest] if: always() runs-on: ubuntu-24.04 permissions: @@ -120,8 +120,13 @@ jobs: sha: ${{ github.sha }} target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} - vitest_sc: - name: Vitest (Shared Components) + vitest: + name: Vitest + strategy: + matrix: + package: + - shared-components + - module-api runs-on: ubuntu-24.04 steps: - name: Checkout code @@ -137,32 +142,32 @@ jobs: node-version: "lts/*" cache: "pnpm" - - name: Install Shared Component Deps - working-directory: "packages/shared-components" + - name: Install Deps run: "pnpm install" - name: Cache storybook & vitest uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5 with: path: | - packages/shared-components/node_modules/.cache - packages/shared-components/node_modules/.vite/vitest + packages/${{ matrix.package }}/node_modules/.cache + packages/${{ matrix.package }}/node_modules/.vite/vitest key: ${{ hashFiles('pnpm-lock.yaml') }} - name: Setup playwright uses: ./.github/actions/setup-playwright + if: matrix.package == 'shared-components' with: write-cache: ${{ github.event_name != 'merge_group' }} - name: Run tests - working-directory: "packages/shared-components" + working-directory: "packages/${{ matrix.package }}" run: pnpm test:unit --coverage=$ENABLE_COVERAGE - name: Upload Artifact if: env.ENABLE_COVERAGE == 'true' uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7 with: - name: coverage-sharedcomponents + name: coverage-${{ matrix.package }} path: | - packages/shared-components/coverage - !packages/shared-components/coverage/lcov-report + packages/${{ matrix.package }}/coverage + !packages/${{ matrix.package }}/coverage/lcov-report diff --git a/.prettierignore b/.prettierignore index ca5fe9afd8..b6f2c7a1e7 100644 --- a/.prettierignore +++ b/.prettierignore @@ -14,7 +14,8 @@ webpack-stats.json .vscode/ .env coverage -# Auto-generated file +# Auto-generated files +*.api.md /apps/web/src/modules.ts /apps/web/src/modules.js src/i18n/strings diff --git a/apps/desktop/package.json b/apps/desktop/package.json index a4f9c68437..eb63cd55ee 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -105,7 +105,7 @@ "typescript": "5.9.3" }, "hakDependencies": { - "matrix-seshat": "^4.0.1" + "matrix-seshat": "4.0.1" }, "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319" } diff --git a/apps/web/Dockerfile.dockerignore b/apps/web/Dockerfile.dockerignore index 403d667eaa..c1af93fc7e 100644 --- a/apps/web/Dockerfile.dockerignore +++ b/apps/web/Dockerfile.dockerignore @@ -10,6 +10,7 @@ **/.pnpm-store **/tsconfig.node.tsbuildinfo **/*.md +!**/*.api.md **/*.rst .idea/ diff --git a/apps/web/package.json b/apps/web/package.json index 6640de4ff9..a39463e2b5 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@babel/runtime": "^7.12.5", - "@element-hq/element-web-module-api": "catalog:", + "@element-hq/element-web-module-api": "workspace:*", "@element-hq/web-shared-components": "workspace:*", "@fontsource/fira-code": "^5", "@fontsource/inter": "catalog:", diff --git a/apps/web/playwright/snapshots/crypto/crypto.spec.ts/RoomSummaryCard-with-verified-e2ee-linux.png b/apps/web/playwright/snapshots/crypto/crypto.spec.ts/RoomSummaryCard-with-verified-e2ee-linux.png index 3be7831755..0a99a4cf86 100644 Binary files a/apps/web/playwright/snapshots/crypto/crypto.spec.ts/RoomSummaryCard-with-verified-e2ee-linux.png and b/apps/web/playwright/snapshots/crypto/crypto.spec.ts/RoomSummaryCard-with-verified-e2ee-linux.png differ diff --git a/apps/web/playwright/snapshots/right-panel/right-panel.spec.ts/with-name-and-address-linux.png b/apps/web/playwright/snapshots/right-panel/right-panel.spec.ts/with-name-and-address-linux.png index ada2b8a60e..7fb7e011bb 100644 Binary files a/apps/web/playwright/snapshots/right-panel/right-panel.spec.ts/with-name-and-address-linux.png and b/apps/web/playwright/snapshots/right-panel/right-panel.spec.ts/with-name-and-address-linux.png differ diff --git a/apps/web/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap b/apps/web/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap index d4fd8a3bda..0f707477cc 100644 --- a/apps/web/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap +++ b/apps/web/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap @@ -73,7 +73,7 @@ exports[` has button to edit topic 1`] = ` style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: center; --mx-flex-gap: var(--cpd-space-2x); --mx-flex-wrap: wrap;" > has button to edit topic 1`] = ` Public room has button to edit topic 1`] = ` Not encrypted has button to edit topic 1`] = ` >