From 32679c8fb9df59044b9c5aba901b66c598d08d33 Mon Sep 17 00:00:00 2001 From: liviaUeno Date: Thu, 24 Sep 2026 10:41:00 -0300 Subject: [PATCH 1/5] fix: pin matrix-js-sdk to lockfile commit to avoid layered.sh clone --- apps/web/package.json | 2 +- pnpm-lock.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index ac2b693d27a..3d9da89dbeb 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a50e46ec97e..ab97f5ae7c6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -650,7 +650,7 @@ importers: specifier: ^1.0.3 version: 1.0.3 matrix-js-sdk: - specifier: github:matrix-org/matrix-js-sdk#develop + specifier: github:matrix-org/matrix-js-sdk#33e4db98814edb1e100ac8b9721cf84de998f429 version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/33e4db98814edb1e100ac8b9721cf84de998f429 matrix-widget-api: specifier: ^1.17.0 @@ -10053,6 +10053,7 @@ packages: jsrsasign@11.1.3: resolution: {integrity: sha512-nPnK5D/4lv0Dwr7TlzrKtAd8JlLZwFTqTUUB3NQCbtdobcRcohGFxjbPySDVh74iWUudcCsapYT6OxoyhJLhhA==} + deprecated: This package is no longer maintained. jsx-ast-utils@3.3.5: resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==} From e7bc13ccc137d1a644b96dd9653755d195bdfe52 Mon Sep 17 00:00:00 2001 From: liviaUeno Date: Fri, 9 Oct 2026 12:29:21 -0300 Subject: [PATCH 2/5] fix: transform matrix-js-sdk from the pnpm tarball layout --- apps/web/jest.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/jest.config.ts b/apps/web/jest.config.ts index b01778758a1..31d08dc36e9 100644 --- a/apps/web/jest.config.ts +++ b/apps/web/jest.config.ts @@ -48,7 +48,7 @@ const config: Config = { "@vector-im/compound-web": "/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: [ "/src/**/*.{js,ts,tsx}", From 28c6671db9aac1894bb4f182fbab5700223e4afa Mon Sep 17 00:00:00 2001 From: liviaUeno Date: Fri, 9 Oct 2026 13:09:40 -0300 Subject: [PATCH 3/5] fix: stop scanning matrix-js-sdk for workflows --- docs/generated/[id].paths.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/generated/[id].paths.ts b/docs/generated/[id].paths.ts index 58531ec8bd5..9819edd5a1d 100644 --- a/docs/generated/[id].paths.ts +++ b/docs/generated/[id].paths.ts @@ -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]), }, ]; }, From 4061e45746b6e06f5c11ab9b65abad46bcf9d731 Mon Sep 17 00:00:00 2001 From: liviaUeno Date: Tue, 13 Oct 2026 10:48:40 -0300 Subject: [PATCH 4/5] fix: fail when JS_SDK_GITHUB_BASE_REF is set but matrix-js-sdk is pinned --- scripts/layered.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/layered.sh b/scripts/layered.sh index 912ef56a32a..50027aa4709 100755 --- a/scripts/layered.sh +++ b/scripts/layered.sh @@ -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 From 8ebbbc9d4e064f72ef8093e1bac27fa7a7678e60 Mon Sep 17 00:00:00 2001 From: liviaUeno Date: Tue, 13 Oct 2026 11:12:44 -0300 Subject: [PATCH 5/5] fix: drop unrelated jsrsasign deprecated note --- pnpm-lock.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ab97f5ae7c6..3dfd4fc5b7b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10053,7 +10053,6 @@ packages: jsrsasign@11.1.3: resolution: {integrity: sha512-nPnK5D/4lv0Dwr7TlzrKtAd8JlLZwFTqTUUB3NQCbtdobcRcohGFxjbPySDVh74iWUudcCsapYT6OxoyhJLhhA==} - deprecated: This package is no longer maintained. jsx-ast-utils@3.3.5: resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}