Skip to content

Add ability to specify lanIp argument (fix #27) #28

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 4 commits into from
Sep 3, 2018
Merged

Add ability to specify lanIp argument (fix #27) #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd31d2f
Add ability to specify lanIp argument (fix #27)
tartinesKiller Sep 3, 2018
8bb996a
If platform is amazon-fireos, "alias" it as Android (fix #29)
tartinesKiller Sep 3, 2018
f5c4e23
Replaced double-quote with single-quote
tartinesKiller Sep 3, 2018
3420cd2
Fix typo
tartinesKiller Sep 3, 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
10 changes: 6 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
const {
info
} = require('@vue/cli-shared-utils')
const address = require('address')

const defaults = {
mode: 'development',
host: '0.0.0.0',
port: 8080,
https: false
https: false,
lanIp: address.ip()
}

module.exports = (api, options) => {
const address = require('address')
const portfinder = require('portfinder')

api.registerCommand('cordova-serve', {
Expand All @@ -20,7 +21,8 @@ module.exports = (api, options) => {
'--open': `open browser on server start`,
'--host': `specify host (default: ${defaults.host})`,
'--port': `specify port (default: ${defaults.port})`,
'--https': `use https (default: ${defaults.https})`
'--https': `use https (default: ${defaults.https})`,
'--lan-ip': `IP of the machine running cordova-serve (default: ${defaults.lanIp})`
}
}, args => {
const projectDevServerOptions = options.devServer || {}
Expand All @@ -31,7 +33,7 @@ module.exports = (api, options) => {
host: args.host || process.env.HOST || projectDevServerOptions.host || defaults.host,
port,
https: args.https || projectDevServerOptions.https || defaults.https,
lanIp: address.ip()
lanIp: args['lan-ip'] || defaults.lanIp
}
const wwwDirPath = api.resolve('www')
info('your www/index.html is overwrited.')
Expand Down
5 changes: 5 additions & 0 deletions redirect.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
var protocol = '<%- https ? "https" : "http" %>'
var port = '<%- port %>'
var platform = device.platform.toLowerCase()
if (platform === 'amazon-fireos') { // see https://github.com/dekimasoon/vue-cli-plugin-cordova/issues/29
// platform "amazon-fireos" seems to have disapear from Cordova docs, and can't be downloaded anymore.
// In order to avoid asking server for something that doesn't exist, "alias" "amazon-fireos" to simply "android"
platform = 'android'
}
var redirectTo = protocol + '://' + getRedirectIp(lanIp) + ':' + port + '/?_cp=' + platform
window.location.href = redirectTo
})
Expand Down