Skip to content

Fix Raw Domain Ports #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Raw Domain Ports #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = {
return `(function() {${liveReloadOptions ? "\n window.LiveReloadOptions = " + JSON.stringify(liveReloadOptions) + ";" : ''}
var srcUrl = ${options.liveReloadJsUrl ? "'" + options.liveReloadJsUrl + "'" : null};
var host = location.hostname || 'localhost';
var useCustomPort = ${options.liveReloadPort !== options.port} || location.port !== ${options.liveReloadPort};
var useCustomPort = ${options.liveReloadPort !== options.port} || (location.port !== '' && location.port !== ${options.liveReloadPort});
var defaultPort = location.port || (location.protocol === 'https:' ? 443 : 80);
var port = useCustomPort ? ${options.liveReloadPort} : defaultPort;
var path = '${path}';
Expand Down
21 changes: 20 additions & 1 deletion tests/inject-live-reload-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,25 @@ describe('dynamicScript returns right script when', hooks => {

assert.strictEqual(actual, '/_lr/livereload.js?port=4200&host=localhost');
});

it('sets the proper port for http when served via domain', assert => {
location.port = '';

let script = InjectLiveReload.dynamicScript(options);
let actual = getScriptSrc(script);

assert.strictEqual(actual, '/_lr/livereload.js?port=80&host=localhost&path=_lr/livereload');
});

it('sets the proper port for http when served via domain', assert => {
location.port = '';
location.protocol = 'https:'

let script = InjectLiveReload.dynamicScript(options);
let actual = getScriptSrc(script);

assert.strictEqual(actual, '/_lr/livereload.js?port=443&host=localhost&path=_lr/livereload');
});
});

describe('serverMiddleware', hooks => {
Expand Down Expand Up @@ -171,7 +190,7 @@ describe('serverMiddleware', hooks => {
assert.equal(buf, `(function() {
var srcUrl = null;
var host = location.hostname || 'localhost';
var useCustomPort = false || location.port !== 4200;
var useCustomPort = false || (location.port !== '' && location.port !== 4200);
var defaultPort = location.port || (location.protocol === 'https:' ? 443 : 80);
var port = useCustomPort ? 4200 : defaultPort;
var path = '';
Expand Down