Make sure we merge webpack rules properly

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/workflowengine/webpack.js b/apps/workflowengine/webpack.js
index 1d7ec1595a178002d150b15d6cd5376eddb18579..80ec96da675fbac1d611b677e290ba3f62ec2e11 100644 (file)
--- 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 1fa889b98789c957ec85dbabcb4bb8787a804623..7315fa9f8bc2c87173bcc058f24d78aac392996d 100644 (file)
--- 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)
        );