From 26a64a96c27331e32d7a450d885d6ef2f8b4fa75 Mon Sep 17 00:00:00 2001 From: Matt Morley Date: Sun, 18 Aug 2024 16:31:09 -0700 Subject: [PATCH] asdf --- photon-server/build.gradle | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/photon-server/build.gradle b/photon-server/build.gradle index a82665f890..7c8c2ba078 100644 --- a/photon-server/build.gradle +++ b/photon-server/build.gradle @@ -1,7 +1,7 @@ plugins { id "application" id 'com.github.johnrengelman.shadow' version '8.1.1' - id "com.github.node-gradle.node" version "7.0.2" + id "com.github.node-gradle.node" version "7.0.1" id "org.hidetake.ssh" version "2.11.2" id 'edu.wpi.first.WpilibTools' version '1.3.0' } @@ -32,23 +32,17 @@ shadowJar { } node { - download = true - version = "18.20.4" nodeProjectDir = file("${projectDir}/../photon-client") } -tasks.register('buildUI', PnpmTask) { - args = ["run", "build"] -} - -tasks.register('copyUIToResources', Copy) { +tasks.register('copyClientUIToResources', Copy) { from "${projectDir}/../photon-client/dist/" into "${projectDir}/src/main/resources/web/" } tasks.register("buildAndCopyUI") { - dependsOn "buildUI" - finalizedBy "copyUIToResources" + dependsOn "npm_run_build" + finalizedBy "copyClientUIToResources" } run {