From 79648856eb142fa11b57b43e6c07b002655a2d32 Mon Sep 17 00:00:00 2001 From: Ross Kaffenberger Date: Sat, 11 Apr 2020 12:09:56 -0400 Subject: [PATCH] Resolve multi-word snakecase WEBPACKER_DEV_SERVER env values Env values like WEBPACKER_DEV_SERVER_DISABLE_HOST_CHECK and WEBPACKER_DEV_SERVER_USE_LOCAL_IP were not being read into the webpack configuration because of the regex used to resolve the env var name. --- package/__tests__/dev_server.js | 2 ++ package/dev_server.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/__tests__/dev_server.js b/package/__tests__/dev_server.js index 66235737b..d20cc93d4 100644 --- a/package/__tests__/dev_server.js +++ b/package/__tests__/dev_server.js @@ -13,11 +13,13 @@ describe('DevServer', () => { process.env.RAILS_ENV = 'development' process.env.WEBPACKER_DEV_SERVER_HOST = '0.0.0.0' process.env.WEBPACKER_DEV_SERVER_PORT = 5000 + process.env.WEBPACKER_DEV_SERVER_DISABLE_HOST_CHECK = false const devServer = require('../dev_server') expect(devServer).toBeDefined() expect(devServer.host).toEqual('0.0.0.0') expect(devServer.port).toEqual('5000') + expect(devServer.disable_host_check).toBe(false) }) test('with custom env prefix', () => { diff --git a/package/dev_server.js b/package/dev_server.js index fcff0c2be..b482c8026 100644 --- a/package/dev_server.js +++ b/package/dev_server.js @@ -12,7 +12,7 @@ if (devServerConfig) { const envPrefix = config.dev_server.env_prefix || 'WEBPACKER_DEV_SERVER' Object.keys(devServerConfig).forEach((key) => { - const envValue = fetch(`${envPrefix}_${key.toUpperCase().replace(/_/g, '')}`) + const envValue = fetch(`${envPrefix}_${key.toUpperCase()}`) if (envValue !== undefined) devServerConfig[key] = envValue }) }