diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-07 15:34:00 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-07 15:58:45 +0200 |
| commit | e9ad99bc93b6f65277956d997792ec40f08165cb (patch) | |
| tree | ce71714d2d0d680adecf070cb4e698f3a6984b56 /package.json | |
| parent | 94e09d309cb068ea92919767e40e655260ac43cb (diff) | |
| parent | 6e25574ce599cbc37b7215ded03c7d07208af6bb (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package.json b/package.json index fbf5fb673..bbf436fdb 100644 --- a/package.json +++ b/package.json @@ -63,17 +63,17 @@ "@babel/core": "^7.10.3", "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-decorators": "^7.10.3", - "@babel/plugin-transform-react-inline-elements": "^7.10.1", - "@babel/plugin-transform-runtime": "^7.10.3", - "@babel/preset-env": "^7.10.2", - "@babel/preset-react": "^7.10.1", + "@babel/plugin-transform-react-inline-elements": "^7.10.4", + "@babel/plugin-transform-runtime": "^7.10.4", + "@babel/preset-env": "^7.10.4", + "@babel/preset-react": "^7.10.4", "@babel/runtime": "^7.8.4", "@clusterws/cws": "^2.0.0", "@gamestdio/websocket": "^0.3.2", "@rails/ujs": "^6.0.3", "array-includes": "^3.1.1", - "arrow-key-navigation": "^1.1.0", "atrament": "0.2.4", + "arrow-key-navigation": "^1.2.0", "autoprefixer": "^9.8.0", "axios": "^0.19.2", "babel-loader": "^8.1.0", @@ -159,7 +159,7 @@ "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", "substring-trie": "^1.0.2", - "terser-webpack-plugin": "^3.0.3", + "terser-webpack-plugin": "^3.0.6", "tesseract.js": "^2.1.1", "throng": "^4.0.0", "tiny-queue": "^0.2.1", @@ -175,7 +175,7 @@ "@testing-library/jest-dom": "^5.11.0", "@testing-library/react": "^10.4.3", "babel-eslint": "^10.1.0", - "babel-jest": "^25.2.4", + "babel-jest": "^26.1.0", "eslint": "^6.8.0", "eslint-plugin-import": "~2.21.2", "eslint-plugin-jsx-a11y": "~6.3.1", @@ -187,7 +187,7 @@ "react-test-renderer": "^16.13.1", "sass-lint": "^1.13.1", "webpack-dev-server": "^3.11.0", - "yargs": "^15.3.1" + "yargs": "^15.4.0" }, "resolutions": { "kind-of": "^6.0.3" |