From 3a0076c86fe827861637ce74b7d052025bcee26c Mon Sep 17 00:00:00 2001
From: Lynn <lynn@symphony.com>
Date: Tue, 21 Mar 2017 11:50:26 -0700
Subject: [PATCH] simplify local dev env (#35)

---
 README.md      |  8 +++-----
 demo/README.md |  3 +--
 package.json   | 22 +++++++++++-----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 4eff4e2f..8bc91aaf 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,11 @@ In order to achieve those goals Symphony is participating and working in close c
 
 ## Run demo:
 - npm install
-- on mac: npm run demo:mac
-- on windows: npm run demo:win
+- npm run demo
 
 ## Build Instructions:
-- to pick up dependencies: npm install
-- to locally run mac version: npm run dev:mac
-- to locally run windows (64 bit) version: npm run dev:win
+- npm install
+- to run locally: npm run dev
 - to build mac dmg: npm run dist-mac
 - to build win squirrel installer exe (64 bit): npm run dist-win
 - to build win squirrel installer exe (32 bit): npm run dist-win-x86
diff --git a/demo/README.md b/demo/README.md
index 91cc9fe3..e6e1e15c 100644
--- a/demo/README.md
+++ b/demo/README.md
@@ -1,4 +1,3 @@
 To start the demo from command line do:
 - npm install
-- npm run demo:mac (on mac)
-- npm run demo:win (on windows)
+- npm run demo
diff --git a/package.json b/package.json
index d7972c98..b9dc29d4 100644
--- a/package.json
+++ b/package.json
@@ -6,17 +6,16 @@
   "author": "Symphony",
   "main": "js/main.js",
   "scripts": {
-    "dev:mac": "ELECTRON_DEV=true npm run start",
-    "dev:win": "SET ELECTRON_DEV=true && npm run start",
-    "start": "npm run browserify-preload && electron .",
-    "demo:mac": "ELECTRON_DEV=true npm run start:demo",
-    "demo:win": "SET ELECTRON_DEV=true && npm run start:demo",
-    "start:demo": "npm run browserify-preload && electron . --url=file://$(pwd)/demo/index.html",
+    "dev": "npm run browserify-preload && cross-env ELECTRON_DEV=true electron .",
+    "demo": "npm run browserify-preload && cross-env ELECTRON_DEV=true electron . --url=file://$(pwd)/demo/index.html",
+
     "dist-mac": "npm run prebuild && build --mac",
     "dist-win": "npm run prebuild && build --win --x64",
     "dist-win-x86": "npm run prebuild && build --win --ia32",
+
     "unpacked-win": "npm run prebuild && build --win --x64 --dir",
     "unpacked-win-x86": "npm run prebuild && build --win --ia32 --dir",
+
     "prebuild": "npm run lint && npm run test && npm run browserify-preload",
     "lint": "eslint js/**",
     "test": "jest --coverage --testPathPattern tests",
@@ -24,9 +23,9 @@
   },
   "build": {
     "files": [
-        "!coverage/*",
-        "!installer/*",
-        "!tests/*"
+      "!coverage/*",
+      "!installer/*",
+      "!tests/*"
     ],
     "extraFiles": "config/Symphony.config",
     "appId": "symphony-electron-desktop",
@@ -65,6 +64,8 @@
     "url": "https://support.symphony.com"
   },
   "devDependencies": {
+    "browserify": "^14.1.0",
+    "cross-env": "^3.2.4",
     "electron": "1.5.1",
     "electron-builder": "^13.9.0",
     "electron-builder-squirrel-windows": "^12.3.0",
@@ -74,8 +75,7 @@
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-react": "^6.10.0",
-    "jest": "^19.0.2",
-    "browserify": "^14.1.0"
+    "jest": "^19.0.2"
   },
   "dependencies": {
     "electron-squirrel-startup": "^1.0.0",