From 2e102066dbf42137163ddc40f1e0d345c88bfd1f Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Wed, 1 Jul 2020 11:44:21 +0200
Subject: [PATCH] Build container has no yarn

---
 Makefile    | 7 +------
 reflex.conf | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 3d02e9afb..72c4f577a 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ lint:
 	for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;
 
 .PHONY: generate
-generate: protobuf webapp
+generate: protobuf
 	go generate $(GENERATE)
 
 .PHONY: changelog
@@ -197,8 +197,3 @@ $(PROTO_SRC)/accounts.swagger.json: $(PROTO_SRC)/accounts.proto
 .PHONY: protobuf
 protobuf: $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger \
 		  $(PROTO_SRC)/accounts.pb.go $(PROTO_SRC)/accounts.pb.micro.go $(PROTO_SRC)/accounts.pb.web.go $(PROTO_SRC)/accounts.swagger.json
-
-.PHONY: webapp
-webapp:
-	yarn generate-api
-	yarn build
diff --git a/reflex.conf b/reflex.conf
index 61ed9b137..3e496fb0b 100644
--- a/reflex.conf
+++ b/reflex.conf
@@ -2,4 +2,4 @@
 -r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/ocis-accounts && bin/ocis-accounts server --asset-path assets/'
 
 # frontend
--r '^ui/.*\.(vue|js)$' -R '^node_modules/' -- sh -c 'make generate'
+-r '^ui/.*\.(vue|js)$' -R '^node_modules/' -- sh -c 'yarn build && make generate'