From 9c175a597b1d4c8831f3e9e97c27694e7a1c70a7 Mon Sep 17 00:00:00 2001
From: "Juan Picado @jotadeveloper" <juanpicado19@gmail.com>
Date: Sat, 15 Jul 2017 23:22:11 +0200
Subject: [PATCH] fix: update dependencies, add webpack-merge

---
 package-lock.json | Bin 421907 -> 422181 bytes
 package.json      |  11 ++++++-----
 yarn.lock         | Bin 233990 -> 234187 bytes
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index baff6a1eb22cf56b03633ca135ba10e49004cfca..1f116a380c757efbdb8f3bed93c09fe54e12c082 100644
GIT binary patch
delta 109
zcmbRIKyv9L$%Yoj7N!>F7M2#)Eo?U;rw1sr$xOS&#4>%s2S%gmI#FyK;<>3s>8bj<
z`sJxf1&PVox?sMp$>fJ`RHPD1k~2Nc1JX-f(sF!LgQC)$a?`TC{4zp=CM&j>PQI_G
Lw*5jRo3j`ImU}1Q

delta 27
jcmZ4bNOJN6$%Yoj7N!>F7M2#)Eo?U;x4(*FvlasYp3w@8

diff --git a/package.json b/package.json
index c49d08e82..983b8339a 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,7 @@
     "pkginfo": "^0.4.0",
     "request": "^2.72.0",
     "semver": "^5.1.0",
-    "unix-crypt-td-js": "^1.0.0",
-    "webpack-merge": "^4.1.0"
+    "unix-crypt-td-js": "^1.0.0"
   },
   "devDependencies": {
     "axios": "0.16.2",
@@ -103,7 +102,8 @@
     "stylelint-config-standard": "16.0.0",
     "url-loader": "0.5.8",
     "webpack": "3.2.0",
-    "webpack-dev-server": "2.5.0"
+    "webpack-dev-server": "2.5.0",
+    "webpack-merge": "4.1.0"
   },
   "keywords": [
     "private",
@@ -125,10 +125,11 @@
     "test-only": "mocha ./test/functional ./test/unit",
     "lint": "eslint .",
     "lint:css": "stylelint 'src/**/*.scss' --syntax scss",
-    "build-docker": "docker build -t verdaccio . --no-cache",
-    "build:webui": "rimraf static/* && webpack --config tools/webpack.prod.config.babel.js --debug",
+    "pre:webpack": "npm run lint:css && npm run lint",
+    "build:webui": "npm run pre:webpack && rimraf static/* && webpack --config tools/webpack.prod.config.babel.js --debug",
     "dev:webui": "babel-node tools/dev.server.js",
     "prepublish": "in-publish && npm run build:webpack || not-in-publish",
+    "build-docker": "docker build -t verdaccio . --no-cache",
     "build-docker:rpi": "docker build -f Dockerfile.rpi -t verdaccio:rpi ."
   },
   "jest": {
diff --git a/yarn.lock b/yarn.lock
index d166511fc3e0bd043768b299d0e7712f40ff1f3b..137e726c54b4b6a9a48e3b654037388f5f820cd1 100644
GIT binary patch
delta 159
zcmZo$!gqQpU&9v06v4?HpZKRY3NjvIG-x*yVgzEQ?PfyEs_N5YESYy~7qwzuXv315
zT9iIn@R0L#{$gehcMvaCUsu08HK`ymIa?RZ*EP{I)HBd4Nv~2iOH460GBPqwGEOx}
zvM@GJH8nO&H8Hg`Pd2o)OtUnwG&VCdH8h;A*u^M5{hkOD+w=>knOIp2&Gk&SuP$Sb
GmIeTjdN26^

delta 64
zcmX@Tl&@_GU&9v06hU?!g_P8!()8)^L5yP4iv<}EwL1$j0x{EeXCY<@b;h{q(U#0R
T7~{4JTQM)R*<M}F93Tw<p1c#F