Merge branch '2.x' of https://github.com/nuxt/nuxt.js into dev

This commit is contained in:
Pooya Parsa 2018-11-21 19:37:09 +03:30
commit b74e771adf

View File

@ -2,4 +2,7 @@
const { name } = require('../package.json') const { name } = require('../package.json')
const isEdge = name.indexOf('-edge') !== -1 const isEdge = name.indexOf('-edge') !== -1
const cli = require(isEdge ? '@nuxt/cli-edge' : '@nuxt/cli') const cli = require(isEdge ? '@nuxt/cli-edge' : '@nuxt/cli')
if (process.argv[2] !== 'start') {
process.argv.splice(2, 0, 'start')
}
cli.run() cli.run()