Merge pull request #618 from vue-styleguidist/dev

fix: move the build files to the right folder

.gitignore

@@ -25,6 +25,7 @@ test/cypress/videos/
 /examples/*/dist/css/*.css
 /examples/*/dist/index.html
 /examples/*/dist/report.html
+/examples/*/dist/favicon.ico
 
 # docs generted using run.cli
 /examples/*/docs/components/**/*.md

packages/vue-cli-plugin-styleguidist/index.js

@@ -1,7 +1,7 @@
 const styleguidist = require('vue-styleguidist')
 const merge = require('webpack-merge')
 
-module.exports = api => {
+module.exports = (api, options) => {
  api.configureWebpack(() => ({
  // make sure that the docs blocks
  // are ignored during normal serve & build
@@ -25,7 +25,7 @@ module.exports = api => {
  }
  },
  args => {
- getStyleguidist(args, api).binutils.build()
+ getStyleguidist(args, api, options).binutils.build()
  }
  )
 
@@ -40,7 +40,7 @@ module.exports = api => {
  },
 
  args => {
- const server = getStyleguidist(args, api).binutils.server(args.open).app
+ const server = getStyleguidist(args, api, options).binutils.server(args.open).app
 
  // in order to avoid ghosted threads at the end of tests
  ;['SIGINT', 'SIGTERM'].forEach(signal => {
@@ -68,12 +68,15 @@ module.exports = api => {
  )
 }
 
-function getStyleguidist(args, api) {
+function getStyleguidist(args, api, options) {
  const conf = api.resolve(args.config || './styleguide.config.js')
- const userWebpackConfig = conf && conf.length ? require(conf).webpackConfig : {}
+ const sgConf = conf && conf.length ? require(conf) : {}
+ const userWebpackConfig = sgConf.webpackConfig
+ options.outputDir = sgConf.styleguideDir
+ const cliWebpackConfig = getConfig(api)
  return styleguidist(
  conf,
- config => (config.webpackConfig = merge(getConfig(api), userWebpackConfig))
+ config => (config.webpackConfig = merge(cliWebpackConfig, userWebpackConfig))
  )
 }