Merge branch 'dependabot/npm_and_yarn/eslint-7.1.0'

ajv-validator · May 26, 2020 · 11357b6 · 11357b6
2 parents cfb974a + baaafd1
commit 11357b6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -3,7 +3,7 @@ env:
   node: true
 extends: 'eslint:recommended'
 rules:
-  indent: [2, 4, { SwitchCase : 1 } ]
+  indent-legacy: [2, 4, { SwitchCase : 1 } ]
   no-trailing-spaces: 2
   quotes: [ 2, single, avoid-escape ]
   linebreak-style: [ 2, unix ]

diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ coverage
 node_modules
 
 .DS_Store
+package-lock.json
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,10 @@ language: node_js
 before_script:
   - npm install -g codeclimate-test-reporter
 node_js:
-  - "8"
   - "10"
   - "12"
+  - "13"
+  - "14"
 after_script:
   - codeclimate-test-reporter < coverage/lcov.info
   - coveralls < coverage/lcov.info
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
   "devDependencies": {
     "ajv-keywords": "^3.2.0",
     "coveralls": "^3.0.0",
-    "eslint": "^2.4.0",
+    "eslint": "^7.1.0",
     "mocha": "^7.2.0",
     "nyc": "^15.0.1",
     "pre-commit": "^1.2.0"

diff --git a/test/.eslintrc.yml b/test/.eslintrc.yml
@@ -1,6 +1,6 @@
 ---
 rules:
-  indent: [2, 2, { SwitchCase : 1 } ]
+  indent-legacy: [2, 2, { SwitchCase : 1 } ]
   no-invalid-this: 0
   no-empty: [2, allowEmptyCatch: true]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,4 @@ coverage
		node_modules

		.DS_Store
		package-lock.json