Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eed80a0 authored by Markus Heiser's avatar Markus Heiser
Browse files

[mod] install developer tools by: make node.env.dev 



- rename ``./manage node.env.devtools`` to ``./manage node.env.dev``
- add ``make node.env.dev``
- remove local developer tools by ``make node.clean``

Signed-off-by: default avatarMarkus Heiser <markus.heiser@darmarit.de>
parent 7cbfa6a8

Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ MANAGE += data.all data.languages data.useragents data.osm_keys_tags 
MANAGE += docs.html docs.live docs.gh-pages docs.prebuild docs.clean

MANAGE += docs.html docs.live docs.gh-pages docs.prebuild docs.clean

MANAGE += docker.build docker.push docker.buildx

MANAGE += docker.build docker.push docker.buildx

MANAGE += gecko.driver

MANAGE += gecko.driver

MANAGE += node.env node.clean

MANAGE += node.env node.env.dev node.clean

MANAGE += py.build py.clean

MANAGE += py.build py.clean

MANAGE += pyenv pyenv.install pyenv.uninstall

MANAGE += pyenv pyenv.install pyenv.uninstall

MANAGE += pypi.upload pypi.upload.test

MANAGE += pypi.upload pypi.upload.test

manage

+10 −6
Original line number Original line Diff line number Diff line
@@ -97,7 +97,8 @@ redis: 
  install   : create user (${REDIS_USER}) and install systemd service (${REDIS_SERVICE_NAME})

  install   : create user (${REDIS_USER}) and install systemd service (${REDIS_SERVICE_NAME})

  help      : show more redis commands

  help      : show more redis commands

node.:

node.:

  env       : download & install npm dependencies locally

  env       : download & install SearXNG's npm dependencies locally

  env.dev   : download & install developer and CI tools

  clean     : drop locally npm installations

  clean     : drop locally npm installations

py.:

py.:

  build     : Build python packages at ./${PYDIST}

  build     : Build python packages at ./${PYDIST}
@@ -563,16 +564,15 @@ nodejs.ensure() { 
node.env() {

node.env() {

    nodejs.ensure

    nodejs.ensure

    (   set -e

    (   set -e



        build_msg INSTALL "./searx/static/themes/simple/package.json"

        build_msg INSTALL "searx/static/themes/simple/package.json"

        npm --prefix searx/static/themes/simple install

        npm --prefix searx/static/themes/simple install

    )

    )

    dump_return $?

    dump_return $?

}

}





node.env.devtools() {

node.env.dev() {

    nodejs.ensure

    nodejs.ensure

    build_msg INSTALL "package.json: developer and CI tools"

    build_msg INSTALL "./package.json: developer and CI tools"

    npm install

    npm install

}

}
@@ -585,6 +585,10 @@ node.clean() { 
    (   set -e

    (   set -e

        npm --prefix searx/static/themes/simple run clean

        npm --prefix searx/static/themes/simple run clean

    )

    )

    build_msg CLEAN "locally installed developer and CI tools"

    (   set -e

        npm --prefix . run clean

    )

    dump_return $?

    dump_return $?

}

}
@@ -702,7 +706,7 @@ test.pylint() { 




test.pyright() {

test.pyright() {

    build_msg TEST "[pyright] static type check of python sources"

    build_msg TEST "[pyright] static type check of python sources"

    node.env.devtools

    node.env.dev

    # We run Pyright in the virtual environment because Pyright

    # We run Pyright in the virtual environment because Pyright

    # executes "python" to determine the Python version.

    # executes "python" to determine the Python version.

    build_msg TEST "[pyright] suppress warnings related to intentional monkey patching"

    build_msg TEST "[pyright] suppress warnings related to intentional monkey patching"

package.json

+3 −0
Original line number Original line Diff line number Diff line
@@ -2,5 +2,8 @@ 
  "dependencies": {

  "dependencies": {

    "eslint": "^8.18.0",

    "eslint": "^8.18.0",

    "pyright": "^1.1.255"

    "pyright": "^1.1.255"

  },

  "scripts": {

    "clean": "rm -Rf node_modules package-lock.json"

  }

  }

}
 
}