diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-07-10 10:06:21 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-07-10 10:17:23 +0200 |
| commit | 4d3c06af6d1d4a6e1c11e60f17085ea9f3dd5e92 (patch) | |
| tree | c7d3459c3ee302cb2e9b5472aa2963540e57c8f1 | |
| parent | ad51857e54666617544f22353312a9c0668022f9 (diff) | |
| download | nextcloud-server-4d3c06af6d1d4a6e1c11e60f17085ea9f3dd5e92.tar.gz nextcloud-server-4d3c06af6d1d4a6e1c11e60f17085ea9f3dd5e92.zip | |
Make sure we merge webpack rules properly
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | apps/workflowengine/webpack.js | 5 | ||||
| -rw-r--r-- | webpack.common.js | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/apps/workflowengine/webpack.js b/apps/workflowengine/webpack.js index 1d7ec1595a1..80ec96da675 100644 --- a/apps/workflowengine/webpack.js +++ b/apps/workflowengine/webpack.js @@ -10,9 +10,10 @@ module.exports = { module: { rules: [ { - test: /\.handlebars$/, + test: /\.handlebars/, loader: "handlebars-loader", - options: { + query: { + extensions: '.handlebars', helperDirs: path.join(__dirname, 'src/hbs_helpers'), } } diff --git a/webpack.common.js b/webpack.common.js index 1fa889b9878..7315fa9f8bc 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -32,7 +32,7 @@ module.exports = [] workflowengine ) .map(config => - merge(config, { + merge.smart({ module: { rules: [ { @@ -81,5 +81,5 @@ module.exports = [] }, extensions: ['*', '.js', '.vue', '.json'] } - }) + }, config) ); |