Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2019-07-10 11:06:21 +0300
committerJulius Härtl <jus@bitgrid.net>2019-07-10 11:17:23 +0300
commit4d3c06af6d1d4a6e1c11e60f17085ea9f3dd5e92 (patch)
treec7d3459c3ee302cb2e9b5472aa2963540e57c8f1 /webpack.common.js
parentad51857e54666617544f22353312a9c0668022f9 (diff)
Make sure we merge webpack rules properly
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'webpack.common.js')
-rw-r--r--webpack.common.js4
1 files changed, 2 insertions, 2 deletions
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)
);