Merge pull request #15402 from vector-im/t3chguy/fix/10353

Update Jest and JSDOM
This commit is contained in:
Michael Telatynski 2020-10-07 10:43:43 +01:00 committed by GitHub
commit 25eb587e3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1261 additions and 599 deletions

View file

@ -114,8 +114,8 @@
"file-loader": "^5.0.2", "file-loader": "^5.0.2",
"fs-extra": "^0.30.0", "fs-extra": "^0.30.0",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"jest": "^24.9.0", "jest": "^26.5.2",
"jest-environment-jsdom-fourteen": "^1.0.1", "jest-environment-jsdom-sixteen": "^1.0.3",
"json-loader": "^0.5.3", "json-loader": "^0.5.3",
"loader-utils": "^1.2.3", "loader-utils": "^1.2.3",
"matrix-mock-request": "^1.2.3", "matrix-mock-request": "^1.2.3",
@ -147,7 +147,7 @@
"webpack-dev-server": "^3.9.0" "webpack-dev-server": "^3.9.0"
}, },
"jest": { "jest": {
"testEnvironment": "jest-environment-jsdom-fourteen", "testEnvironment": "jest-environment-jsdom-sixteen",
"testMatch": [ "testMatch": [
"<rootDir>/test/**/*-test.js" "<rootDir>/test/**/*-test.js"
], ],

1854
yarn.lock

File diff suppressed because it is too large Load diff