Make sure we merge webpack rules properly

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

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'),
 				}
 			}

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)
 	);