From 34b7c632f5de5814e5cde64c8af09c17a8f664d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Thu, 26 Oct 2023 20:20:03 +0200
Subject: [PATCH] [dome] introduce Diff dependency
---
ivette/.dome-pkg-app.lock | 2 +-
ivette/package.json | 23 ++++-----
ivette/src/dome/renderer/text/richtext.tsx | 1 +
ivette/src/dome/template/makefile.packages | 3 +-
ivette/yarn.lock | 56 +++++++++++++---------
5 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/ivette/.dome-pkg-app.lock b/ivette/.dome-pkg-app.lock
index f0697a7751c..6db93f438a0 100644
--- a/ivette/.dome-pkg-app.lock
+++ b/ivette/.dome-pkg-app.lock
@@ -1 +1 @@
-react@^16 react-dom@^16 source-map-support lodash react-virtualized react-draggable react-fast-compare codemirror
+react@^16 react-dom@^16 source-map-support lodash react-virtualized react-draggable react-fast-compare codemirror@^5 diff
diff --git a/ivette/package.json b/ivette/package.json
index 645a55b5fb8..d4137dc6303 100644
--- a/ivette/package.json
+++ b/ivette/package.json
@@ -63,16 +63,16 @@
},
"dependencies": {
"@babel/runtime": "",
+ "@codemirror/commands": "6.1.0",
+ "@codemirror/lang-cpp": "6.0.1",
+ "@codemirror/language": "6.2.1",
+ "@codemirror/search": "6.2.3",
+ "@codemirror/state": "6.1.1",
+ "@codemirror/view": "6.2.3",
"@fortawesome/fontawesome-free": "",
"@types/diff": "",
"@types/react-window": "",
- "codemirror": "^5.65.2",
- "@codemirror/view": "6.2.3",
- "@codemirror/state": "6.1.1",
- "@codemirror/search": "6.2.3",
- "@codemirror/language": "6.2.1",
- "@codemirror/commands": "6.1.0",
- "@codemirror/lang-cpp": "6.0.1",
+ "codemirror": "^5",
"cytoscape": "",
"cytoscape-cola": "",
"cytoscape-cose-bilkent": "",
@@ -81,16 +81,17 @@
"cytoscape-klay": "",
"cytoscape-panzoom": "",
"cytoscape-popper": "",
- "diff": "",
+ "diff": "^5.1.0",
"immutable": "",
+ "jsdiff": "^1.1.1",
"lodash": "^4.17.21",
"react": "^16",
"react-cytoscapejs": "",
"react-dom": "^16",
- "react-draggable": "^4.4.4",
- "react-fast-compare": "^3.2.0",
+ "react-draggable": "^4.4.6",
+ "react-fast-compare": "^3.2.2",
"react-pivottable": "^0.11.0",
- "react-virtualized": "^9.22.3",
+ "react-virtualized": "^9.22.5",
"react-window": "",
"source-map-support": "^0.5.21",
"tippy.js": "6.3.7"
diff --git a/ivette/src/dome/renderer/text/richtext.tsx b/ivette/src/dome/renderer/text/richtext.tsx
index 178e1b8aa58..da539bf1a05 100644
--- a/ivette/src/dome/renderer/text/richtext.tsx
+++ b/ivette/src/dome/renderer/text/richtext.tsx
@@ -24,6 +24,7 @@ import React, { CSSProperties } from 'react';
import { classes } from 'dome/misc/utils';
import * as CS from '@codemirror/state';
import * as CM from '@codemirror/view';
+// import { diffLines } from 'diff';
/* -------------------------------------------------------------------------- */
/* --- Basic Definitions --- */
diff --git a/ivette/src/dome/template/makefile.packages b/ivette/src/dome/template/makefile.packages
index d18bd0aa813..3d689992f11 100644
--- a/ivette/src/dome/template/makefile.packages
+++ b/ivette/src/dome/template/makefile.packages
@@ -50,6 +50,7 @@ DOME_APP_PACKAGES= \
react-virtualized \
react-draggable \
react-fast-compare \
- codemirror
+ codemirror@^5 \
+ diff
# --------------------------------------------------------------------------
diff --git a/ivette/yarn.lock b/ivette/yarn.lock
index 22ba4319118..9d1c2e4511d 100644
--- a/ivette/yarn.lock
+++ b/ivette/yarn.lock
@@ -3558,10 +3558,10 @@ clsx@^1.0.4, clsx@^1.1.1:
resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
-codemirror@^5.65.2:
- version "5.65.2"
- resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.2.tgz#5799a70cb3d706e10f60e267245e3a75205d3dd9"
- integrity sha512-SZM4Zq7XEC8Fhroqe3LxbEEX1zUPWH1wMr5zxiBuiUF64iYOUH/JI88v4tBag8MiBS8B8gRv8O1pPXGYXQ4ErA==
+codemirror@^5:
+ version "5.65.15"
+ resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.15.tgz#66899278f44a7acde0eb641388cd563fe6dfbe19"
+ integrity sha512-YC4EHbbwQeubZzxLl5G4nlbLc1T21QTrKGaOal/Pkm9dVDMZXMH7+ieSPEOZCtO9I68i8/oteJKOxzHC2zR+0g==
collection-visit@^1.0.0:
version "1.0.0"
@@ -4240,10 +4240,10 @@ detect-node@^2.0.4:
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
-diff@:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
- integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+diff@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
+ integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
diffie-hellman@^5.0.0:
version "5.0.3"
@@ -6216,6 +6216,11 @@ is-docker@^2.0.0:
resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+is-equal@~0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-0.1.0.tgz#fcf6e0fdc9dca9a4d4768bae73b8cdaa5b3fab6e"
+ integrity sha512-TXeTngl99D9PltZtHiuAJE8YpG7V3KR8Djya8SQQ9MMJ+nDuAui+AxQY8a0y8csxUlOn/ZpFj4ACh8semteBGQ==
+
is-extendable@^0.1.0, is-extendable@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -6450,6 +6455,13 @@ js2xmlparser@^4.0.1:
dependencies:
xmlcreate "^2.0.4"
+jsdiff@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/jsdiff/-/jsdiff-1.1.1.tgz#eaa6e7c16db9f64b979d28f986fa1ca457b222e5"
+ integrity sha512-a3k+sL1kZ9cGcEzu+4juqCp4QbEDibhu0mHSlBL/fNmekWyfRpffZ8tGhlxD3mBNVLa/GCYeTwxex351hGlerw==
+ dependencies:
+ is-equal "~0.1.0"
+
jsdoc@:
version "3.6.7"
resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.6.7.tgz#00431e376bed7f9de4716c6f15caa80e64492b89"
@@ -7900,7 +7912,7 @@ promise-retry@^2.0.1:
err-code "^2.0.2"
retry "^0.12.0"
-prop-types@>=15.0.0, prop-types@^15.5.10:
+prop-types@>=15.0.0, prop-types@^15.5.10, prop-types@^15.8.1:
version "15.8.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -8092,18 +8104,18 @@ react-draggable@^3.0.3:
classnames "^2.2.5"
prop-types "^15.6.0"
-react-draggable@^4.4.4:
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f"
- integrity sha512-6e0WdcNLwpBx/YIDpoyd2Xb04PB0elrDrulKUgdrIlwuYvxh5Ok9M+F8cljm8kPXXs43PmMzek9RrB1b7mLMqA==
+react-draggable@^4.4.6:
+ version "4.4.6"
+ resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.6.tgz#63343ee945770881ca1256a5b6fa5c9f5983fe1e"
+ integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw==
dependencies:
clsx "^1.1.1"
- prop-types "^15.6.0"
+ prop-types "^15.8.1"
-react-fast-compare@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
- integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
+react-fast-compare@^3.2.2:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"
+ integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==
react-hot-loader@^4:
version "4.13.0"
@@ -8147,10 +8159,10 @@ react-sortablejs@^1.3.4:
dependencies:
prop-types ">=15.0.0"
-react-virtualized@^9.22.3:
- version "9.22.3"
- resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.3.tgz#f430f16beb0a42db420dbd4d340403c0de334421"
- integrity sha512-MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw==
+react-virtualized@^9.22.5:
+ version "9.22.5"
+ resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.5.tgz#bfb96fed519de378b50d8c0064b92994b3b91620"
+ integrity sha512-YqQMRzlVANBv1L/7r63OHa2b0ZsAaDp1UhVNEdUaXI8A5u6hTpA5NYtUueLH2rFuY/27mTGIBl7ZhqFKzw18YQ==
dependencies:
"@babel/runtime" "^7.7.2"
clsx "^1.0.4"
--
GitLab