Merge pull request #160 from conveyal/dev

v3.7.1
conveyal · Mar 31, 2017 · 191aaf6 · 191aaf6
2 parents 394bc65 + d4d8e6a
commit 191aaf6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/bin/mastarm b/bin/mastarm
@@ -85,7 +85,7 @@ commander
     const config = loadConfig(process.cwd(), commander.config, commander.env)
     const get = util.makeGetFn([options, commander, config.settings])
 
-    const env = get('env')
+    const env = get('env') || 'development'
     const s3bucket = get('s3bucket')
 
     const files = util.parseEntries([...entries, ...(get('entries') || [])])

diff --git a/lib/js-transform.js b/lib/js-transform.js
@@ -5,13 +5,18 @@ const through = require('through2')
 const YAML = require('yamljs')
 
 const babelConfig = require('./babel-config')
-const util = require('./util')
 
 module.exports = function transform ({
   config,
   env
 }) {
-  util.configureEnvironment({config, env})
+  const envvars = Object.assign({}, process.env, {
+    CONFIG_PATH: config.path,
+    MESSAGES: JSON.stringify(config.messages),
+    NODE_ENV: env,
+    SETTINGS: JSON.stringify(config.settings),
+    STORE: JSON.stringify(config.store)
+  }, config.env)
 
   return [
     svgToString,
@@ -22,7 +27,7 @@ module.exports = function transform ({
     }),
     yamlTransform,
     babelify.configure(babelConfig(env)),
-    [envify(process.env), {global: true}] // Envify needs to happen last...
+    [envify(envvars), {global: true}] // Envify needs to happen last...
   ]
 }