Merge pull request #19056 from vector-im/dbkr/yarnupgrade_20210914

yarn upgrade
pull/19080/head
David Baker 2021-09-15 17:53:13 +01:00 committed by GitHub
commit 446c4f991f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 566 additions and 547 deletions

View File

@ -65,8 +65,8 @@
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-widget-api": "^0.1.0-beta.16", "matrix-widget-api": "^0.1.0-beta.16",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^17.0.2", "react": "17.0.2",
"react-dom": "^17.0.2", "react-dom": "17.0.2",
"sanitize-html": "^2.3.2", "sanitize-html": "^2.3.2",
"ua-parser-js": "^0.7.24" "ua-parser-js": "^0.7.24"
}, },
@ -93,8 +93,8 @@
"@types/flux": "^3.1.9", "@types/flux": "^3.1.9",
"@types/modernizr": "^3.5.3", "@types/modernizr": "^3.5.3",
"@types/node": "^14.14.22", "@types/node": "^14.14.22",
"@types/react": "^17.0.2", "@types/react": "17.0.14",
"@types/react-dom": "^17.0.2", "@types/react-dom": "17.0.9",
"@types/sanitize-html": "^2.3.1", "@types/sanitize-html": "^2.3.1",
"@typescript-eslint/eslint-plugin": "^4.17.0", "@typescript-eslint/eslint-plugin": "^4.17.0",
"@typescript-eslint/parser": "^4.17.0", "@typescript-eslint/parser": "^4.17.0",
@ -151,13 +151,16 @@
"stylelint-config-standard": "^20.0.0", "stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.18.0", "stylelint-scss": "^3.18.0",
"terser-webpack-plugin": "^2.3.8", "terser-webpack-plugin": "^2.3.8",
"typescript": "^4.1.3", "typescript": "4.3.5",
"webpack": "^4.46.0", "webpack": "^4.46.0",
"webpack-cli": "^3.3.12", "webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.2", "webpack-dev-server": "^3.11.2",
"worker-loader": "^2.0.0", "worker-loader": "^2.0.0",
"worklet-loader": "^2.0.0" "worklet-loader": "^2.0.0"
}, },
"resolutions": {
"@types/react": "17.0.14"
},
"jest": { "jest": {
"testEnvironment": "jest-environment-jsdom-sixteen", "testEnvironment": "jest-environment-jsdom-sixteen",
"testMatch": [ "testMatch": [

1100
yarn.lock

File diff suppressed because it is too large Load Diff