diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-09-01 16:52:37 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-09-01 17:02:18 +0200 |
commit | 3fefb7909ba55d0c8d82a4bf711aac0668a3a38c (patch) | |
tree | b77f9cb09791fbe92cc3a93d1b08c39ee383c843 /package.json | |
parent | d95dd3883e0c7d1626f5e3b88d24af2627a641e2 (diff) | |
parent | 79305428a7c2bda311bc9d367a84acc28f569522 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/package.json b/package.json index 658944c7e..3982f7cde 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,6 @@ "blurhash": "^1.1.3", "classnames": "^2.2.5", "compression-webpack-plugin": "^5.0.1", - "copy-webpack-plugin": "^6.0.3", "cross-env": "^7.0.2", "css-loader": "^4.2.2", "cssnano": "^4.1.10", @@ -114,7 +113,7 @@ "lodash": "^4.17.19", "mark-loader": "^0.1.6", "marky": "^1.2.1", - "mini-css-extract-plugin": "^0.9.0", + "mini-css-extract-plugin": "^0.11.0", "mkdirp": "^1.0.4", "npmlog": "^4.1.2", "object-assign": "^4.1.1", @@ -162,7 +161,7 @@ "stringz": "^2.1.0", "substring-trie": "^1.0.2", "terser-webpack-plugin": "^3.0.6", - "tesseract.js": "2.0.0-alpha.16", + "tesseract.js": "^2.1.1", "throng": "^4.0.0", "tiny-queue": "^0.2.1", "uuid": "^8.2.0", @@ -174,7 +173,7 @@ "wicg-inert": "^3.0.3" }, "devDependencies": { - "@testing-library/jest-dom": "^5.11.2", + "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^10.4.7", "babel-eslint": "^10.1.0", "babel-jest": "^26.3.0", |