yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 10:19:30 +02:00
Code Issues Releases Wiki Activity

Fix / files with ESLint rules with 0 errors.

Browse source
This commit is contained in:
Gunther Brunner 2016-01-19 21:12:05 +09:00
parent b2217d01dd
commit b263d1458c
2 changed files with 105 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gulpfile.js
View file

@ -18,20 +18,6 @@ var karmaConfig = '/res/test/karma.conf.js'
var stream = require('stream') var stream = require('stream')
var run = require('gulp-run') var run = require('gulp-run')
gulp.task('jshint', function () {
return gulp.src([
'lib/**/*.js'
, 'res/app/**/*.js'
, 'res/auth-ldap/**/*.js'
, 'res/auth-mock/**/*.js'
, 'res/common/**/*.js'
, 'res/test/**/*.js'
, '*.js'
])
.pipe(jshint())
.pipe(jshint.reporter('jshint-stylish'))
})
gulp.task('jsonlint', function() { gulp.task('jsonlint', function() {
return gulp.src([ return gulp.src([
'.jshintrc' '.jshintrc'
@ -63,10 +49,8 @@ gulp.task('eslint', function () {
.pipe(eslint.format()) .pipe(eslint.format())
// To have the process exit with an error code (1) on // To have the process exit with an error code (1) on
// lint error, return the stream and pipe to failAfterError last. // lint error, return the stream and pipe to failAfterError last.
.pipe(eslint.failAfterError()); .pipe(eslint.failAfterError())
}); })
gulp.task('lint', ['jsonlint']) gulp.task('lint', ['jsonlint'])
gulp.task('test', ['lint', 'run:checkversion']) gulp.task('test', ['lint', 'run:checkversion'])
@ -92,7 +76,8 @@ gulp.task('karma', function (done) {
if (gutil.env.multi) { if (gutil.env.multi) {
protractorConfig = './res/test/protractor-multi.conf' protractorConfig = './res/test/protractor-multi.conf'
} else if (gutil.env.appium) { }
else if (gutil.env.appium) {
protractorConfig = './res/test/protractor-appium.conf' protractorConfig = './res/test/protractor-appium.conf'
} }
@ -113,13 +98,14 @@ gulp.task('protractor', ['webdriver-update'], function (callback) {
})) }))
.on('error', function(e) { .on('error', function(e) {
console.log(e) console.log(e)
/* eslint no-console: 0 */
}) })
.on('end', callback) .on('end', callback)
}) })
// For piping strings // For piping strings
function fromString(filename, string) { function fromString(filename, string) {
/* eslint no-underscore-dangle: 0 */
var src = new stream.Readable({objectMode: true}) var src = new stream.Readable({objectMode: true})
src._read = function() { src._read = function() {
this.push(new gutil.File({ this.push(new gutil.File({
@ -140,7 +126,7 @@ gulp.task('webpack:build', function (callback) {
myConfig.plugins = myConfig.plugins.concat( myConfig.plugins = myConfig.plugins.concat(
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
'NODE_ENV': JSON.stringify('production') NODE_ENV: JSON.stringify('production')
} }
}) })
) )
@ -169,7 +155,7 @@ gulp.task('webpack:others', function (callback) {
myConfig.plugins = myConfig.plugins.concat( myConfig.plugins = myConfig.plugins.concat(
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
'NODE_ENV': JSON.stringify('production') NODE_ENV: JSON.stringify('production')
} }
}) })
) )

135
webpack.config.js
View file

@ -9,64 +9,64 @@ var log = require('./lib/util/logger').createLogger('webpack:config')
module.exports = { module.exports = {
webpack: { webpack: {
context: __dirname, context: __dirname
cache: true, , cache: true
entry: { , entry: {
app: pathutil.resource('app/app.js'), app: pathutil.resource('app/app.js')
authldap: pathutil.resource('auth/ldap/scripts/entry.js'), , authldap: pathutil.resource('auth/ldap/scripts/entry.js')
authmock: pathutil.resource('auth/mock/scripts/entry.js') , authmock: pathutil.resource('auth/mock/scripts/entry.js')
}, }
output: { , output: {
path: pathutil.resource('build'), path: pathutil.resource('build')
publicPath: '/static/app/build/', , publicPath: '/static/app/build/'
filename: 'entry/[name].entry.js', , filename: 'entry/[name].entry.js'
chunkFilename: '[id].[hash].chunk.js' , chunkFilename: '[id].[hash].chunk.js'
}, }
stats: { , stats: {
colors: true colors: true
}, }
resolve: { , resolve: {
root: [ root: [
pathutil.resource('app/components') pathutil.resource('app/components')
], ]
modulesDirectories: [ , modulesDirectories: [
'web_modules', 'web_modules'
'bower_components', , 'bower_components'
'node_modules' , 'node_modules'
], ]
alias: { , alias: {
'angular-bootstrap': 'angular-bootstrap/ui-bootstrap-tpls', 'angular-bootstrap': 'angular-bootstrap/ui-bootstrap-tpls'
'localforage': 'localforage/dist/localforage.js', , 'localforage': 'localforage/dist/localforage.js'
'socket.io': 'socket.io-client', , 'socket.io': 'socket.io-client'
'stats': 'stats.js/src/Stats.js', , 'stats': 'stats.js/src/Stats.js'
'underscore.string': 'underscore.string/index' , 'underscore.string': 'underscore.string/index'
} }
}, }
module: { , module: {
loaders: [ loaders: [
{ test: /\.css$/, loader: 'style!css' }, {test: /\.css$/, loader: 'style!css'}
{ test: /\.scss$/, loader: 'style!css!sass'}, , {test: /\.scss$/, loader: 'style!css!sass'}
{ test: /\.less$/, loader: 'style!css!less'}, , {test: /\.less$/, loader: 'style!css!less'}
{ test: /\.json$/, loader: 'json' }, , {test: /\.json$/, loader: 'json'}
{ test: /\.jpg$/, loader: 'url?limit=1000&mimetype=image/jpeg' }, , {test: /\.jpg$/, loader: 'url?limit=1000&mimetype=image/jpeg'}
{ test: /\.png$/, loader: 'url?limit=1000&mimetype=image/png' }, , {test: /\.png$/, loader: 'url?limit=1000&mimetype=image/png'}
{ test: /\.gif$/, loader: 'url?limit=1000&mimetype=image/gif' }, , {test: /\.gif$/, loader: 'url?limit=1000&mimetype=image/gif'}
{ test: /\.svg/, loader: 'url?limit=1&mimetype=image/svg+xml' }, , {test: /\.svg/, loader: 'url?limit=1&mimetype=image/svg+xml'}
{ test: /\.woff/, loader: 'url?limit=1&mimetype=application/font-woff'}, , {test: /\.woff/, loader: 'url?limit=1&mimetype=application/font-woff'}
{ test: /\.otf/, loader: 'url?limit=1&mimetype=application/font-woff' }, , {test: /\.otf/, loader: 'url?limit=1&mimetype=application/font-woff'}
{ test: /\.ttf/, loader: 'url?limit=1&mimetype=application/font-woff' }, , {test: /\.ttf/, loader: 'url?limit=1&mimetype=application/font-woff'}
{ test: /\.eot/, loader: 'url?limit=1&mimetype=vnd.ms-fontobject' }, , {test: /\.eot/, loader: 'url?limit=1&mimetype=vnd.ms-fontobject'}
{ test: /\.jade$/, loader: 'template-html-loader' }, , {test: /\.jade$/, loader: 'template-html-loader'}
{ test: /\.html$/, loader: 'html-loader' }, , {test: /\.html$/, loader: 'html-loader'}
{ test: /angular\.js$/, loader: 'exports?angular'}, , {test: /angular\.js$/, loader: 'exports?angular'}
{ test: /angular-cookies\.js$/, loader: 'imports?angular=angular'}, , {test: /angular-cookies\.js$/, loader: 'imports?angular=angular'}
{ test: /angular-route\.js$/, loader: 'imports?angular=angular'}, , {test: /angular-route\.js$/, loader: 'imports?angular=angular'}
{ test: /angular-touch\.js$/, loader: 'imports?angular=angular'}, , {test: /angular-touch\.js$/, loader: 'imports?angular=angular'}
{ test: /angular-animate\.js$/, loader: 'imports?angular=angular'}, , {test: /angular-animate\.js$/, loader: 'imports?angular=angular'}
{ test: /angular-growl\.js$/, loader: 'imports?angular=angular'}, , {test: /angular-growl\.js$/, loader: 'imports?angular=angular'}
{ test: /uuid\.js$/, loader: 'imports?require=>undefined'}, , {test: /uuid\.js$/, loader: 'imports?require=>undefined'}
{ test: /dialogs\.js$/, loader: 'script'} , {test: /dialogs\.js$/, loader: 'script'}
], ]
// TODO: enable when its sane // TODO: enable when its sane
// preLoaders: [ // preLoaders: [
// { // {
@ -75,11 +75,11 @@ module.exports = {
// loader: 'eslint-loader' // loader: 'eslint-loader'
// } // }
// ], // ],
noParse: [ , noParse: [
// pathutil.resource('bower_components') // pathutil.resource('bower_components')
] ]
}, }
plugins: [ , plugins: [
new webpack.ResolverPlugin( new webpack.ResolverPlugin(
new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin( new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin(
'bower.json' 'bower.json'
@ -95,20 +95,23 @@ module.exports = {
, new CommonsChunkPlugin('entry/commons.entry.js') , new CommonsChunkPlugin('entry/commons.entry.js')
, new ProgressPlugin(_.throttle( , new ProgressPlugin(_.throttle(
function(progress, message) { function(progress, message) {
log.info( var msg
'Build progress %d%% (%s)' if (message) {
, Math.floor(progress * 100) msg = message
, message ? message : (progress >= 1 ? 'complete' : 'unknown') }
) else {
msg = progress >= 1 ? 'complete' : 'unknown'
}
log.info('Build progress %d%% (%s)', Math.floor(progress * 100), msg)
} }
, 1000 , 1000
)) ))
] ]
}, }
webpackServer: { , webpackServer: {
debug: true, debug: true
devtool: 'eval', , devtool: 'eval'
stats: { , stats: {
colors: true colors: true
} }
} }