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}", 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/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]), }, ]; }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a50e46ec97e..3dfd4fc5b7b 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 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