Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/next'
Browse files Browse the repository at this point in the history
  • Loading branch information
mhewson committed Dec 20, 2018
2 parents 7430778 + 399fd5e commit 02ac81c
Show file tree
Hide file tree
Showing 51 changed files with 7,471 additions and 5,640 deletions.
18 changes: 3 additions & 15 deletions build/webpack.test.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,16 @@
Used with mocha-webpack for unit testing
*/

var path = require('path')
var utils = require('./utils')
var webpack = require('webpack')
var config = require('../config')
var merge = require('webpack-merge')
var baseWebpackConfig = require('./webpack.base.conf')
var nodeExternals = require('webpack-node-externals')

function resolve(dir) {
return path.join(__dirname, '..', dir);
}

var webpackConfig = merge(baseWebpackConfig, {
entry: {
'dev': path.resolve(__dirname, '../src/dev.js')
},
externals: [nodeExternals()],
devtool: config.build.productionSourceMap ? '#source-map' : false,
devtool: 'inline-cheap-module-source-map',
output: {
path: config.build.assetsRoot,
filename: utils.assetsPath('js/[name].[chunkhash].js'),
chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
devtoolModuleFilenameTemplate: '[absolute-resource-path]',
devtoolFallbackModuleFilenameTemplate: '[absolute-resource-path]?[hash]'
},
})

Expand Down
3 changes: 3 additions & 0 deletions generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,8 @@ inquirer.prompt(QUESTIONS).then((answers) => {

// Done!
console.log(chalk.green(`Successfuly generated files for '${name}' in ${outDir}`));
console.log(chalk.white('Add component to src/components/_index.js'));
console.log(chalk.white('Add component example to src/components/examples.js'));
console.log(chalk.white('Place component example in src/App.vue'));
});

Loading

0 comments on commit 02ac81c

Please sign in to comment.