fix file list for circle deployment, add JS lint

* lint will be done in build step and fail with error
This commit is contained in:
David Kaltschmidt
2015-08-20 23:17:58 +02:00
parent e518bedecb
commit 392f8ce69b
3 changed files with 19 additions and 3 deletions

View File

@@ -35,7 +35,7 @@ dependencies:
- make deps
- mkdir -p $(dirname $SRCDIR)
- cp -r $(pwd)/ $SRCDIR
- cd $SRCDIR/client; $TOOLS/rebuild-image weaveworks/scope-ui-build . Dockerfile gulpfile.js package.json webpack.config.js .eslintrc
- cd $SRCDIR/client; $TOOLS/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc
test:
override:

View File

@@ -27,7 +27,7 @@ module.exports = {
// This will not actually create a app.js file in ./build. It is used
// by the dev server for dynamic hot loading.
output: {
path: path.resolve(__dirname, '/build/'),
path: path.join(__dirname, 'build/'),
filename: 'app.js',
publicPath: 'http://localhost:4041/build/'
},

View File

@@ -1,18 +1,30 @@
var webpack = require('webpack');
var autoprefixer = require('autoprefixer-core');
var path = require('path');
/**
* This is the Webpack configuration file for production.
*/
module.exports = {
// fail on first error when building release
bail: true,
entry: './app/scripts/main',
output: {
path: __dirname + '/build/',
path: path.join(__dirname, 'build/'),
filename: 'app.js'
},
module: {
preLoaders: [
{
test: /\.js$/,
exclude: /node_modules/,
loader: 'eslint-loader'
}
],
loaders: [
{
test: /\.less$/,
@@ -36,6 +48,10 @@ module.exports = {
})
],
eslint: {
failOnError: true
},
resolve: {
extensions: ['', '.js', '.jsx']
},