diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 19:31:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 21:49:35 +0200 |
| commit | 1488be7d9683fb3442c6f7bd4fd911d224f0c929 (patch) | |
| tree | 42548a596bb118e08c14c4d0ae9eacb3e8b2f36b /package.json | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
| parent | d22f3a7d5140ef1c3ae6e9bd2241bbb5289af8d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/package.json b/package.json index 061234a31..6bbe87f11 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,7 @@ "blurhash": "^1.0.0", "classnames": "^2.2.5", "compression-webpack-plugin": "^3.0.0", + "copy-webpack-plugin": "^5.0.4", "cross-env": "^5.1.4", "css-loader": "^3.2.0", "cssnano": "^4.1.10", @@ -96,8 +97,8 @@ "escape-html": "^1.0.3", "exif-js": "^2.3.0", "express": "^4.17.1", + "file-loader": "^4.2.0", "favico.js": "^0.3.10", - "file-loader": "^4.1.0", "font-awesome": "^4.7.0", "glob": "^7.1.1", "http-link-header": "^1.0.2", @@ -137,7 +138,7 @@ "react-notification": "^6.8.4", "react-overlays": "^0.8.3", "react-redux": "^7.1.0", - "react-redux-loading-bar": "^4.0.8", + "react-redux-loading-bar": "^4.4.0", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", "react-select": "^2.4.4", @@ -146,18 +147,19 @@ "react-textarea-autosize": "^7.1.0", "react-toggle": "^4.0.1", "redis": "^2.7.1", - "redux": "^4.0.1", + "redux": "^4.0.4", "redux-immutable": "^4.0.0", "redux-thunk": "^2.2.0", "rellax": "^1.10.0", "requestidlecallback": "^0.3.0", "reselect": "^4.0.0", - "rimraf": "^2.6.3", + "rimraf": "^3.0.0", "sass": "^1.22.9", "sass-loader": "^7.0.3", "stringz": "^2.0.0", "substring-trie": "^1.0.2", "terser-webpack-plugin": "^1.4.1", + "tesseract.js": "^2.0.0-alpha.13", "throng": "^4.0.0", "tiny-queue": "^0.2.1", "uuid": "^3.1.0", |