From 841f07c8472af14e72c3c89b46c9852b1460f763 Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Tue, 28 Dec 2021 17:24:20 +0100
Subject: [PATCH]  a bit more tidying up

---
 .../dev/adamko/kafkatorio/lang/node.gradle.kts       |  4 ++--
 .../events-mod/src/main/typescript/package-lock.json |  2 +-
 modules/events-mod/src/main/typescript/package.json  | 12 ++++--------
 modules/infra-factorio-server/build.gradle.kts       |  2 ++
 modules/infra-kafka-pipe/build.gradle.kts            |  2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/node.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/node.gradle.kts
index f335393..642bf90 100644
--- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/node.gradle.kts
+++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/node.gradle.kts
@@ -1,7 +1,7 @@
 package dev.adamko.kafkatorio.lang
 
 import com.github.gradle.node.NodePlugin
-import com.github.gradle.node.npm.task.NpmTask
+import com.github.gradle.node.npm.task.NpmInstallTask
 import dev.adamko.kafkatorio.gradle.areJsonPropertiesUpToDate
 import dev.adamko.kafkatorio.gradle.not
 import dev.adamko.kafkatorio.jsonMapper
@@ -56,6 +56,6 @@ val updatePackageJson by tasks.registering(UpdatePackageJson::class) {
 }
 
 tasks.assemble { dependsOn(updatePackageJson) }
-tasks.withType<NpmTask> {
+tasks.withType<NpmInstallTask> {
   dependsOn(updatePackageJson)
 }
diff --git a/modules/events-mod/src/main/typescript/package-lock.json b/modules/events-mod/src/main/typescript/package-lock.json
index 32fb6ef..a7c3550 100644
--- a/modules/events-mod/src/main/typescript/package-lock.json
+++ b/modules/events-mod/src/main/typescript/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "kafkatorio-events-mod",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/modules/events-mod/src/main/typescript/package.json b/modules/events-mod/src/main/typescript/package.json
index 033dca2..603a2d4 100644
--- a/modules/events-mod/src/main/typescript/package.json
+++ b/modules/events-mod/src/main/typescript/package.json
@@ -9,8 +9,7 @@
   "engines": {
     "node": ">=10.13.0"
   },
-  "devDependencies": {
-  },
+  "devDependencies": {},
   "dependencies": {
     "lua-types": "^2.11.0",
     "@types/node": "^12.0.8",
@@ -19,10 +18,7 @@
     "typescript": "4.5.4"
   },
   "license": "UNLICENSED",
-  "peerDependencies": {
-  },
-  "optionalDependencies": {
-  },
-  "bundledDependencies": [
-  ]
+  "peerDependencies": {},
+  "optionalDependencies": {},
+  "bundledDependencies": []
 }
diff --git a/modules/infra-factorio-server/build.gradle.kts b/modules/infra-factorio-server/build.gradle.kts
index 5951ca5..392f15c 100644
--- a/modules/infra-factorio-server/build.gradle.kts
+++ b/modules/infra-factorio-server/build.gradle.kts
@@ -22,6 +22,8 @@ val deployModToServer by tasks.registering(Copy::class) {
   description = "Copy the mod to the Factorio Docker server"
   group = project.name
 
+  dependsOn(factorioMod)
+
   from(
     provider { factorioMod.incoming.artifacts.artifactFiles.files }
   )
diff --git a/modules/infra-kafka-pipe/build.gradle.kts b/modules/infra-kafka-pipe/build.gradle.kts
index d3d3fb0..89066a3 100644
--- a/modules/infra-kafka-pipe/build.gradle.kts
+++ b/modules/infra-kafka-pipe/build.gradle.kts
@@ -25,4 +25,4 @@ val dockerBuildKafkaPipe by tasks.registering(Exec::class) {
   workingDir = dockerSrcDir.asFile
   commandLine = parseSpaceSeparatedArgs(""" docker-compose build kafka-pipe """)
 }
-tasks.assemble { dependsOn(dockerBuildKafkaPipe) }
+//tasks.assemble { dependsOn(dockerBuildKafkaPipe) }