From 36f7660afdfa3db8f79db8cc530ed6079dc11f69 Mon Sep 17 00:00:00 2001
From: Matthew R <matthew@staff.libraryofcode.org>
Date: Sat, 18 Jan 2020 02:05:22 -0500
Subject: [PATCH] Add TS building in makefile; yarn run build now just runs
 HOME=/root go build -v -ldflags="-s -w" -o dist/bin/checkCertificate
 src/go/checkCertificate/checkCertificate.go

---
 Makefile     | 7 ++++++-
 package.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f620957..6be4d86 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
+# Builds TypeScript & Go
+
 check_certificate_files := $(wildcard src/go/checkCertificate/*.go)
 check_certificate_signatures_files := $(wildcard src/go/checkCertSignatures/*.go)
 storage_files := $(wildcard src/go/storage/*.go)
 
-all: check_certificate check_cert_signatures storage
+all: check_certificate check_cert_signatures storage typescript
 
 check_certificate: 
 	HOME=/root go build -v -ldflags="-s -w" -o dist/bin/checkCertificate ${check_certificate_files}
@@ -18,3 +20,6 @@ storage:
 	HOME=/root go build -v -ldflags="-s -w" -o dist/bin/storage ${storage_files}
 	@chmod 740 dist/bin/storage
 	file dist/bin/storage
+
+typescript:
+	tsc -p ./tsconfig.json
diff --git a/package.json b/package.json
index 1785d79..8a7d054 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "dist/Client.js",
   "scripts": {
     "lint": "eslint ./ --ext ts --fix",
-    "build": "tsc -p ./tsconfig.json && make",
+    "build": "make",
     "lint-find": "eslint ./ --ext ts"
   },
   "author": "Library of Code sp-us Engineering Team",