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 /config/webpack/shared.js | |
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 'config/webpack/shared.js')
-rw-r--r-- | config/webpack/shared.js | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/config/webpack/shared.js b/config/webpack/shared.js index 36b5a459e..11c321c58 100644 --- a/config/webpack/shared.js +++ b/config/webpack/shared.js @@ -5,7 +5,6 @@ const { basename, dirname, join, relative, resolve } = require('path'); const { sync } = require('glob'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const AssetsManifestPlugin = require('webpack-assets-manifest'); -const CopyPlugin = require('copy-webpack-plugin'); const { env, settings, core, flavours, output } = require('./configuration.js'); const rules = require('./rules'); const localePacks = require('./generateLocalePacks'); @@ -110,12 +109,6 @@ module.exports = { writeToDisk: true, publicPath: true, }), - new CopyPlugin({ - patterns: [ - { from: 'node_modules/tesseract.js/dist/worker.min.js', to: 'ocr' }, - { from: 'node_modules/tesseract.js-core/tesseract-core.wasm.js', to: 'ocr' }, - ], - }), ], resolve: { |