From 6ded5e0c03a769b0c64772628318e994871c63df Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 4 Nov 2024 16:22:13 -0800 Subject: [PATCH 1/3] Gradle plugin version updates --- gradle.properties | 4 ++-- server/build.gradle | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4a7268ed28..78bcf07eb9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -58,8 +58,8 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 -gradleNodePluginVersion=3.5.1 -gradlePluginsVersion=4.2.0 +gradleNodePluginVersion=7.1.0 +gradlePluginsVersion=4.3.0-npmSetupUpdates-SNAPSHOT owaspDependencyCheckPluginVersion=11.0.0 versioningPluginVersion=1.1.2 diff --git a/server/build.gradle b/server/build.gradle index 8496ae9704..9350118ed6 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -228,12 +228,4 @@ else } } -// We add this configuration here so we have a single location to link to for the npm and node executables. -// Each project that requires node will have its own downloaded version of node and npm, but for the symlinkNode -// task we need a single location, and one that works even when not building from source (Issue 35207) -project.node { - workDir = BuildUtils.getRootBuildDirFile(project, ".node") - npmWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") - yarnWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") -} project.tasks.named('deployApp').configure { dependsOn(project.tasks.npmSetup) } From 2956f6681f7ac279d7e0cd31e09e70c6cec61bb8 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 4 Nov 2024 16:44:02 -0800 Subject: [PATCH 2/3] Add dependency on server npm setup task --- server/minification/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/minification/build.gradle b/server/minification/build.gradle index 14c3cd7e2d..05366ef140 100644 --- a/server/minification/build.gradle +++ b/server/minification/build.gradle @@ -1 +1,5 @@ +import org.labkey.gradle.util.BuildUtils + apply plugin: 'org.labkey.build.npmRun' + +project.tasks.npmSetup.dependsOn(BuildUtils.getServerProject(project).tasks.npmSetup) From 5f3442b9b9ab954166c5e391f213dc66dd0ad6e6 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 5 Nov 2024 07:00:12 -0800 Subject: [PATCH 3/3] Configure minification to do its own npmSetup (at least for now) --- server/minification/build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/minification/build.gradle b/server/minification/build.gradle index 05366ef140..18867dc61b 100644 --- a/server/minification/build.gradle +++ b/server/minification/build.gradle @@ -1,5 +1,8 @@ -import org.labkey.gradle.util.BuildUtils apply plugin: 'org.labkey.build.npmRun' -project.tasks.npmSetup.dependsOn(BuildUtils.getServerProject(project).tasks.npmSetup) +project.node { + download = true + workDir = project.file(".gradle/nodejs") + npmWorkDir = project.file(".gradle/npm") +}