Merge commit '3136d69bed78dcf9fd0a41f356412f3aa8061f25' into release

jgraph · Jul 5, 2023 · 9ac1154 · 9ac1154
2 parents a330a63 + 3136d69
commit 9ac1154
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/drawio b/drawio
diff --git a/yarn.lock b/yarn.lock
@@ -49,12 +49,13 @@
     fs-extra "^9.0.1"
 
 "@electron/notarize@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.0.0.tgz#4df39e817264746aa9bd779e0091b6c441715b72"
-  integrity sha512-dqDpd2YCgl6PHJgXEuKGYH3+L4GIGV7ZbKYJjJv66ed+hVPxZA+GAL5JH8/hCnoyQa8WzJTzqd+qhiL5Oxr+SA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.1.0.tgz#76aaec10c8687225e8d0a427cc9df67611c46ff3"
+  integrity sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==
   dependencies:
     debug "^4.1.1"
     fs-extra "^9.0.1"
+    promise-retry "^2.0.1"
 
 "@electron/osx-sign@^1.0.4":
   version "1.0.4"
@@ -221,14 +222,14 @@
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
 "@types/node@*":
-  version "20.3.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.2.tgz#fa6a90f2600e052a03c18b8cb3fd83dd4e599898"
-  integrity sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==
+  version "20.3.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.3.tgz#329842940042d2b280897150e023e604d11657d6"
+  integrity sha512-wheIYdr4NYML61AjC8MKj/2jrR/kDQri/CIpVoZwldwhnIrD/j9jIU5bJ8yBKuB2VhpFV7Ab6G2XkBjv9r9Zzw==
 
 "@types/node@^18.11.18":
-  version "18.16.18"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.18.tgz#85da09bafb66d4bc14f7c899185336d0c1736390"
-  integrity sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==
+  version "18.16.19"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea"
+  integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==
 
 "@types/plist@^3.0.1":
   version "3.0.2"
@@ -996,9 +997,9 @@ electron-updater@^5.3.0:
     typed-emitter "^2.1.0"
 
 electron@^24.1.0:
-  version "24.6.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-24.6.0.tgz#4e21e739c3b63075c5e8968ee45061d1626d139f"
-  integrity sha512-XI101tybeVGl2tFyrd304KMAnNCbLKKZGrmWNWpTYK9LgsP9m5Q/LN3dFctDv/bpKmrko8sCKMtARlzbf/hTCw==
+  version "24.6.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-24.6.1.tgz#f3577a553c9b50295395f1688dd84f96affae289"
+  integrity sha512-SXbRtatpvBqtOwlOiEbaI47Repspz5a/qoaNZ+GB3DLhi9Z0r28t14pu+a9nXgX5tXj8lOfN8D9wmwVYdo4TAg==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"
@@ -1216,15 +1217,15 @@ get-stream@^5.1.0:
     pump "^3.0.0"
 
 glob@^10.2.2:
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.0.tgz#763d02a894f3cdfc521b10bbbbc8e0309e750cce"
-  integrity sha512-AQ1/SB9HH0yCx1jXAT4vmCbTOPe5RQ+kCurjbel5xSCGhebumUv+GJZfa1rEqor3XIViqwSEmlkZCQD43RWrBg==
+  version "10.3.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.1.tgz#9789cb1b994515bedb811a6deca735b5c37d2bf4"
+  integrity sha512-9BKYcEeIs7QwlCYs+Y3GBvqAMISufUS0i2ELd11zpZjxI5V9iyRj0HgzB5/cLf2NY4vcYBTYzJ7GIui7j/4DOw==
   dependencies:
     foreground-child "^3.1.0"
     jackspeak "^2.0.3"
     minimatch "^9.0.1"
     minipass "^5.0.0 || ^6.0.2"
-    path-scurry "^1.7.0"
+    path-scurry "^1.10.0"
 
 glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
@@ -1584,10 +1585,10 @@ lru-cache@^7.7.1:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
   integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
 
-lru-cache@^9.1.1:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835"
-  integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==
+"lru-cache@^9.1.1 || ^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"
+  integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==
 
 make-fetch-happen@^11.0.3:
   version "11.1.1"
@@ -1917,12 +1918,12 @@ path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-scurry@^1.7.0:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.9.2.tgz#90f9d296ac5e37e608028e28a447b11d385b3f63"
-  integrity sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==
+path-scurry@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.0.tgz#0ffbd4c1f7de9600f98a1405507d9f9acb438ab3"
+  integrity sha512-tZFEaRQbMLjwrsmidsGJ6wDMv0iazJWk6SfIKnY4Xru8auXgmJkOBa5DUbYFcFD2Rzk2+KDlIiF0GVXNCbgC7g==
   dependencies:
-    lru-cache "^9.1.1"
+    lru-cache "^9.1.1 || ^10.0.0"
     minipass "^5.0.0 || ^6.0.2"
 
 pdf-lib@^1.17.1:
+21 −0		ChangeLog
+1 −1		VERSION
+2,023 −2,011		src/main/webapp/js/app.min.js
+18 −66		src/main/webapp/js/diagramly/App.js
+49 −0		src/main/webapp/js/diagramly/Dialogs.js
+37 −35		src/main/webapp/js/diagramly/Editor.js
+228 −127		src/main/webapp/js/diagramly/EditorUi.js
+43 −9		src/main/webapp/js/diagramly/GraphViewer.js
+28 −10		src/main/webapp/js/diagramly/Menus.js
+3 −3		src/main/webapp/js/diagramly/vsdx/importer.js
+8 −8		src/main/webapp/js/extensions.min.js
+13 −19		src/main/webapp/js/grapheditor/Dialogs.js
+12 −2		src/main/webapp/js/grapheditor/Editor.js
+75 −0		src/main/webapp/js/grapheditor/EditorUi.js
+1 −1		src/main/webapp/js/grapheditor/Format.js
+61 −11		src/main/webapp/js/grapheditor/Graph.js
+4 −4		src/main/webapp/js/grapheditor/Sidebar.js
+2,147 −2,135		src/main/webapp/js/integrate.min.js
+167 −167		src/main/webapp/js/stencils.min.js
+1,217 −1,206		src/main/webapp/js/viewer-static.min.js
+1,217 −1,206		src/main/webapp/js/viewer.min.js
+26 −25		src/main/webapp/mxgraph/mxClient.js
+0 −400		src/main/webapp/plugins/tickets.js
+1 −0		src/main/webapp/resources/dia.txt
+1 −0		src/main/webapp/resources/dia_am.txt
+1 −0		src/main/webapp/resources/dia_ar.txt
+1 −0		src/main/webapp/resources/dia_bg.txt
+1 −0		src/main/webapp/resources/dia_bn.txt
+1 −0		src/main/webapp/resources/dia_bs.txt
+1 −0		src/main/webapp/resources/dia_ca.txt
+1 −0		src/main/webapp/resources/dia_cs.txt
+1 −0		src/main/webapp/resources/dia_da.txt
+1 −0		src/main/webapp/resources/dia_de.txt
+1 −0		src/main/webapp/resources/dia_el.txt
+1 −0		src/main/webapp/resources/dia_eo.txt
+1 −0		src/main/webapp/resources/dia_es.txt
+1 −0		src/main/webapp/resources/dia_et.txt
+1 −0		src/main/webapp/resources/dia_eu.txt
+1 −0		src/main/webapp/resources/dia_fa.txt
+1 −0		src/main/webapp/resources/dia_fi.txt
+1 −0		src/main/webapp/resources/dia_fil.txt
+1 −0		src/main/webapp/resources/dia_fr.txt
+1 −0		src/main/webapp/resources/dia_gl.txt
+1 −0		src/main/webapp/resources/dia_gu.txt
+1 −0		src/main/webapp/resources/dia_he.txt
+1 −0		src/main/webapp/resources/dia_hi.txt
+1 −0		src/main/webapp/resources/dia_hr.txt
+1 −0		src/main/webapp/resources/dia_hu.txt
+1 −0		src/main/webapp/resources/dia_i18n.txt
+1 −0		src/main/webapp/resources/dia_id.txt
+3 −2		src/main/webapp/resources/dia_it.txt
+1 −0		src/main/webapp/resources/dia_ja.txt
+1 −0		src/main/webapp/resources/dia_kn.txt
+1 −0		src/main/webapp/resources/dia_ko.txt
+1 −0		src/main/webapp/resources/dia_lt.txt
+1 −0		src/main/webapp/resources/dia_lv.txt
+1 −0		src/main/webapp/resources/dia_ml.txt
+1 −0		src/main/webapp/resources/dia_mr.txt
+1 −0		src/main/webapp/resources/dia_ms.txt
+1 −0		src/main/webapp/resources/dia_my.txt
+1 −0		src/main/webapp/resources/dia_nl.txt
+1 −0		src/main/webapp/resources/dia_no.txt
+1 −0		src/main/webapp/resources/dia_pl.txt
+1 −0		src/main/webapp/resources/dia_pt-br.txt
+1 −0		src/main/webapp/resources/dia_pt.txt
+1 −0		src/main/webapp/resources/dia_ro.txt
+1 −0		src/main/webapp/resources/dia_ru.txt
+1 −0		src/main/webapp/resources/dia_si.txt
+1 −0		src/main/webapp/resources/dia_sk.txt
+1 −0		src/main/webapp/resources/dia_sl.txt
+1 −0		src/main/webapp/resources/dia_sr.txt
+1 −0		src/main/webapp/resources/dia_sv.txt
+1 −0		src/main/webapp/resources/dia_sw.txt
+1 −0		src/main/webapp/resources/dia_ta.txt
+1 −0		src/main/webapp/resources/dia_te.txt
+1 −0		src/main/webapp/resources/dia_th.txt
+1 −0		src/main/webapp/resources/dia_tr.txt
+1 −0		src/main/webapp/resources/dia_uk.txt
+1 −0		src/main/webapp/resources/dia_vi.txt
+1 −0		src/main/webapp/resources/dia_zh-tw.txt
+1 −0		src/main/webapp/resources/dia_zh.txt
+1 −1		src/main/webapp/service-worker.js
+1 −1		src/main/webapp/service-worker.js.map
+2 −2		src/main/webapp/styles/dark.css
+19 −0		src/main/webapp/styles/grapheditor.css