From 5df8f5307b84f02c5cc23cf7d337a23411f7d8e8 Mon Sep 17 00:00:00 2001
From: Christopher Hiller <boneskull@boneskull.com>
Date: Tue, 26 May 2020 16:55:09 -0700
Subject: [PATCH] once again fiddle with browserify

---
 .eslintrc.yml             |  1 -
 karma.conf.js             |  6 +++++-
 lib/mocha.js              |  2 +-
 lib/{ => nodejs}/growl.js |  4 ++--
 package-scripts.js        | 16 +++++++++++++++-
 package.json              |  8 ++++++--
 6 files changed, 29 insertions(+), 8 deletions(-)
 rename lib/{ => nodejs}/growl.js (97%)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 16aeff313d..e185b97711 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -32,7 +32,6 @@ overrides:
       - 'bin/*'
       - 'docs/_data/**/*.js'
       - 'lib/cli/**/*.js'
-      - 'lib/growl.js'
       - 'lib/nodejs/**/*.js'
       - 'scripts/**/*.js'
       - 'test/integration/helpers.js'
diff --git a/karma.conf.js b/karma.conf.js
index 0aec4006a5..610f4ecda2 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -37,7 +37,11 @@ module.exports = config => {
           .ignore('supports-color')
           .ignore('./lib/esm-utils.js')
           .ignore('./lib/cli/*.js')
-          .ignore('./lib/nodejs/*.js')
+          .ignore('./lib/nodejs/serializer.js')
+          .ignore('./lib/nodejs/worker.js')
+          .ignore('./lib/nodejs/buffered-worker-pool.js')
+          .ignore('./lib/nodejs/buffered-runner.js')
+          .ignore('./lib/nodejs/reporters/buffered.js')
           .on('bundled', (err, content) => {
             if (err) {
               throw err;
diff --git a/lib/mocha.js b/lib/mocha.js
index 523dc11bb9..b078121624 100644
--- a/lib/mocha.js
+++ b/lib/mocha.js
@@ -9,7 +9,7 @@
 var escapeRe = require('escape-string-regexp');
 var path = require('path');
 var builtinReporters = require('./reporters');
-var growl = require('./growl');
+var growl = require('./nodejs/growl');
 var utils = require('./utils');
 var mocharc = require('./mocharc.json');
 var errors = require('./errors');
diff --git a/lib/growl.js b/lib/nodejs/growl.js
similarity index 97%
rename from lib/growl.js
rename to lib/nodejs/growl.js
index 9ad19f5468..6664d67c67 100644
--- a/lib/growl.js
+++ b/lib/nodejs/growl.js
@@ -8,8 +8,8 @@
 const os = require('os');
 const path = require('path');
 const {sync: which} = require('which');
-const {EVENT_RUN_END} = require('./runner').constants;
-const {isBrowser} = require('./utils');
+const {EVENT_RUN_END} = require('../runner').constants;
+const {isBrowser} = require('../utils');
 
 /**
  * @summary
diff --git a/package-scripts.js b/package-scripts.js
index e6f0f61e10..8819f72292 100644
--- a/package-scripts.js
+++ b/package-scripts.js
@@ -34,7 +34,21 @@ function test(testName, mochaParams) {
 module.exports = {
   scripts: {
     build: {
-      script: `browserify -e browser-entry.js --plugin ./scripts/dedefine --ignore './lib/cli/*.js' --ignore './lib/esm-utils.js' --ignore 'chokidar' --ignore 'fs' --ignore 'glob' --ignore 'path' --ignore 'supports-color' --ignore './lib/nodejs/*.js' -o mocha.js`,
+      script: `browserify -e browser-entry.js \
+      --plugin ./scripts/dedefine \
+      --ignore 'chokidar' \
+      --ignore 'fs' \
+      --ignore 'glob' \
+      --ignore 'path' \
+      --ignore 'supports-color' \
+      --ignore './lib/cli/*.js' \
+      --ignore './lib/esm-utils.js' \
+      --ignore './lib/nodejs/serializer.js' \
+      --ignore './lib/nodejs/buffered-runner.js' \
+      --ignore './lib/nodejs/reporters/buffered.js' \
+      --ignore './lib/nodejs/worker.js' \
+      --ignore './lib/nodejs/buffered-worker-pool.js' \
+      -o mocha.js`,
       description: 'Build browser bundle'
     },
     lint: {
diff --git a/package.json b/package.json
index 0cb6237647..d0beb9b42c 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
   },
   "browser": {
     "./index.js": "./browser-entry.js",
-    "./lib/growl.js": "./lib/browser/growl.js",
+    "./lib/nodejs/growl.js": "./lib/browser/growl.js",
     "tty": "./lib/browser/tty.js",
     "./lib/cli/*.js": false,
     "chokidar": false,
@@ -164,7 +164,11 @@
     "glob": false,
     "path": false,
     "supports-color": false,
-    "./lib/nodejs/*.js": false
+    "./lib/nodejs/serializer.js": false,
+    "./lib/nodejs/worker.js": false,
+    "./lib/nodejs/buffered-worker-pool.js": false,
+    "./lib/nodejs/buffered-runner.js": false,
+    "./lib/nodejs/reporters/buffered.js": false
   },
   "prettier": {
     "singleQuote": true,