Skip to content

ci: fix crypto wasm types #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liviaUeno wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

ci: fix crypto wasm types #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32679c8
fix: pin matrix-js-sdk to lockfile commit to avoid layered.sh clone
liviaUeno Sep 24, 2026
e7bc13c
fix: transform matrix-js-sdk from the pnpm tarball layout
liviaUeno Oct 9, 2026
28c6671
fix: stop scanning matrix-js-sdk for workflows
liviaUeno Oct 9, 2026
4061e45
fix: fail when JS_SDK_GITHUB_BASE_REF is set but matrix-js-sdk is pinned
liviaUeno Oct 13, 2026
8ebbbc9
fix: drop unrelated jsrsasign deprecated note
liviaUeno Oct 13, 2026
4c15406
Merge remote-tracking branch 'origin/develop' into fix-remove-layered…
liviaUeno Oct 22, 2026
741afc7
fix: declare matrix-sdk-crypto-wasm as a direct devDependency of apps…
liviaUeno Oct 22, 2026
c58c695
fix: drop dead olm include from the playwright tsconfig
liviaUeno Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/jest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const config: Config = {
"@vector-im/compound-web": "<rootDir>/node_modules/@vector-im/compound-web",
},
transformIgnorePatterns: [
`${path.join(__dirname, "../..")}/node_modules/.pnpm/(?!(mime|uuid|p-retry|is-network-error|react-merge-refs|is-ip|ip-regex|super-regex|function-timeout|time-span|convert-hrtime|clone-regexp|is-regexp|matrix-web-i18n|await-lock|@element-hq/web-shared-components|react-virtuoso|lodash|domutils|domhandler|domelementtype|dom-serializer|entities)).+$`,
`${path.join(__dirname, "../..")}/node_modules/.pnpm/(?!(mime|uuid|p-retry|is-network-error|react-merge-refs|is-ip|ip-regex|super-regex|function-timeout|time-span|convert-hrtime|clone-regexp|is-regexp|matrix-web-i18n|await-lock|@element-hq/web-shared-components|react-virtuoso|lodash|domutils|domhandler|domelementtype|dom-serializer|entities|matrix-js-sdk)).+$`,
],
collectCoverageFrom: [
"<rootDir>/src/**/*.{js,ts,tsx}",
Expand Down
3 changes: 2 additions & 1 deletion apps/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"lodash": "npm:lodash-es@4.18.1",
"maplibre-gl": "^5.0.0",
"matrix-encrypt-attachment": "^1.0.3",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#33e4db98814edb1e100ac8b9721cf84de998f429",
"matrix-widget-api": "^1.16.1",
"memoize-one": "^6.0.0",
"mime": "^4.0.4",
Expand Down Expand Up @@ -131,6 +131,7 @@
"@element-hq/element-web-playwright-common": "workspace:*",
"@fetch-mock/jest": "^0.2.20",
"@jest/globals": "^30.2.0",
"@matrix-org/matrix-sdk-crypto-wasm": "^18.3.1",
"@peculiar/webcrypto": "^1.4.3",
"@playwright/test": "catalog:",
"@principalstudio/html-webpack-inject-preload": "^1.2.7",
Expand Down
3 changes: 1 addition & 2 deletions apps/web/playwright/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"include": [
"**/*.ts",
"../src/@types/matrix-js-sdk.d.ts",
"../node_modules/matrix-js-sdk/src/@types/*.d.ts",
"../node_modules/matrix-js-sdk/node_modules/@matrix-org/olm/index.d.ts"
"../node_modules/matrix-js-sdk/src/@types/*.d.ts"
]
}
2 changes: 1 addition & 1 deletion docs/generated/[id].paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default {
return [
{
params: { id: "automations" },
content: await genWorkflowMermaid([root, join(root, "node_modules", "matrix-js-sdk")]),
content: await genWorkflowMermaid([root]),
},
];
},
Expand Down
8 changes: 7 additions & 1 deletion pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions scripts/layered.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,9 @@ if [ "$js_sdk_dep" = "github:matrix-org/matrix-js-sdk#develop" ]; then
pnpm -C apps/web link ./matrix-js-sdk
pnpm link ./matrix-js-sdk
else
if [ -n "$JS_SDK_GITHUB_BASE_REF" ]; then
echo "ERROR: JS_SDK_GITHUB_BASE_REF ($JS_SDK_GITHUB_BASE_REF) was requested, but package.json pins matrix-js-sdk to $js_sdk_dep, so it would be ignored." >&2
exit 1
fi
echo "Skipping matrix-js-sdk fetch and link as package.json pins $js_sdk_dep"
fi
Loading