diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-25 15:31:45 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-25 15:31:45 +0100 |
| commit | e71b16ae2b5623dc664c79ffa7d96282af662c78 (patch) | |
| tree | db77dc96f03d7e9b51e33b379dd1f1b9bebc0343 /package.json | |
| parent | 24696458bf22c8529b49f89b2791e3e07583b7e0 (diff) | |
| parent | 41b38b027396d50cac2cf995f2b5830c2cf592fa (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies.
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json index bab4b3c66..b244d94ba 100644 --- a/package.json +++ b/package.json @@ -60,13 +60,13 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.12.3", + "@babel/core": "^7.12.7", "@babel/plugin-proposal-class-properties": "^7.8.3", "@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.5", + "@babel/preset-env": "^7.12.7", + "@babel/preset-react": "^7.12.7", "@babel/runtime": "^7.12.5", "@clusterws/cws": "^3.0.0", "@gamestdio/websocket": "^0.3.2", @@ -168,16 +168,16 @@ "webpack": "^4.44.2", "webpack-assets-manifest": "^3.1.1", "webpack-bundle-analyzer": "^4.1.0", - "webpack-cli": "^4.2.0", + "webpack-cli": "^3.3.12", "webpack-merge": "^5.4.0", "wicg-inert": "^3.1.0" }, "devDependencies": { "@testing-library/jest-dom": "^5.11.6", - "@testing-library/react": "^11.2.0", + "@testing-library/react": "^11.2.2", "babel-eslint": "^10.1.0", "babel-jest": "^26.6.3", - "eslint": "^7.13.0", + "eslint": "^7.14.0", "eslint-plugin-import": "~2.22.1", "eslint-plugin-jsx-a11y": "~6.4.1", "eslint-plugin-promise": "~4.2.1", |