Merge branch 'main' into releases/v1

xt0rted · Feb 25, 2021 · 23938e5 · 23938e5
2 parents b5de3d0 + 08cc491
commit 23938e5
Show file tree

Hide file tree

Showing 13 changed files with 1,278 additions and 1,585 deletions.
diff --git a/.eslintrc.js b/.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"],
       },
     },

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+version: 2
+updates:
+
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 99
+
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 99
+    versioning-strategy: increase
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,27 +4,27 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node: [12, 13]
+        node: [12, 14]
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v2.3.4
 
       - name: Install node
-        uses: actions/setup-node@v1.3.0
+        uses: actions/setup-node@v2.1.4
         with:
           node-version: ${{ matrix.node }}
 
-      - run: npm ci
+      - run: yarn install
 
-      - run: npm test
+      - run: yarn test
 
-      - run: npm run build
+      - run: yarn run build
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -10,6 +10,6 @@ jobs:
 
     steps:
       - name: Block Autosquash Commits
-        uses: xt0rted/block-autosquash-commits-action@v2.0.0
+        uses: xt0rted/block-autosquash-commits-action@v2.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
-## Unreleased
+## Version 1.1.0
+
+- 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
 

diff --git a/README.md b/README.md
@@ -1,9 +1,8 @@
 # GitHub Action for dotnet-format
 
 [![CI Workflow Status](https://github.com/xt0rted/dotnet-format/workflows/CI/badge.svg)](https://github.com/xt0rted/dotnet-format/actions?query=workflow%3ACI)
-[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=xt0rted/dotnet-format)](https://dependabot.com)
 
-Run `dotnet-format` as part of your workflow to report formatting errors or auto fix violations as part of your pull request workflow.
+Run [dotnet-format](https://github.com/dotnet/format) as part of your workflow to report formatting errors or auto fix violations as part of your pull request workflow.
 
 ## Usage