From b1ae5442836ec0970a804a93977f154609bf4853 Mon Sep 17 00:00:00 2001 From: Colin Tucker Date: Thu, 22 Mar 2018 15:45:40 +1100 Subject: [PATCH] Added auto host mode for webpack dev server. --- _config/controller.yml | 2 +- src/Extensions/ControllerExtension.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/_config/controller.yml b/_config/controller.yml index 2ab26f6..e0879e0 100644 --- a/_config/controller.yml +++ b/_config/controller.yml @@ -24,7 +24,7 @@ Only: SilverStripe\CMS\Controllers\ContentController: dev_server: - host: localhost + host: auto port: 8080 https: auto timeout: 10 diff --git a/src/Extensions/ControllerExtension.php b/src/Extensions/ControllerExtension.php index cd48297..23a5b9d 100644 --- a/src/Extensions/ControllerExtension.php +++ b/src/Extensions/ControllerExtension.php @@ -329,6 +329,12 @@ public function getDevServerURL($path = null) if (isset($config['host']) && isset($config['port'])) { + // Auto Host Mode: + + if ($config['host'] === 'auto') { + $config['host'] = Director::host(); + } + // Define Protocol: $protocol = function ($config) { @@ -461,6 +467,12 @@ protected function testDevServer() if (isset($config['host']) && isset($config['port'])) { + // Auto Host Mode: + + if ($config['host'] === 'auto') { + $config['host'] = Director::host(); + } + // Define Timeout: $timeout = isset($config['timeout']) ? $config['timeout'] : 10;