Skip to content

Use devServer.public to build sockjsUrl, if defined. #1526

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

Merged
merged 2 commits into from
Jun 11, 2018
Merged

Use devServer.public to build sockjsUrl, if defined. #1526

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bb982e
Use devServer.public to build sockjsUrl, if defined.
trashpanda001 Jun 8, 2018
97e6772
Rename `public` to `publicOpt`, as it is a reserve word.
trashpanda001 Jun 9, 2018
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
3 changes: 2 additions & 1 deletion packages/@vue/cli-service/lib/commands/serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ module.exports = (api, options) => {

// inject dev & hot-reload middleware entries
if (!isProduction) {
const sockjsUrl = url.format({
const publicOpt = projectDevServerOptions.public
const sockjsUrl = publicOpt ? `//${publicOpt}/sockjs-node` : url.format({
protocol,
port,
hostname: urls.lanUrlForConfig || 'localhost',
Expand Down