fix: use env_prefix dev_server param in dev_server.js (#1858)

rails · Jan 3, 2019 · a9c8979 · a9c8979
1 parent 9ea3b43
commit a9c8979
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/package/__tests__/dev_server.js b/package/__tests__/dev_server.js
@@ -20,6 +20,21 @@ describe('DevServer', () => {
     expect(devServer.port).toEqual('5000')
   })
 
+  test('with custom env prefix', () => {
+    const config = require('../config')
+    config.dev_server.env_prefix = 'TEST_WEBPACKER_DEV_SERVER_'
+
+    process.env.NODE_ENV = 'development'
+    process.env.RAILS_ENV = 'development'
+    process.env.TEST_WEBPACKER_DEV_SERVER_HOST = '0.0.0.0'
+    process.env.TEST_WEBPACKER_DEV_SERVER_PORT = 5000
+
+    const devServer = require('../dev_server')
+    expect(devServer).toBeDefined()
+    expect(devServer.host).toEqual('0.0.0.0')
+    expect(devServer.port).toEqual('5000')
+  })
+
   test('with NODE_ENV and RAILS_ENV set to production', () => {
     process.env.RAILS_ENV = 'production'
     process.env.NODE_ENV = 'production'

diff --git a/package/dev_server.js b/package/dev_server.js
@@ -9,8 +9,10 @@ const fetch = (key) => {
 const devServerConfig = config.dev_server
 
 if (devServerConfig) {
+  const envPrefix = config.dev_server.env_prefix || 'WEBPACKER_DEV_SERVER_'
+
   Object.keys(devServerConfig).forEach((key) => {
-    const envValue = fetch(`WEBPACKER_DEV_SERVER_${key.toUpperCase().replace(/_/g, '')}`)
+    const envValue = fetch(`${envPrefix}${key.toUpperCase().replace(/_/g, '')}`)
     if (envValue !== undefined) devServerConfig[key] = envValue
   })
 }