From 905c1b9489e2c7627ef90807c8cd1f322e8a0117 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Jan 2026 22:02:42 +0000 Subject: [PATCH] Update dependency await-lock to v3 (#31466) * Update dependency await-lock to v3 * Change moduleResolution Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Make jest happier Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Patch await-lock to make jest happy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Patch @vector-im/matrix-wysiwyg Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- jest.config.ts | 2 +- package.json | 2 +- .../@vector-im+matrix-wysiwyg+2.40.0.patch | 12 ++++++++++ patches/await-lock+3.0.0.patch | 14 +++++++++++ .../structures/PipContainer-test.tsx | 3 +-- tsconfig.json | 2 +- yarn.lock | 24 +++++++------------ 7 files changed, 38 insertions(+), 21 deletions(-) create mode 100644 patches/@vector-im+matrix-wysiwyg+2.40.0.patch create mode 100644 patches/await-lock+3.0.0.patch diff --git a/jest.config.ts b/jest.config.ts index caaf27f30c..935357a56c 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -42,7 +42,7 @@ const config: Config = { "counterpart": "/node_modules/counterpart", }, transformIgnorePatterns: [ - "/node_modules/(?!(mime|matrix-js-sdk|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)).+$", + "/node_modules/(?!(mime|matrix-js-sdk|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)).+$", ], collectCoverageFrom: [ "/src/**/*.{js,ts,tsx}", diff --git a/package.json b/package.json index 4e5ca848cc..70d6b69f0c 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "@zxcvbn-ts/core": "^3.0.4", "@zxcvbn-ts/language-common": "^3.0.4", "@zxcvbn-ts/language-en": "^3.0.2", - "await-lock": "^2.1.0", + "await-lock": "^3.0.0", "bloom-filters": "^3.0.3", "blurhash": "^2.0.3", "browserslist": "^4.23.2", diff --git a/patches/@vector-im+matrix-wysiwyg+2.40.0.patch b/patches/@vector-im+matrix-wysiwyg+2.40.0.patch new file mode 100644 index 0000000000..9da3dcc34e --- /dev/null +++ b/patches/@vector-im+matrix-wysiwyg+2.40.0.patch @@ -0,0 +1,12 @@ +diff --git a/node_modules/@vector-im/matrix-wysiwyg/package.json b/node_modules/@vector-im/matrix-wysiwyg/package.json +index 8163a3b..dfef973 100644 +--- a/node_modules/@vector-im/matrix-wysiwyg/package.json ++++ b/node_modules/@vector-im/matrix-wysiwyg/package.json +@@ -11,6 +11,7 @@ + "license": "SEE LICENSE IN README.md", + "exports": { + ".": { ++ "types": "./dist/index.d.ts", + "import": "./dist/matrix-wysiwyg.js", + "require": "./dist/matrix-wysiwyg.umd.cjs" + } diff --git a/patches/await-lock+3.0.0.patch b/patches/await-lock+3.0.0.patch new file mode 100644 index 0000000000..8798538841 --- /dev/null +++ b/patches/await-lock+3.0.0.patch @@ -0,0 +1,14 @@ +diff --git a/node_modules/await-lock/package.json b/node_modules/await-lock/package.json +index 84a2734..cbda839 100644 +--- a/node_modules/await-lock/package.json ++++ b/node_modules/await-lock/package.json +@@ -6,7 +6,8 @@ + "exports": { + ".": { + "types": "./build/AwaitLock.d.ts", +- "import": "./build/AwaitLock.js" ++ "import": "./build/AwaitLock.js", ++ "require": "./build/AwaitLock.js" + } + }, + "files": [ diff --git a/test/unit-tests/components/structures/PipContainer-test.tsx b/test/unit-tests/components/structures/PipContainer-test.tsx index 2d3bcd821b..35966d6d02 100644 --- a/test/unit-tests/components/structures/PipContainer-test.tsx +++ b/test/unit-tests/components/structures/PipContainer-test.tsx @@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details. import React from "react"; import { mocked, type Mocked } from "jest-mock"; import { screen, render, act, cleanup } from "jest-matrix-react"; -import userEvent from "@testing-library/user-event"; +import userEvent, { type UserEvent } from "@testing-library/user-event"; import { type MatrixClient, PendingEventOrdering, @@ -18,7 +18,6 @@ import { type RoomMember, } from "matrix-js-sdk/src/matrix"; import { Widget, type ClientWidgetApi } from "matrix-widget-api"; -import { type UserEvent } from "@testing-library/user-event/dist/types/setup/setup"; import { useMockedCalls, diff --git a/tsconfig.json b/tsconfig.json index ca876bff0b..28fbb701bf 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,7 @@ "esModuleInterop": true, "useDefineForClassFields": true, "module": "es2022", - "moduleResolution": "node", + "moduleResolution": "bundler", "target": "es2022", "noUnusedLocals": true, "sourceMap": false, diff --git a/yarn.lock b/yarn.lock index 1ab4993bcc..01186e944c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1690,17 +1690,8 @@ yaml "^2.7.0" "@element-hq/web-shared-components@link:packages/shared-components": - version "0.0.0-test.12" - dependencies: - "@element-hq/element-web-module-api" "^1.8.0" - "@vector-im/compound-design-tokens" "^6.4.3" - classnames "^2.5.1" - counterpart "^0.18.6" - lodash "^4.17.21" - matrix-web-i18n "3.5.2" - patch-package "^8.0.1" - react-merge-refs "^3.0.2" - temporal-polyfill "^0.3.0" + version "0.0.0" + uid "" "@emnapi/core@^1.4.3": version "1.7.0" @@ -4644,13 +4635,14 @@ "@vector-im/matrix-wysiwyg-wasm@link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.40.0-53c9ca5ea907d91e4515da64f20a82e5586b882c-integrity/node_modules/bindings/wysiwyg-wasm": version "0.0.0" + uid "" "@vector-im/matrix-wysiwyg@2.40.0": version "2.40.0" resolved "https://registry.yarnpkg.com/@vector-im/matrix-wysiwyg/-/matrix-wysiwyg-2.40.0.tgz#53c9ca5ea907d91e4515da64f20a82e5586b882c" integrity sha512-8LRFLs5PEKYs4lOL7aJ4lL/hGCrvEvOYkCR3JggXYXDVMtX4LmfdlKYucSAe98pCmqAAbLRvlRcR1bTOYvM8ug== dependencies: - "@vector-im/matrix-wysiwyg-wasm" "link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.40.0-53c9ca5ea907d91e4515da64f20a82e5586b882c-integrity/node_modules/bindings/wysiwyg-wasm" + "@vector-im/matrix-wysiwyg-wasm" "link:../../Library/Caches/Yarn/v6/npm-@vector-im-matrix-wysiwyg-2.40.0-53c9ca5ea907d91e4515da64f20a82e5586b882c-integrity/node_modules/bindings/wysiwyg-wasm" "@vitest/expect@3.2.4": version "3.2.4" @@ -5271,10 +5263,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -await-lock@^2.1.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/await-lock/-/await-lock-2.2.2.tgz#a95a9b269bfd2f69d22b17a321686f551152bcef" - integrity sha512-aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw== +await-lock@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/await-lock/-/await-lock-3.0.0.tgz#d6c6c5554d1a734509f5c0f6fa49a24457043d19" + integrity sha512-eO6fLiSnrJrMdjWMNK8zbVRXPs2TKJg78iKZd9wDpN3na5tcoV6EoeiOlMgk2QaAQ1gIrK1YuMsJHXWqz89tSA== axe-core@^4.10.0: version "4.10.2"