Add cross-env

eladhayun · Mar 27, 2020 · 6365afe · 6365afe
1 parent f62208b
commit 6365afe
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 77 deletions.
diff --git a/env/.env.local b/env/.env.local
@@ -0,0 +1 @@
+REACT_APP_API_SERVER=http://localhost:8080
diff --git a/env/.env.prod b/env/.env.prod
@@ -0,0 +1 @@
+REACT_APP_API_SERVER=http://localhost:8080
diff --git a/env/.env.staging b/env/.env.staging
@@ -0,0 +1 @@
+REACT_APP_API_SERVER=http://localhost:8080
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,15 +25,15 @@
     "typeface-roboto": "0.0.75"
   },
   "devDependencies": {
+    "cross-env": "^7.0.2",
     "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.2",
-    "http-proxy-middleware": "^1.0.3",
     "husky": "^4.2.3",
     "lint-staged": "^10.0.9",
     "prettier": "^2.0.2"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "cross-env react-scripts start",
     "build": "react-scripts build"
   },
   "eslintConfig": {

diff --git a/src/utils/ajaxUtils.js b/src/utils/ajaxUtils.js
@@ -1,5 +1,6 @@
 import { ajax } from 'rxjs/ajax'
 import { getApiToken } from './authUtils'
+import { pickBy, identity, memoize } from 'lodash'
 
 const defaultHeaders = {
   contentType: {
@@ -10,15 +11,14 @@ const defaultHeaders = {
   }
 }
 
-function defaultAuthHeaders() {
-  const apiToken = getApiToken()
-  if (apiToken) {
-    return {
+const defaultAuthHeaders = memoize(() => {
+  return pickBy(
+    {
       Authorization: getApiToken()
-    }
-  }
-  return {}
-}
+    },
+    identity
+  )
+})
 
 export const getJSON = (url, headers = {}) => {
   return ajax.getJSON(url, {