From e71bf9c2882a54fca7897628f792887cd25de16f Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Fri, 24 Jan 2020 18:30:31 -0800
Subject: [PATCH] use cpx2 instead of unmaintained cpx package

---
 package-lock.json | Bin 772908 -> 764447 bytes
 package.json      |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index df1d45362823f9814a7971554c7655415b20e998..3cc465afa6de76dc269c4ad9dab41dd3bfd21d0c 100644
GIT binary patch
delta 545
zcmV++0^a?smM@>wE`WpqgaWh!6bzRj5(5UejSU0GC%0ub1CRx`(mVrXFSmbf0}&dx
z;D`gtEw{qB1ENO(GM7QB15gTZcrq_7FJo|cGMBNc10|QxBnAakQ)_5Bct~wkZb(gd
zR#Q1SQ*c2;VnKH{YEMI9YH2V_d1Y`yQ8X`AOj=PZQbH>;bx<-;LN9uGY)?aKQ+Qf-
zIWJ>&Z)Ha@SanfiT2OgTby;R~lVM3Ymz@6w8J7tt0SuQla03&U{^|t@ml?|f6PI`a
z1Rs}8CJ76dfFKDJmrbn-8x3b{Z(=fHVRL07Iv^sKzySm$mkx0R4wsF`3JV8bF)lGO
zE-;rN0t6qI<;?>S6LV-~Y-}xYb#HWKB03-<UNJ5=mtz71DVN{W10}b>-2rz3mky)^
z4VSiu1sj)eiwioJ?$8Mvm&1z-Dph7$MR!$4VpeQ7Yj1U0b1`Z|WKB$DbU8I>WJz`~
zT4hLQHcU5hP-SCjO<HJLD=%kcWph_FcV|>VQfqQXS4D7haB4+CR6%-GM^HyNPBLmr
zX?J3m@rMg1myj9+8MmAQ1cRlQZLkFhw{EHgd>yy<$OPI(w~!JAH9xn`QUwN7w;ZVj
zqi(mr83rB)x9%YZt^~JYC<bE+htV?zhtV?!x6v~Q%qq9FUkC>bw_<JxEn2t9$q14k
jx6tYcJTJH18VMRFxB5j1z(t2ijtPfJjtaL)jtk>FPVm2(

delta 3760
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
S<dJ<j8eL3#UrzMut^Wl8fbk&!

diff --git a/package.json b/package.json
index 0a0a11dd3..f6d8ef285 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "serve": "http-server -p 1338",
     "model-server": "node lib/servers/model/server.js",
     "model-server-watch": "nodemon --watch lib lib/servers/model/server.js",
-    "volume-server": "node lib/servers/volume/server.js --idMap em 'test/${id}.mdb' --defaultPort  1336",
+    "volume-server": "node lib/servers/volume/server.js --idMap em 'test/${id}.mdb' --defaultPort 1336",
     "preversion": "npm run test",
     "postversion": "git push && git push --tags",
     "prepublishOnly": "npm run test && npm run build"
@@ -76,7 +76,7 @@
     "benchmark": "^2.1.4",
     "circular-dependency-plugin": "^5.2.0",
     "concurrently": "^5.0.2",
-    "cpx": "^1.5.0",
+    "cpx2": "^2.0.0",
     "css-loader": "^3.4.2",
     "eslint": "^6.8.0",
     "extra-watch-webpack-plugin": "^1.0.3",
-- 
GitLab