diff --git a/.eslintignore b/.eslintignore
index 7862c971..675b6a8c 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,3 @@
-vendor/*
-!/vendor/vendor.js
-!/modules/default/**
-!/modules/node_helper
-!/modules/node_helper/**
+modules/default/alert/notificationFx.js
+modules/default/alert/modernizr.custom.js
+modules/default/alert/classie.js
diff --git a/Gruntfile.js b/Gruntfile.js
index 557bfa62..9953cf80 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,28 +1,7 @@
 module.exports = function(grunt) {
 	require("time-grunt")(grunt);
-	var fix = (grunt.option("env") || "lint") === "lint";
 	grunt.initConfig({
-		eslint: {
-			options: {
-				fix: fix,
-				configFile: ".eslintrc.json"
-			},
-			target: [
-				"js/*.js",
-				"modules/default/*.js",
-				"modules/default/*/*.js",
-				"serveronly/*.js",
-				"clientonly/*.js",
-				"*.js",
-				"tests/**/*.js",
-				"!modules/default/alert/notificationFx.js",
-				"!modules/default/alert/modernizr.custom.js",
-				"!modules/default/alert/classie.js",
-				"config/*",
-				"translations/translations.js",
-				"vendor/vendor.js"
-			]
-		},
+		pkg: grunt.file.readJSON("package.json"),
 		jsonlint: {
 			main: {
 				src: [
@@ -39,7 +18,6 @@ module.exports = function(grunt) {
 			}
 		}
 	});
-	grunt.loadNpmTasks("grunt-eslint");
 	grunt.loadNpmTasks("grunt-jsonlint");
-	grunt.registerTask("default", ["eslint", "jsonlint"]);
+	grunt.registerTask("default", ["jsonlint"]);
 };
diff --git a/package.json b/package.json
index 89caa773..baf6bed9 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,11 @@
     "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
     "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
     "test:lint": "grunt --env=test",
+    "text:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json",
     "test:style": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
     "config:check": "node tests/configs/check_config.js",
     "lint": "grunt --env=lint",
+    "lint:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix",
     "lint:markdown": "markdownlint *.md modules/README.md modules/default/**/*.md --config .markdownlintrc.json",
     "lint:style": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix",
     "lint:yaml": "yamllint .travis.yml"
@@ -44,8 +46,7 @@
     "chai-as-promised": "^7.1.1",
     "current-week-number": "^1.0.7",
     "danger": "^3.1.3",
-    "grunt": "latest",
-    "grunt-eslint": "latest",
+    "eslint": "^6.8.0",
     "grunt-jsonlint": "latest",
     "http-auth": "^3.2.3",
     "jsdom": "^11.6.2",