Browse Source

[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.
Alexandre Flament 3 years ago
parent
commit
14ba56fd1a
3 changed files with 19 additions and 17 deletions
  1. 4 7
      manage
  2. 13 9
      searx/static/themes/oscar/package.json
  3. 2 1
      searx/static/themes/simple/package.json

+ 4 - 7
manage

@@ -310,14 +310,11 @@ node.env() {
 }
 
 node.clean() {
-
     build_msg CLEAN "locally installed npm dependencies"
-    rm -rf \
-       ./searx/static/themes/oscar/package-lock.json \
-       ./searx/static/themes/oscar/node_modules \
-       ./searx/static/themes/simple/package-lock.json \
-       ./searx/static/themes/simple/node_modules
-       ./searx/static/themes/simple/ion.less \
+    (   set -e
+        npm --prefix searx/static/themes/oscar run clean
+        npm --prefix searx/static/themes/simple run clean
+    )
     dump_return $?
 }
 

+ 13 - 9
searx/static/themes/oscar/package.json

@@ -1,23 +1,27 @@
 {
     "devDependencies": {
-        "grunt": "^1.3.0",
-        "grunt-cli": "^1.3.2",
+        "grunt": "~1.4.1",
+        "grunt-cli": "^1.4.3",
         "grunt-contrib-concat": "~1.0.1",
         "grunt-contrib-copy": "^1.0.0",
         "grunt-contrib-jshint": "~3.0.0",
         "grunt-contrib-less": "~3.0.0",
-        "grunt-contrib-uglify": "~5.0.0",
-        "grunt-contrib-watch": "~1.1.0"
-    },
-    "scripts": {
-        "build": "npm install && grunt",
-        "start": "grunt watch",
-        "test": "grunt"
+        "grunt-contrib-uglify": "~5.0.1",
+        "grunt-contrib-watch": "~1.1.0",
+        "jslint": "^0.12.1",
+        "less": "^4.1.1",
+        "less-plugin-clean-css": "^1.5.1"
     },
     "dependencies": {
         "bootstrap": "^3.4.1",
         "corejs-typeahead": "^1.3.1",
         "jquery": "^3.6.0",
         "leaflet": "^1.7.1"
+    },
+    "scripts": {
+        "all": "npm install && grunt",
+        "build": "grunt",
+        "watch": "grunt watch",
+        "clean": "rm -Rf node_modules package-lock.json"
     }
 }

+ 2 - 1
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"
   }
 }