Skip to content

Commit 3ba6bb7

Browse files
committed
BE: Fix FE static resources population for local run
1 parent ba70933 commit 3ba6bb7

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

api/build.gradle

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ sourceSets {
103103
java {
104104
srcDirs += generateGrammarSource.outputDirectory
105105
}
106+
resources {
107+
srcDirs += project(":frontend").layout.buildDirectory.dir("vite")
108+
}
106109
}
107110
}
108111

@@ -143,12 +146,4 @@ if (includeFrontend) {
143146
tasks.named("build") {
144147
dependsOn(":frontend:buildFrontend")
145148
}
146-
147-
tasks.named("processResources") {
148-
dependsOn(":frontend:buildFrontend")
149-
from(project(":frontend").layout.buildDirectory.dir("vite")) {
150-
into("static")
151-
}
152-
into("$buildDir/resources/main")
153-
}
154149
}

frontend/build.gradle

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,17 @@ node {
99
nodeProjectDir = project.layout.projectDirectory
1010
}
1111

12+
tasks.register("clean") {
13+
group = "build"
14+
description = "Cleans frontend build"
15+
16+
doFirst {
17+
delete(
18+
project.layout.buildDirectory,
19+
project.layout.projectDirectory.dir("src/generated-sources")
20+
)
21+
}
22+
}
1223

1324
tasks.named("pnpmInstall") {
1425
inputs.files(file("package.json"))
@@ -25,10 +36,10 @@ tasks.register('generateContract', PnpmTask) {
2536
tasks.register('buildFrontend', PnpmTask) {
2637
dependsOn generateContract
2738
inputs.files(fileTree("src/"))
28-
outputs.dir(project.layout.buildDirectory.dir("vite"))
39+
outputs.dir(project.layout.buildDirectory.dir("vite/static"))
2940
args = ['build']
3041
environment = System.getenv() + [
31-
"VITE_TAG": project.version,
42+
"VITE_TAG" : project.version,
3243
"VITE_COMMIT": "git rev-parse --short HEAD".execute().text.trim()
3344
]
3445
}

frontend/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default defineConfig(({ mode }) => {
3535
port: 3000,
3636
},
3737
build: {
38-
outDir: 'build/vite',
38+
outDir: 'build/vite/static',
3939
rollupOptions: {
4040
output: {
4141
manualChunks(id: string) {

0 commit comments

Comments
 (0)