diff options
| author | Joffrey Bion <joffrey.bion@booking.com> | 2020-05-17 17:47:46 +0200 |
|---|---|---|
| committer | Joffrey Bion <joffrey.bion@booking.com> | 2020-05-17 17:53:26 +0200 |
| commit | 2f3b41c03c1c0c0cc037aad12fd5f2ab27bf7b0a (patch) | |
| tree | c683050091960db618caea506a3c7af6dc987cde | |
| parent | Upgrade krossbow to 0.20.3 (diff) | |
| download | seven-wonders-2f3b41c03c1c0c0cc037aad12fd5f2ab27bf7b0a.tar.gz seven-wonders-2f3b41c03c1c0c0cc037aad12fd5f2ab27bf7b0a.tar.bz2 seven-wonders-2f3b41c03c1c0c0cc037aad12fd5f2ab27bf7b0a.zip | |
Fix static inclusion from frontend
| -rw-r--r-- | sw-server/build.gradle.kts | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sw-server/build.gradle.kts b/sw-server/build.gradle.kts index 66e70dbb..0d5612c1 100644 --- a/sw-server/build.gradle.kts +++ b/sw-server/build.gradle.kts @@ -36,12 +36,14 @@ dependencies { testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin") } -// packages the frontend app within the jar -tasks.bootJar { - from("../sw-ui/build/processedResources/Js/main") { +tasks.processResources { + // package the frontend app within the jar as static + val frontendBuildDir = project(":sw-ui").buildDir + val frontendDist = frontendBuildDir.toPath().resolve("distributions") + from(frontendDist) { + include("**/*") into("static") } } - // make sure we build the frontend before creating the jar -tasks.bootJar.get().dependsOn(":sw-ui:assemble") +tasks.processResources.get().dependsOn(":sw-ui:assemble") |