Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
7b7a5b3
Merge branch 'searxng:master' into master
Gnkalk Feb 28, 2025
b6487b7
[web-client] simple theme: build & development env based on vite.
return42 Jan 23, 2025
a1132de
[web-client] simple theme: move sources to client/simple/src
return42 Jan 23, 2025
7a6ea56
[web-client] simple theme: vite build -- CSS sourcemaps still missing!!!
return42 Jan 30, 2025
b74496b
[web-client] simple theme: eslint JS source files
return42 Jan 30, 2025
a8ed79b
[web-client] simple theme: stylelint LESS source files
return42 Feb 4, 2025
d29ca7d
[web-client] simple theme: stylelint-prettier LESS source files
return42 Feb 5, 2025
a207f5d
[web-client] simple theme: move src/brand to client/simple/src
return42 Jan 31, 2025
30ee34d
[web-client] simple theme: vite plugins plg_svg2png & plg_svg2svg
return42 Feb 1, 2025
189dd01
[web-client] simple theme: refactor jinja_svg_catalog and cleanup ico…
return42 Feb 4, 2025
872e09d
[web-client] simple theme: move SVGs to client/simple/src and deploy …
return42 Feb 5, 2025
1a3543d
[web-client] simple theme: final build by vite & clean up grunt lefto…
return42 Feb 5, 2025
2bf77f5
[web-client] integrate the migrated theme in the development workflows
return42 Feb 5, 2025
6500d73
[web-client] integrate the migrated theme in the github CI
return42 Feb 6, 2025
8b864ed
[fix] simple template - video.html fix button icon to icon_small
return42 Feb 15, 2025
485f1f8
[upd] npm: Bump eslint from 9.19.0 to 9.20.1 in /client/simple
return42 Feb 15, 2025
d5ba3bf
[build] /static
return42 Feb 15, 2025
4e195e1
[mod] bump copy-webpack-plugin 13.0.2, eslint 9.21 & vite 6.2.0
return42 Feb 28, 2025
cd1b88e
[mod] bump copy-webpack-plugin 13.0.2, eslint 9.21 & vite 6.2.0
return42 Feb 28, 2025
d9d5e91
[upd] web-client (simple): Bump globals in /client/simple
dependabot[bot] Feb 28, 2025
28b5cbf
[l10n] update translations from Weblate
searxng-bot Feb 28, 2025
b4b1a61
[upd] pypi: Bump setproctitle from 1.3.4 to 1.3.5
dependabot[bot] Feb 28, 2025
355883f
[upd] pypi: Bump typer-slim from 0.15.1 to 0.15.2
dependabot[bot] Feb 28, 2025
73e4128
[data] update searx.data - update_external_bangs.py
return42 Mar 1, 2025
a4b120c
[data] update searx.data - update_engine_descriptions.py
return42 Mar 1, 2025
64810ee
[data] update searx.data - update_ahmia_blacklist.py
return42 Mar 1, 2025
ccf485c
[data] update searx.data - update_wikidata_units.py
return42 Mar 1, 2025
01e2b3e
[data] update searx.data - update_firefox_version.py
return42 Mar 1, 2025
0341907
[fix] bing fetch engine traits - adjusted XPath selectors
return42 Mar 1, 2025
30a8204
[data] update searx.data - update_engine_traits.py
return42 Mar 1, 2025
1d16b94
[fix] wikidata: increase wikidata queries timeout
return42 Mar 1, 2025
d0022d8
[refactor] soundcloud engine
return42 Mar 1, 2025
a51416c
[feat] engines: add openclipart.org
Bnyro Feb 26, 2025
0c2076c
[doc] minor improvements to the favicon docs (cache.db_url)
return42 Mar 1, 2025
80f5fad
[fix] add backward compatibility for the "enabled_plugins:"
return42 Feb 28, 2025
71d1504
[feat] add 360search engine for searxng
hezhijie0327 Feb 23, 2025
97aa5a7
[feat] add Sogou engine for searxng
hezhijie0327 Feb 23, 2025
76f52b5
[feat] add Sogou WeChat article search support
hezhijie0327 Mar 2, 2025
b0beb30
[chore] add `timediff` field for sogou_videos
hezhijie0327 Mar 2, 2025
8984d7a
[fix] brave engine: add sec-fetch headers and source=web argument
return42 Mar 2, 2025
194f222
[fix] engines: Google-Web & Google-Video (random arc_id)
return42 Mar 6, 2025
08d0847
[feat] engines: add www.chinaso.com
hezhijie0327 Mar 4, 2025
8fe4904
[feat] engines: add www.iqiyi.com
hezhijie0327 Mar 4, 2025
066aabc
[feat] engines: add www.acfun.cn
hezhijie0327 Mar 5, 2025
b8671c7
[feat] engines: add baidu (general)
p3psi-boo Dec 18, 2024
860f0a3
[l10n] update translations from Weblate
searxng-bot Mar 7, 2025
424cbf7
[upd] pypi: Bump jinja2 from 3.1.5 to 3.1.6
dependabot[bot] Mar 7, 2025
375f0c4
[upd] pypi: Bump mock from 5.1.0 to 5.2.0
dependabot[bot] Mar 7, 2025
00bae78
[upd] web-client (simple): Bump stylelint in /client/simple
dependabot[bot] Mar 7, 2025
9a50f6c
[upd] web-client (simple): Bump vite in /client/simple
dependabot[bot] Mar 7, 2025
e7cb18c
[upd] web-client (simple): Bump vite-plugin-static-copy
dependabot[bot] Mar 7, 2025
08a90d4
[doc] add missing docs for the search.max_page setting
return42 Mar 6, 2025
67a8b66
[README] Updated logo paths
Aadniz Mar 7, 2025
02b76c8
[fix] engine qwant: add tgp and llm arguments to avoid CAPTCHA
loorisr Mar 7, 2025
eb36336
[fix] set language for engines from chinese market (no i18n index nor…
return42 Mar 7, 2025
4884747
[fix] presearch engine: Title showing <em> html code
Aadniz Mar 7, 2025
523d2a7
[fix] uwsgi: don't set static-expires
return42 Mar 6, 2025
73d50f5
[feat] add bilibili support to get get_embeded_stream_url
Austin-Olacsi Mar 6, 2025
a88b4d7
[fix] presearch engine: domain sometimes included in beginning of titles
Aadniz Mar 7, 2025
8b1d73c
[feat] add docker into devcontainer (#4475)
vojkovic Mar 9, 2025
3fe602a
[fix] "[fix] uwsgi: don't set static-expires": Clean comment that for…
xlionjuan Mar 11, 2025
a30e01b
Merge branch 'master' of https://github.com/searxng/searxng
Gnkalk Mar 14, 2025
a71ab4c
Merge branch 'dev' of https://github.com/parchlinuxb/gitee
Gnkalk Mar 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
8 changes: 7 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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):"
13 changes: 1 addition & 12 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down Expand Up @@ -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%

Expand Down
3 changes: 3 additions & 0 deletions client/simple/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dist
node_modules
.stylelintcache
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
24 changes: 24 additions & 0 deletions client/simple/README.rst
Original file line number Diff line number Diff line change
@@ -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
34 changes: 34 additions & 0 deletions client/simple/eslint.config.js
Original file line number Diff line number Diff line change
@@ -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],
},
},

];
Loading
Loading