From e3dfedf8b501ec987a946576cea51aa1d694472d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= <jeremie@astori.fr>
Date: Tue, 26 Mar 2019 23:16:39 -0400
Subject: [PATCH] Replace mocha-webpack with mochapack

---
 package.json                                  |  4 +-
 ...{.nycrc-mocha-webpack => .nycrc-mochapack} |  0
 test/{mocha-webpack.opts => mochapack.opts}   |  0
 yarn.lock                                     | 70 +++++++++++++------
 4 files changed, 49 insertions(+), 25 deletions(-)
 rename test/{.nycrc-mocha-webpack => .nycrc-mochapack} (100%)
 rename test/{mocha-webpack.opts => mochapack.opts} (100%)

diff --git a/package.json b/package.json
index f700ab11..7b5ded06 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "start": "node index start",
     "test": "run-p --aggregate-output --continue-on-error lint:* test:{client,server}",
     "test:browser": "webpack-dev-server --config=webpack.config-browser.js",
-    "test:client": "nyc --nycrc-path=test/.nycrc-mocha-webpack mocha-webpack --colors --opts=test/mocha-webpack.opts",
+    "test:client": "nyc --nycrc-path=test/.nycrc-mochapack mochapack --colors --opts=test/mochapack.opts",
     "test:server": "nyc --nycrc-path=test/.nycrc-mocha mocha --colors",
     "watch": "webpack --watch"
   },
@@ -95,7 +95,7 @@
     "mini-css-extract-plugin": "0.5.0",
     "mocha": "6.0.2",
     "mocha-loader": "2.0.1",
-    "mocha-webpack": "2.0.0-beta.0",
+    "mochapack": "1.1.0",
     "moment": "2.24.0",
     "mousetrap": "1.6.3",
     "npm-run-all": "4.1.5",
diff --git a/test/.nycrc-mocha-webpack b/test/.nycrc-mochapack
similarity index 100%
rename from test/.nycrc-mocha-webpack
rename to test/.nycrc-mochapack
diff --git a/test/mocha-webpack.opts b/test/mochapack.opts
similarity index 100%
rename from test/mocha-webpack.opts
rename to test/mochapack.opts
diff --git a/yarn.lock b/yarn.lock
index 3956063c..68135b7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1974,6 +1974,25 @@ chokidar@^2.0.0, chokidar@^2.0.2:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^2.0.4:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
 chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
@@ -5579,29 +5598,6 @@ mocha-loader@2.0.1:
     script-loader "^0.7.2"
     style-loader "^0.23.1"
 
-mocha-webpack@2.0.0-beta.0:
-  version "2.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/mocha-webpack/-/mocha-webpack-2.0.0-beta.0.tgz#d85fc9a70f82a4ad595b7702a1181605dfa59549"
-  integrity sha512-2ezbW0h5cYWr874F/hzytQCqINxk+GVelMY4xWTSHwwH1LrPAOzjlUljZ+/PhpaP6QeqYbL5x5vK/bnaXqkfEw==
-  dependencies:
-    babel-runtime "^6.18.0"
-    chalk "^2.3.0"
-    chokidar "^2.0.2"
-    glob-parent "^3.1.0"
-    globby "^7.1.1"
-    interpret "^1.0.1"
-    is-glob "^4.0.0"
-    loader-utils "^1.1.0"
-    lodash "^4.3.0"
-    memory-fs "^0.4.1"
-    nodent-runtime "^3.0.3"
-    normalize-path "^2.0.1"
-    progress "^2.0.0"
-    source-map-support "^0.5.0"
-    strip-ansi "^4.0.0"
-    toposort "^1.0.0"
-    yargs "^11.0.0"
-
 mocha@6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.0.2.tgz#cdc1a6fdf66472c079b5605bac59d29807702d2c"
@@ -5631,6 +5627,29 @@ mocha@6.0.2:
     yargs-parser "11.1.1"
     yargs-unparser "1.5.0"
 
+mochapack@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mochapack/-/mochapack-1.1.0.tgz#0fe24228b4b92a987ece2258e96188f59f248435"
+  integrity sha512-IFNA4LasRYWu2pNRjDRpoU8I/aLLgdVfkqlWz+x+tMLBrQO3HC18b+gjevIKeIfjVJ3msNJSSa4elOLNVd9HPw==
+  dependencies:
+    babel-runtime "^6.18.0"
+    chalk "^2.3.0"
+    chokidar "^2.0.4"
+    glob-parent "^3.1.0"
+    globby "^7.1.1"
+    interpret "^1.0.1"
+    is-glob "^4.0.0"
+    loader-utils "^1.1.0"
+    lodash "^4.3.0"
+    memory-fs "^0.4.1"
+    nodent-runtime "^3.0.3"
+    normalize-path "^2.0.1"
+    progress "^2.0.0"
+    source-map-support "^0.5.0"
+    strip-ansi "^4.0.0"
+    toposort "^1.0.0"
+    yargs "^11.0.0"
+
 moment@2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
@@ -8780,6 +8799,11 @@ upath@^1.1.0:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
   integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
 
+upath@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"