From 4d3c06af6d1d4a6e1c11e60f17085ea9f3dd5e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 10 Jul 2019 10:06:21 +0200
Subject: [PATCH] Make sure we merge webpack rules properly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
apps/workflowengine/webpack.js | 5 +++--
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)
);
--
GitLab