diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-26 22:54:09 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-26 23:19:22 +0200 |
| commit | aaec64a500346502aedefff446f1d8688ac5077c (patch) | |
| tree | b24b5c7fa4b500b00c85cee3ef2cbb553d763f4d /package.json | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
| parent | 3086c645fde2345d34e401bdf3e2f19f19da3294 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json index 87b4ead51..c1a6a3b9b 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "atrament": "^0.2.3", "autoprefixer": "^9.6.0", "axios": "^0.19.0", - "babel-loader": "^8.0.5", + "babel-loader": "^8.0.6", "babel-plugin-lodash": "^3.3.4", "babel-plugin-preval": "^3.0.1", "babel-plugin-react-intl": "^3.1.3", @@ -112,7 +112,7 @@ "lodash": "^4.7.11", "mark-loader": "^0.1.6", "marky": "^1.2.1", - "mini-css-extract-plugin": "^0.5.0", + "mini-css-extract-plugin": "^0.7.0", "mkdirp": "^0.5.1", "npmlog": "^4.1.2", "object-assign": "^4.1.1", @@ -155,7 +155,7 @@ "rimraf": "^2.6.3", "sass": "^1.20.3", "sass-loader": "^7.0.3", - "stringz": "^1.0.0", + "stringz": "^2.0.0", "substring-trie": "^1.0.2", "terser-webpack-plugin": "^1.3.0", "throng": "^4.0.0", @@ -173,7 +173,7 @@ "babel-jest": "^24.8.0", "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.14.0", - "eslint": "^5.11.1", + "eslint": "^5.16.0", "eslint-plugin-import": "~2.17.3", "eslint-plugin-jsx-a11y": "~6.2.1", "eslint-plugin-promise": "~4.1.1", @@ -183,7 +183,7 @@ "react-intl-translations-manager": "^5.0.3", "react-test-renderer": "^16.8.6", "sass-lint": "^1.13.1", - "webpack-dev-server": "^3.5.1", + "webpack-dev-server": "^3.7.2", "yargs": "^12.0.5" } } |