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 /config/webpack | |
| 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 'config/webpack')
| -rw-r--r-- | config/webpack/development.js | 1 | ||||
| -rw-r--r-- | config/webpack/shared.js | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/webpack/development.js b/config/webpack/development.js index 1e50a4f46..56f6e43f0 100644 --- a/config/webpack/development.js +++ b/config/webpack/development.js @@ -56,5 +56,6 @@ module.exports = merge(sharedConfig, { settings.dev_server.watch_options, watchOptions ), + writeToDisk: filePath => /ocr/.test(filePath), }, }); diff --git a/config/webpack/shared.js b/config/webpack/shared.js index b6e2537b1..1741ffdb9 100644 --- a/config/webpack/shared.js +++ b/config/webpack/shared.js @@ -5,6 +5,7 @@ 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'); @@ -109,6 +110,10 @@ module.exports = { writeToDisk: true, publicPath: true, }), + new CopyPlugin([ + { from: 'node_modules/tesseract.js/dist/worker.min.js', to: 'ocr' }, + { from: 'node_modules/tesseract.js-core/tesseract-core.wasm.js', to: 'ocr' }, + ]), ], resolve: { |