From a79d0396189770cc6b529ba1f5eabed728978dee Mon Sep 17 00:00:00 2001
From: Max Kasperowski <mka@informatik.uni-kiel.de>
Date: Wed, 20 Dec 2023 12:16:34 +0100
Subject: [PATCH 1/6] Add new elkjs version 0.9.0

---
 client/package.json                | 1 +
 client/src/json/json_template.html | 3 ++-
 client/webpack.config.js           | 8 +++++++-
 server/build.gradle                | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/client/package.json b/client/package.json
index 5798308..7015bdc 100644
--- a/client/package.json
+++ b/client/package.json
@@ -13,6 +13,7 @@
     "elkjs-7": "npm:elkjs@0.7.0",
     "elkjs-7-1": "npm:elkjs@0.7.1",
     "elkjs-8": "npm:elkjs@0.8.2",
+    "elkjs-9": "npm:elkjs@0.9.0",
     "elkjs-latest": "npm:elkjs@latest",
     "elkjs-next": "npm:elkjs@next",
     "jquery": "^3.4.0",
diff --git a/client/src/json/json_template.html b/client/src/json/json_template.html
index 433abe7..6bb0d36 100644
--- a/client/src/json/json_template.html
+++ b/client/src/json/json_template.html
@@ -28,6 +28,7 @@
             <form class="form-inline float-right">
                 <select id="elk-version" class="custom-select">
                     <option value="latest" selected>@latest (<%= htmlWebpackPlugin.options.latestVersion %>)</option>
+                    <option value="9">0.9.0</option>
                     <option value="8">0.8.2</option>
                     <option value="7-1">0.7.1</option>
                     <option value="7">0.7.0</option>
@@ -70,4 +71,4 @@
 	<script src="jquery/jquery.slim.min.js"></script>
 	<script src="bootstrap/js/bootstrap.min.js"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/client/webpack.config.js b/client/webpack.config.js
index e5a263d..12c5e64 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -35,6 +35,7 @@ module.exports = async function (env) {
     const elkWorkerPath7 = 'node_modules/elkjs-7/lib/elk-worker.min.js';
     const elkWorkerPath7_1 = 'node_modules/elkjs-7-1/lib/elk-worker.min.js';
     const elkWorkerPath8 = 'node_modules/elkjs-8/lib/elk-worker.min.js';
+    const elkWorkerPath9 = 'node_modules/elkjs-9/lib/elk-worker.min.js';
     const elkWorkerPathLatest = 'node_modules/elkjs-latest/lib/elk-worker.min.js';
     const elkWorkerPathNext = 'node_modules/elkjs-next/lib/elk-worker.min.js';
     const currentGitCommit = childProcess.execSync('git rev-parse --short HEAD').toString().trim();
@@ -203,6 +204,10 @@ module.exports = async function (env) {
                 from: elkWorkerPath8,
                 to: 'elk-8'
             }]),
+            new CopyWebpackPlugin([{
+                from: elkWorkerPath8,
+                to: 'elk-9'
+            }]),
             new CopyWebpackPlugin([{
                 from: elkWorkerPathLatest,
                 to: 'elk-latest'
@@ -211,6 +216,7 @@ module.exports = async function (env) {
                 from: elkWorkerPathNext,
                 to: 'elk-next'
             }])
+
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/server/build.gradle b/server/build.gradle
index cd9d281..601a163 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 }
 
 ext.versions = [
-    xtext: '2.25.0',
+    xtext: '2.28.0',
     elk: '0.9.0-SNAPSHOT',
     sprotty: '0.9.1',
     lsp4j: '0.8.0',

From 22ce4b07cc47e924a25ce6872057cce6cd9de622 Mon Sep 17 00:00:00 2001
From: Max Kasperowski <mka@informatik.uni-kiel.de>
Date: Thu, 21 Dec 2023 09:25:13 +0100
Subject: [PATCH 2/6] remove unnecessary whitespace

---
 client/webpack.config.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/webpack.config.js b/client/webpack.config.js
index 12c5e64..b15bb29 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -216,7 +216,6 @@ module.exports = async function (env) {
                 from: elkWorkerPathNext,
                 to: 'elk-next'
             }])
-
         ]
     }
 }

From 32f4c8f2052cde61828f3cacf8c5bffcc5b6c3db Mon Sep 17 00:00:00 2001
From: Max Kasperowski <mka@informatik.uni-kiel.de>
Date: Fri, 22 Dec 2023 10:14:47 +0100
Subject: [PATCH 3/6] add elkjs 0.9.0 to yarn.lock

---
 client/yarn.lock | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/yarn.lock b/client/yarn.lock
index afde76d..cb086c1 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -925,6 +925,11 @@ duplexify@^3.4.2, duplexify@^3.6.0:
   resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.8.2.tgz#c37763c5a3e24e042e318455e0147c912a7c248e"
   integrity sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==
 
+"elkjs-9@npm:elkjs@0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.0.tgz#739139dfda438c57c92a7616bcbbda1e8508a2e6"
+  integrity sha512-1wauhuHI2Nf4qbHoGZG90dUM5GTAYcWTc5vpIAZ1N7kxZrv+jPVznUfxjVm9X761A7uzcjRpUCi7L1v06QHNAg==
+
 elliptic@^6.0.0:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"

From 7ea3d96340e5362b74b53974c7591fbf4fcb58f0 Mon Sep 17 00:00:00 2001
From: Max Kasperowski <mka@informatik.uni-kiel.de>
Date: Mon, 8 Jan 2024 15:39:33 +0100
Subject: [PATCH 4/6] update lockfile with correct versions

---
 client/yarn.lock | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/yarn.lock b/client/yarn.lock
index cb086c1..43421a1 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -910,7 +910,7 @@ duplexify@^3.4.2, duplexify@^3.6.0:
   resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.6.2.tgz#b33ea52cd2e049abf921598e5106995865245bda"
   integrity sha512-eAPWONv3c+eT+F1r5dvH/qbyBjPi21LPFlUFaQgB5fCguWTZvp4rjEbVX2iY8TjnprOq9cYXNME38J3Tqxby/w==
 
-"elkjs-7-1@npm:elkjs@0.7.1", "elkjs-latest@npm:elkjs@latest":
+"elkjs-7-1@npm:elkjs@0.7.1":
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.7.1.tgz#4751c5e918a4988139baf7f214e010aea22de969"
   integrity sha512-lD86RWdh480/UuRoHhRcnv2IMkIcK6yMDEuT8TPBIbO3db4HfnVF+1lgYdQi99Ck0yb+lg5Eb46JCHI5uOsmAw==
@@ -920,16 +920,21 @@ duplexify@^3.4.2, duplexify@^3.6.0:
   resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.7.0.tgz#c9341af221456979a74c5806ecbddaeaaea305b5"
   integrity sha512-lddP9+t2AR7vzfJI8ccKrjwxWzwfXAqglikw97UYPchQEKZ4GCxye1rhVfst26CrGUxwcabOdXTG3Cnf1tYWKQ==
 
-"elkjs-8@npm:elkjs@0.8.2", "elkjs-next@npm:elkjs@next":
+"elkjs-8@npm:elkjs@0.8.2":
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.8.2.tgz#c37763c5a3e24e042e318455e0147c912a7c248e"
   integrity sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==
 
-"elkjs-9@npm:elkjs@0.9.0":
+"elkjs-9@npm:elkjs@0.9.0", "elkjs-latest@npm:elkjs@latest":
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.0.tgz#739139dfda438c57c92a7616bcbbda1e8508a2e6"
   integrity sha512-1wauhuHI2Nf4qbHoGZG90dUM5GTAYcWTc5vpIAZ1N7kxZrv+jPVznUfxjVm9X761A7uzcjRpUCi7L1v06QHNAg==
 
+"elkjs-next@npm:elkjs@next":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.1.tgz#fd1524b3f0bed72dc65ba107ae91bcf04b5582bd"
+  integrity sha512-JWKDyqAdltuUcyxaECtYG6H4sqysXSLeoXuGUBfRNESMTkj+w+qdb0jya8Z/WI0jVd03WQtCGhS6FOFtlhD5FQ==
+
 elliptic@^6.0.0:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"

From 13e0790a3b0308af6660e6421e956bd9bca7bfe1 Mon Sep 17 00:00:00 2001
From: Max Kasperowski <mka@informatik.uni-kiel.de>
Date: Mon, 8 Jan 2024 15:55:38 +0100
Subject: [PATCH 5/6] correct elk webworker reference

---
 client/webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/webpack.config.js b/client/webpack.config.js
index b15bb29..5a188a0 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -205,7 +205,7 @@ module.exports = async function (env) {
                 to: 'elk-8'
             }]),
             new CopyWebpackPlugin([{
-                from: elkWorkerPath8,
+                from: elkWorkerPath9,
                 to: 'elk-9'
             }]),
             new CopyWebpackPlugin([{

From ffd86165c2ae735d0e9b5c46de67704e8b784164 Mon Sep 17 00:00:00 2001
From: Max Kasperowski <mka@informatik.uni-kiel.de>
Date: Wed, 22 May 2024 08:49:48 +0200
Subject: [PATCH 6/6] update to use current 0.9.3 version of elkjs

---
 client/package.json                |  2 +-
 client/src/json/json_template.html |  2 +-
 client/yarn.lock                   | 19 ++++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/client/package.json b/client/package.json
index 7015bdc..08f0334 100644
--- a/client/package.json
+++ b/client/package.json
@@ -13,7 +13,7 @@
     "elkjs-7": "npm:elkjs@0.7.0",
     "elkjs-7-1": "npm:elkjs@0.7.1",
     "elkjs-8": "npm:elkjs@0.8.2",
-    "elkjs-9": "npm:elkjs@0.9.0",
+    "elkjs-9": "npm:elkjs@0.9.3",
     "elkjs-latest": "npm:elkjs@latest",
     "elkjs-next": "npm:elkjs@next",
     "jquery": "^3.4.0",
diff --git a/client/src/json/json_template.html b/client/src/json/json_template.html
index 6bb0d36..c9b156d 100644
--- a/client/src/json/json_template.html
+++ b/client/src/json/json_template.html
@@ -28,7 +28,7 @@
             <form class="form-inline float-right">
                 <select id="elk-version" class="custom-select">
                     <option value="latest" selected>@latest (<%= htmlWebpackPlugin.options.latestVersion %>)</option>
-                    <option value="9">0.9.0</option>
+                    <option value="9">0.9.3</option>
                     <option value="8">0.8.2</option>
                     <option value="7-1">0.7.1</option>
                     <option value="7">0.7.0</option>
diff --git a/client/yarn.lock b/client/yarn.lock
index 43421a1..24fb7ad 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -925,15 +925,20 @@ duplexify@^3.4.2, duplexify@^3.6.0:
   resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.8.2.tgz#c37763c5a3e24e042e318455e0147c912a7c248e"
   integrity sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==
 
-"elkjs-9@npm:elkjs@0.9.0", "elkjs-latest@npm:elkjs@latest":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.0.tgz#739139dfda438c57c92a7616bcbbda1e8508a2e6"
-  integrity sha512-1wauhuHI2Nf4qbHoGZG90dUM5GTAYcWTc5vpIAZ1N7kxZrv+jPVznUfxjVm9X761A7uzcjRpUCi7L1v06QHNAg==
+"elkjs-9@npm:elkjs@0.9.3":
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.3.tgz#16711f8ceb09f1b12b99e971b138a8384a529161"
+  integrity sha512-f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==
+
+"elkjs-latest@npm:elkjs@latest":
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.3.tgz#16711f8ceb09f1b12b99e971b138a8384a529161"
+  integrity sha512-f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==
 
 "elkjs-next@npm:elkjs@next":
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.1.tgz#fd1524b3f0bed72dc65ba107ae91bcf04b5582bd"
-  integrity sha512-JWKDyqAdltuUcyxaECtYG6H4sqysXSLeoXuGUBfRNESMTkj+w+qdb0jya8Z/WI0jVd03WQtCGhS6FOFtlhD5FQ==
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.3.tgz#16711f8ceb09f1b12b99e971b138a8384a529161"
+  integrity sha512-f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==
 
 elliptic@^6.0.0:
   version "6.5.4"