Merge 3c99bc6 into 2f10309

mochajs · Nov 30, 2019 · 8c34ca3 · 8c34ca3
2 parents 2f10309 + 3c99bc6
commit 8c34ca3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -29,7 +29,7 @@ overrides:
       - test/integration/helpers.js
       - lib/growl.js
     parserOptions:
-      ecmaVersion: 6
+      ecmaVersion: 2017
     env:
       browser: no
 
@@ -77,7 +77,7 @@ overrides:
   - files:
       - test/**/*.mjs
     parserOptions:
-      ecmaVersion: 6
+      ecmaVersion: 2017
       sourceType: module
 
   - files:

diff --git a/karma.conf.js b/karma.conf.js
@@ -31,8 +31,10 @@ module.exports = config => {
     browserify: {
       debug: true,
       configure: function configure(b) {
-        b.ignore('glob')
+        b.ignore('./lib/cli/*.js')
+          .ignore('chokidar')
           .ignore('fs')
+          .ignore('glob')
           .ignore('path')
           .ignore('supports-color')
           .on('bundled', (err, content) => {

diff --git a/package-scripts.js b/package-scripts.js
@@ -23,7 +23,7 @@ function test(testName, mochaParams) {
 module.exports = {
   scripts: {
     build: {
-      script: `browserify -e browser-entry.js --plugin ./scripts/dedefine --ignore 'fs' --ignore 'glob' --ignore 'path' --ignore 'supports-color' --ignore chokidar -o mocha.js`,
+      script: `browserify -e browser-entry.js --plugin ./scripts/dedefine --ignore './lib/cli/*.js' --ignore 'chokidar' --ignore 'fs' --ignore 'glob' --ignore 'path' --ignore 'supports-color' -o mocha.js`,
       description: 'Build browser bundle'
     },
     lint: {

diff --git a/package.json b/package.json
@@ -626,11 +626,12 @@
     "./index.js": "./browser-entry.js",
     "./lib/growl.js": "./lib/browser/growl.js",
     "tty": "./lib/browser/tty.js",
+    "./lib/cli/*.js": false,
+    "chokidar": false,
     "fs": false,
     "glob": false,
     "path": false,
-    "supports-color": false,
-    "chokidar": false
+    "supports-color": false
   },
   "prettier": {
     "singleQuote": true,