From 932fb0b0b7be8c995ad1e8568a31ba808770f5a7 Mon Sep 17 00:00:00 2001 From: nightly Date: Wed, 19 Oct 2022 15:56:48 +0200 Subject: [PATCH] Fix a couple things --- .eslintrc | 230 +++++++++++++++++++++++----------------------- package-lock.json | 20 ++++ package.json | 1 + 3 files changed, 135 insertions(+), 116 deletions(-) diff --git a/.eslintrc b/.eslintrc index 2493cc8..bec6fce 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,120 +1,118 @@ { - "env": { - "es6": true, - "amd": true, - "browser": true - }, - - "root": true, - "ignorePatterns": ["docs/", "dist/", "out/", "rethinkdb_data/", "node_modules/", "bulmaselect/"], - - "parserOptions": { - "sourceType": "module", - "ecmaVersion": 2020 - }, - - "extends": ["eslint:recommended"], - - "rules": { - "arrow-parens": [1, "always"], - "block-spacing": [1, "always"], - "brace-style": [1, "1tbs", { "allowSingleLine": true }], - "comma-dangle": [1, "always-multiline"], - "comma-spacing": [1, { "before": false, "after": true }], - "comma-style": [1, "last"], - "computed-property-spacing": [1, "never"], - "consistent-this": [1, "self"], - "eol-last": 1, - "eqeqeq": [1, "smart"], - "no-inline-comments": 1, - "jsx-quotes": [1, "prefer-double"], - "lines-around-comment": [1, { "beforeBlockComment": false }], - "max-depth": [1, 8], - "max-nested-callbacks": [1, 8], - "new-parens": 1, - "no-array-constructor": 1, - "no-lonely-if": 1, - "no-mixed-spaces-and-tabs": 1, - "no-multiple-empty-lines": 1, - "no-new-object": 1, - "no-spaced-func": 1, - "no-trailing-spaces": 1, - "no-return-await": 1, - "no-undef": 0, - "no-unneeded-ternary": 1, - "no-var": 1, - "object-curly-spacing": [1, "always"], - "operator-linebreak": [1, "after"], - "padded-blocks": [1, "never"], - "prefer-const": ["error", { "destructuring": "any", "ignoreReadBeforeAssign": false }], - "prettier/prettier": 1, - "quotes": [1, "double", { "avoidEscape": true, "allowTemplateLiterals": false }], - "quote-props": [1, "consistent-as-needed"], - "semi": [1, "always"], - "semi-spacing": [1, { "before": false, "after": true }], - "space-before-blocks": [1, "always"], - "space-in-parens": [1, "never"], - "space-infix-ops": [1, { "int32Hint": true }], - "spaced-comment": [1, "always"], - "sort-imports": [ - "warn", - { - "ignoreCase": false, - "ignoreDeclarationSort": true, - "ignoreMemberSort": false, - "memberSyntaxSortOrder": ["none", "all", "multiple", "single"], - "allowSeparatedGroups": false - } - ] - }, - - // Typescript overrides - "overrides": [ + "env": { + "es6": true, + "amd": true, + "browser": true + }, + + "root": true, + "ignorePatterns": ["docs/", "dist/", "out/", "rethinkdb_data/", "node_modules/", "bulmaselect/"], + + "parserOptions": { + "sourceType": "module", + "ecmaVersion": 2020 + }, + + "extends": ["eslint:recommended"], + + "rules": { + "arrow-parens": [1, "always"], + "block-spacing": [1, "always"], + "brace-style": [1, "1tbs", { "allowSingleLine": true }], + "comma-dangle": [1, "always-multiline"], + "comma-spacing": [1, { "before": false, "after": true }], + "comma-style": [1, "last"], + "computed-property-spacing": [1, "never"], + "consistent-this": [1, "self"], + "eol-last": 1, + "eqeqeq": [1, "smart"], + "no-inline-comments": 1, + "jsx-quotes": [1, "prefer-double"], + "lines-around-comment": [1, { "beforeBlockComment": false }], + "max-depth": [1, 8], + "max-nested-callbacks": [1, 8], + "new-parens": 1, + "no-array-constructor": 1, + "no-lonely-if": 1, + "no-mixed-spaces-and-tabs": 1, + "no-multiple-empty-lines": 1, + "no-new-object": 1, + "no-spaced-func": 1, + "no-trailing-spaces": 1, + "no-return-await": 1, + "no-undef": 0, + "no-unneeded-ternary": 1, + "no-var": 1, + "object-curly-spacing": [1, "always"], + "operator-linebreak": [1, "after"], + "padded-blocks": [1, "never"], + "prefer-const": ["error", { "destructuring": "any", "ignoreReadBeforeAssign": false }], + "quotes": [1, "double", { "avoidEscape": true, "allowTemplateLiterals": false }], + "quote-props": [1, "consistent-as-needed"], + "semi": [1, "always"], + "semi-spacing": [1, { "before": false, "after": true }], + "space-before-blocks": [1, "always"], + "space-in-parens": [1, "never"], + "space-infix-ops": [1, { "int32Hint": true }], + "spaced-comment": [1, "always"], + "sort-imports": [ + "warn", { - "files": ["*.ts", "*.tsx"], - "parser": "@typescript-eslint/parser", - "plugins": ["@typescript-eslint"], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/eslint-recommended", - "plugin:@typescript-eslint/recommended" - ], - - // Enable if you need jsx support - // "parserOptions": { - // "ecmaFeatures": { "jsx": true } - // }, - - "rules": { - "semi": "off", - "@typescript-eslint/no-unused-vars": "error", - "@typescript-eslint/member-delimiter-style": "error", - "@typescript-eslint/member-ordering": "error", - "@typescript-eslint/type-annotation-spacing": "error", - "@typescript-eslint/semi": [1, "always"], - "@typescript-eslint/no-explicit-any": 0, - "@typescript-eslint/no-var-requires": 0, - "@typescript-eslint/explicit-module-boundary-types": "off", - "@typescript-eslint/ban-ts-comment": "off", - "@typescript-eslint/no-empty-function": "off", - "@typescript-eslint/naming-convention": [ - "warn", - { "selector": "default", "format": ["camelCase"] }, - { "selector": "variableLike", "format": ["camelCase"] }, - { "selector": "variable", "format": ["camelCase", "UPPER_CASE", "PascalCase"] }, - { "selector": "parameter", "format": ["camelCase"], "leadingUnderscore": "allow" }, - { "selector": "memberLike", "format": ["camelCase"] }, - { "selector": "memberLike", "modifiers": ["private"], "format": ["camelCase"], "leadingUnderscore": "require" }, - { "selector": "typeLike", "format": null }, - { "selector": "typeAlias", "format": null }, - { "selector": "typeProperty", "format": null }, - { "selector": "typeParameter", "format": ["PascalCase"], "prefix": ["T"] }, - { "selector": "interface", "format": ["PascalCase"], "custom": { "regex": "^I[A-Z]", "match": false } }, - { "selector": "objectLiteralProperty", "format": null }, - { "selector": "enumMember", "format": ["UPPER_CASE"] } - ] - } + "ignoreCase": false, + "ignoreDeclarationSort": true, + "ignoreMemberSort": false, + "memberSyntaxSortOrder": ["none", "all", "multiple", "single"], + "allowSeparatedGroups": false } ] - } - \ No newline at end of file + }, + + // Typescript overrides + "overrides": [ + { + "files": ["*.ts", "*.tsx"], + "parser": "@typescript-eslint/parser", + "plugins": ["@typescript-eslint"], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], + + // Enable if you need jsx support + // "parserOptions": { + // "ecmaFeatures": { "jsx": true } + // }, + + "rules": { + "semi": "off", + "@typescript-eslint/no-unused-vars": "error", + "@typescript-eslint/member-delimiter-style": "error", + "@typescript-eslint/member-ordering": "error", + "@typescript-eslint/type-annotation-spacing": "error", + "@typescript-eslint/semi": [1, "always"], + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-var-requires": 0, + "@typescript-eslint/explicit-module-boundary-types": "off", + "@typescript-eslint/ban-ts-comment": "off", + "@typescript-eslint/no-empty-function": "off", + "@typescript-eslint/naming-convention": [ + "warn", + { "selector": "default", "format": ["camelCase"] }, + { "selector": "variableLike", "format": ["camelCase"] }, + { "selector": "variable", "format": ["camelCase", "UPPER_CASE", "PascalCase"] }, + { "selector": "parameter", "format": ["camelCase"], "leadingUnderscore": "allow" }, + { "selector": "memberLike", "format": ["camelCase"] }, + { "selector": "memberLike", "modifiers": ["private"], "format": ["camelCase"], "leadingUnderscore": "require" }, + { "selector": "typeLike", "format": null }, + { "selector": "typeAlias", "format": null }, + { "selector": "typeProperty", "format": null }, + { "selector": "typeParameter", "format": ["PascalCase"], "prefix": ["T"] }, + { "selector": "interface", "format": ["PascalCase"], "custom": { "regex": "^I[A-Z]", "match": false } }, + { "selector": "objectLiteralProperty", "format": null }, + { "selector": "enumMember", "format": ["UPPER_CASE"] } + ] + } + } + ] +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 75c5360..fa2d468 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,6 +31,7 @@ "@types/express": "^4.17.14", "eslint": "8.25.0", "eslint-config-next": "12.3.1", + "eslint-config-prettier": "^8.5.0", "typescript": "^4.8.4" } }, @@ -1587,6 +1588,18 @@ } } }, + "node_modules/eslint-config-prettier": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", + "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, "node_modules/eslint-import-resolver-node": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", @@ -5671,6 +5684,13 @@ "eslint-plugin-react-hooks": "^4.5.0" } }, + "eslint-config-prettier": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", + "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", + "dev": true, + "requires": {} + }, "eslint-import-resolver-node": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", diff --git a/package.json b/package.json index 4553fb5..04e1166 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@types/express": "^4.17.14", "eslint": "8.25.0", "eslint-config-next": "12.3.1", + "eslint-config-prettier": "^8.5.0", "typescript": "^4.8.4" }, "dependencies": {