Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for elk 0.9.0 #70

Merged
merged 7 commits into from
May 22, 2024
Merged

Update for elk 0.9.0 #70

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a79d039
Add new elkjs version 0.9.0
Eddykasp Dec 20, 2023
22ce4b0
remove unnecessary whitespace
Eddykasp Dec 21, 2023
32f4c8f
add elkjs 0.9.0 to yarn.lock
Eddykasp Dec 22, 2023
7ea3d96
update lockfile with correct versions
Eddykasp Jan 8, 2024
13e0790
correct elk webworker reference
Eddykasp Jan 8, 2024
ffd8616
update to use current 0.9.3 version of elkjs
Eddykasp May 22, 2024
2fb094c
Merge branch 'master' into mka/release-0.9.0
Eddykasp May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"elkjs-7": "npm:[email protected]",
"elkjs-7-1": "npm:[email protected]",
"elkjs-8": "npm:[email protected]",
"elkjs-9": "npm:[email protected]",
"elkjs-latest": "npm:elkjs@latest",
"elkjs-next": "npm:elkjs@next",
"jquery": "^3.4.0",
Expand Down
3 changes: 2 additions & 1 deletion client/src/json/json_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -70,4 +71,4 @@
<script src="jquery/jquery.slim.min.js"></script>
<script src="bootstrap/js/bootstrap.min.js"></script>
</body>
</html>
</html>
8 changes: 7 additions & 1 deletion client/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -203,6 +204,10 @@ module.exports = async function (env) {
from: elkWorkerPath8,
to: 'elk-8'
}]),
new CopyWebpackPlugin([{
from: elkWorkerPath8,
Eddykasp marked this conversation as resolved.
Show resolved Hide resolved
to: 'elk-9'
}]),
new CopyWebpackPlugin([{
from: elkWorkerPathLatest,
to: 'elk-latest'
Expand All @@ -211,6 +216,7 @@ module.exports = async function (env) {
from: elkWorkerPathNext,
to: 'elk-next'
}])

Eddykasp marked this conversation as resolved.
Show resolved Hide resolved
]
}
}
}
2 changes: 1 addition & 1 deletion server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading