merge conflicts

boot.js

@@ -7,7 +7,7 @@ import express from 'express'
 import newrelic from 'artsy-newrelic'
 import path from 'path'
 import { IpFilter } from 'express-ipfilter'
-import { createReloadable, isDevelopment } from 'lib/reloadable'
+import { createReloadable, isDevelopment } from '@artsy/express-reloadable'
 
 const debug = require('debug')('app')
 const app = module.exports = express()
@@ -28,7 +28,7 @@ artsyXapp.init(xappConfig, () => {
   app.use(newrelic)
 
   if (isDevelopment) {
-    const reloadAndMount = createReloadable(app)
+    const reloadAndMount = createReloadable(app, require)
 
     // Enable server-side code hot-swapping on change
     app.use('/api', reloadAndMount(path.resolve(__dirname, 'api'), {

index.js

@@ -1,14 +1,20 @@
 require('babel-core/register')
 require('coffee-script/register')
-
+const _ = require('underscore')
 const env = require('node-env-file')
 
-if (process.env.NODE_ENV === 'test') {
+const NODE_ENV = process.env.NODE_ENV
+
+if (NODE_ENV === 'test') {
   env('./.env.test')
 
-  // Other envs: development, staging, production
-} else {
+  // If NODE_ENV is development or unset, assume that it's a local setup
+} else if (NODE_ENV === 'development' || _.isUndefined(NODE_ENV)) {
   env('./.env')
+
+  // Other envs: staging, production
+} else {
+  env('./.env', { raise: false })
 }
 
 require('./boot')

package.json

@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@artsy/reaction-force": "^0.3.1",
+    "@artsy/express-reloadable": "^1.0.2",
     "airtable": "^0.4.5",
     "artsy-backbone-mixins": "git://github.com/artsy/artsy-backbone-mixins.git",
     "artsy-ezel-components": "git://github.com/artsy/artsy-ezel-components.git",