From 9aad55f8afd04b7d68706f2875515609a0da446a Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <me@raisedadead.com>
Date: Thu, 27 Sep 2018 12:28:31 +0530
Subject: [PATCH] fix(scripts): adjust npm run scripts

---
 package.json                                         | 10 ++++++----
 {config => scripts}/ensure-env.js                    |  4 ++--
 develop-client-server.js => scripts/start-develop.js |  0
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename {config => scripts}/ensure-env.js (94%)
 rename develop-client-server.js => scripts/start-develop.js (100%)

diff --git a/package.json b/package.json
index 338ad21f87..18e316a744 100644
--- a/package.json
+++ b/package.json
@@ -3,13 +3,15 @@
   "version": "0.0.1",
   "scripts": {
     "bootstrap": "lerna bootstrap",
-    "develop": "node ./config/ensure-env.js && node develop-client-server.js",
+    "develop": "npm-run-all -s ensure-env start-develop",
+    "ensure-env": "node ./scripts/ensure-env.js",
     "lint": "echo 'Warning: TODO - Define Linting.'",
-    "pretest": "run-s lint bootstrap",
-    "test": "run-p test:*",
+    "pretest": "npm-run-all -s lint bootstrap",
+    "test": "npm-run-all -p test:*",
     "test:client": "echo 'Warning: TODO - Define Testing.'",
     "test:curriculum": "echo 'Warning: TODO - Define Testing.'",
-    "test:server": "echo 'Warning: TODO - Define Testing.'"
+    "test:server": "echo 'Warning: TODO - Define Testing.'",
+    "start-develop": "node ./scripts/start-develop.js"
   },
   "devDependencies": {
     "eslint-config-freecodecamp": "^1.1.1",
diff --git a/config/ensure-env.js b/scripts/ensure-env.js
similarity index 94%
rename from config/ensure-env.js
rename to scripts/ensure-env.js
index 50d66bd192..534452be71 100644
--- a/config/ensure-env.js
+++ b/scripts/ensure-env.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const env = require('./env');
+const env = require('../config/env');
 
 const apiPath = path.resolve(__dirname, '../api-server');
 const clientPath = path.resolve(__dirname, '../client');
@@ -28,4 +28,4 @@ fs.access(`${apiPath}/server/resources/pathMigration.json`, err => {
 });
 
 
-fs.writeFileSync(`${clientPath}/config/env.json`, JSON.stringify(env))
+fs.writeFileSync(`${clientPath}/config/env.json`, JSON.stringify(env));
diff --git a/develop-client-server.js b/scripts/start-develop.js
similarity index 100%
rename from develop-client-server.js
rename to scripts/start-develop.js