From 3d21beb86d31404caebea7ca3bd0aab6f87e9f3e Mon Sep 17 00:00:00 2001
From: Gaurav Tiwari <gaurav@gauravtiwari.co.uk>
Date: Sun, 14 Jan 2018 14:55:53 +0000
Subject: [PATCH 1/4] Return false in production environments

---
 lib/webpacker/dev_server.rb | 10 +++++++---
 test/dev_server_test.rb     |  7 +++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/webpacker/dev_server.rb b/lib/webpacker/dev_server.rb
index ea09990d8..6f3ddd1b0 100644
--- a/lib/webpacker/dev_server.rb
+++ b/lib/webpacker/dev_server.rb
@@ -3,15 +3,19 @@ class Webpacker::DevServer
   # Webpacker.dev_server.connect_timeout = 1
   cattr_accessor(:connect_timeout) { 0.01 }
 
-  delegate :config, to: :@webpacker
+  delegate :config, :env, to: :@webpacker
 
   def initialize(webpacker)
     @webpacker = webpacker
   end
 
   def running?
-    Socket.tcp(host, port, connect_timeout: connect_timeout).close
-    true
+    if env.production?
+      false
+    else
+      Socket.tcp(host, port, connect_timeout: connect_timeout).close
+      true
+    end
   rescue
     false
   end
diff --git a/test/dev_server_test.rb b/test/dev_server_test.rb
index 77d3a902e..1e2ce867a 100644
--- a/test/dev_server_test.rb
+++ b/test/dev_server_test.rb
@@ -1,6 +1,13 @@
 require "test_helper"
 
 class DevServerTest < Webpacker::Test
+  def test_running
+    with_node_env("production") do
+      reloaded_config
+      refute Webpacker.dev_server.running?
+    end
+  end
+
   def test_host
     with_node_env("development") do
       reloaded_config

From 0edb06221f196b7a4a9cd843207131aa70548b69 Mon Sep 17 00:00:00 2001
From: Gaurav Tiwari <gaurav@gauravtiwari.co.uk>
Date: Sun, 14 Jan 2018 14:59:03 +0000
Subject: [PATCH 2/4] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d4ece959..addc672e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 **Please note that Webpacker 3.1.0 and 3.1.1 has some serious bugs so please consider using either 3.0.2 or 3.2.0**
 
+## [Unreleased]
+
+- Disable dev server running? check in production environments [#1179](https://github.com/rails/webpacker/pull/1179)
+
 ## [3.2.0] - 2017-12-16
 
 ### To upgrade:

From b09ff29f1410f9ee73ff423d6459d1799a2e4b2f Mon Sep 17 00:00:00 2001
From: Gaurav Tiwari <gaurav@gauravtiwari.co.uk>
Date: Sun, 14 Jan 2018 16:04:54 +0000
Subject: [PATCH 3/4] Check for dev server config instead

---
 CHANGELOG.md                | 2 +-
 lib/webpacker/dev_server.rb | 6 +++---
 test/dev_server_test.rb     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index addc672e0..83ceb2bbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## [Unreleased]
 
-- Disable dev server running? check in production environments [#1179](https://github.com/rails/webpacker/pull/1179)
+- Disable dev server running? check if no dev server config is present in that environment [#1179](https://github.com/rails/webpacker/pull/1179)
 
 ## [3.2.0] - 2017-12-16
 
diff --git a/lib/webpacker/dev_server.rb b/lib/webpacker/dev_server.rb
index 6f3ddd1b0..cc24798bb 100644
--- a/lib/webpacker/dev_server.rb
+++ b/lib/webpacker/dev_server.rb
@@ -10,11 +10,11 @@ def initialize(webpacker)
   end
 
   def running?
-    if env.production?
-      false
-    else
+    if config.dev_server.present?
       Socket.tcp(host, port, connect_timeout: connect_timeout).close
       true
+    else
+      false
     end
   rescue
     false
diff --git a/test/dev_server_test.rb b/test/dev_server_test.rb
index 1e2ce867a..4c6bf1ea8 100644
--- a/test/dev_server_test.rb
+++ b/test/dev_server_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 class DevServerTest < Webpacker::Test
-  def test_running
+  def test_running?
     with_node_env("production") do
       reloaded_config
       refute Webpacker.dev_server.running?

From 6f8d70e460b5f386c1c602c963f879207ce3aa52 Mon Sep 17 00:00:00 2001
From: Gaurav Tiwari <gaurav@gauravtiwari.co.uk>
Date: Sun, 14 Jan 2018 16:05:40 +0000
Subject: [PATCH 4/4] Don't include env

---
 lib/webpacker/dev_server.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/webpacker/dev_server.rb b/lib/webpacker/dev_server.rb
index cc24798bb..49c918bc5 100644
--- a/lib/webpacker/dev_server.rb
+++ b/lib/webpacker/dev_server.rb
@@ -3,7 +3,7 @@ class Webpacker::DevServer
   # Webpacker.dev_server.connect_timeout = 1
   cattr_accessor(:connect_timeout) { 0.01 }
 
-  delegate :config, :env, to: :@webpacker
+  delegate :config, to: :@webpacker
 
   def initialize(webpacker)
     @webpacker = webpacker