From 8bf72b470ee5f0a57e04b0501348ec2ec030bac0 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Wed, 22 Feb 2017 00:18:47 +0100 Subject: [PATCH] tried to address linting issues --- .eslintrc | 5 +---- package.json | 2 +- webapp/.eslintrc | 16 +++++++++++----- webapp/views/components/Header.js | 5 ++--- webapp/views/components/Layout.js | 2 +- webapp/views/components/LetterOptions.js | 10 +++++----- webapp/views/components/Preview.js | 2 +- webapp/views/pages/404.js | 2 +- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.eslintrc b/.eslintrc index 0015a09..92f5b79 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,7 +4,6 @@ "es6": true }, "parserOptions": { - "ecmaVersion": 6, "sourceType": "module" }, "rules": { @@ -40,7 +39,7 @@ "max-len": [2, 140], "max-params": [1, 4], "max-statements": [2, 20], - "new-cap": [2, { "capIsNewExceptions": ["Q"] }], + "new-cap": 2, "no-eval": 2, "no-bitwise": 2, "no-caller": 2, @@ -49,7 +48,6 @@ "no-dupe-class-members": 2, "no-empty": 2, "no-mixed-spaces-and-tabs": 2, - "no-multi-spaces": 2, "no-multi-str": 2, "no-new": 2, "no-this-before-super": 2, @@ -67,7 +65,6 @@ "prefer-template": 0, "quotes": [2, "single", "avoid-escape"], "require-yield": 0, - "semi": 2, "space-before-function-paren": [2, "never"], "space-unary-ops": [2, {"words": false, "nonwords": false}], "space-infix-ops": 2, diff --git a/package.json b/package.json index fbc581a..fcc274d 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "babel-preset-react": "^6.23.0", "clean-webpack-plugin": "^0.1.15", "copy-webpack-plugin": "^4.0.1", - "eslint": "^3.15.0", + "eslint": "^3.16.0", "html-webpack-plugin": "^2.28.0", "nodemon": "^1.11.0", "react-collapsible": "^1.2.1", diff --git a/webapp/.eslintrc b/webapp/.eslintrc index e5e0584..bab6ddc 100644 --- a/webapp/.eslintrc +++ b/webapp/.eslintrc @@ -1,13 +1,16 @@ { + "parser": "babel-eslint", + "parserOptions": { + "ecmaVersion": 8, + "ecmaFeatures": { + "jsx": true + }, + "sourceType": "module" + }, "env": { "browser": true, "es6": true }, - "parserOptions": { - "ecmaFeatures": { - "jsx": true - } - }, "plugins": [ "react" ], @@ -15,5 +18,8 @@ "react": { "pragma": "h" } + }, + "globals": { + "require": true, } } diff --git a/webapp/views/components/Header.js b/webapp/views/components/Header.js index fd02297..30ed42c 100644 --- a/webapp/views/components/Header.js +++ b/webapp/views/components/Header.js @@ -1,10 +1,9 @@ import { h } from 'preact'; -import { Link } from 'preact-router'; -export default function () { +export default function() { return (
-

PDFer

+

PDFer

) } diff --git a/webapp/views/components/Layout.js b/webapp/views/components/Layout.js index 9416813..8c21ad7 100644 --- a/webapp/views/components/Layout.js +++ b/webapp/views/components/Layout.js @@ -1,7 +1,7 @@ import { h } from 'preact'; import Header from './Header'; -export default function (props) { +export default function(props) { return (
diff --git a/webapp/views/components/LetterOptions.js b/webapp/views/components/LetterOptions.js index 7b3ebf2..fc58bd7 100644 --- a/webapp/views/components/LetterOptions.js +++ b/webapp/views/components/LetterOptions.js @@ -4,25 +4,25 @@ import Input from './Input'; import TextAreaInput from './TextAreaInput'; import Select from './Select'; -const EXAMPLE_ADDRESS="Max Mustermann\nMusterstr. 73\n12345 Musterstadt"; +const EXAMPLE_ADDRESS = 'Max Mustermann\nMusterstr. 73\n12345 Musterstadt'; export default function(props) { const templateTypeOptions = [ { value: 'brief-fam', - name: "Familie" + name: 'Familie' }, { value: 'brief-valerie', - name: "Valerie" + name: 'Valerie' }, { value: 'brief-rain', - name: "Rain Baumeister" + name: 'Rain Baumeister' }, { value: 'brief-thomas', - name: "Thomas" + name: 'Thomas' } ]; diff --git a/webapp/views/components/Preview.js b/webapp/views/components/Preview.js index e43341a..11cd400 100644 --- a/webapp/views/components/Preview.js +++ b/webapp/views/components/Preview.js @@ -1,4 +1,4 @@ -import { Component, h } from 'preact'; +import { h } from 'preact'; export default props => { if (props.pdfIsLoading) { diff --git a/webapp/views/pages/404.js b/webapp/views/pages/404.js index 834c64f..c49fdb8 100644 --- a/webapp/views/pages/404.js +++ b/webapp/views/pages/404.js @@ -1,6 +1,6 @@ import { h } from 'preact'; -export default function (props) { +export default function(props) { return (

No hope!