refactor: simplify Netlify Dev detectors env (#1046)

netlify · Aug 2, 2020 · 582e17f · 582e17f
1 parent dd7d90f
commit 582e17f
Show file tree

Hide file tree

Showing 29 changed files with 6 additions and 37 deletions.
diff --git a/src/commands/dev/index.js b/src/commands/dev/index.js
@@ -398,7 +398,7 @@ async function startDevServer(settings, log) {
     throw err
   })
   const ps = child_process.spawn(commandBin, settings.args, {
-    env: { ...settings.env, FORCE_COLOR: 'true' },
+    env: { ...process.env, ...settings.env, FORCE_COLOR: 'true' },
     stdio: 'pipe',
   })
 

diff --git a/src/detectors/README.md b/src/detectors/README.md
@@ -51,7 +51,7 @@ module.exports = function() {
     framework: 'gitbook',
     command: getYarnOrNPMCommand(),
     frameworkPort: 4000,
-    env: { ...process.env },
+    env: { NAME: 'value' },
     possibleArgsArrs,
     dist: 'public',
   }

diff --git a/src/detectors/angular.js b/src/detectors/angular.js
@@ -23,7 +23,6 @@ module.exports = function() {
     framework: 'angular',
     command: getYarnOrNPMCommand(),
     frameworkPort: 4200,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'dist',
   }

diff --git a/src/detectors/brunch.js b/src/detectors/brunch.js
@@ -16,7 +16,6 @@ module.exports = function() {
     framework: 'brunch',
     command: getYarnOrNPMCommand(),
     frameworkPort: 3333,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'app/assets',
   }

diff --git a/src/detectors/create-react-app.js b/src/detectors/create-react-app.js
@@ -25,7 +25,7 @@ module.exports = function() {
     framework: 'create-react-app',
     command: getYarnOrNPMCommand(),
     frameworkPort: 3000, // the port that create-react-app normally outputs
-    env: { ...process.env, BROWSER: 'none', PORT: 3000 },
+    env: { BROWSER: 'none', PORT: 3000 },
     stdio: ['inherit', 'pipe', 'pipe'],
     possibleArgsArrs,
     dist: 'public',

diff --git a/src/detectors/docusaurus.js b/src/detectors/docusaurus.js
@@ -16,7 +16,6 @@ module.exports = function() {
     framework: 'docusaurus',
     command: getYarnOrNPMCommand(),
     frameworkPort: 3000,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'static',
   }

diff --git a/src/detectors/eleventy.js b/src/detectors/eleventy.js
@@ -11,7 +11,6 @@ module.exports = function() {
   return {
     framework: 'eleventy',
     frameworkPort: 8080,
-    env: { ...process.env },
     command: 'npx',
     possibleArgsArrs: [['eleventy', '--serve', '--watch']],
     dist: '_site',

diff --git a/src/detectors/ember.js b/src/detectors/ember.js
@@ -23,7 +23,6 @@ module.exports = function() {
     framework: 'ember',
     command: getYarnOrNPMCommand(),
     frameworkPort: 4200,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'dist',
   }

diff --git a/src/detectors/expo.js b/src/detectors/expo.js
@@ -24,7 +24,6 @@ module.exports = function() {
     framework: 'expo',
     command: getYarnOrNPMCommand(),
     frameworkPort: 19006,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'web-build',
   }

diff --git a/src/detectors/gatsby.js b/src/detectors/gatsby.js
@@ -20,7 +20,7 @@ module.exports = function() {
     framework: 'gatsby',
     command: getYarnOrNPMCommand(),
     frameworkPort: 8000,
-    env: { ...process.env, GATSBY_LOGGER: 'yurnalist' },
+    env: { GATSBY_LOGGER: 'yurnalist' },
     possibleArgsArrs,
     dist: 'public',
   }

diff --git a/src/detectors/gridsome.js b/src/detectors/gridsome.js
@@ -16,7 +16,6 @@ module.exports = function() {
     framework: 'gridsome',
     command: getYarnOrNPMCommand(),
     frameworkPort: 8080,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'dist',
   }

diff --git a/src/detectors/hexo.js b/src/detectors/hexo.js
@@ -20,7 +20,6 @@ module.exports = function() {
     framework: 'hexo',
     command: getYarnOrNPMCommand(),
     frameworkPort: 4000,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'public',
   }

diff --git a/src/detectors/hugo.js b/src/detectors/hugo.js
@@ -8,7 +8,6 @@ module.exports = function() {
   return {
     framework: 'hugo',
     frameworkPort: 1313,
-    env: { ...process.env },
     command: 'hugo',
     possibleArgsArrs: [['server', '-w']],
     dist: 'public',

diff --git a/src/detectors/jekyll.js b/src/detectors/jekyll.js
@@ -8,7 +8,6 @@ module.exports = function() {
   return {
     framework: 'jekyll',
     frameworkPort: 4000,
-    env: { ...process.env },
     command: 'bundle',
     possibleArgsArrs: [['exec', 'jekyll', 'serve', '-w']],
     dist: '_site',

diff --git a/src/detectors/middleman.js b/src/detectors/middleman.js
@@ -8,7 +8,6 @@ module.exports = function() {
   return {
     framework: 'middleman',
     frameworkPort: 4567,
-    env: { ...process.env },
     command: 'bundle',
     possibleArgsArrs: [['exec', 'middleman', 'server']],
     dist: 'build',

diff --git a/src/detectors/next.js b/src/detectors/next.js
@@ -20,7 +20,6 @@ module.exports = function() {
     framework: 'next',
     command: getYarnOrNPMCommand(),
     frameworkPort: 3000,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'out',
   }

diff --git a/src/detectors/nuxt.js b/src/detectors/nuxt.js
@@ -22,7 +22,6 @@ module.exports = function() {
     framework: 'nuxt',
     command: getYarnOrNPMCommand(),
     frameworkPort: 3000,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'dist',
   }

diff --git a/src/detectors/parcel.js b/src/detectors/parcel.js
@@ -23,7 +23,6 @@ module.exports = function() {
     framework: 'parcel',
     command: getYarnOrNPMCommand(),
     frameworkPort: 1234,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'dist',
   }

diff --git a/src/detectors/phenomic.js b/src/detectors/phenomic.js
@@ -16,7 +16,6 @@ module.exports = function() {
     framework: 'phenomic',
     command: getYarnOrNPMCommand(),
     frameworkPort: 3333,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'public',
   }

diff --git a/src/detectors/quasar-v0.17.js b/src/detectors/quasar-v0.17.js
@@ -23,7 +23,6 @@ module.exports = function() {
     framework: 'quasar-cli-v0.17',
     command: getYarnOrNPMCommand(),
     frameworkPort: 8080,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: '.quasar',
   }

diff --git a/src/detectors/quasar.js b/src/detectors/quasar.js
@@ -23,7 +23,6 @@ module.exports = function() {
     framework: 'quasar',
     command: getYarnOrNPMCommand(),
     frameworkPort: 8081,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: '.quasar',
   }

diff --git a/src/detectors/react-static.js b/src/detectors/react-static.js
@@ -20,7 +20,6 @@ module.exports = function() {
     framework: 'react-static',
     command: getYarnOrNPMCommand(),
     frameworkPort: 3000,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'dist',
   }

diff --git a/src/detectors/sapper.js b/src/detectors/sapper.js
@@ -22,7 +22,6 @@ module.exports = function() {
     framework: 'sapper',
     command: getYarnOrNPMCommand(),
     frameworkPort: 3000,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'static',
   }

diff --git a/src/detectors/stencil.js b/src/detectors/stencil.js
@@ -20,7 +20,7 @@ module.exports = function() {
     framework: 'stencil',
     command: getYarnOrNPMCommand(),
     frameworkPort: 3333, // the port that stencil normally outputs
-    env: { ...process.env, BROWSER: 'none', PORT: 3000 },
+    env: { BROWSER: 'none', PORT: 3000 },
     possibleArgsArrs,
     dist: 'www',
   }

diff --git a/src/detectors/svelte.js b/src/detectors/svelte.js
@@ -24,7 +24,6 @@ module.exports = function() {
     framework: 'svelte',
     command: getYarnOrNPMCommand(),
     frameworkPort: 5000,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'public',
   }

diff --git a/src/detectors/vue.js b/src/detectors/vue.js
@@ -22,7 +22,6 @@ module.exports = function() {
     framework: 'vue',
     command: getYarnOrNPMCommand(),
     frameworkPort: 8080,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: 'dist',
   }

diff --git a/src/detectors/vuepress.js b/src/detectors/vuepress.js
@@ -22,7 +22,6 @@ module.exports = function() {
     framework: 'vuepress',
     command: getYarnOrNPMCommand(),
     frameworkPort: 8080,
-    env: { ...process.env },
     possibleArgsArrs,
     dist: '.vuepress/dist',
   }

diff --git a/src/utils/detect-server.js b/src/utils/detect-server.js
@@ -7,7 +7,7 @@ const fuzzy = require('fuzzy')
 const fs = require('fs')
 
 module.exports.serverSettings = async (devConfig, flags, projectDir, log) => {
-  let settings = { env: { ...process.env } }
+  let settings = {}
   const detectorsFiles = fs.readdirSync(path.join(__dirname, '..', 'detectors')).filter(x => x.endsWith('.js')) // only accept .js detector files
 
   if (typeof devConfig.framework !== 'string') throw new Error('Invalid "framework" option provided in config')
@@ -180,7 +180,6 @@ async function getStaticServerSettings(settings, flags, projectDir, log) {
   }
   log(`${NETLIFYDEVWARN} Running static server from "${path.relative(path.dirname(projectDir), dist)}"`)
   return {
-    env: { ...process.env },
     noCmd: true,
     frameworkPort: await getPort({ port: 3999 }),
     dist,

diff --git a/src/utils/detect-server.test.js b/src/utils/detect-server.test.js
@@ -18,9 +18,7 @@ test('loadDetector: invalid', t => {
 })
 
 test('serverSettings: minimal config', async t => {
-  const env = { ...process.env }
   const settings = await serverSettings({ framework: '#auto' }, {}, sitePath, () => {})
-  t.deepEqual(settings.env, env)
   t.is(settings.framework, undefined)
 })
 
@@ -37,33 +35,27 @@ test('serverSettings: throw if "port" not available', async t => {
 })
 
 test('serverSettings: "command" override npm', async t => {
-  const env = { ...process.env }
   const devConfig = { framework: '#custom', command: 'npm run dev', targetPort: 1234 }
   const settings = await serverSettings(devConfig, {}, sitePath, () => {})
   t.is(settings.framework, devConfig.framework)
   t.is(settings.command, devConfig.command.split(' ')[0])
   t.deepEqual(settings.args, devConfig.command.split(' ').slice(1))
-  t.deepEqual(settings.env, env)
 })
 
 test('serverSettings: "command" override yarn', async t => {
-  const env = { ...process.env }
   const devConfig = { framework: '#custom', command: 'yarn dev', targetPort: 1234 }
   const settings = await serverSettings(devConfig, {}, sitePath, () => {})
   t.is(settings.framework, devConfig.framework)
   t.is(settings.command, devConfig.command.split(' ')[0])
   t.deepEqual(settings.args, devConfig.command.split(' ').slice(1))
-  t.deepEqual(settings.env, env)
 })
 
 test('serverSettings: custom framework parameters', async t => {
-  const env = { ...process.env }
   const devConfig = { framework: '#custom', command: 'yarn dev', targetPort: 3000, publish: sitePath }
   const settings = await serverSettings(devConfig, {}, sitePath, () => {})
   t.is(settings.framework, '#custom')
   t.is(settings.command, devConfig.command.split(' ')[0])
   t.deepEqual(settings.args, devConfig.command.split(' ').slice(1))
-  t.deepEqual(settings.env, env)
   t.is(settings.targetPort, devConfig.frameworkPort)
   t.is(settings.dist, devConfig.publish)
 })