Skip to content
This repository was archived by the owner on Dec 1, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions lib/demo/command.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,30 @@ const service = require('./service')
module.exports = api => ({
opts: {
description: 'demo of plugin',
usage: 'vue-cli-service demo entry'
usage: 'vue-cli-service demo [options] entry',
options: {
'--mode': 'specify `serve` or `build` mode (default: `serve`)'
}
},
fn: async args => {
const context = api.getCwd()
const entry = args._[0] || ''
const lang = api.hasPlugin('typescript') ? 'ts' : 'js'
const open = true

const command = args.mode || 'serve'
const customArgs = { open }
if (command === 'build') {
customArgs.dest = './demo/dist'
}

// TODO: should be checked wheter dist files generating

if (!existsSync(path.join(context, './demo', entry))) {
console.log(chalk.red(`Demo file ${chalk.yellow(entry)} does not exist.`))
return
}

return service(context, entry, lang, { open })
return service(context, entry, lang, customArgs, command)
}
})
4 changes: 2 additions & 2 deletions lib/demo/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ function createService (context, entry, lang) {
})
}

module.exports = (context, entry, lang, args) => {
return createService(context, entry, lang).run('serve', args)
module.exports = (context, entry, lang, args, command) => {
return createService(context, entry, lang).run(command, args)
}
26 changes: 24 additions & 2 deletions tests/unit/commands/demo.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ test('demo javascript', () => {
expect(calls[0][1]).toMatch('Demo.vue')
expect(calls[0][2]).toMatch('js')
expect(calls[0][3]).toEqual({ open: true })
expect(calls[0][4]).toMatch('serve')
})

test('demo typescript', () => {
Expand Down Expand Up @@ -60,7 +61,7 @@ test('demo failed due to not exit demo entry', () => {
logSpy.mockImplementation(() => {})
existsSyncSpy.mockReturnValueOnce(false)
const mockDemo = require('../../../lib/demo/service')

const service = createMockService([{
id: 'vue-cli-plugin-p11n',
apply: api => {
Expand All @@ -69,9 +70,30 @@ test('demo failed due to not exit demo entry', () => {
}
}], process.cwd())
service.run('demo', { _: ['demo', 'Foo.vue']})

expect(mockDemo).not.toHaveBeenCalled()
expect(logSpy).toHaveBeenCalled()

logSpy.mockClear()
})

test('demo --mode build', () => {
existsSyncSpy.mockReturnValueOnce(true)
const mockDemo = require('../../../lib/demo/service')

const service = createMockService([{
id: 'vue-cli-plugin-p11n',
apply: api => {
const demo = require('../../../lib/demo/command')(api)
api.registerCommand('demo', demo.opts, demo.fn)
}
}], process.cwd())
service.run('demo', { _: ['demo', 'Demo.vue'], mode: 'build' })

const calls = mockDemo.mock.calls
expect(calls[0][0]).toMatch('/')
expect(calls[0][1]).toMatch('Demo.vue')
expect(calls[0][2]).toMatch('js')
expect(calls[0][3]).toEqual({ open: true, dest: './demo/dist' })
expect(calls[0][4]).toMatch('build')
})
6 changes: 3 additions & 3 deletions tests/unit/services/demo.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test('demo', () => {
const mockPlugin = require('../../../lib/demo/plugin')
const mockCliService = require(cliServicePath)

service('/', '/entry', 'ts', { mode: 'build' })
service('/', '/entry', 'ts', { mode: 'build' }, 'serve')

const mockCliServiceCalls = mockCliService.mock.calls
expect(mockCliServiceCalls[0][0]).toMatch('/')
Expand All @@ -29,5 +29,5 @@ test('demo', () => {
expect(mockPluginCalls[0][2]).toMatch('ts')

const instance = mockCliService.mock.instances[0]
expect(instance.run).toHaveBeenCalled()
})
expect(instance.run.mock.calls).toEqual([['serve', { mode: 'build' }]])
})