Skip to content

Commit

Permalink
remove conflicting eslint rules and lint
Browse files Browse the repository at this point in the history
  • Loading branch information
drazisil committed Mar 1, 2020
1 parent 9c1e2ff commit eb690e7
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 33 deletions.
26 changes: 0 additions & 26 deletions .eslintrc.json

This file was deleted.

8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"private": true,
"bin": "bin/codecov",
"scripts": {
"lint": "eslint src",
"test": "jest",
"build-linux": "pkg . --targets linux --output out/codecov-linux",
"build-macos": "pkg . --targets macos --output out/codecov-macos",
Expand Down Expand Up @@ -56,14 +57,17 @@
"env": {
"commonjs": true,
"es6": true,
"node": true
"node": true,
"jest": true
},
"extends": [
"plugin:prettier/recommended"
],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
"SharedArrayBuffer": "readonly",
"td:": "readonly",
"expect": "readonly"
},
"parserOptions": {
"ecmaVersion": 2018
Expand Down
6 changes: 4 additions & 2 deletions src/helpers/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,12 @@ function isBlacklisted(projectRoot, file, manualBlacklist) {
function fetchGitRoot() {
try {
return (
child_process.spawnSync("git", ["rev-parse", "--show-toplevel"])
child_process
.spawnSync("git", ["rev-parse", "--show-toplevel"])
.stdout.toString()
.trimRight() ||
child_process.spawnSync("hg", ["root"])
child_process
.spawnSync("hg", ["root"])
.stdout.toString()
.trimRight() ||
process.cwd()
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/web.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@ module.exports = {
populateBuildParams,
uploadToCodecov,
uploadToCodecovPUT,
generateQuery,
generateQuery
};
1 change: 1 addition & 0 deletions test/helpers/files.test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*global expect */
const td = require("testdouble")
const fs = require("fs");
const path = require("path");
Expand Down
6 changes: 4 additions & 2 deletions test/test_helpers.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
global.td = require('testdouble')
global.expect = require('expect')
const td = require('testdouble')
// eslint-disable-next-line no-unused-vars
const expect = require('expect')

// eslint-disable-next-line no-undef
require('testdouble-jest')(td, jest)

0 comments on commit eb690e7

Please sign in to comment.