From fc23cace1b0ca95e655bbd91bca7294507b0349e Mon Sep 17 00:00:00 2001 From: David Govea Date: Tue, 26 May 2015 16:42:25 -0700 Subject: [PATCH 1/3] Read new runtime option from .ember-cli : `liveReloadForceLocalhost` --- index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.js b/index.js index af45dc5..c4ea526 100644 --- a/index.js +++ b/index.js @@ -33,6 +33,8 @@ module.exports = { process.env.EMBER_CLI_INJECT_LIVE_RELOAD_PORT = options.liveReloadPort; process.env.EMBER_CLI_INJECT_LIVE_RELOAD_BASEURL = options.baseURL; // default is '/' + process.env.EMBER_CLI_INJECT_LIVE_RELOAD_FORCE_LOCALHOST = options.liveReloadForceLocalhost; + app.use(options.baseURL + 'ember-cli-live-reload.js', function(request, response, next) { response.contentType('text/javascript'); From 854b0e5581c6021532b423ba79d99f3368883fa4 Mon Sep 17 00:00:00 2001 From: David Govea Date: Tue, 26 May 2015 16:43:25 -0700 Subject: [PATCH 2/3] If forceLocalhost, assemble fully-qualified baseURL for live-reload script snippet --- index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.js b/index.js index c4ea526..ada6f65 100644 --- a/index.js +++ b/index.js @@ -35,6 +35,9 @@ module.exports = { process.env.EMBER_CLI_INJECT_LIVE_RELOAD_BASEURL = options.baseURL; // default is '/' process.env.EMBER_CLI_INJECT_LIVE_RELOAD_FORCE_LOCALHOST = options.liveReloadForceLocalhost; + if (options.liveReloadForceLocalhost) { + process.env.EMBER_CLI_INJECT_LIVE_RELOAD_BASEURL = 'http://localhost:' + options.port + options.baseURL; + } app.use(options.baseURL + 'ember-cli-live-reload.js', function(request, response, next) { response.contentType('text/javascript'); From 890ae935961b8d77ca5ff5c69be37d7f473c5550 Mon Sep 17 00:00:00 2001 From: David Govea Date: Tue, 26 May 2015 16:45:47 -0700 Subject: [PATCH 3/3] If forceLocalhost, don't prefer `location.hostname` in dynamicScript --- index.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index ada6f65..487ec4f 100644 --- a/index.js +++ b/index.js @@ -14,9 +14,16 @@ module.exports = { dynamicScript: function(request) { var liveReloadPort = process.env.EMBER_CLI_INJECT_LIVE_RELOAD_PORT; + var forceLocalhost = process.env.EMBER_CLI_INJECT_LIVE_RELOAD_FORCE_LOCALHOST; + + var dynamicHost = "location.hostname || 'localhost'"; + + if (forceLocalhost) { + dynamicHost = "'localhost'"; + } return "(function() {\n " + - "var src = (location.protocol || 'http:') + '//' + (location.hostname || 'localhost') + ':" + liveReloadPort + "/livereload.js?snipver=1';\n " + + "var src = (location.protocol || 'http:') + '//' + (" + dynamicHost + ") + ':" + liveReloadPort + "/livereload.js?snipver=1';\n " + "var script = document.createElement('script');\n " + "script.type = 'text/javascript';\n " + "script.src = src;\n " +