From 79931f3c72ee40a4298d7e32c18bc017d363c764 Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Thu, 13 Jul 2023 13:48:51 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20S=C3=B8rger=20for=20at=20fronten?= =?UTF-8?q?d=20bundles=20i=20jar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sindre Kjelsrud Co-authored-by: Amalie Mansåker Co-authored-by: Christian Bulow Skovborg --- backend/build.gradle.kts | 2 +- backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt | 2 +- frontend/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts index 2f009f6..e7d5eb1 100644 --- a/backend/build.gradle.kts +++ b/backend/build.gradle.kts @@ -66,7 +66,7 @@ tasks { } } from({ Paths.get(project(":frontend").buildDir.path) }){ - into("frontend/.next") + into("frontend/out") } doLast { configurations.runtimeClasspath.get().forEach { diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt index a47adc5..28efaea 100644 --- a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt +++ b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt @@ -27,7 +27,7 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin } routing { singlePageApplication{ - react("frontend/.next") + react("frontend/out") ignoreFiles { it.endsWith(".txt") } diff --git a/frontend/build.gradle.kts b/frontend/build.gradle.kts index 9b4b519..4899dea 100644 --- a/frontend/build.gradle.kts +++ b/frontend/build.gradle.kts @@ -7,4 +7,4 @@ tasks.assemble { dependsOn("yarn", "yarn_build") } -project.buildDir = File(".next") \ No newline at end of file +project.buildDir = File("out") \ No newline at end of file