This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 384e7b80f20 Improve jsClient building for gradle caching (#2149)
384e7b80f20 is described below
commit 384e7b80f20325a9f6e5b40f351ef0f03242f3f5
Author: Houston Putman <[email protected]>
AuthorDate: Wed Dec 13 11:24:56 2023 -0500
Improve jsClient building for gradle caching (#2149)
Running "gradle clean" should no longer be necessary when changing
branches.
---
solr/webapp/build.gradle | 52 +++++++++++++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 21 deletions(-)
diff --git a/solr/webapp/build.gradle b/solr/webapp/build.gradle
index 6cd0189ac61..f2b830f544f 100644
--- a/solr/webapp/build.gradle
+++ b/solr/webapp/build.gradle
@@ -32,6 +32,7 @@ configurations {
ext {
jsClientWorkspace = layout.buildDirectory.dir("jsClientWorkspace").get()
+ jsClientBuildDir = layout.buildDirectory.dir("jsClientBuild").get()
jsClientBundleDir = layout.buildDirectory.dir("jsClientBundle").get()
browserifyVersion = "17.0.0"
}
@@ -45,7 +46,7 @@ dependencies {
generatedJSClient project(path: ":solr:api", configuration: "jsClient")
generatedJSClientBundle files(jsClientBundleDir) {
- builtBy "generateJsClientBundle"
+ builtBy "finalizeJsBundleDir"
}
}
@@ -53,7 +54,12 @@ task syncJSClientSourceCode(type: Sync) {
group = 'Solr JS Client'
from configurations.generatedJSClient
- into project.jsClientWorkspace
+ into jsClientWorkspace
+
+ // Keep the node modules, so that they don't need to be re-downloaded
+ preserve {
+ include "node_modules/**"
+ }
}
task jsClientDownloadDeps(type: NpmTask) {
@@ -61,7 +67,7 @@ task jsClientDownloadDeps(type: NpmTask) {
dependsOn tasks.syncJSClientSourceCode
args = ["install"]
- workingDir = file(project.jsClientWorkspace)
+ workingDir = file(jsClientWorkspace)
inputs.dir("${jsClientWorkspace}/src")
inputs.file("${jsClientWorkspace}/package.json")
@@ -73,7 +79,7 @@ task jsClientBuild(type: NpmTask) {
dependsOn tasks.jsClientDownloadDeps
args = ["run", "build"]
- workingDir = file(project.jsClientWorkspace)
+ workingDir = file(jsClientWorkspace)
inputs.dir("${jsClientWorkspace}/src")
inputs.file("${jsClientWorkspace}/package.json")
@@ -83,36 +89,40 @@ task jsClientBuild(type: NpmTask) {
task downloadBrowserify(type: NpmTask) {
group = 'Build Dependency Download'
- args = ["install", "browserify@${project.browserifyVersion}"]
+ args = ["install", "browserify@${browserifyVersion}"]
- inputs.property("browserify version", project.browserifyVersion)
- outputs.dir("${project.nodeProjectDir}/node_modules/browserify")
+ inputs.property("browserify version", browserifyVersion)
+ outputs.dir("${nodeProjectDir}/node_modules/browserify")
}
-task setupJsBundleDir(type: Sync) {
+task generateJsClientBundle(type: NpxTask) {
group = 'Solr JS Client'
- dependsOn tasks.syncJSClientSourceCode
+ dependsOn tasks.downloadBrowserify
+ dependsOn tasks.jsClientBuild
- from configurations.generatedJSClient
+ command = 'browserify'
+ args = ['dist/index.js', '-s', 'solrApi', '-o',
"${jsClientBuildDir}/index.js"]
+ workingDir = file(jsClientWorkspace)
- include "README.md"
- include "docs/**"
+ inputs.dir(jsClientWorkspace)
+ inputs.property("browserify version", browserifyVersion)
- into project.jsClientBundleDir
+ outputs.file("${jsClientBuildDir}/index.js")
}
-task generateJsClientBundle(type: NpxTask) {
+task finalizeJsBundleDir(type: Sync) {
group = 'Solr JS Client'
- dependsOn tasks.downloadBrowserify
- dependsOn tasks.jsClientBuild
- dependsOn tasks.setupJsBundleDir
- command = 'browserify'
- args = ['dist/index.js', '-s', 'solrApi', '-o',
"${jsClientBundleDir}/index.js"]
- workingDir = file(project.jsClientWorkspace)
+ from configurations.generatedJSClient {
+ include "README.md"
+ include "docs/**"
+ }
+ from tasks.generateJsClientBundle {
+ include "index.js"
+ }
- outputs.dir("${jsClientBundleDir}")
+ into jsClientBundleDir
}
war {
