From 00141dcfa97c4a01c0a4dd1b601e573f0a85ffb4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 7 Mar 2023 17:50:03 +0000 Subject: [PATCH 1/4] Update to React 18 --- package.json | 15 +++++------ yarn.lock | 75 +++++++++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index c1dbce4a8b..4cf14c09e9 100644 --- a/package.json +++ b/package.json @@ -61,8 +61,8 @@ "analyse:unused-exports": "node ./scripts/analyse_unused_exports.js" }, "resolutions": { - "@types/react-dom": "17.0.19", - "@types/react": "17.0.53" + "@types/react-dom": "18.0.11", + "@types/react": "18.0.28" }, "dependencies": { "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz", @@ -73,8 +73,8 @@ "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.1.1", - "react": "17.0.2", - "react-dom": "17.0.2", + "react": "^18.2.0", + "react-dom": "^18.2.0", "sanitize-html": "^2.3.2", "ua-parser-js": "^1.0.0" }, @@ -99,14 +99,13 @@ "@principalstudio/html-webpack-inject-preload": "^1.2.7", "@sentry/webpack-plugin": "^1.18.1", "@svgr/webpack": "^5.5.0", - "@testing-library/react": "^12.1.5", - "@types/flux": "^3.1.9", + "@testing-library/react": "^14", "@types/jest": "^29.0.0", "@types/jsrsasign": "^10.5.4", "@types/modernizr": "^3.5.3", "@types/node": "^16", - "@types/react": "17.0.53", - "@types/react-dom": "17.0.19", + "@types/react": "18.0.28", + "@types/react-dom": "18.0.11", "@types/sanitize-html": "^2.3.1", "@types/ua-parser-js": "^0.7.36", "@typescript-eslint/eslint-plugin": "^5.45.0", diff --git a/yarn.lock b/yarn.lock index 7619caa2dc..9e7d331ad2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1892,10 +1892,10 @@ "@svgr/plugin-svgo" "^5.5.0" loader-utils "^2.0.0" -"@testing-library/dom@^8.0.0": - version "8.20.0" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.20.0.tgz#914aa862cef0f5e89b98cc48e3445c4c921010f6" - integrity sha512-d9ULIT+a4EXLX3UU8FBjauG9NnsZHkHztXoIcTsOKoOw030fyjheN9svkTULjJxtYag9DZz5Jz5qkWZDPxTFwA== +"@testing-library/dom@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.0.0.tgz#cc50e8df2a7dccff95555102beebbae60e95e95e" + integrity sha512-+/TLgKNFsYUshOY/zXsQOk+PlFQK+eyJ9T13IDVNJEi+M+Un7xlJK+FZKkbGSnf0+7E1G6PlDhkSYQ/GFiruBQ== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" @@ -1914,14 +1914,14 @@ "@babel/runtime" "^7.12.5" react-error-boundary "^3.1.0" -"@testing-library/react@^12.1.5": - version "12.1.5" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.5.tgz#bb248f72f02a5ac9d949dea07279095fa577963b" - integrity sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg== +"@testing-library/react@^14": + version "14.0.0" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-14.0.0.tgz#59030392a6792450b9ab8e67aea5f3cc18d6347c" + integrity sha512-S04gSNJbYE30TlIMLTzv6QCTzt9AqIF5y6s6SzVFILNcNvbV/jU96GeiTPillGQo+Ny64M/5PV7klNYYgv5Dfg== dependencies: "@babel/runtime" "^7.12.5" - "@testing-library/dom" "^8.0.0" - "@types/react-dom" "<18.0.0" + "@testing-library/dom" "^9.0.0" + "@types/react-dom" "^18.0.0" "@tootallnate/once@2": version "2.0.0" @@ -1986,19 +1986,6 @@ resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== -"@types/fbemitter@*": - version "2.0.32" - resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c" - integrity sha512-Hwq28bBlbmfCgLnNJvjl5ssTrbZCTSblI4vqPpqZrbbEL8vn5l2UivxhlMYfUY7a4SR8UB6RKoLjOZfljqAa6g== - -"@types/flux@^3.1.9": - version "3.1.11" - resolved "https://registry.yarnpkg.com/@types/flux/-/flux-3.1.11.tgz#e030d61e6c7fd6187dfa0e7e3dfcc8036c511581" - integrity sha512-Aq4UB1ZqAKcPbhB0GpgMw2sntvOh71he9tjz53TLKrI7rw3Y3LxCW5pTYY9IV455hQapm4pmxFjpqlWOs308Yg== - dependencies: - "@types/fbemitter" "*" - "@types/react" "*" - "@types/geojson@*", "@types/geojson@^7946.0.10": version "7946.0.10" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249" @@ -2152,12 +2139,12 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== -"@types/react-dom@17.0.19", "@types/react-dom@<18.0.0": - version "17.0.19" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.19.tgz#36feef3aa35d045cacd5ed60fe0eef5272f19492" - integrity sha512-PiYG40pnQRdPHnlf7tZnp0aQ6q9tspYr72vD61saO6zFCybLfMqwUCN0va1/P+86DXn18ZWeW30Bk7xlC5eEAQ== +"@types/react-dom@18.0.11", "@types/react-dom@^18.0.0": + version "18.0.11" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.11.tgz#321351c1459bc9ca3d216aefc8a167beec334e33" + integrity sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw== dependencies: - "@types/react" "^17" + "@types/react" "*" "@types/react-redux@^7.1.20": version "7.1.25" @@ -2169,10 +2156,10 @@ hoist-non-react-statics "^3.3.0" redux "^4.0.0" -"@types/react@*", "@types/react@17.0.53", "@types/react@^17": - version "17.0.53" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.53.tgz#10d4d5999b8af3d6bc6a9369d7eb953da82442ab" - integrity sha512-1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw== +"@types/react@*", "@types/react@18.0.28": + version "18.0.28" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065" + integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -8188,7 +8175,7 @@ matrix-mock-request@^2.5.0: lodash "^4.17.20" maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" - matrix-events-sdk "0.0.1" + matrix-events-sdk "2.0.0" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^1.1.1" minimist "^1.2.5" @@ -10381,6 +10368,14 @@ react-dom@17.0.2: object-assign "^4.1.1" scheduler "^0.20.2" +react-dom@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" + integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== + dependencies: + loose-envify "^1.1.0" + scheduler "^0.23.0" + react-error-boundary@^3.1.0: version "3.1.4" resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-3.1.4.tgz#255db92b23197108757a888b01e5b729919abde0" @@ -10445,6 +10440,13 @@ react@17.0.2: loose-envify "^1.1.0" object-assign "^4.1.1" +react@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" + integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== + dependencies: + loose-envify "^1.1.0" + read-cache@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" @@ -10905,6 +10907,13 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" + integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== + dependencies: + loose-envify "^1.1.0" + schema-utils@^0.4.0, schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" From 81e2876e3922a56f4e20fd36de18bee7fb24f4d2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 7 Mar 2023 17:50:32 +0000 Subject: [PATCH 2/4] Fix types --- .editorconfig | 2 +- src/components/views/auth/VectorAuthPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 87f4c70ae1..8587533002 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,4 +26,4 @@ trim_trailing_whitespace = true indent_size = 4 [package.json] -indent_size = 2 +indent_size = 4 diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx index 560fe424aa..1ad03e0107 100644 --- a/src/components/views/auth/VectorAuthPage.tsx +++ b/src/components/views/auth/VectorAuthPage.tsx @@ -19,7 +19,7 @@ import SdkConfig from "matrix-react-sdk/src/SdkConfig"; import VectorAuthFooter from "./VectorAuthFooter"; -export default class VectorAuthPage extends React.PureComponent { +export default class VectorAuthPage extends React.PureComponent { private static welcomeBackgroundUrl; // cache the url as a static to prevent it changing without refreshing From fd497878218bf553fb5fa82749311483c65c374a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 22 Apr 2024 09:30:53 +0100 Subject: [PATCH 3/4] Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 102 +++++++++++++++++++++++++-------------------------- yarn.lock | 22 ++++------- 2 files changed, 59 insertions(+), 65 deletions(-) diff --git a/package.json b/package.json index f1a8948e3b..c4b2e65718 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,14 @@ "contribute.json" ], "style": "bundle.css", + "matrix_i18n_extra_translation_funcs": [ + "UserFriendlyError" + ], "scripts": { "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", + "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json", + "i18n:lint": "prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null", + "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", "clean": "rimraf lib webapp", "build": "yarn clean && yarn build:genfiles && yarn build:bundle", "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats", @@ -53,19 +59,16 @@ "lint:types:src": "tsc --noEmit --jsx react", "lint:types:module_system": "tsc --noEmit --project ./tsconfig.module_system.json", "lint:style": "stylelint \"res/css/**/*.pcss\"", + "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'", "test": "jest", "coverage": "yarn test --coverage", "analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts", - "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js", - "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'", - "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json", - "i18n:lint": "prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null", - "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", - "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp" + "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp", + "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js" }, "resolutions": { - "@types/react-dom": "18.0.11", - "@types/react": "18.0.28" + "@types/react-dom": "18.2.25", + "@types/react": "18.2.79" }, "dependencies": { "@matrix-org/olm": "3.2.15", @@ -73,20 +76,23 @@ "gfm.css": "^1.1.2", "jsrsasign": "^11.0.0", "katex": "^0.16.0", + "lodash": "^4.17.21", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.3.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "ua-parser-js": "^1.0.0", - "lodash": "^4.17.21" + "ua-parser-js": "^1.0.0" }, "devDependencies": { + "@action-validator/cli": "^0.6.0", + "@action-validator/core": "^0.6.0", "@babel/core": "^7.12.10", "@babel/eslint-parser": "^7.12.10", "@babel/eslint-plugin": "^7.12.10", "@babel/plugin-proposal-class-properties": "^7.12.1", "@babel/plugin-proposal-export-default-from": "^7.12.1", + "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1", "@babel/plugin-proposal-numeric-separator": "^7.12.7", "@babel/plugin-proposal-object-rest-spread": "^7.12.1", @@ -103,21 +109,45 @@ "@sentry/webpack-plugin": "^2.7.1", "@svgr/webpack": "^8.0.0", "@testing-library/react": "^14", + "@types/commonmark": "^0.27.9", + "@types/content-type": "^1.1.8", + "@types/counterpart": "^0.18.4", + "@types/diff-match-patch": "^1.0.36", + "@types/escape-html": "^1.0.4", + "@types/file-saver": "^2.0.7", + "@types/glob-to-regexp": "^0.4.4", "@types/jest": "^29.0.0", + "@types/jitsi-meet": "^2.0.2", "@types/jsrsasign": "^10.5.4", + "@types/katex": "^0.16.7", + "@types/lodash": "^4.14.197", + "@types/minimist": "^1.2.5", "@types/modernizr": "^3.5.6", "@types/node": "^16", - "@types/react": "18.0.28", - "@types/react-dom": "18.0.11", + "@types/node-fetch": "^2.6.4", + "@types/pako": "^2.0.3", + "@types/qrcode": "^1.5.5", + "@types/react": "18.2.79", + "@types/react-beautiful-dnd": "^13.1.7", + "@types/react-dom": "18.2.25", + "@types/react-transition-group": "^4.4.9", "@types/sanitize-html": "^2.9.5", + "@types/sdp-transform": "^2.4.9", + "@types/tar-js": "^0.3.5", "@types/ua-parser-js": "^0.7.36", + "@types/uuid": "^9.0.7", "@typescript-eslint/eslint-plugin": "^7.0.0", "@typescript-eslint/parser": "^7.0.0", "babel-jest": "^29.0.0", "babel-loader": "^9.0.0", + "babel-plugin-jsx-remove-data-test-id": "^3.0.0", + "buffer": "^6.0.3", "chokidar": "^3.5.1", "concurrently": "^8.0.0", + "copy-webpack-plugin": "^12.0.0", + "cronstrue": "^2.41.0", "css-loader": "^7.0.0", + "css-minimizer-webpack-plugin": "^6.0.0", "dotenv": "^16.0.2", "eslint": "8.57.0", "eslint-config-google": "^0.14.0", @@ -129,6 +159,7 @@ "eslint-plugin-react-hooks": "^4.3.0", "eslint-plugin-unicorn": "^52.0.0", "fake-indexeddb": "^5.0.0", + "fetch-mock": "9.11.0", "fetch-mock-jest": "^1.5.1", "file-loader": "^6.0.0", "html-webpack-plugin": "^5.5.3", @@ -155,61 +186,30 @@ "postcss-scss": "^4.0.4", "postcss-simple-vars": "^7.0.1", "prettier": "3.2.5", + "process": "^0.11.10", "raw-loader": "^4.0.2", "rimraf": "^5.0.0", "semver": "^7.5.2", + "setimmediate": "^1.0.5", "string-replace-loader": "3", "style-loader": "4", "stylelint": "^16.1.0", "stylelint-config-standard": "^36.0.0", "stylelint-scss": "^6.0.0", "terser-webpack-plugin": "^5.3.9", + "ts-node": "^10.9.1", "ts-prune": "^0.10.3", "typescript": "5.4.3", + "util": "^0.12.5", "webpack": "^5.89.0", + "webpack-bundle-analyzer": "^4.8.0", "webpack-cli": "^5.0.0", "webpack-dev-server": "^5.0.0", - "yaml": "^2.3.3", - "webpack-bundle-analyzer": "^4.8.0", - "util": "^0.12.5", - "ts-node": "^10.9.1", - "setimmediate": "^1.0.5", - "process": "^0.11.10", - "fetch-mock": "9.11.0", - "css-minimizer-webpack-plugin": "^6.0.0", - "cronstrue": "^2.41.0", - "copy-webpack-plugin": "^12.0.0", - "buffer": "^6.0.3", - "babel-plugin-jsx-remove-data-test-id": "^3.0.0", - "@types/uuid": "^9.0.7", - "@types/tar-js": "^0.3.5", - "@types/sdp-transform": "^2.4.9", - "@types/react-transition-group": "^4.4.9", - "@types/react-beautiful-dnd": "^13.1.7", - "@types/qrcode": "^1.5.5", - "@types/pako": "^2.0.3", - "@types/node-fetch": "^2.6.4", - "@types/minimist": "^1.2.5", - "@types/lodash": "^4.14.197", - "@types/katex": "^0.16.7", - "@types/jitsi-meet": "^2.0.2", - "@types/glob-to-regexp": "^0.4.4", - "@types/file-saver": "^2.0.7", - "@types/escape-html": "^1.0.4", - "@types/diff-match-patch": "^1.0.36", - "@types/counterpart": "^0.18.4", - "@types/content-type": "^1.1.8", - "@types/commonmark": "^0.27.9", - "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7", - "@action-validator/core": "^0.6.0", - "@action-validator/cli": "^0.6.0" + "yaml": "^2.3.3" }, "@casualbot/jest-sonar-reporter": { "outputDirectory": "coverage", "outputName": "jest-sonar-report.xml", "relativePaths": true - }, - "matrix_i18n_extra_translation_funcs": [ - "UserFriendlyError" - ] -} \ No newline at end of file + } +} diff --git a/yarn.lock b/yarn.lock index 5939910599..966ae0c8a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3280,10 +3280,10 @@ dependencies: "@types/react" "*" -"@types/react-dom@18.0.11", "@types/react-dom@^18.0.0": - version "18.0.11" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.11.tgz#321351c1459bc9ca3d216aefc8a167beec334e33" - integrity sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw== +"@types/react-dom@18.2.25", "@types/react-dom@^18.0.0": + version "18.2.25" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.25.tgz#2946a30081f53e7c8d585eb138277245caedc521" + integrity sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA== dependencies: "@types/react" "*" @@ -3304,13 +3304,12 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@18.0.28": - version "18.0.28" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065" - integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew== +"@types/react@*", "@types/react@18.2.79": + version "18.2.79" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.79.tgz#c40efb4f255711f554d47b449f796d1c7756d865" + integrity sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w== dependencies: "@types/prop-types" "*" - "@types/scheduler" "*" csstype "^3.0.2" "@types/retry@0.12.0": @@ -3330,11 +3329,6 @@ dependencies: htmlparser2 "^8.0.0" -"@types/scheduler@*": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.4.tgz#fedc3e5b15c26dc18faae96bf1317487cb3658cf" - integrity sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ== - "@types/sdp-transform@^2.4.9": version "2.4.9" resolved "https://registry.yarnpkg.com/@types/sdp-transform/-/sdp-transform-2.4.9.tgz#26ef39f487a6909b0512f580b80920a366b27f52" From a033d031b5d7b116ca77cc0a26940b9e039cb0e7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 22 Apr 2024 14:33:21 +0100 Subject: [PATCH 4/4] Update test Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- test/app-tests/loading-test.tsx | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/test/app-tests/loading-test.tsx b/test/app-tests/loading-test.tsx index fffdd95945..486b871d78 100644 --- a/test/app-tests/loading-test.tsx +++ b/test/app-tests/loading-test.tsx @@ -336,22 +336,19 @@ describe("loading:", function () { }); }); - it("shows a home page by default if we have no joined rooms", function () { + it("shows a home page by default if we have no joined rooms", async () => { localStorage.removeItem("mx_last_room_id"); loadApp(); - return awaitLoggedIn(matrixChat!) - .then(() => { - // we are logged in - let the sync complete - return expectAndAwaitSync(); - }) - .then(() => { - // once the sync completes, we should have a home page - httpBackend.verifyNoOutstandingExpectation(); - expect(matrixChat?.container.querySelector(".mx_HomePage")).toBeTruthy(); - expect(windowLocation?.hash).toEqual("#/home"); - }); + await awaitLoggedIn(matrixChat!); + // we are logged in - let the sync complete + await expectAndAwaitSync(); + // once the sync completes, we should have a home page + httpBackend.verifyNoOutstandingExpectation(); + await waitFor(() => matrixChat?.container.querySelector(".mx_HomePage")); + expect(matrixChat?.container.querySelector(".mx_HomePage")).toBeTruthy(); + expect(windowLocation?.hash).toEqual("#/home"); }); it("shows a room view if we followed a room link", function () {