diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-10-26 15:47:21 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-10-26 15:48:16 +0100 |
| commit | 9c34090db84fc28bf6c40da700095f025f1887ea (patch) | |
| tree | 960afb18131d57f7120c0d584915f0c2c29902bb /package.json | |
| parent | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (diff) | |
| parent | 3678b10823a691256ad63c1c4df8dc659dfc3bc0 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/package.json b/package.json index 5d07f31a5..84dfb8a64 100644 --- a/package.json +++ b/package.json @@ -60,17 +60,17 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.11.6", + "@babel/core": "^7.12.3", "@babel/plugin-proposal-class-properties": "^7.8.3", - "@babel/plugin-proposal-decorators": "^7.10.5", - "@babel/plugin-transform-react-inline-elements": "^7.10.4", - "@babel/plugin-transform-runtime": "^7.11.5", - "@babel/preset-env": "^7.11.5", - "@babel/preset-react": "^7.10.4", - "@babel/runtime": "^7.11.2", + "@babel/plugin-proposal-decorators": "^7.12.1", + "@babel/plugin-transform-react-inline-elements": "^7.12.1", + "@babel/plugin-transform-runtime": "^7.12.1", + "@babel/preset-env": "^7.12.1", + "@babel/preset-react": "^7.12.1", + "@babel/runtime": "^7.12.1", "@clusterws/cws": "^3.0.0", "@gamestdio/websocket": "^0.3.2", - "@github/webauthn-json": "^0.5.6", + "@github/webauthn-json": "^0.5.7", "@rails/ujs": "^6.0.3", "array-includes": "^3.1.1", "atrament": "0.2.4", @@ -127,8 +127,8 @@ "promise.prototype.finally": "^3.1.2", "prop-types": "^15.5.10", "punycode": "^2.1.0", - "react": "^16.13.1", - "react-dom": "^16.13.1", + "react": "^16.14.0", + "react-dom": "^16.14.0", "react-hotkeys": "^1.1.4", "react-immutable-proptypes": "^2.2.0", "react-immutable-pure-component": "^2.2.2", @@ -174,7 +174,7 @@ }, "devDependencies": { "@testing-library/jest-dom": "^5.11.4", - "@testing-library/react": "^11.0.4", + "@testing-library/react": "^11.1.0", "babel-eslint": "^10.1.0", "babel-jest": "^26.5.2", "eslint": "^7.11.0", @@ -188,7 +188,7 @@ "react-test-renderer": "^16.13.1", "sass-lint": "^1.13.1", "webpack-dev-server": "^3.11.0", - "yargs": "^16.0.3" + "yargs": "^16.1.0" }, "resolutions": { "kind-of": "^6.0.3" |