diff --git a/.eslintignore b/.eslintignore index a65b417..9ebea40 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1,2 @@ +src/server/public lib diff --git a/.eslintrc.js b/.eslintrc.js index 466e993..a49b7c0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -9,6 +9,7 @@ module.exports = { semi: false, }, ], + 'prefer-template': "error" }, - env: { mocha: true }, + env: { mocha: true } } diff --git a/package.json b/package.json index 70bbe21..6794081 100644 --- a/package.json +++ b/package.json @@ -92,12 +92,6 @@ "url": "https://github.com/typicode/json-server/issues" }, "homepage": "https://github.com/typicode/json-server", - "standard": { - "fix": true, - "env": { - "mocha": true - } - }, "engines": { "node": ">= 4" } diff --git a/src/cli/run.js b/src/cli/run.js index c811cd9..011d8a9 100644 --- a/src/cli/run.js +++ b/src/cli/run.js @@ -18,20 +18,20 @@ function prettyPrint(argv, object, rules) { console.log() console.log(chalk.bold(' Resources')) for (let prop in object) { - console.log(' ' + root + '/' + prop) + console.log(` ${root}/${prop}`) } if (rules) { console.log() console.log(chalk.bold(' Other routes')) for (var rule in rules) { - console.log(' ' + rule + ' -> ' + rules[rule]) + console.log(` ${rule} -> ${rules[rule]}`) } } console.log() console.log(chalk.bold(' Home')) - console.log(' ' + root) + console.log(` ${root}`) console.log() } @@ -172,7 +172,7 @@ module.exports = function(argv) { process.stdin.setEncoding('utf8') process.stdin.on('data', chunk => { if (chunk.trim().toLowerCase() === 's') { - const filename = 'db-' + Date.now() + '.json' + const filename = `db-${Date.now()}.json` const file = path.join(argv.snapshots, filename) const state = app.db.getState() fs.writeFileSync(file, JSON.stringify(state, null, 2), 'utf-8') diff --git a/src/cli/utils/load.js b/src/cli/utils/load.js index 8cb26d6..61f7324 100644 --- a/src/cli/utils/load.js +++ b/src/cli/utils/load.js @@ -36,6 +36,6 @@ module.exports = function(source, cb) { const data = low(source, { storage: fileAsync }).getState() cb(null, data) } else { - throw new Error('Unsupported source ' + source) + throw new Error(`Unsupported source ${source}`) } } diff --git a/src/server/rewriter.js b/src/server/rewriter.js index b88afd5..c6227d9 100644 --- a/src/server/rewriter.js +++ b/src/server/rewriter.js @@ -19,14 +19,14 @@ module.exports = routes => { // Rewrite target url using params let target = routes[route] for (let param in req.params) { - target = target.replace(':' + param, req.params[param]) + target = target.replace(`:${param}`, req.params[param]) } req.url = target req.query = updateQueryString(req.query, req.url) next() }) } else { - router.all(route + '*', (req, res, next) => { + router.all(`${route}*`, (req, res, next) => { // Rewrite url by replacing prefix req.url = req.url.replace(route, routes[route]) req.query = updateQueryString(req.query, req.url) diff --git a/src/server/router/index.js b/src/server/router/index.js index f6370c8..159983b 100644 --- a/src/server/router/index.js +++ b/src/server/router/index.js @@ -66,10 +66,10 @@ module.exports = (source, opts = { foreignKeySuffix: 'Id' }) => { } const msg = - `Type of "${key}" (${typeof value}) ` + - (_.isObject(source) ? '' : `in ${source}`) + - ' is not supported. ' + - 'Use objects or arrays of objects.' + `Type of "${key}" (${typeof value}) ${_.isObject(source) + ? '' + : `in ${source}`} is not supported. ` + + `Use objects or arrays of objects.` throw new Error(msg) }) diff --git a/src/server/router/plural.js b/src/server/router/plural.js index da7194c..6724f33 100644 --- a/src/server/router/plural.js +++ b/src/server/router/plural.js @@ -161,7 +161,7 @@ module.exports = (db, name, opts) => { res.setHeader('X-Total-Count', chain.size()) res.setHeader( 'Access-Control-Expose-Headers', - 'X-Total-Count' + (_page ? ', Link' : '') + `X-Total-Count${_page ? ', Link' : ''}` ) } @@ -175,29 +175,29 @@ module.exports = (db, name, opts) => { if (page.first) { links.first = fullURL.replace( - 'page=' + page.current, - 'page=' + page.first + `page=${page.current}`, + `page=${page.first}` ) } if (page.prev) { links.prev = fullURL.replace( - 'page=' + page.current, - 'page=' + page.prev + `page=${page.current}`, + `page=${page.prev}` ) } if (page.next) { links.next = fullURL.replace( - 'page=' + page.current, - 'page=' + page.next + `page=${page.current}`, + `page=${page.next}` ) } if (page.last) { links.last = fullURL.replace( - 'page=' + page.current, - 'page=' + page.last + `page=${page.current}`, + `page=${page.last}` ) }