Merge branch 'master' of https://github.com/searxng/searxng

Author: Gnkalk

.devcontainer/devcontainer.json

@@ -3,7 +3,8 @@
     "dockerfile": "Dockerfile"
   },
   "features": {
-    "ghcr.io/devcontainers/features/github-cli": {}
+    "ghcr.io/devcontainers/features/github-cli": {},
+    "ghcr.io/devcontainers/features/docker-in-docker": {}
   },
   "customizations": {
     "vscode": {

.editorconfig

@@ -16,11 +16,17 @@ max_line_length = 119
 [*.html]
 indent_size = 4
 
+[*.css]
+indent_size = 2
+
+[*.less]
+indent_size = 2
+
 [*.js]
 indent_size = 2
 
 [*.json]
-indent_size = 4
+indent_size = 2
 insert_final_newline = ignore
 
 # Minified JavaScript files shouldn't be changed

.github/dependabot.yml

@@ -12,11 +12,11 @@ updates:
       prefix: "[upd] pypi:"
 
   - package-ecosystem: "npm"
-    directory: "/searx/static/themes/simple"
+    directory: "/client/simple"
     schedule:
       interval: "weekly"
       day: "friday"
     open-pull-requests-limit: 5
     target-branch: "master"
     commit-message:
-      prefix: "[upd] npm:"
+      prefix: "[upd] web-client (simple):"

.github/workflows/integration.yml

@@ -44,19 +44,8 @@ jobs:
         with:
           python-version: '3.12'
           architecture: 'x64'
-      - name: Cache Python dependencies
-        id: cache-python
-        uses: actions/cache@v4
-        with:
-          path: |
-            ./local
-            ./.nvm
-            ./node_modules
-          key: python-ubuntu-24.04-3.12-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }}
-      - name: Install node dependencies
-        run: make V=1 node.env
       - name: Build themes
-        run: make V=1 themes.all
+        run: make themes.all
 
   documentation:
     name: Documentation

Makefile

@@ -50,7 +50,7 @@ search.checker.%: install
 	$(Q)./manage pyenv.cmd searxng-checker -v "$(subst _, ,$(patsubst search.checker.%,%,$@))"
 
 PHONY += test ci.test test.shell
-ci.test: test.yamllint test.black test.types.ci  test.pylint test.unit test.robot test.rst test.shell test.pybabel test.themes
+ci.test: test.yamllint test.black test.types.ci  test.pylint test.unit test.robot test.rst test.shell test.pybabel
 test:    test.yamllint test.black test.types.dev test.pylint test.unit test.robot test.rst test.shell
 test.shell:
 	$(Q)shellcheck -x -s dash \
@@ -75,7 +75,7 @@ test.shell:
 # wrap ./manage script
 
 MANAGE += weblate.translations.commit weblate.push.translations
-MANAGE += data.all data.traits data.useragents data.locales
+MANAGE += data.all data.traits data.useragents data.locales data.currencies
 MANAGE += docs.html docs.live docs.gh-pages docs.prebuild docs.clean
 MANAGE += docker.build docker.push docker.buildx
 MANAGE += gecko.driver
@@ -85,7 +85,6 @@ MANAGE += pyenv pyenv.install pyenv.uninstall
 MANAGE += format.python
 MANAGE += test.yamllint test.pylint test.black test.pybabel test.unit test.coverage test.robot test.rst test.clean test.themes test.types.dev test.types.ci
 MANAGE += themes.all themes.fix themes.test
-MANAGE += themes.simple themes.simple.pygments themes.simple.fix
 MANAGE += static.build.commit static.build.drop static.build.restore
 MANAGE += nvm.install nvm.clean nvm.status nvm.nodejs
 

README.rst

@@ -2,7 +2,7 @@
 
 ----
 
-.. figure:: https://raw.githubusercontent.com/searxng/searxng/master/src/brand/searxng.svg
+.. figure:: https://raw.githubusercontent.com/searxng/searxng/master/client/simple/src/brand/searxng.svg
    :target: https://docs.searxng.org/
    :alt: SearXNG
    :width: 100%
@@ -34,7 +34,7 @@ A user_, admin_ and developer_ handbook is available on the homepage_.
 .. _homepage: https://docs.searxng.org/
 .. _metasearch engine: https://en.wikipedia.org/wiki/Metasearch_engine
 
-.. |SearXNG logo| image:: https://raw.githubusercontent.com/searxng/searxng/master/src/brand/searxng-wordmark.svg
+.. |SearXNG logo| image:: https://raw.githubusercontent.com/searxng/searxng/master/client/simple/src/brand/searxng-wordmark.svg
    :target: https://docs.searxng.org/
    :width: 5%
 

client/simple/.gitignore

@@ -0,0 +1,3 @@
+dist
+node_modules
+.stylelintcache

…x/static/themes/simple/.stylelintrc.json client/simple/.stylelintrc.jsonsearx/static/themes/simple/.stylelintrc.json renamed to client/simple/.stylelintrc.json searx/static/themes/simple/.stylelintrc.json renamed to client/simple/.stylelintrc.json

@@ -1,6 +1,9 @@
 {
-  "extends": "stylelint-config-standard-less",
+  "formatter": "unix",
+  "plugins": [ "stylelint-prettier" ],
+  "extends": [ "stylelint-config-standard-less" ],
   "rules": {
+    "prettier/prettier": true,
     "declaration-empty-line-before": null,
     "no-invalid-position-at-import-rule": null,
     "property-no-vendor-prefix": null,

client/simple/README.rst

@@ -0,0 +1,24 @@
+=====================
+MEMO vite development
+=====================
+
+Local install::
+
+  # in folder ./client/simple/
+  $ npm install
+
+Start development server::
+
+  $ ./manage vite.simple.dev
+
+  # in folder ./client/simple/
+  $ npm exec -- vite
+
+Fix source code::
+
+  # in folder ./client/simple/
+  $ npm run fix
+
+Fix & Build::
+
+  $ ./manage vite.simple.build

client/simple/eslint.config.js

@@ -0,0 +1,34 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  pluginJs.configs.recommended,
+
+  // global "ignores"
+  // https://eslint.org/docs/latest/use/configure/configuration-files#globally-ignoring-files-with-ignores
+  {
+    ignores: ["node_modules/", "dist/"]
+  },
+
+  {
+    files: [
+      "**/*.js",
+    ],
+    linterOptions: {
+      reportUnusedDisableDirectives: "error",
+      // noInlineConfig: true
+    },
+    languageOptions: {
+      sourceType: "module",
+      globals: {
+        ...globals.browser,
+      }
+    },
+    rules: {
+      indent: ["error", 2],
+    },
+  },
+
+];