From 04cac04b5b0111c7c82e58fd115fae392367d0a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Paku=C5=82a?= <zulus@w3des.net>
Date: Sun, 24 Sep 2023 21:59:37 +0200
Subject: [PATCH] Fix github workflows

---
 .github/workflows/MacOsPR.yml             |  2 +-
 .github/workflows/windowsPR.yml           |  2 +-
 org.eclipse.wildwebdeveloper/package.json |  1 +
 org.eclipse.wildwebdeveloper/pom.xml      | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/MacOsPR.yml b/.github/workflows/MacOsPR.yml
index 03b1147ff9..7380118262 100644
--- a/.github/workflows/MacOsPR.yml
+++ b/.github/workflows/MacOsPR.yml
@@ -24,6 +24,6 @@ jobs:
         maven-version: 3.9.2
     - uses: actions/setup-node@v3
       with:
-        node-version: '20'
+        node-version: '18'
     - name: Build with Maven
       run: mvn -B clean verify
diff --git a/.github/workflows/windowsPR.yml b/.github/workflows/windowsPR.yml
index b1fe95e4b6..7050027339 100644
--- a/.github/workflows/windowsPR.yml
+++ b/.github/workflows/windowsPR.yml
@@ -24,6 +24,6 @@ jobs:
         maven-version: 3.9.2
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
     - name: Build with Maven
       run: mvn -B clean verify
diff --git a/org.eclipse.wildwebdeveloper/package.json b/org.eclipse.wildwebdeveloper/package.json
index 1415520c32..e40536dd37 100644
--- a/org.eclipse.wildwebdeveloper/package.json
+++ b/org.eclipse.wildwebdeveloper/package.json
@@ -9,6 +9,7 @@
     "yaml-language-server": "1.14.0",
     "vscode-languageserver-protocol": "3.17.4-next.3",
     "vscode-languageserver-types": "3.17.4-next.2",
+    "vscode-languageserver": "8.1.0",
     "vscode-css-languageserver": "file:target/vscode-css-languageserver-1.0.0.tgz",
     "vscode-html-languageserver": "file:target/vscode-html-languageserver-1.0.0.tgz",
     "vscode-json-languageserver": "file:target/vscode-json-languageserver-1.3.4.tgz",
diff --git a/org.eclipse.wildwebdeveloper/pom.xml b/org.eclipse.wildwebdeveloper/pom.xml
index 7c5edc0124..e16ffedcfe 100644
--- a/org.eclipse.wildwebdeveloper/pom.xml
+++ b/org.eclipse.wildwebdeveloper/pom.xml
@@ -161,6 +161,19 @@
 							</target>
 						</configuration>
 					</execution>
+					<execution>
+						<id>remove package-lock before install</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<delete
+									file="${project.directory}/package-lock.json" />
+							</target>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -204,6 +217,8 @@
 								<arg>--only=prod</arg>
 								<arg>--no-bin-links</arg>
 								<arg>--ignore-scripts</arg>
+								<arg>--install-strategy=hoisted</arg>
+								<arg>--force</arg>
 <!-- The actual verions for the LS and other dependency NPM Modules are to be set in  './package.json file',  
 	which is used to install the dependencies -->
 							</arguments>