From c719f2a7969316728d6aefd8afa81065903af7da Mon Sep 17 00:00:00 2001
From: Joffrey BION <joffrey.bion@gmail.com>
Date: Fri, 20 Jan 2017 22:35:49 +0100
Subject: Remove NPM setup from build

---
 frontend/build.gradle | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'frontend')

diff --git a/frontend/build.gradle b/frontend/build.gradle
index 2b8eabfd..42e646a3 100644
--- a/frontend/build.gradle
+++ b/frontend/build.gradle
@@ -3,10 +3,12 @@ plugins {
 }
 
 apply plugin: 'base'
+apply plugin: 'idea'
+
+buildDir = 'build'
 
 node {
     version = '6.9.4'
-    npmVersion = '4.1.1'
     yarnVersion = '0.19.1'
     download = true
 }
@@ -14,15 +16,15 @@ node {
 task bundle(type: YarnTask) {
     inputs.dir(new File('public'))
     inputs.dir(new File('src'))
-    outputs.dir(new File('build'))
+    outputs.dir(new File("$buildDir"))
     args = ['run', 'build']
 }
 
-task start(type: NpmTask) {
+task start(type: YarnTask) {
     args = ['start']
 }
 
-task test(type: NpmTask) {
+task test(type: YarnTask) {
     args = ['test']
 }
 
-- 
cgit