diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-06-17 17:10:15 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-17 17:10:15 +0200 |
| commit | 59e92004b3aa8543a42f1bd40d32f936177a434d (patch) | |
| tree | d952a82dc15cc16bda626d60dd0162c25bb125b4 /package.json | |
| parent | 0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200 (diff) | |
| parent | b1d492f30a584a9e204ac1345e6508ed4acb44bd (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index afb16618f..ba47aa059 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@babel/core": "^7.10.2", "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-decorators": "^7.8.3", - "@babel/plugin-transform-react-inline-elements": "^7.9.0", + "@babel/plugin-transform-react-inline-elements": "^7.10.1", "@babel/plugin-transform-runtime": "^7.10.1", "@babel/preset-env": "^7.10.2", "@babel/preset-react": "^7.10.1", @@ -87,7 +87,7 @@ "compression-webpack-plugin": "^4.0.0", "copy-webpack-plugin": "^6.0.2", "cross-env": "^7.0.2", - "css-loader": "^3.5.3", + "css-loader": "^3.6.0", "cssnano": "^4.1.10", "detect-passive-events": "^1.0.2", "dotenv": "^8.2.0", @@ -178,11 +178,11 @@ "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.2", "eslint": "^6.8.0", - "eslint-plugin-import": "~2.20.2", + "eslint-plugin-import": "~2.21.2", "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-promise": "~4.2.1", "eslint-plugin-react": "~7.20.0", - "jest": "^25.4.0", + "jest": "^26.0.1", "raf": "^3.4.1", "react-intl-translations-manager": "^5.0.3", "react-test-renderer": "^16.13.1", |