diff options
| author | jbion <joffrey.bion@amadeus.com> | 2017-01-20 19:50:07 +0100 |
|---|---|---|
| committer | jbion <joffrey.bion@amadeus.com> | 2017-01-20 19:50:07 +0100 |
| commit | 941cc5ff9fc59e2e39d5f458d9921b74d09b2f64 (patch) | |
| tree | a6e9af050fa7b2a791f4dae911b78c967851ea15 | |
| parent | Remove conflicting old index (diff) | |
| download | seven-wonders-941cc5ff9fc59e2e39d5f458d9921b74d09b2f64.tar.gz seven-wonders-941cc5ff9fc59e2e39d5f458d9921b74d09b2f64.tar.bz2 seven-wonders-941cc5ff9fc59e2e39d5f458d9921b74d09b2f64.zip | |
Use the build folder to stay in the standard
| -rw-r--r-- | backend/build.gradle | 4 | ||||
| -rw-r--r-- | frontend/build.gradle | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/backend/build.gradle b/backend/build.gradle index 61e8960b..b8331c28 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -35,10 +35,12 @@ dependencies { testCompile 'org.springframework.boot:spring-boot-starter-test' } +// packages the frontend app within the jar jar { - from('../frontend/dist') { + from('../frontend/build') { into 'static' } } +// make sure we build the frontend before creating the jar jar.dependsOn(':frontend:assemble')
\ No newline at end of file diff --git a/frontend/build.gradle b/frontend/build.gradle index 9be32934..2b8eabfd 100644 --- a/frontend/build.gradle +++ b/frontend/build.gradle @@ -4,9 +4,6 @@ plugins { apply plugin: 'base' -version '0.0.1' -buildDir = 'dist' - node { version = '6.9.4' npmVersion = '4.1.1' @@ -17,7 +14,7 @@ node { task bundle(type: YarnTask) { inputs.dir(new File('public')) inputs.dir(new File('src')) - outputs.dir(new File('dist')) + outputs.dir(new File('build')) args = ['run', 'build'] } |