diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 16:19:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 18:36:16 +0200 |
| commit | 356e9150dfec5bbb8a56b128c1d3372cd5731ec6 (patch) | |
| tree | b5270b3fe3c38ef2d94670f06613c4bdf71d0631 /package.json | |
| parent | f4b008906dcfc3333ec533884aa10b65f8ae41a2 (diff) | |
| parent | ede0be5dba6836606db772a007ad9be5d60c7b99 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package.json b/package.json index 078ad82f7..87b4ead51 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@clusterws/cws": "^0.14.0", "array-includes": "^3.0.3", "atrament": "^0.2.3", - "autoprefixer": "^9.5.1", + "autoprefixer": "^9.6.0", "axios": "^0.19.0", "babel-loader": "^8.0.5", "babel-plugin-lodash": "^3.3.4", @@ -97,7 +97,7 @@ "exif-js": "^2.3.0", "express": "^4.17.1", "favico.js": "^0.3.10", - "file-loader": "^3.0.1", + "file-loader": "^4.0.0", "font-awesome": "^4.7.0", "glob": "^7.1.1", "http-link-header": "^1.0.2", @@ -149,7 +149,7 @@ "redux": "^4.0.1", "redux-immutable": "^4.0.0", "redux-thunk": "^2.2.0", - "rellax": "^1.7.1", + "rellax": "^1.10.0", "requestidlecallback": "^0.3.0", "reselect": "^4.0.0", "rimraf": "^2.6.3", @@ -161,20 +161,20 @@ "throng": "^4.0.0", "tiny-queue": "^0.2.1", "uuid": "^3.1.0", - "webpack": "^4.29.6", + "webpack": "^4.34.0", "webpack-assets-manifest": "^3.1.1", - "webpack-bundle-analyzer": "^3.1.0", - "webpack-cli": "^3.3.2", + "webpack-bundle-analyzer": "^3.3.2", + "webpack-cli": "^3.3.4", "webpack-merge": "^4.2.1", "websocket.js": "^0.1.12" }, "devDependencies": { "babel-eslint": "^10.0.1", "babel-jest": "^24.8.0", - "enzyme": "^3.8.0", - "enzyme-adapter-react-16": "^1.7.1", + "enzyme": "^3.10.0", + "enzyme-adapter-react-16": "^1.14.0", "eslint": "^5.11.1", - "eslint-plugin-import": "~2.14.0", + "eslint-plugin-import": "~2.17.3", "eslint-plugin-jsx-a11y": "~6.2.1", "eslint-plugin-promise": "~4.1.1", "eslint-plugin-react": "~7.12.1", |