From c29e806df00d9d35e8289200a9b7ff939edd77d0 Mon Sep 17 00:00:00 2001 From: Jeff Escalante Date: Thu, 27 Jul 2017 12:22:14 -0700 Subject: [PATCH] add spike environment variable for config file ease --- lib/config.js | 1 + test/environments.js | 2 ++ test/fixtures/environments/app.doge.js | 2 +- test/fixtures/environments/app.js | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/config.js b/lib/config.js index 8029df9..41b1ed4 100644 --- a/lib/config.js +++ b/lib/config.js @@ -262,6 +262,7 @@ module.exports = class Config { * @return {Object} validated spike options object */ parseAppJs (opts) { + if (opts.env) { process.env.SPIKE_ENV = opts.env } let config = loadFile(path.resolve(opts.root, 'app.js')) if (opts.env) { diff --git a/test/environments.js b/test/environments.js index 60adb85..6299d07 100644 --- a/test/environments.js +++ b/test/environments.js @@ -3,7 +3,9 @@ const {compileFixture} = require('./_helpers') test('environment config parsed correctly', (t) => { return compileFixture(t, 'environments', { env: 'doge' }).then(({res}) => { + t.is(res.stats.compilation.options.entry.doge1[0], 'doge') t.is(res.stats.compilation.options.entry.doge2[0], 'very') t.is(res.stats.compilation.options.entry.doge3[0], 'amaze') + t.is(res.stats.compilation.options.entry.doge4[0], 'doge') }) }) diff --git a/test/fixtures/environments/app.doge.js b/test/fixtures/environments/app.doge.js index 4d37947..5ad44c3 100644 --- a/test/fixtures/environments/app.doge.js +++ b/test/fixtures/environments/app.doge.js @@ -1,3 +1,3 @@ module.exports = { - entry: { doge3: 'amaze' } + entry: { doge3: 'amaze', doge4: process.env.SPIKE_ENV } } diff --git a/test/fixtures/environments/app.js b/test/fixtures/environments/app.js index 9b4f29d..9c9d26e 100644 --- a/test/fixtures/environments/app.js +++ b/test/fixtures/environments/app.js @@ -1,3 +1,3 @@ module.exports = { - entry: { doge2: 'very' } + entry: { doge2: 'very', doge1: process.env.SPIKE_ENV } }