From 8ac1cdf476d406c2dbaebb709fa5b8742244d58c Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jonathan@jdbernard.com>
Date: Sun, 9 Feb 2020 03:40:49 -0600
Subject: [PATCH] Fix environment-specific builds.

---
 .gitignore           | 6 ++++++
 Makefile             | 2 +-
 web/.env.development | 1 +
 web/.env.prod        | 1 -
 web/Makefile         | 8 +-------
 web/package.json     | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 120000 web/.env.prod

diff --git a/.gitignore b/.gitignore
index 6a2e6a0..d6fff35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,9 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+
+# Terrform files
+.terraform/
+
+# API Testing Files
+api/temp/
diff --git a/Makefile b/Makefile
index c09413a..553efa3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION:=$(shell git describe --always)
-TARGET_ENV=dev
+TARGET_ENV ?= dev
 
 build: dist/personal-measure-api.tar.gz dist/personal-measure-web.tar.gz
 
diff --git a/web/.env.development b/web/.env.development
index c9f9d44..990c916 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -1,3 +1,4 @@
+NODE_ENV=production
 VUE_APP_PM_API_BASE=https://pmapi-dev.jdb-labs.com/api
 VUE_APP_LOG_LEVEL=INFO
 VUE_APP_API_LOG_LEVEL=ERROR
diff --git a/web/.env.prod b/web/.env.prod
deleted file mode 120000
index f4b7f93..0000000
--- a/web/.env.prod
+++ /dev/null
@@ -1 +0,0 @@
-.env.production
\ No newline at end of file
diff --git a/web/Makefile b/web/Makefile
index 9ae1766..ca13b5a 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -1,11 +1,5 @@
 build:
-	pwd; \
-	. .env.${TARGET_ENV}; \
-	echo "Using API URL: ${VUE_APP_PM_API_BASE}"; \
-	npm run build
+	npm run build-${TARGET_ENV}
 
 serve:
-	VUE_APP_PM_API_BASE=/api \
-	VUE_APP_API_LOG_LEVEL=WARN \
-	VUE_APP_LOG_LEVEL=TRACE \
 	npm run serve
diff --git a/web/package.json b/web/package.json
index ea80e9a..bfd3b06 100644
--- a/web/package.json
+++ b/web/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build --mode production",
+    "build-prod": "vue-cli-service build --mode production",
     "build-dev": "vue-cli-service build --mode development",
     "lint": "vue-cli-service lint",
     "test:unit": "vue-cli-service test:unit"