From 9108c90f0e9d17a8a14b502be3d33d129c93d294 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Wed, 16 Jun 2021 09:16:02 +0200 Subject: [mod] simple theme: update dependencies --- searx/static/themes/simple/package.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'searx/static/themes/simple/package.json') diff --git a/searx/static/themes/simple/package.json b/searx/static/themes/simple/package.json index e84489947..47cddf031 100644 --- a/searx/static/themes/simple/package.json +++ b/searx/static/themes/simple/package.json @@ -1,20 +1,23 @@ { "devDependencies": { - "grunt": "~1.0.3", + "grunt-cli": "^1.4.3", + "grunt": "~1.4.1", "grunt-contrib-concat": "~1.0.1", - "grunt-contrib-cssmin": "^2.2.1", - "grunt-contrib-jshint": "~1.1.0", + "grunt-contrib-cssmin": "^4.0.0", + "grunt-contrib-jshint": "~3.0.0", "grunt-contrib-less": "~3.0.0", - "grunt-contrib-uglify": "~3.4.0", + "grunt-contrib-uglify": "~5.0.1", "grunt-contrib-watch": "~1.1.0", - "grunt-webfont": "^1.7.1", + "grunt-webfont": "^1.7.2", "ionicons-npm": "^2.0.1", - "jslint": "^0.12.0", + "jslint": "^0.12.1", + "less": "^4.1.1", "less-plugin-clean-css": "^1.5.1" }, "scripts": { "build": "npm install && grunt", "start": "grunt watch", "test": "grunt" - } + }, + "dependencies": {} } -- cgit v1.2.3 From e3ebfd41d7379384186fd74a7db430247eef8c84 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Wed, 16 Jun 2021 12:13:37 +0200 Subject: [mod] simple theme: autocomplete-js becomes a packages.json dependency Update to version 2.7.1 --- searx/static/themes/simple/package.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'searx/static/themes/simple/package.json') diff --git a/searx/static/themes/simple/package.json b/searx/static/themes/simple/package.json index 47cddf031..038520a3d 100644 --- a/searx/static/themes/simple/package.json +++ b/searx/static/themes/simple/package.json @@ -2,6 +2,7 @@ "devDependencies": { "grunt-cli": "^1.4.3", "grunt": "~1.4.1", + "grunt-contrib-copy": "^1.0.0", "grunt-contrib-concat": "~1.0.1", "grunt-contrib-cssmin": "^4.0.0", "grunt-contrib-jshint": "~3.0.0", @@ -14,10 +15,13 @@ "less": "^4.1.1", "less-plugin-clean-css": "^1.5.1" }, + "dependencies": { + "autocomplete-js": "2.7.1", + "leaflet": "^1.7.1" + }, "scripts": { "build": "npm install && grunt", "start": "grunt watch", "test": "grunt" - }, - "dependencies": {} + } } -- cgit v1.2.3 From c01325688158fdde886e2ecb347d8d4d9707a84d Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Wed, 16 Jun 2021 15:39:32 +0200 Subject: [mod] remove common grunt install Before this commit, there are 3 node_modules directory: * one in . * two others in ./searx/statics/themes/* This is no desirable: * it declares the npm depdenencies in the shell script. * dependabot can't updates theses dependencies. * this is a not standard way to build a package (two different locations for the dependencies). With this commit and the PR #150 there is one unique node_modules directory per theme. --- searx/static/themes/simple/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'searx/static/themes/simple/package.json') diff --git a/searx/static/themes/simple/package.json b/searx/static/themes/simple/package.json index 038520a3d..e23157bf4 100644 --- a/searx/static/themes/simple/package.json +++ b/searx/static/themes/simple/package.json @@ -20,8 +20,8 @@ "leaflet": "^1.7.1" }, "scripts": { - "build": "npm install && grunt", - "start": "grunt watch", - "test": "grunt" + "all": "npm install && grunt", + "build": "grunt", + "watch": "grunt watch" } } -- cgit v1.2.3 From 14ba56fd1a9e82206f964a8830953a1b51eecbdd Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Wed, 16 Jun 2021 15:51:43 +0200 Subject: [mod] make node.clean: call the "clean" script from the packages.json The dependencies and build process are described in the gruntfiles.js and packages.json files. It makes sense to move the clean up to these files too. --- searx/static/themes/simple/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'searx/static/themes/simple/package.json') diff --git a/searx/static/themes/simple/package.json b/searx/static/themes/simple/package.json index e23157bf4..22357a4c7 100644 --- a/searx/static/themes/simple/package.json +++ b/searx/static/themes/simple/package.json @@ -22,6 +22,7 @@ "scripts": { "all": "npm install && grunt", "build": "grunt", - "watch": "grunt watch" + "watch": "grunt watch", + "clean": "rm -Rf node_modules package-lock.json ion.less" } } -- cgit v1.2.3