summaryrefslogtreecommitdiff
path: root/searx
diff options
context:
space:
mode:
authorAlexandre Flament <alex@al-f.net>2021-08-24 09:52:40 +0200
committerMarkus Heiser <markus.heiser@darmarit.de>2021-08-31 12:20:23 +0200
commit0ee316f3d1561853ceb26fc3cf4ec673f575168d (patch)
treea2d2b25c9103e3cf6d1b868087511d8f49bbf5a1 /searx
parent2948a99b6e51c42039025b049d8f92e92b1b7d2c (diff)
downloadsearxng-0ee316f3d1561853ceb26fc3cf4ec673f575168d.tar.gz
searxng-0ee316f3d1561853ceb26fc3cf4ec673f575168d.zip
eslint: grunt integration
Diffstat (limited to 'searx')
-rw-r--r--searx/static/themes/simple/.eslintrc.json3
-rw-r--r--searx/static/themes/simple/gruntfile.js11
-rw-r--r--searx/static/themes/simple/package.json3
3 files changed, 6 insertions, 11 deletions
diff --git a/searx/static/themes/simple/.eslintrc.json b/searx/static/themes/simple/.eslintrc.json
index cfe1e0b3a..f6aed7584 100644
--- a/searx/static/themes/simple/.eslintrc.json
+++ b/searx/static/themes/simple/.eslintrc.json
@@ -5,8 +5,7 @@
},
"extends": "eslint:recommended",
"parserOptions": {
- "ecmaVersion": 12,
- "sourceType": "module"
+ "ecmaVersion": 12
},
"rules": {
}
diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js
index 049e21fca..47e5a962e 100644
--- a/searx/static/themes/simple/gruntfile.js
+++ b/searx/static/themes/simple/gruntfile.js
@@ -9,15 +9,13 @@ module.exports = function(grunt) {
watch: {
scripts: {
files: ['src/**'],
- tasks: ['jshint', 'copy', 'concat', 'uglify', 'less:development', 'less:production']
+ tasks: ['eslint', 'copy', 'concat', 'uglify', 'less:development', 'less:production']
}
},
- jshint: {
- files: ['src/js/main/*.js', 'src/js/head/*.js', '../__common__/js/*.js'],
- },
eslint: {
options: {
- configFile: '.eslintrc.json'
+ configFile: '.eslintrc.json',
+ failOnError: false
},
target: [
'src/js/main/*.js',
@@ -204,8 +202,7 @@ module.exports = function(grunt) {
grunt.registerTask('test', ['jshint']);
grunt.registerTask('default', [
- // 'eslint',
- 'jshint',
+ 'eslint',
'stylelint',
'copy',
'concat',
diff --git a/searx/static/themes/simple/package.json b/searx/static/themes/simple/package.json
index e36181001..9ddc66d39 100644
--- a/searx/static/themes/simple/package.json
+++ b/searx/static/themes/simple/package.json
@@ -1,6 +1,5 @@
{
"devDependencies": {
- "eslint": "^7.32.0",
"grunt-cli": "^1.4.3",
"grunt": "~1.4.1",
"grunt-contrib-copy": "^1.0.0",
@@ -14,7 +13,7 @@
"grunt-eslint": "^23.0.0",
"grunt-webfont": "^1.7.2",
"ionicons-npm": "^2.0.1",
- "jslint": "^0.12.1",
+ "eslint": "^7.32.0",
"less": "^4.1.1",
"less-plugin-clean-css": "^1.5.1",
"stylelint": "^13.13.1",