diff options
| author | Starfall <root@starfall.blue> | 2019-12-09 19:07:33 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2019-12-09 19:09:31 -0600 |
| commit | 6b34fcfef7566105e8d80ab5fee0a539c06cddbf (patch) | |
| tree | 8fad2d47bf8be255d3c671c40cbfd04c2f55ed03 /config/webpack | |
| parent | 9fbb4af7611aa7836e65ef9f544d341423c15685 (diff) | |
| parent | 246addd5b33a172600342af3fb6fb5e4c80ad95e (diff) | |
Merge branch 'glitch'`
Diffstat (limited to 'config/webpack')
| -rw-r--r-- | config/webpack/development.js | 1 | ||||
| -rw-r--r-- | config/webpack/rules/css.js | 5 | ||||
| -rw-r--r-- | config/webpack/shared.js | 5 | ||||
| -rw-r--r-- | config/webpack/tests.js (renamed from config/webpack/test.js) | 0 |
4 files changed, 9 insertions, 2 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/rules/css.js b/config/webpack/rules/css.js index f9b87de9b..6ecfb3164 100644 --- a/config/webpack/rules/css.js +++ b/config/webpack/rules/css.js @@ -9,7 +9,6 @@ module.exports = { options: { sourceMap: true, importLoaders: 2, - localIdentName: '[name]__[local]___[hash:base64:5]', }, }, { @@ -21,7 +20,9 @@ module.exports = { { loader: 'sass-loader', options: { - includePaths: ['app/javascript'], + sassOptions: { + includePaths: ['app/javascript'], + }, implementation: require('sass'), sourceMap: true, }, 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: { diff --git a/config/webpack/test.js b/config/webpack/tests.js index 8b56eb92f..8b56eb92f 100644 --- a/config/webpack/test.js +++ b/config/webpack/tests.js |