From 2f720788c606421a852b74d356f35e2d98f8f6a1 Mon Sep 17 00:00:00 2001
From: Albin Henriksson <albhe428@student.liu.se>
Date: Tue, 16 Feb 2021 16:46:38 +0100
Subject: [PATCH] #2: Added linting to ci again
---
client/.eslintrc | 7 +++++--
client/.prettierrc | 3 ++-
client/package-lock.json | 26 ++++++--------------------
client/package.json | 11 ++---------
4 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/client/.eslintrc b/client/.eslintrc
index 193fae78..1554deca 100644
--- a/client/.eslintrc
+++ b/client/.eslintrc
@@ -28,7 +28,10 @@
],
"rules": {
"semi":"off",
- "react/jsx-one-expression-per-line": "off"
+ "react/jsx-one-expression-per-line": "off",
+ "prettier/prettier": ["error", {
+ "endOfLine":"auto"
+ }]
- }
+ }
}
diff --git a/client/.prettierrc b/client/.prettierrc
index 76ee677f..0cc6d643 100644
--- a/client/.prettierrc
+++ b/client/.prettierrc
@@ -2,5 +2,6 @@
"semi": false,
"trailingComma": "none",
"singleQuote": true,
- "printWidth": 80
+ "printWidth": 80,
+ "endOfLine": "lf"
}
\ No newline at end of file
diff --git a/client/package-lock.json b/client/package-lock.json
index c8b2a048..4c2023ef 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -5567,11 +5567,11 @@
}
},
"eslint": {
- "version": "7.20.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.20.0.tgz",
- "integrity": "sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.19.0.tgz",
+ "integrity": "sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==",
"requires": {
- "@babel/code-frame": "7.12.11",
+ "@babel/code-frame": "^7.0.0",
"@eslint/eslintrc": "^0.3.0",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
@@ -5583,7 +5583,7 @@
"eslint-utils": "^2.1.0",
"eslint-visitor-keys": "^2.0.0",
"espree": "^7.3.1",
- "esquery": "^1.4.0",
+ "esquery": "^1.2.0",
"esutils": "^2.0.2",
"file-entry-cache": "^6.0.0",
"functional-red-black-tree": "^1.0.1",
@@ -5610,14 +5610,6 @@
"v8-compile-cache": "^2.0.3"
},
"dependencies": {
- "@babel/code-frame": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
- "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
- "requires": {
- "@babel/highlight": "^7.10.4"
- }
- },
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -5814,12 +5806,6 @@
"confusing-browser-globals": "^1.0.10"
}
},
- "eslint-config-strongloop": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-config-strongloop/-/eslint-config-strongloop-2.1.0.tgz",
- "integrity": "sha1-dj3Rmt/OiNewBR5uJV8a43eDtMY=",
- "dev": true
- },
"eslint-import-resolver-node": {
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
@@ -16776,4 +16762,4 @@
"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
}
}
-}
\ No newline at end of file
+}
diff --git a/client/package.json b/client/package.json
index f85e71cc..7382e3ea 100644
--- a/client/package.json
+++ b/client/package.json
@@ -52,12 +52,5 @@
"last 1 safari version"
]
},
- "proxy": "http://localhost:5000/api/",
- "devDependencies": {
- "@typescript-eslint/eslint-plugin": "^4.15.1",
- "@typescript-eslint/parser": "^4.15.1",
- "eslint": "^7.20.0",
- "eslint-config-strongloop": "^2.1.0",
- "eslint-plugin-react": "^7.22.0"
- }
-}
\ No newline at end of file
+ "proxy": "http://localhost:5000/api/"
+}
--
GitLab