diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37a80d3b44..fcbd881ac8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,8 +148,6 @@ check-eslint: cache: paths: - .cache/npm - before_script: - - sh .gitlab-scripts/bower_allow_root.sh script: - cd sao - npm install --cache ${NODE_CACHE_DIR} --unsafe-perm --legacy-peer-deps @@ -302,8 +300,6 @@ check-account-chart: cache: paths: - .cache/npm - before_script: - - sh .gitlab-scripts/bower_allow_root.sh script: - cd "${PACKAGE}" - npm -s install --cache ${NODE_CACHE_DIR} --unsafe-perm --legacy-peer-deps diff --git a/.gitlab-scripts/bower_allow_root.sh b/.gitlab-scripts/bower_allow_root.sh deleted file mode 100755 index fc17f19c58..0000000000 --- a/.gitlab-scripts/bower_allow_root.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -echo '{ "allow_root": true }' > ~/.bowerrc diff --git a/.hgignore b/.hgignore index 0f6ca8b98e..b24babb886 100644 --- a/.hgignore +++ b/.hgignore @@ -4,7 +4,6 @@ syntax: glob dist/ build/ node_modules/ -bower_components/ .tox/ requirements.txt requirements-dev.txt diff --git a/sao/CHANGELOG b/sao/CHANGELOG index cc491c729d..adde5e3fbb 100644 --- a/sao/CHANGELOG +++ b/sao/CHANGELOG @@ -1,3 +1,4 @@ +* Remove bower dependency * Allow tabs to be reordered Version 7.8.0 - 2025-12-15 diff --git a/sao/Gruntfile.js b/sao/Gruntfile.js index 3280b24e4b..96a4e8758e 100644 --- a/sao/Gruntfile.js +++ b/sao/Gruntfile.js @@ -30,10 +30,10 @@ module.exports = function(grunt) { ]; var less_paths = [ 'src', - 'bower_components', - 'bower_components/bootstrap', - 'bower_components/bootstrap/less', - 'bower_components/bootstrap-rtl-ondemand/less', + 'node_modules', + 'node_modules/bootstrap', + 'node_modules/bootstrap/less', + 'node_modules/bootstrap-rtl-ondemand/less', ]; // Project configuration. diff --git a/sao/bower.json b/sao/bower.json deleted file mode 100644 index 75e002380c..0000000000 --- a/sao/bower.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "sao", - "version": "0.0.0", - "authors": [ - "Tryton" - ], - "description": "Web client for Tryton", - "license": "GPL", - "homepage": "http://www.tryton.org/", - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - "jquery": "^3", - "bootstrap": "^3.3.7", - "moment": "^2.10", - "gettext.js": "^2", - "c3": "^0.7", - "papaparse": "^5.0", - "fullcalendar": "^3.10.2", - "mousetrap": "^1.6", - "bootstrap-rtl-ondemand": "^3.3.4-ondemand", - "Sortable": "sortablejs#^1.8.4" - } -} diff --git a/sao/index.html b/sao/index.html index 29f07ca84a..69bd217b75 100644 --- a/sao/index.html +++ b/sao/index.html @@ -9,22 +9,22 @@ this repository contains the full copyright notices and license terms. --> Tryton - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + diff --git a/sao/package.json b/sao/package.json index f492981c82..e6c97d7370 100644 --- a/sao/package.json +++ b/sao/package.json @@ -22,7 +22,6 @@ "Gruntfile.js", "LICENSE", "README.md", - "bower.json", "dist", "images", "sounds", @@ -34,8 +33,7 @@ ], "scripts": { "test": "npx grunt test -v", - "check": "npx eslint src tests", - "postinstall": "npx bower install" + "check": "npx eslint src tests" }, "devDependencies": { "eslint": "^9.24.0", @@ -52,7 +50,16 @@ "tryton" ], "dependencies": { - "bower": "^1.8.14", + "jquery": "^3", + "bootstrap": "^3.3.7", + "moment": "^2.10", + "gettext.js": "^2", + "c3": "^0.7", + "papaparse": "^5.0", + "fullcalendar": "^3.10.2", + "mousetrap": "^1.6", + "bootstrap-rtl-ondemand": "^3.3.4-ondemand", + "sortablejs": "^1.8.4", "grunt": "^1.6", "grunt-cli": "^1.5", "grunt-contrib-concat": "^2.1", diff --git a/sao/src/sao-variables.less b/sao/src/sao-variables.less index 366aa6f5c8..68871ee2fc 100644 --- a/sao/src/sao-variables.less +++ b/sao/src/sao-variables.less @@ -24,7 +24,7 @@ @panel-default-text: #fff; @panel-default-heading-bg: @brand-primary; -@icon-font-path: "../bower_components/bootstrap/fonts/"; +@icon-font-path: "../node_modules/bootstrap/fonts/"; @font-size-small: @font-size-base; diff --git a/sao/tests/index.html b/sao/tests/index.html index b8cefaad50..7f3cbf4f9f 100644 --- a/sao/tests/index.html +++ b/sao/tests/index.html @@ -4,10 +4,10 @@ this repository contains the full copyright notices and license terms. --> Sao Test Suite - - - - + + + +