2 files changed, 12 insertions, 0 deletions

diff --git a/gradle.properties b/gradle.properties
index 499732a1..8b4f3793 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,6 +5,8 @@ jettyVersion=9.4.42.v20210604
 junitVersion=5.7.2
 mweVersion=1.6.1
 mwe2Version=2.12.1
+nodeVersion=14.17.1
+npmVersion=7.19.0
 slf4JVersion=1.7.31
 xtextVersion=2.26.0.M1
 xtextAntlrGeneratorVersion=2.1.1
\ No newline at end of file
diff --git a/language-web/build.gradle b/language-web/build.gradle
index dcb69406..e04af7cb 100644
--- a/language-web/build.gradle
+++ b/language-web/build.gradle
@@ -17,10 +17,17 @@ def currentNodeEnv =  devMode ? 'development' : 'production'
 
 apply plugin: 'com.moowork.node'
 
+node {
+        version = nodeVersion
+        npmVersion = project.ext.npmVersion
+        download = true
+}
+
 for (environment in ['production', 'development']) {
         def taskName = 'webpack' + environment.substring(0, 1).toUpperCase() + environment.substring(1);
         task(taskName, type: NpmTask) {
                 dependsOn ':language:generateXtext'
+                dependsOn npmInstall
                 inputs.dir 'src/main/css'
                 inputs.dir 'src/main/html'
                 inputs.dir 'src/main/js'
@@ -34,6 +41,7 @@ for (environment in ['production', 'development']) {
 
 apply plugin: 'application'
 mainClassName = mainClass
+distTar.enabled = false
 distZip.enabled = false
 
 jar {
@@ -44,6 +52,7 @@ jar {
 }
 
 apply plugin: 'com.github.johnrengelman.shadow'
+shadowDistTar.enabled = false
 shadowDistZip.enabled = false
 
 shadowJar {
@@ -76,6 +85,7 @@ task jettyRun(type: JavaExec) {
 
 task webpackServe(type: NpmTask) {
         dependsOn ':language:generateXtext'
+        dependsOn npmInstall
         outputs.dir "${webpackOutputDir}/hmr"
         args = ['run', 'serve']
         setEnvironment NODE_ENV: 'hmr'