From 0ee850f9cc4b215b5bc11f314052f9e122360c62 Mon Sep 17 00:00:00 2001
From: Max Kasperowski <Eddykasp@users.noreply.github.com>
Date: Wed, 22 May 2024 12:11:43 +0200
Subject: [PATCH] Update for elk 0.9.0 (#70)

* Add new elkjs version 0.9.0

* remove unnecessary whitespace

* add elkjs 0.9.0 to yarn.lock

* update lockfile with correct versions

* correct elk webworker reference

* update to use current 0.9.3 version of elkjs
---
 client/package.json                |  1 +
 client/src/json/json_template.html |  3 ++-
 client/webpack.config.js           |  7 ++++++-
 client/yarn.lock                   | 15 +++++++++++++++
 server/build.gradle                |  2 +-
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/client/package.json b/client/package.json
index 5798308..08f0334 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.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 433abe7..c9b156d 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.3</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..5a188a0 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: elkWorkerPath9,
+                to: 'elk-9'
+            }]),
             new CopyWebpackPlugin([{
                 from: elkWorkerPathLatest,
                 to: 'elk-latest'
@@ -213,4 +218,4 @@ module.exports = async function (env) {
             }])
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/client/yarn.lock b/client/yarn.lock
index 746072c..5713e84 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -926,6 +926,21 @@ 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.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.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"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
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',