Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lint: default template to standard #226

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions templates/js/app.js.ejs
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
<% if (view) { -%>
var createError = require('http-errors');
var createError = require('http-errors')
<% } -%>
var express = require('express');
var path = require('path');
var express = require('express')
var path = require('path')
<% Object.keys(modules).sort().forEach(function (variable) { -%>
var <%- variable %> = require('<%- modules[variable] %>');
<% }); -%>
var <%- variable %> = require('<%- modules[variable] %>')
<% }) -%>

<% Object.keys(localModules).sort().forEach(function (variable) { -%>
var <%- variable %> = require('<%- localModules[variable] %>');
<% }); -%>
var <%- variable %> = require('<%- localModules[variable] %>')
<% }) -%>

var app = express();
var app = express()

<% if (view) { -%>
// view engine setup
<% if (view.render) { -%>
app.engine('<%- view.engine %>', <%- view.render %>);
app.engine('<%- view.engine %>', <%- view.render %>)
<% } -%>
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', '<%- view.engine %>');
app.set('views', path.join(__dirname, 'views'))
app.set('view engine', '<%- view.engine %>')

<% } -%>
<% uses.forEach(function (use) { -%>
app.use(<%- use %>);
<% }); -%>
app.use(<%- use %>)
<% }) -%>

<% mounts.forEach(function (mount) { -%>
app.use(<%= mount.path %>, <%- mount.code %>);
<% }); -%>
app.use(<%= mount.path %>, <%- mount.code %>)
<% }) -%>

<% if (view) { -%>
// catch 404 and forward to error handler
app.use(function(req, res, next) {
next(createError(404));
});
app.use(function (req, res, next) {
next(createError(404))
})

// error handler
app.use(function(err, req, res, next) {
app.use(function (err, req, res, next) {
// set locals, only providing error in development
res.locals.message = err.message;
res.locals.error = req.app.get('env') === 'development' ? err : {};
res.locals.message = err.message
res.locals.error = req.app.get('env') === 'development' ? err : {}

// render the error page
res.status(err.status || 500);
res.render('error');
});
res.status(err.status || 500)
res.render('error')
})

<% } -%>
module.exports = app;
module.exports = app
12 changes: 6 additions & 6 deletions templates/js/routes/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var express = require('express');
var router = express.Router();
var express = require('express')
var router = express.Router()

/* GET home page. */
router.get('/', function(req, res, next) {
res.render('index', { title: 'Express' });
});
router.get('/', function (req, res, next) {
res.render('index', { title: 'Express' })
})

module.exports = router;
module.exports = router
12 changes: 6 additions & 6 deletions templates/js/routes/users.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var express = require('express');
var router = express.Router();
var express = require('express')
var router = express.Router()

/* GET users listing. */
router.get('/', function(req, res, next) {
res.send('respond with a resource');
});
router.get('/', function (req, res, next) {
res.send('respond with a resource')
})

module.exports = router;
module.exports = router
50 changes: 25 additions & 25 deletions templates/js/www.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,49 @@
* Module dependencies.
*/

var app = require('../app');
var debug = require('debug')('<%- name %>:server');
var http = require('http');
var app = require('../app')
var debug = require('debug')('<%- name %>:server')
var http = require('http')

/**
* Get port from environment and store in Express.
*/

var port = normalizePort(process.env.PORT || '3000');
app.set('port', port);
var port = normalizePort(process.env.PORT || '3000')
app.set('port', port)

/**
* Create HTTP server.
*/

var server = http.createServer(app);
var server = http.createServer(app)

/**
* Listen on provided port, on all network interfaces.
*/

server.listen(port);
server.on('error', onError);
server.on('listening', onListening);
server.listen(port)
server.on('error', onError)
server.on('listening', onListening)

/**
* Normalize a port into a number, string, or false.
*/

function normalizePort(val) {
var port = parseInt(val, 10);
var port = parseInt(val, 10)

if (isNaN(port)) {
// named pipe
return val;
return val
}

if (port >= 0) {
// port number
return port;
return port
}

return false;
return false
}

/**
Expand All @@ -55,25 +55,25 @@ function normalizePort(val) {

function onError(error) {
if (error.syscall !== 'listen') {
throw error;
throw error
}

var bind = typeof port === 'string'
? 'Pipe ' + port
: 'Port ' + port;
: 'Port ' + port

// handle specific listen errors with friendly messages
switch (error.code) {
case 'EACCES':
console.error(bind + ' requires elevated privileges');
process.exit(1);
break;
console.error(bind + ' requires elevated privileges')
process.exit(1)
break
case 'EADDRINUSE':
console.error(bind + ' is already in use');
process.exit(1);
break;
console.error(bind + ' is already in use')
process.exit(1)
break
default:
throw error;
throw error
}
}

Expand All @@ -82,9 +82,9 @@ function onError(error) {
*/

function onListening() {
var addr = server.address();
var addr = server.address()
var bind = typeof addr === 'string'
? 'pipe ' + addr
: 'port ' + addr.port;
debug('Listening on ' + bind);
: 'port ' + addr.port
debug('Listening on ' + bind)
}
7 changes: 7 additions & 0 deletions test/cmd.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

var assert = require('assert')
var AppRunner = require('./support/app-runner')
var CLIEngine = require('eslint').CLIEngine
var exec = require('child_process').exec
var fs = require('fs')
var mkdirp = require('mkdirp')
Expand Down Expand Up @@ -79,6 +80,12 @@ describe('express(1)', function () {
'}\n')
})

it('should be standard', function () {
var cli = new CLIEngine()
var report = cli.executeOnFiles([ctx.dir])
assert.equal(report.results.length, 0, 'should not have warnings or errors')
})

it('should have installable dependencies', function (done) {
this.timeout(NPM_INSTALL_TIMEOUT)
npmInstall(ctx.dir, done)
Expand Down