diff --git a/knip.ts b/knip.ts index fd0003670f..4b98d33fba 100644 --- a/knip.ts +++ b/knip.ts @@ -52,6 +52,9 @@ export default { "@jest/globals", "vitest-environment-jest-fixed-jsdom", + // We import this in some tests, transitive dep of @playwright/test + "playwright-core", + // Used by matrix-js-sdk, which means we have to include them as a // dependency so that // we can run `tsc` (since we import the typescript // source of js-sdk, rather than the transpiled and annotated JS like you diff --git a/package.json b/package.json index 352036a543..2b8c1e243f 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "@babel/runtime": "^7.12.5", "@casualbot/jest-sonar-reporter": "2.5.0", "@element-hq/element-call-embedded": "0.16.3", - "@element-hq/element-web-playwright-common": "2.2.4", + "@element-hq/element-web-playwright-common": "2.2.5", "@fetch-mock/jest": "^0.2.20", "@peculiar/webcrypto": "^1.4.3", "@playwright/test": "1.57.0", @@ -264,7 +264,6 @@ "minimist": "^1.2.6", "modernizr": "^3.12.0", "patch-package": "^8.0.0", - "playwright-core": "^1.51.0", "postcss": "8.4.46", "postcss-easings": "^4.0.0", "postcss-hexrgba": "2.1.0", diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json index f87d497502..5987d81dbd 100644 --- a/packages/shared-components/package.json +++ b/packages/shared-components/package.json @@ -48,9 +48,6 @@ "lint:js": "eslint --max-warnings 0 src && prettier --check .", "lint:types": "tsc --noEmit && tsc --noEmit -p tsconfig.node.json" }, - "resolutions": { - "playwright": "1.57.0" - }, "dependencies": { "@element-hq/element-web-module-api": "^1.8.0", "@vector-im/compound-design-tokens": "^6.4.3", @@ -63,7 +60,7 @@ "temporal-polyfill": "^0.3.0" }, "devDependencies": { - "@element-hq/element-web-playwright-common": "2.2.4", + "@element-hq/element-web-playwright-common": "2.2.5", "@fetch-mock/vitest": "^0.2.18", "@matrix-org/react-sdk-module-api": "^2.5.0", "@playwright/test": "1.57.0", @@ -109,7 +106,7 @@ "vite": "^7.3.1", "vite-plugin-dts": "^4.5.4", "vite-plugin-node-polyfills": "^0.25.0", - "vitest": "^4.0.17", + "vitest": "^4.0.18", "vitest-browser-react": "^2.0.2", "vitest-sonar-reporter": "^3.0.0" }, diff --git a/packages/shared-components/yarn.lock b/packages/shared-components/yarn.lock index 504b612a75..2341936db5 100644 --- a/packages/shared-components/yarn.lock +++ b/packages/shared-components/yarn.lock @@ -286,15 +286,15 @@ resolved "https://registry.yarnpkg.com/@element-hq/element-web-module-api/-/element-web-module-api-1.9.0.tgz#2e4fcc8809418c8670d4f0576bc4a9a235bc6c50" integrity sha512-Ao/V9w+wysZK4bh61LlKlznF10n2ZbD6KcUI46/zUMttXbmJn3ahvbzhEpwYcD+Cjy3ag5ycxLIIGkKV/fncXg== -"@element-hq/element-web-playwright-common@2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@element-hq/element-web-playwright-common/-/element-web-playwright-common-2.2.4.tgz#b5cc29a2f02e168d43da11c30c895a8ade99299c" - integrity sha512-zeJQl+TuAsOoXDmc+7SSvrTtxfRRYsRs9WuhkjsLbZrDOzh3H7h5EDiQAAwZbBgLAm36kz4OLSpr3vBy8d09Gw== +"@element-hq/element-web-playwright-common@2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@element-hq/element-web-playwright-common/-/element-web-playwright-common-2.2.5.tgz#69b626ae35a297b341aa06c201168046b251edbe" + integrity sha512-M2a/vPqmqL0GigKeROYGMUjSxwGNSnDResK5sFjD6FJNlxVmJNSD5NdCe9SQ46o2VI0j2dJKD+e3n3gcQ/CNCg== dependencies: "@axe-core/playwright" "^4.10.1" "@testcontainers/postgresql" "^11.0.0" glob "^13.0.0" - lodash-es "^4.17.21" + lodash-es "^4.17.23" mailpit-api "^1.2.0" strip-ansi "^7.1.0" testcontainers "^11.0.0" @@ -1768,21 +1768,21 @@ react-refresh "^0.18.0" "@vitest/browser-playwright@^4.0.17": - version "4.0.17" - resolved "https://registry.yarnpkg.com/@vitest/browser-playwright/-/browser-playwright-4.0.17.tgz#cb7384b00b78b8b04f70b4b375e3091916a49d6b" - integrity sha512-CE9nlzslHX6Qz//MVrjpulTC9IgtXTbJ+q7Rx1HD+IeSOWv4NHIRNHPA6dB4x01d9paEqt+TvoqZfmgq40DxEQ== + version "4.0.18" + resolved "https://registry.yarnpkg.com/@vitest/browser-playwright/-/browser-playwright-4.0.18.tgz#1a844a44cf2f1e2321ca70e405063104350e5472" + integrity sha512-gfajTHVCiwpxRj1qh0Sh/5bbGLG4F/ZH/V9xvFVoFddpITfMta9YGow0W6ZpTTORv2vdJuz9TnrNSmjKvpOf4g== dependencies: - "@vitest/browser" "4.0.17" - "@vitest/mocker" "4.0.17" + "@vitest/browser" "4.0.18" + "@vitest/mocker" "4.0.18" tinyrainbow "^3.0.3" -"@vitest/browser@4.0.17": - version "4.0.17" - resolved "https://registry.yarnpkg.com/@vitest/browser/-/browser-4.0.17.tgz#42eedfe6d2844f37dc60aa6481326edd1a2ffadd" - integrity sha512-cgf2JZk2fv5or3efmOrRJe1V9Md89BPgz4ntzbf84yAb+z2hW6niaGFinl9aFzPZ1q3TGfWZQWZ9gXTFThs2Qw== +"@vitest/browser@4.0.18": + version "4.0.18" + resolved "https://registry.yarnpkg.com/@vitest/browser/-/browser-4.0.18.tgz#9d826cc21f09c27f8fe758715a92a6a878236a02" + integrity sha512-gVQqh7paBz3gC+ZdcCmNSWJMk70IUjDeVqi+5m5vYpEHsIwRgw3Y545jljtajhkekIpIp5Gg8oK7bctgY0E2Ng== dependencies: - "@vitest/mocker" "4.0.17" - "@vitest/utils" "4.0.17" + "@vitest/mocker" "4.0.18" + "@vitest/utils" "4.0.18" magic-string "^0.30.21" pixelmatch "7.1.0" pngjs "^7.0.0" @@ -1817,15 +1817,15 @@ chai "^5.2.0" tinyrainbow "^2.0.0" -"@vitest/expect@4.0.17": - version "4.0.17" - resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-4.0.17.tgz#67bb0d4a7d37054590a19dcf831f7936d14a8a02" - integrity sha512-mEoqP3RqhKlbmUmntNDDCJeTDavDR+fVYkSOw8qRwJFaW/0/5zA9zFeTrHqNtcmwh6j26yMmwx2PqUDPzt5ZAQ== +"@vitest/expect@4.0.18": + version "4.0.18" + resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-4.0.18.tgz#361510d99fbf20eb814222e4afcb8539d79dc94d" + integrity sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ== dependencies: "@standard-schema/spec" "^1.0.0" "@types/chai" "^5.2.2" - "@vitest/spy" "4.0.17" - "@vitest/utils" "4.0.17" + "@vitest/spy" "4.0.18" + "@vitest/utils" "4.0.18" chai "^6.2.1" tinyrainbow "^3.0.3" @@ -1838,12 +1838,12 @@ estree-walker "^3.0.3" magic-string "^0.30.17" -"@vitest/mocker@4.0.17": - version "4.0.17" - resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-4.0.17.tgz#ce559098be1ae18ae5aa441a79939bcd7fc8f42f" - integrity sha512-+ZtQhLA3lDh1tI2wxe3yMsGzbp7uuJSWBM1iTIKCbppWTSBN09PUC+L+fyNlQApQoR+Ps8twt2pbSSXg2fQVEQ== +"@vitest/mocker@4.0.18": + version "4.0.18" + resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-4.0.18.tgz#b9735da114ef65ea95652c5bdf13159c6fab4865" + integrity sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ== dependencies: - "@vitest/spy" "4.0.17" + "@vitest/spy" "4.0.18" estree-walker "^3.0.3" magic-string "^0.30.21" @@ -1861,20 +1861,27 @@ dependencies: tinyrainbow "^3.0.3" -"@vitest/runner@4.0.17": - version "4.0.17" - resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-4.0.17.tgz#dcc3bb4a4b1077858f3b105e91b2eeb208cee780" - integrity sha512-JmuQyf8aMWoo/LmNFppdpkfRVHJcsgzkbCA+/Bk7VfNH7RE6Ut2qxegeyx2j3ojtJtKIbIGy3h+KxGfYfk28YQ== +"@vitest/pretty-format@4.0.18": + version "4.0.18" + resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-4.0.18.tgz#fbccd4d910774072ec15463553edb8ca5ce53218" + integrity sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw== dependencies: - "@vitest/utils" "4.0.17" + tinyrainbow "^3.0.3" + +"@vitest/runner@4.0.18": + version "4.0.18" + resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-4.0.18.tgz#c2c0a3ed226ec85e9312f9cc8c43c5b3a893a8b1" + integrity sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw== + dependencies: + "@vitest/utils" "4.0.18" pathe "^2.0.3" -"@vitest/snapshot@4.0.17": - version "4.0.17" - resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-4.0.17.tgz#40d71a3dad4ac39812ed96a95fded46a920e1a31" - integrity sha512-npPelD7oyL+YQM2gbIYvlavlMVWUfNNGZPcu0aEUQXt7FXTuqhmgiYupPnAanhKvyP6Srs2pIbWo30K0RbDtRQ== +"@vitest/snapshot@4.0.18": + version "4.0.18" + resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-4.0.18.tgz#bcb40fd6d742679c2ac927ba295b66af1c6c34c5" + integrity sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA== dependencies: - "@vitest/pretty-format" "4.0.17" + "@vitest/pretty-format" "4.0.18" magic-string "^0.30.21" pathe "^2.0.3" @@ -1885,10 +1892,10 @@ dependencies: tinyspy "^4.0.3" -"@vitest/spy@4.0.17": - version "4.0.17" - resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-4.0.17.tgz#d0936f8908b4dae091d9b948be3bae8e19d1878d" - integrity sha512-I1bQo8QaP6tZlTomQNWKJE6ym4SHf3oLS7ceNjozxxgzavRAgZDc06T7kD8gb9bXKEgcLNt00Z+kZO6KaJ62Ew== +"@vitest/spy@4.0.18": + version "4.0.18" + resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-4.0.18.tgz#ba0f20503fb6d08baf3309d690b3efabdfa88762" + integrity sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw== "@vitest/ui@^4.0.17": version "4.0.17" @@ -1920,6 +1927,14 @@ "@vitest/pretty-format" "4.0.17" tinyrainbow "^3.0.3" +"@vitest/utils@4.0.18": + version "4.0.18" + resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-4.0.18.tgz#9636b16d86a4152ec68a8d6859cff702896433d4" + integrity sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA== + dependencies: + "@vitest/pretty-format" "4.0.18" + tinyrainbow "^3.0.3" + "@volar/language-core@2.4.23", "@volar/language-core@~2.4.11": version "2.4.23" resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.23.tgz#deb6dbc5fdbafa9bb7ba691fc59cb196cdb856d3" @@ -4705,10 +4720,10 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash-es@^4.17.21: - version "4.17.22" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.22.tgz#eb7d123ec2470d69b911abe34f85cb694849b346" - integrity sha512-XEawp1t0gxSi9x01glktRZ5HDy0HXqrM0x5pXQM98EaI0NxO6jVM7omDOxsuEo5UIASAnm2bRp1Jt/e0a2XU8Q== +lodash-es@^4.17.23: + version "4.17.23" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.23.tgz#58c4360fd1b5d33afc6c0bbd3d1149349b1138e0" + integrity sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg== lodash.camelcase@^4.3.0: version "4.3.0" @@ -6901,18 +6916,18 @@ vitest-sonar-reporter@^3.0.0: resolved "https://registry.yarnpkg.com/vitest-sonar-reporter/-/vitest-sonar-reporter-3.0.0.tgz#3bb34a9a46390dce83a50de16135fc325c73359d" integrity sha512-QRT5m9Z/3Kt0WVDVcFHm5LC9Ba89yDP4twlX2QUAJ9PdqfJBkLAh/kXj7m6U3i0k6GxnIEiwCc295bmAYokmZg== -vitest@^4.0.17: - version "4.0.17" - resolved "https://registry.yarnpkg.com/vitest/-/vitest-4.0.17.tgz#0e39e67a909a132afe434ee1278bdcf0c17fd063" - integrity sha512-FQMeF0DJdWY0iOnbv466n/0BudNdKj1l5jYgl5JVTwjSsZSlqyXFt/9+1sEyhR6CLowbZpV7O1sCHrzBhucKKg== +vitest@^4.0.18: + version "4.0.18" + resolved "https://registry.yarnpkg.com/vitest/-/vitest-4.0.18.tgz#56f966353eca0b50f4df7540cd4350ca6d454a05" + integrity sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ== dependencies: - "@vitest/expect" "4.0.17" - "@vitest/mocker" "4.0.17" - "@vitest/pretty-format" "4.0.17" - "@vitest/runner" "4.0.17" - "@vitest/snapshot" "4.0.17" - "@vitest/spy" "4.0.17" - "@vitest/utils" "4.0.17" + "@vitest/expect" "4.0.18" + "@vitest/mocker" "4.0.18" + "@vitest/pretty-format" "4.0.18" + "@vitest/runner" "4.0.18" + "@vitest/snapshot" "4.0.18" + "@vitest/spy" "4.0.18" + "@vitest/utils" "4.0.18" es-module-lexer "^1.7.0" expect-type "^1.2.2" magic-string "^0.30.21" diff --git a/playwright/e2e/room/create-room.spec.ts b/playwright/e2e/room/create-room.spec.ts index dd0ea63776..554f972c7d 100644 --- a/playwright/e2e/room/create-room.spec.ts +++ b/playwright/e2e/room/create-room.spec.ts @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import { type Page } from "playwright-core"; +import { type Page } from "@playwright/test"; import { SettingLevel } from "../../../src/settings/SettingLevel"; import { UIFeature } from "../../../src/settings/UIFeature"; diff --git a/playwright/e2e/voip/element-call.spec.ts b/playwright/e2e/voip/element-call.spec.ts index feb6323b4d..b481f241cc 100644 --- a/playwright/e2e/voip/element-call.spec.ts +++ b/playwright/e2e/voip/element-call.spec.ts @@ -6,7 +6,7 @@ Please see LICENSE files in the repository root for full details. */ import { readFile } from "node:fs/promises"; -import { type Page } from "playwright-core"; +import { type Page } from "@playwright/test"; import type { EventType, Preset } from "matrix-js-sdk/src/matrix"; import { SettingLevel } from "../../../src/settings/SettingLevel"; diff --git a/yarn.lock b/yarn.lock index 36f465dd16..ff26488876 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1675,15 +1675,15 @@ resolved "https://registry.yarnpkg.com/@element-hq/element-web-module-api/-/element-web-module-api-1.9.0.tgz#2e4fcc8809418c8670d4f0576bc4a9a235bc6c50" integrity sha512-Ao/V9w+wysZK4bh61LlKlznF10n2ZbD6KcUI46/zUMttXbmJn3ahvbzhEpwYcD+Cjy3ag5ycxLIIGkKV/fncXg== -"@element-hq/element-web-playwright-common@2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@element-hq/element-web-playwright-common/-/element-web-playwright-common-2.2.4.tgz#b5cc29a2f02e168d43da11c30c895a8ade99299c" - integrity sha512-zeJQl+TuAsOoXDmc+7SSvrTtxfRRYsRs9WuhkjsLbZrDOzh3H7h5EDiQAAwZbBgLAm36kz4OLSpr3vBy8d09Gw== +"@element-hq/element-web-playwright-common@2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@element-hq/element-web-playwright-common/-/element-web-playwright-common-2.2.5.tgz#69b626ae35a297b341aa06c201168046b251edbe" + integrity sha512-M2a/vPqmqL0GigKeROYGMUjSxwGNSnDResK5sFjD6FJNlxVmJNSD5NdCe9SQ46o2VI0j2dJKD+e3n3gcQ/CNCg== dependencies: "@axe-core/playwright" "^4.10.1" "@testcontainers/postgresql" "^11.0.0" glob "^13.0.0" - lodash-es "^4.17.21" + lodash-es "^4.17.23" mailpit-api "^1.2.0" strip-ansi "^7.1.0" testcontainers "^11.0.0" @@ -9492,10 +9492,10 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash-es@^4.17.21: - version "4.17.22" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.22.tgz#eb7d123ec2470d69b911abe34f85cb694849b346" - integrity sha512-XEawp1t0gxSi9x01glktRZ5HDy0HXqrM0x5pXQM98EaI0NxO6jVM7omDOxsuEo5UIASAnm2bRp1Jt/e0a2XU8Q== +lodash-es@^4.17.23: + version "4.17.23" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.23.tgz#58c4360fd1b5d33afc6c0bbd3d1149349b1138e0" + integrity sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg== lodash.camelcase@^4.3.0: version "4.3.0" @@ -10531,7 +10531,7 @@ pkijs@^3.3.3: pvutils "^1.1.3" tslib "^2.8.1" -playwright-core@1.57.0, playwright-core@^1.51.0: +playwright-core@1.57.0: version "1.57.0" resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.57.0.tgz#3dcc9a865af256fa9f0af0d67fc8dd54eecaebf5" integrity sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==