Partial fix of the webpack build

This commit is contained in:
Lucas Verney 2018-02-26 23:25:15 +01:00
parent 59775eab8a
commit e139aec62d
2 changed files with 5 additions and 5 deletions

View File

@ -12,7 +12,7 @@ const createLintingRule = () => ({
test: /\.(js|vue)$/, test: /\.(js|vue)$/,
loader: 'eslint-loader', loader: 'eslint-loader',
enforce: 'pre', enforce: 'pre',
include: [resolve('src'), resolve('test')], include: [resolve('js_src'), resolve('test')],
options: { options: {
formatter: require('eslint-friendly-formatter'), formatter: require('eslint-friendly-formatter'),
emitWarning: !config.dev.showEslintErrorsInOverlay emitWarning: !config.dev.showEslintErrorsInOverlay
@ -22,7 +22,7 @@ const createLintingRule = () => ({
module.exports = { module.exports = {
context: path.resolve(__dirname, '../cuizin'), context: path.resolve(__dirname, '../cuizin'),
entry: { entry: {
app: './src/main.js' app: './js_src/main.js'
}, },
output: { output: {
path: config.build.assetsRoot, path: config.build.assetsRoot,
@ -35,7 +35,7 @@ module.exports = {
extensions: ['.js', '.vue', '.json'], extensions: ['.js', '.vue', '.json'],
alias: { alias: {
'vue$': 'vue/dist/vue.esm.js', 'vue$': 'vue/dist/vue.esm.js',
'@': resolve('src'), '@': resolve('js_src'),
} }
}, },
module: { module: {
@ -49,7 +49,7 @@ module.exports = {
{ {
test: /\.js$/, test: /\.js$/,
loader: 'babel-loader', loader: 'babel-loader',
include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')] include: [resolve('js_src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
}, },
{ {
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,

View File

@ -62,7 +62,7 @@ const webpackConfig = merge(baseWebpackConfig, {
// see https://github.com/ampedandwired/html-webpack-plugin // see https://github.com/ampedandwired/html-webpack-plugin
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
filename: config.build.index, filename: config.build.index,
template: 'index.html', template: 'static/index.html',
inject: true, inject: true,
minify: { minify: {
removeComments: true, removeComments: true,