Skip to content

Commit

Permalink
modify some parts at eslintrc.json at client and server based on comm…
Browse files Browse the repository at this point in the history
…ents and also remove some unnecessary scripts and packages from package.json

relates #5 #6
  • Loading branch information
hassanelnajjar committed Mar 27, 2021
1 parent 43f9b2a commit 7fe601d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 122 deletions.
13 changes: 3 additions & 10 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"es2021": true,
"node": true,
"jest/globals": true
},
Expand All @@ -12,7 +12,7 @@
"SharedArrayBuffer": "readonly"
},
"parserOptions": {
"ecmaVersion": 2018
"ecmaVersion": 12
},
"plugins": ["prettier", "jest"],
"rules": {
Expand All @@ -22,13 +22,6 @@
"singleQuote": true,
"trailingComma": "all"
}
],
"jest/no-disabled-tests": "warn",
"jest/no-focused-tests": "error",
"jest/no-identical-title": "error",
"jest/prefer-to-have-length": "warn",
"jest/valid-expect": "error",
"consistent-return": "off",
"jest/no-test-callback": "off"
]
}
}
4 changes: 0 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
"editor.formatOnSave": true,
"files.eol": "\n",
"cSpell.words": [
"pgport",
"usercalories",
"userexercisescalories",
"userfoodcalories"
],
"cSpell.ignoreWords": ["starticon"]
}
4 changes: 2 additions & 2 deletions client/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"parser": "babel-eslint",
"extends": ["airbnb", "prettier","plugin:jest/recommended"],
"parserOptions": {
"es6": true,
"ecmaVersion": 6,
"ecmaVersion": 12,
"ecmaFeatures": {
"impliedStrict": true,
"jsx": true,
"experimentalObjectRestSpread": true
}
},
Expand Down
101 changes: 0 additions & 101 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
"scripts": {
"dev": "cross-env NODE_ENV=development nodemon server/index.js",
"kill": "fuser -k 5000/tcp",
"server": "npm run dev",
"client": "cd client && npm start",
"test": "cross-env NODE_ENV=test jest",
"kill-run": "npm run kill && npm run server",
"start": "cross-env NODE_ENV=production node ./server/index.js",
"heroku-postbuild": "NODE_ENV=production cd client && npm install && npm run build",
"build:db": "NODE_ENV=test node server/database/config",
"heroku-postbuild": "cd client && npm install && npm run build",
"build:db": "cross-env NODE_ENV=test node server/database/config",
"lint-fix": "eslint server/ --fix",
"lint": "eslint server/",
"lint-react": "cd client && npm run lint"
Expand All @@ -31,13 +30,11 @@
"dependencies": {
"bcrypt": "^5.0.1",
"compression": "^1.7.4",
"cookie": "^0.4.1",
"cookie-parser": "^1.4.5",
"cross-env": "^7.0.3",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"jest": "^26.6.0",
"joi": "^17.4.0",
"jsonwebtoken": "^8.5.1",
"pg": "^8.5.1",
"supertest": "^6.1.3",
Expand Down

0 comments on commit 7fe601d

Please sign in to comment.