Merge pull request #78 from harbby/dev

Dev
harbby · Mar 27, 2019 · 4552ec3 · 4552ec3
2 parents 8bfe737 + 34274c6
commit 4552ec3
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/sylph-controller/build.gradle b/sylph-controller/build.gradle
@@ -32,25 +32,18 @@ node {
   nodeModulesDir = file("${project.projectDir}/src/main/webapp")
 }
 
-task clear(type: Delete) {
-  delete file("${project.projectDir}/src/main/webapp/node_modules"),
-          file("${project.projectDir}/src/main/webapp/app/libs")
-}
-
-//clean.dependsOn 'clear'
-
 //default yarn_install
 task package_install(type: YarnTask) {
   // add the express package only
-  args = ['install', '--modules-folder', './app/libs']
+  args = ['install', '--modules-folder', project.buildDir.path + '/webapp/app/libs']
 }
 task build_package(type: YarnTask, dependsOn: package_install) {
   //只安装快递包
   args = ['run', 'build']
 }
 task build_webapp(type: Copy, dependsOn: build_package) {
   from('src/main/webapp/app')
-  //from('src/main/webapp/node_modules')
+  from(project.buildDir.path + '/webapp/app')
   into project(':sylph-dist').buildDir.path + '/webapp'
 }
 assemble.dependsOn 'build_webapp'