fix: Properly allow .eslintrc overrides and restore support for ES6 g…

…lobals by default. (#40)
videojs · Sep 26, 2018 · 560bcdb · 560bcdb
1 parent 6e00fa0
commit 560bcdb
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 79 deletions.
diff --git a/cli.js b/cli.js
@@ -38,7 +38,7 @@ if (config.jsdoc === false) {
 
 const cli = new CLIEngine({
   cwd: process.cwd(),
-  configFile: path.join(__dirname, 'eslintrc.json'),
+  baseConfig: require(path.join(__dirname, 'eslintrc.json')),
   fix: Boolean(commander.format),
   ignorePattern: config.ignore,
   cache: true,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   "dependencies": {
     "commander": "^2.17.1",
     "eslint": "^5.4.0",
-    "eslint-config-videojs": "^5.0.1",
+    "eslint-config-videojs": "^5.0.2",
     "eslint-plugin-jsdoc": "^3.7.1",
     "eslint-plugin-json-light": "^1.0.3",
     "eslint-plugin-markdown": "^1.0.0-beta.8",