Merge pull request #1406 from phac-nml/gradle-node-optimizations

BUILD: gradle buildWebapp enhancements
phac-nml · Nov 8, 2022 · 0824d2f · 0824d2f
2 parents 47ee6d6 + 4db2639
commit 0824d2f
Show file tree

Hide file tree

Showing 4 changed files with 236 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -304,15 +304,19 @@ tasks.register<PnpmTask>("cleanWebapp") {
 }
 
 tasks.register<PnpmTask>("buildWebapp") {
-    dependsOn(":cleanWebapp")
-    pnpmCommand.set(listOf("build"))
-    inputs.dir("${project.projectDir}/src/main/webapp/resources")
+    inputs.files(fileTree("${project.projectDir}/src/main/webapp/resources"))
+    inputs.file("${project.projectDir}/src/main/webapp/package.json")
+    inputs.file("${project.projectDir}/src/main/webapp/pnpm-lock.yaml")
+
     outputs.dir("${project.projectDir}/src/main/webapp/dist")
+
+    dependsOn(":pnpmInstall")
+    pnpmCommand.set(listOf("clean", "build"))
 }
 
 tasks.register<PnpmTask>("startWebapp") {
-    dependsOn(":cleanWebapp")
-    pnpmCommand.set(listOf("start"))
+    dependsOn(":pnpmInstall")
+    pnpmCommand.set(listOf("clean", "start"))
     inputs.dir("${project.projectDir}/src/main/webapp/resources")
     outputs.dir("${project.projectDir}/src/main/webapp/dist")
 }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,7 +4,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.github.node-gradle.node") version "3.4.0"
+        id("com.github.node-gradle.node") version "3.5.0"
         id("io.spring.dependency-management") version "1.0.11.RELEASE"
         id("org.gradle.test-retry") version "1.4.0"
         id("org.springframework.boot") version "2.7.4"

diff --git a/src/main/webapp/package.json b/src/main/webapp/package.json
@@ -3,12 +3,12 @@
   "version": "1.0.0",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "webpack --mode production",
-    "start": "webpack --mode development --watch",
-    "clean": "rm -rf dist/ pages/templates/i18n/",
-    "test": "jest resources/js/**/*.test.js",
-    "test_watch": "jest --watch resources/js/**/*.test.js",
-    "lint": "eslint --ext resources/js/**/*.{js,jsx,ts,tsx}"
+    "build": "run-z --then webpack --mode production",
+    "start": "run-z --then webpack --mode development --watch",
+    "clean": "run-z --then rm -rf dist/ pages/templates/i18n/",
+    "test": "run-z --then jest resources/js/**/*.test.js",
+    "test_watch": "run-z --then jest --watch resources/js/**/*.test.js",
+    "lint": "run-z --then eslint --ext resources/js/**/*.{js,jsx,ts,tsx}"
   },
   "browserslist": [
     "last 2 Chrome versions",
@@ -128,6 +128,7 @@
     "prettier": "^2.7.0",
     "properties-reader": "^2.2.0",
     "react-is": "^17.0.2",
+    "run-z": "^1.10.1",
     "speed-measure-webpack-plugin": "^1.5.0",
     "terser-webpack-plugin": "^5.3.1",
     "typescript": "^4.7.2",