# HG changeset patch # User Kiara Grouwstra <kiara.grouwstra@gmail.com> # Date 1719774491 0 # Sun Jun 30 19:08:11 2024 +0000 # Node ID 3a4d3986ec44e26b511d45eb1a6f71553ec295c8 # Parent b2d3b7130ad6e85eca03dceb3753a02c42a5b637 # EXP-Topic bower-to-cdn Replace Bower with CDN jsdeliver.com see https://discuss.tryton.org/t/state-of-the-dependencies-of-the-web-client/3441/8 diff --git a/sao/Gruntfile.js b/sao/Gruntfile.js --- a/sao/Gruntfile.js +++ b/sao/Gruntfile.js @@ -28,10 +28,6 @@ ]; var less_paths = [ 'src', - 'bower_components', - 'bower_components/bootstrap', - 'bower_components/bootstrap/less', - 'bower_components/bootstrap-rtl-ondemand/less', ]; // Project configuration. diff --git a/sao/package.json b/sao/package.json --- 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": "^8.57.0", @@ -51,7 +49,7 @@ "tryton" ], "dependencies": { - "bower": "^1.8.4", + "qunit": "^2.21.0", "grunt": "^1.0", "grunt-cli": "^1.3", "grunt-contrib-concat": "^1.0", diff --git a/sao/src/sao-variables.less b/sao/src/sao-variables.less --- a/sao/src/sao-variables.less +++ b/sao/src/sao-variables.less @@ -24,6 +24,6 @@ @panel-default-text: #fff; @panel-default-heading-bg: @brand-primary; -@icon-font-path: "../bower_components/bootstrap/fonts/"; +@icon-font-path: "https://cdn.jsdelivr.net/npm/bootstrap/fonts/"; @font-size-small: @font-size-base; diff --git a/sao/tests/index.html b/sao/tests/index.html --- a/sao/tests/index.html +++ b/sao/tests/index.html @@ -4,12 +4,12 @@ <html> <head> <title>Sao Test Suite</title> - <script type="text/javascript" src="../bower_components/jquery/dist/jquery.js"></script> - <script type="text/javascript" src="../bower_components/bootstrap/dist/js/bootstrap.js"></script> - <script type="text/javascript" src="../bower_components/moment/moment.js"></script> - <script type="text/javascript" src="../bower_components/gettext.js/dist/gettext.js"></script> - <script type="text/javascript" src="../bower_components/qunit/qunit/qunit.js"></script> - <link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" media="screen"/> + <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.js"></script> + <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/bootstrap/dist/js/bootstrap.js"></script> + <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/moment/moment.js"></script> + <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gettext.js/dist/gettext.js"></script> + <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/qunit/qunit/qunit.js"></script> + <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/qunit/qunit/qunit.css" media="screen"/> <script type="text/javascript" src="../dist/tryton-sao.js"></script> <script type="text/javascript" src="./sao.js"></script> </head> # HG changeset patch # User Kiara Grouwstra <kiara.grouwstra@gmail.com> # Date 1720465309 0 # Mon Jul 08 19:01:49 2024 +0000 # Node ID f9c52bacdd274f7986777933122dcf79725d3782 # Parent 3a4d3986ec44e26b511d45eb1a6f71553ec295c8 # EXP-Topic bower-to-cdn use bootstrap less files from CDN diff --git a/sao/src/sao.less b/sao/src/sao.less --- a/sao/src/sao.less +++ b/sao/src/sao.less @@ -1,7 +1,7 @@ /* This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. */ -@import "bootstrap"; -@import "bootstrap-rtl"; +@import (less) "//://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.css"; +@import (less) "//://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.rtl.css"; @import "sao-variables"; html { user-select: none; # HG changeset patch # User Kiara Grouwstra <kiara.grouwstra@gmail.com> # Date 1720465430 0 # Mon Jul 08 19:03:50 2024 +0000 # Node ID b868c8d0aab47853cda7834d3485ae3146ca106c # Parent f9c52bacdd274f7986777933122dcf79725d3782 # EXP-Topic bower-to-cdn delete bower file diff --git a/sao/bower.json b/sao/bower.json deleted file mode 100644 --- a/sao/bower.json +++ /dev/null @@ -1,32 +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": "^0.7", - "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" - }, - "devDependencies": { - "qunit": "^1.18" - } -} # HG changeset patch # User Kiara Grouwstra <kiara.grouwstra@gmail.com> # Date 1720465890 0 # Mon Jul 08 19:11:30 2024 +0000 # Node ID cf291aa5355295fa7d9114c8d11c46fe669495cd # Parent b868c8d0aab47853cda7834d3485ae3146ca106c # EXP-Topic bower-to-cdn fix schema diff --git a/sao/src/sao.less b/sao/src/sao.less --- a/sao/src/sao.less +++ b/sao/src/sao.less @@ -1,7 +1,7 @@ /* This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. */ -@import (less) "//://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.css"; -@import (less) "//://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.rtl.css"; +@import (less) "https://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.css"; +@import (less) "https://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.rtl.css"; @import "sao-variables"; html { user-select: none; # HG changeset patch # User Kiara Grouwstra <kiara.grouwstra@gmail.com> # Date 1720625794 0 # Wed Jul 10 15:36:34 2024 +0000 # Node ID cf2865c0bf22928141506d181321e0bb7ccd648d # Parent cf291aa5355295fa7d9114c8d11c46fe669495cd # EXP-Topic bower-to-cdn use less versions of bootstrap diff --git a/sao/src/sao.less b/sao/src/sao.less --- a/sao/src/sao.less +++ b/sao/src/sao.less @@ -1,7 +1,7 @@ /* This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. */ -@import (less) "https://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.css"; -@import (less) "https://cdn.jsdelivr.net/npm/bootstrap/dist/css/bootstrap.rtl.css"; +@import (less) "https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/less/bootstrap.less"; +@import (less) "https://cdn.jsdelivr.net/npm/bootstrap-rtl-ondemand@3.3.4/less/bootstrap-rtl.less"; @import "sao-variables"; html { user-select: none;