Merge branch 'master' into 'devel'

Master v4.18.0

See merge request !254

.vscode/settings.json

+{
+    "cSpell.words": [
+        "prms"
+    ],
+    "cSpell.language": "en,fr-FR"
+}
\ No newline at end of file

CHANGELOG.md

 # Historique des versions
 
-### 4.18.0 - 2024-01-29
+### 4.18.0 - 2024-01-30
 
 #### Nouvelles fonctionnalités
 

jalhyd_branch

-325-courbe-de-remous-calculer-une-courbe-de-remous-de-passe-a-macro-rugosites
+master

package-lock.json

 {
   "name": "fr.irstea.cassiopee",
-  "version": "4.17.1",
+  "version": "4.18.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "fr.irstea.cassiopee",
-      "version": "4.17.1",
+      "version": "4.18.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -87,7 +87,7 @@
       }
     },
     "jalhyd": {
-      "version": "4.17.1",
+      "version": "4.18.0",
       "license": "LGPL-3.0-or-later",
       "dependencies": {
         "@types/base-64": "^1.0.0",

package.json

@@ -3,7 +3,7 @@
   "displayName": "Cassiopée",
   "description": "Hydraulic calculators",
   "author": "Inrae",
-  "version": "4.17.1",
+  "version": "4.18.0",
   "main": "main.js",
   "homepage": "https://cassiopee.g-eau.fr",
   "license": "MIT",

scripts/deploy-new-stable-version.sh

@@ -79,6 +79,7 @@ cd ..
 # 2.1 update Git repository
 git checkout master
 git pull --rebase
+rm -rf jalhyd/node_modules
 npm install
 if [ ! -z "$(git status --untracked-files=no --porcelain)" ]
 then
@@ -106,6 +107,6 @@ git push --tags --force
 
 echo
 echo "N'oubliez pas de modifier le numéro de version dans le document https://doi.org/10.15454/TLO5LX"
-echo 
+echo
 
 echo "Tagging done, Gitlab CI/CD should take care of the rest."