Merge pull request #151 from xt0rted/eslint-update

Update eslint to v7

.eslintrc.js

@@ -16,10 +16,47 @@ module.exports = {
   rules: {
     "array-bracket-spacing": "error",
     "comma-dangle": ["error", "always-multiline"],
+    eqeqeq: ["error", "smart"],
     indent: ["error", 2],
+    "object-curly-newline": ["error", {
+      ExportDeclaration: {
+        multiline: true,
+        minProperties: 2,
+      },
+      ImportDeclaration: {
+        multiline: true,
+        minProperties: 2,
+      },
+      ObjectExpression: {
+        multiline: true,
+        minProperties: 2,
+      },
+      ObjectPattern: { consistent: true },
+    }],
     "object-shorthand": "error",
     quotes: ["error", "double"],
+    "quote-props": ["error", "as-needed"],
     semi: "error",
+    // strings
+    "no-nonoctal-decimal-escape": "error",
+    // variables
+    "no-const-assign": "error",
+    "no-var": "error",
+    "prefer-const": "error",
+    // arrow functions
+    "arrow-body-style": ["error", "as-needed"],
+    "arrow-parens": ["error", "always"],
+    "arrow-spacing": ["error", {
+      before: true, after: true,
+    }],
+    "implicit-arrow-linebreak": ["error", "beside"],
+    "prefer-arrow-callback": "error",
+    // classes
+    "class-methods-use-this": "error",
+    "no-dupe-class-members": "error",
+    "no-useless-constructor": "error",
+    // modules
+    "no-duplicate-imports": ["error", { includeExports: true }],
   },
   overrides: [
     {
@@ -35,15 +72,43 @@ module.exports = {
         camelcase: "off",
         indent: "off",
         quotes: "off",
-        "@typescript-eslint/camelcase": ["error", {
-          properties: "always",
-          genericType: "always",
-          ignoreDestructuring: false,
-          allow: [
-            "pull_number",
-          ],
-        }],
         "@typescript-eslint/indent": ["error", 2],
+        "@typescript-eslint/naming-convention": [
+          "error",
+          // eslint defaults
+          {
+            selector: "default",
+            format: ["camelCase"],
+          },
+          {
+            selector: "variable",
+            format: ["camelCase", "UPPER_CASE"],
+          },
+          {
+            selector: "parameter",
+            format: ["camelCase"],
+            leadingUnderscore: "allow",
+          },
+          {
+            selector: "memberLike",
+            modifiers: ["private"],
+            format: ["camelCase"],
+            leadingUnderscore: "require",
+          },
+          {
+            selector: "typeLike",
+            format: ["PascalCase"],
+          },
+          // project specific settings
+          {
+            selector: "enumMember",
+            format: ["StrictPascalCase"],
+          },
+          {
+            selector: "property",
+            format: null,
+          },
+        ],
         "@typescript-eslint/quotes": ["error", "double"],
       },
     },

CHANGELOG.md

@@ -5,6 +5,10 @@
 - Bumped `@actions/core` from 1.2.3 to 1.2.6
 - Bumped `@actions/exec` from 1.0.3 to 1.0.4
 - Bumped `@actions/github` from 2.1.1 to 4.0.0
+- Bumped `@typescript-eslint/eslint-plugin` from 2.34.0 to 4.15.2
+- Bumped `@typescript-eslint/parser` from 2.34.0 to 4.15.2
+- Bumped  `eslint` from 6.8.0 to 7.22.0
+- Adjusted eslint rules and fixed any violations
 
 ## Version 1.0.1
 

package.json

@@ -29,10 +29,10 @@
   },
   "devDependencies": {
     "@types/node": "^14.14.31",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.34.0",
+    "@typescript-eslint/eslint-plugin": "^4.15.2",
+    "@typescript-eslint/parser": "^4.15.2",
     "@zeit/ncc": "^0.22.3",
-    "eslint": "^6.8.0",
+    "eslint": "^7.20.0",
     "typescript": "^4.2.2"
   }
 }

src/actions.ts

@@ -1,4 +1,7 @@
-import { getInput, setOutput } from "@actions/core";
+import {
+  getInput,
+  setOutput,
+} from "@actions/core";
 
 import { format } from "./dotnet";
 

src/dotnet.ts

@@ -1,4 +1,8 @@
-import { debug, info, warning } from "@actions/core";
+import {
+  debug,
+  info,
+  warning,
+} from "@actions/core";
 import { exec } from "@actions/exec";
 import { context } from "@actions/github";
 import { which } from "@actions/io";
@@ -27,9 +31,7 @@ function formatOnlyChangedFiles(onlyChangedFiles: boolean): boolean {
 }
 
 export async function format(options: FormatOptions): Promise<boolean> {
-  const execOptions: ExecOptions = {
-    ignoreReturnCode: true,
-  };
+  const execOptions: ExecOptions = { ignoreReturnCode: true };
 
   const dotnetFormatOptions = ["format", "--check"];
 

src/files.ts

@@ -1,33 +1,36 @@
 import { extname } from "path";
 
 import { getInput } from "@actions/core";
-import { context, getOctokit } from "@actions/github";
+import {
+  context,
+  getOctokit,
+} from "@actions/github";
 
-enum fileStatus {
+enum FileStatus {
   /**
    * The file was added.
    */
-  added = "added",
+  Added = "added",
 
   /**
    * The mode of the file was changed or there are unknown changes because the diff was truncated.
    */
-  changed = "changed",
+  Changed = "changed",
 
   /**
    * The content of the file was modified.
    */
-  modified = "modified",
+  Modified = "modified",
 
   /**
    * The file was removed.
    */
-  removed = "removed",
+  Removed = "removed",
 
   /**
    * The file was renamed.
    */
-  renamed = "renamed",
+  Renamed = "renamed",
 }
 
 const fileTypes = [
@@ -49,7 +52,7 @@ export async function getPullRequestFiles(): Promise<string[]> {
   });
 
   return files
-    .filter(file => file.status !== fileStatus.removed)
-    .filter(file => fileTypes.includes(extname(file.filename)))
-    .map(file => file.filename);
+    .filter((file) => file.status !== FileStatus.Removed)
+    .filter((file) => fileTypes.includes(extname(file.filename)))
+    .map((file) => file.filename);
 }

src/main.ts

@@ -1,6 +1,12 @@
-import { getInput, setFailed } from "@actions/core";
+import {
+  getInput,
+  setFailed,
+} from "@actions/core";
 
-import { check, fix } from "./actions";
+import {
+  check,
+  fix,
+} from "./actions";
 
 export async function run(): Promise<void> {
   try {
@@ -19,9 +25,12 @@ export async function run(): Promise<void> {
         throw Error(`Unsupported action "${action}"`);
     }
   } catch (error) {
-    setFailed(error.message);
-    throw error;
+    if (error instanceof Error) {
+      setFailed(error.message);
+    } else {
+      throw error;
+    }
   }
 }
 
-run();
+void run();