From b7ba30160febb820122dd4af3cc7369ec7fbc63c Mon Sep 17 00:00:00 2001 From: Jean-Pascal <jean-pascal.aubry@inrae.fr> Date: Tue, 12 Dec 2023 13:52:04 +0000 Subject: [PATCH] fix: update chart-js-plugin-zoom to v2.0.1, remove patch script applied at compilation and modify preprocess script Refs #638 --- package-lock.json | 2 +- package.json | 2 +- scripts/fix-chartjs-plugin-zoom-2.0.0.sh | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100755 scripts/fix-chartjs-plugin-zoom-2.0.0.sh diff --git a/package-lock.json b/package-lock.json index 5d7978904..0a65543d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "@wdio/globals": "^8.8.2", "@wdio/types": "^8.8.0", "angular2-hotkeys": "^13.1.0", - "chartjs-plugin-zoom": "^2.0.0", + "chartjs-plugin-zoom": "^2.0.1", "core-js": "^3.23.3", "file-saver": "^2.0.5", "he": "^1.2.0", diff --git a/package.json b/package.json index e8dd2b92e..c1955fa53 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "mkdocs": "bash scripts/prepare_mkdocs.sh; cd build; python3 -m mkdocs build -f mkdocs-fr.yml && python3 -m mkdocs build -f mkdocs-en.yml && cd .. && node scripts/mkdocs-postprocess.js", "mkdocs2pdf": "node scripts/extract-nghyd-version.js build/cassiopee_version.tex && python3 scripts/mkdocs2pdf.py && node scripts/mkdocs2pdf-postprocess.js && bash scripts/check-pdf-docs.sh", "clean": "rm -rf build dist release src/date_revision.ts src/assets/docs docs/pdf_build", - "preprocess": "mkdir -p build; node scripts/preprocessors.js; npm run service-worker-version; bash scripts/fix-chartjs-plugin-zoom-2.0.0.sh", + "preprocess": "mkdir -p build; node scripts/preprocessors.js; npm run service-worker-version;", "start": "npm run preprocess && npm run mkdocs && npm run ng serve -- --host 127.0.0.1 --poll 5000", "build-no-pdf": "npm run preprocess && npm run mkdocs && npm run ng build -- --configuration production", "build": "npm run build-href -basehref=/", diff --git a/scripts/fix-chartjs-plugin-zoom-2.0.0.sh b/scripts/fix-chartjs-plugin-zoom-2.0.0.sh deleted file mode 100755 index 45824bdb6..000000000 --- a/scripts/fix-chartjs-plugin-zoom-2.0.0.sh +++ /dev/null @@ -1,4 +0,0 @@ -# fix compilation error due to chartjs-plugin-zoom 2.0.0 -# cf. https://forgemia.inra.fr/cassiopee/nghyd/-/issues/238#note_76247 - -sed -i "s/const enum UpdateModeEnum {$/enum UpdateModeEnum {/g" node_modules/chartjs-plugin-zoom/types/index.d.ts -- GitLab