Skip to content
Snippets Groups Projects
Commit 07a36de3 authored by David Dorchies's avatar David Dorchies
Browse files

Merge branch '638-update-chartjs-zoom-plugin-to-v2-0-1' into 'devel'

Resolve "Update chartjs zoom plugin to v2.0.1"

Closes #638

See merge request !238
parents 925c917e 4a47ff57
No related branches found
No related tags found
2 merge requests!252release: version 4.18.0,!238Resolve "Update chartjs zoom plugin to v2.0.1"
Pipeline #158351 passed
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
"@wdio/globals": "^8.8.2", "@wdio/globals": "^8.8.2",
"@wdio/types": "^8.8.0", "@wdio/types": "^8.8.0",
"angular2-hotkeys": "^13.1.0", "angular2-hotkeys": "^13.1.0",
"chartjs-plugin-zoom": "^2.0.0", "chartjs-plugin-zoom": "^2.0.1",
"core-js": "^3.23.3", "core-js": "^3.23.3",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"he": "^1.2.0", "he": "^1.2.0",
...@@ -96,7 +96,8 @@ ...@@ -96,7 +96,8 @@
"@types/base-64": "^1.0.0", "@types/base-64": "^1.0.0",
"@types/lodash": "^4.14.191", "@types/lodash": "^4.14.191",
"base-64": "^1.0.0", "base-64": "^1.0.0",
"lodash": "^4.14.191" "lodash": "^4.14.191",
"seedrandom": "^3.0.5"
}, },
"devDependencies": { "devDependencies": {
"@types/jasmine": "^4.0.3", "@types/jasmine": "^4.0.3",
...@@ -111,6 +112,7 @@ ...@@ -111,6 +112,7 @@
"eslint-plugin-prefer-arrow": "^1.2.3", "eslint-plugin-prefer-arrow": "^1.2.3",
"jasmine": "^4.2.1", "jasmine": "^4.2.1",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"ts-node": "^10.9.1",
"typedoc": "^0.23.7", "typedoc": "^0.23.7",
"typescript": "^4.7.4", "typescript": "^4.7.4",
"uglify-js": "^3.17.4" "uglify-js": "^3.17.4"
...@@ -9744,8 +9746,9 @@ ...@@ -9744,8 +9746,9 @@
"peer": true "peer": true
}, },
"node_modules/chartjs-plugin-zoom": { "node_modules/chartjs-plugin-zoom": {
"version": "2.0.0", "version": "2.0.1",
"license": "MIT", "resolved": "https://registry.npmjs.org/chartjs-plugin-zoom/-/chartjs-plugin-zoom-2.0.1.tgz",
"integrity": "sha512-ogOmLu6e+Q7E1XWOCOz9YwybMslz9qNfGV2a+qjfmqJYpsw5ZMoRHZBUyW+NGhkpQ5PwwPA/+rikHpBZb7PZuA==",
"dependencies": { "dependencies": {
"hammerjs": "^2.0.8" "hammerjs": "^2.0.8"
}, },
...@@ -22051,6 +22054,11 @@ ...@@ -22051,6 +22054,11 @@
"version": "3.0.1", "version": "3.0.1",
"license": "MIT" "license": "MIT"
}, },
"node_modules/seedrandom": {
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
"integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
},
"node_modules/select": { "node_modules/select": {
"version": "1.1.2", "version": "1.1.2",
"license": "MIT" "license": "MIT"
......
...@@ -17,7 +17,7 @@ ...@@ -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", "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", "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", "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", "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-no-pdf": "npm run preprocess && npm run mkdocs && npm run ng build -- --configuration production",
"build": "npm run build-href -basehref=/", "build": "npm run build-href -basehref=/",
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
"@wdio/globals": "^8.8.2", "@wdio/globals": "^8.8.2",
"@wdio/types": "^8.8.0", "@wdio/types": "^8.8.0",
"angular2-hotkeys": "^13.1.0", "angular2-hotkeys": "^13.1.0",
"chartjs-plugin-zoom": "^2.0.0", "chartjs-plugin-zoom": "^2.0.1",
"core-js": "^3.23.3", "core-js": "^3.23.3",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"he": "^1.2.0", "he": "^1.2.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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment