diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 9ed8095..01d59db 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -12,7 +12,7 @@ const createLintingRule = () => ({ test: /\.(js|vue)$/, loader: 'eslint-loader', enforce: 'pre', - include: [resolve('src'), resolve('test')], + include: [resolve('js_src'), resolve('test')], options: { formatter: require('eslint-friendly-formatter'), emitWarning: !config.dev.showEslintErrorsInOverlay @@ -22,7 +22,7 @@ const createLintingRule = () => ({ module.exports = { context: path.resolve(__dirname, '../cuizin'), entry: { - app: './src/main.js' + app: './js_src/main.js' }, output: { path: config.build.assetsRoot, @@ -35,7 +35,7 @@ module.exports = { extensions: ['.js', '.vue', '.json'], alias: { 'vue$': 'vue/dist/vue.esm.js', - '@': resolve('src'), + '@': resolve('js_src'), } }, module: { @@ -49,7 +49,7 @@ module.exports = { { test: /\.js$/, 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)(\?.*)?$/, diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index fcf7bc5..bc98d21 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -62,7 +62,7 @@ const webpackConfig = merge(baseWebpackConfig, { // see https://github.com/ampedandwired/html-webpack-plugin new HtmlWebpackPlugin({ filename: config.build.index, - template: 'index.html', + template: 'static/index.html', inject: true, minify: { removeComments: true,