JamesIves · JamesIves · May 10, 2021 · Apr 4, 2021 · Apr 6, 2021 · Apr 6, 2021
@@ -1,17 +1,15 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node
 {
-	"name": "Node.js & TypeScript",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": { 
-			"VARIANT": "12"
-		}
-	},
-	"settings": { 
-		"terminal.integrated.shell.linux": "/bin/bash"
-	},
-	"extensions": [
-		"dbaeumer.vscode-eslint"
-	],
-	"remoteUser": "node"
+  "name": "Node.js & TypeScript",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "args": {
+      "VARIANT": "12"
+    }
+  },
+  "settings": {
+    "terminal.integrated.shell.linux": "/bin/bash"
+  },
+  "extensions": ["dbaeumer.vscode-eslint"],
+  "remoteUser": "node"
 }
@@ -1,6 +1,10 @@
 {
-  "plugins": ["jest", "@typescript-eslint", "github"],
-  "extends": ["plugin:github/recommended"],
+  "plugins": ["jest", "@typescript-eslint"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended"
+  ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaVersion": 9,
@@ -10,57 +14,61 @@
   "globals": {
     "fetch": true
   },
+  "env": {
+    "node": true,
+    "es6": true,
+    "jest/globals": true
+  },
   "rules": {
-    "eslint-comments/no-use": "off",
-    "import/no-namespace": "off",
-    "no-unused-vars": "off",
-    "@typescript-eslint/no-unused-vars": "error",
-    "@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
-    "@typescript-eslint/no-require-imports": "error",
-    "@typescript-eslint/array-type": "error",
-    "@typescript-eslint/await-thenable": "error",
-    "@typescript-eslint/ban-ts-comment": "error",
-    "camelcase": "off",
-    "@typescript-eslint/naming-convention": [
+    "@typescript-eslint/ban-types": [
       "error",
       {
-        "selector": "default",
-        "format": ["camelCase", "UPPER_CASE", "StrictPascalCase"]
+        "types": {
+          "Number": {
+            "message": "Use number instead",
+            "fixWith": "number"
+          },
+          "String": {
+            "message": "Use string instead",
+            "fixWith": "string"
+          },
+          "Boolean": {
+            "message": "Use boolean instead",
+            "fixWith": "boolean"
+          },
+          "Object": {
+            "message": "Use object instead",
+            "fixWith": "object"
+          },
+          "{}": {
+            "message": "Use object instead",
+            "fixWith": "object"
+          },
+          "Symbol": {
+            "message": "Use symbol instead",
+            "fixWith": "symbol"
+          }
+        }
       }
     ],
-    "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-    "@typescript-eslint/func-call-spacing": ["error", "never"],
-    "@typescript-eslint/no-array-constructor": "error",
-    "@typescript-eslint/no-empty-interface": "error",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-extraneous-class": "error",
-    "@typescript-eslint/no-for-in-array": "error",
-    "@typescript-eslint/no-inferrable-types": "error",
-    "@typescript-eslint/no-misused-new": "error",
-    "@typescript-eslint/no-namespace": "error",
-    "@typescript-eslint/no-non-null-assertion": "warn",
-    "@typescript-eslint/no-unnecessary-qualifier": "error",
-    "@typescript-eslint/no-unnecessary-type-assertion": "error",
-    "@typescript-eslint/no-useless-constructor": "error",
-    "@typescript-eslint/no-var-requires": "error",
-    "@typescript-eslint/prefer-for-of": "warn",
-    "@typescript-eslint/prefer-function-type": "warn",
-    "@typescript-eslint/prefer-includes": "error",
-    "@typescript-eslint/prefer-string-starts-ends-with": "error",
-    "@typescript-eslint/promise-function-async": "error",
-    "@typescript-eslint/require-array-sort-compare": "error",
-    "@typescript-eslint/restrict-plus-operands": "error",
-    "semi": "off",
-    "@typescript-eslint/semi": ["error", "never"],
-    "@typescript-eslint/type-annotation-spacing": "error",
-    "@typescript-eslint/unbound-method": "error",
-    "no-console": "off",
-    "no-shadow": "off", // replaced by ts-eslint rule below
-    "@typescript-eslint/no-shadow": "error"
+    "@typescript-eslint/array-type": ["error", {"default": "array"}],
+    "@typescript-eslint/explicit-module-boundary-types": "error",
+    "@typescript-eslint/no-explicit-any": "error",
+    "@typescript-eslint/no-unused-vars": "error",
+    "@typescript-eslint/explicit-function-return-type": "error",
+    "object-shorthand": ["error", "always"],
+    "prefer-destructuring": [
+      "error",
+      {
+        "array": false,
+        "object": true
       },
-  "env": {
-    "node": true,
-    "es6": true,
-    "jest/globals": true
+      {
+        "enforceForRenamedProperties": false
+      }
+    ],
+    "no-console": ["error", {"allow": ["warn", "error"]}],
+    "no-alert": "error",
+    "no-debugger": "error"
   }
 }
@@ -2,20 +2,23 @@
 name: Bug Report
 about: Create a bug report to help us improve the action.
 labels:
-  - bug
-
+  - triage ⚠️
 ---
 
 <!-- Please check the Q&A before posting an issue: https://github.com/JamesIves/github-pages-deploy-action/discussions?discussions_q=category%3AQ%26A -->
 
 ## Describe the bug
+
 <!-- Please provide a clear and concise description of what the bug is. -->
 
 ## Reproduction Steps
+
 <!-- Steps to reproduce the behavior. -->
 
 ## Logs
+
 <!-
F438
- Please provide your deployment logs and a link or sample to/of your workflow. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again. -->
 
 ## Additional Comments
+
 <!--Add any other context about the problem here. -->
@@ -3,8 +3,7 @@ contact_links:
   - name: Feature Request and Ideas
     url: https://github.com/JamesIves/github-pages-deploy-action/discussions?discussions_q=category%3AIdeas
     about: If you have an idea or would like to make a feature request please open a discussion thread.
-    
+
   - name: Support and Questions
     url: https://github.com/JamesIves/github-pages-deploy-action/discussions?discussions_q=category%3AQ%26A
     about: Need help or just have a general question? Please open a discussion thread.
-
@@ -1,8 +1,11 @@
 ## Description
+
 <!-- Provide a description of what your changes do. -->
 
 ## Testing Instructions
+
 <!-- Give us step by step instructions on how to test your changes. -->
 
 ## Additional Notes
+
 <!-- Anything else that will help us test the pull request. -->
@@ -1,8 +1,8 @@
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "10:00"
-  open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: '/'
+    schedule:
+      interval: daily
+      time: '10:00'
+    open-pull-requests-limit: 10
@@ -72,8 +72,8 @@ jobs:
     needs: build
     strategy:
       matrix:
-        branch: ["gh-pages", "no-pages"]
-        commit: ["singleCommit", "add commits"]
+        branch: ['gh-pages', 'no-pages']
+        commit: ['singleCommit', 'add commits']
       max-parallel: 1
     steps:
       - name: Checkout
@@ -120,7 +120,7 @@ jobs:
         if: ${{ matrix.branch == 'gh-pages' }}
         with:
           folder: integration
-          branch: ${{ matrix.branch }} 
+          branch: ${{ matrix.branch }}
           single-commit: ${{ matrix.commit == 'singleCommit' }}
           dry-run: true
 

@@ -1,4 +1,4 @@
-name: "CodeQL"
+name: 'CodeQL'
 on:
   push:
     branches:
@@ -18,14 +18,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
 
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
@@ -18,4 +18,4 @@ jobs:
           branch: releases/v4
           folder: .
           clean: false
-          single-commit: true
+          single-commit: true
@@ -34,7 +34,7 @@ jobs:
           single-commit: true
           clean: true
           silent: true
-          
+
   # Deploys using checkout@v1 with an ACCESS_TOKEN.
   integration-checkout-v1:
     needs: integration-cross-repo-push
@@ -84,7 +84,6 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branches: gh-pages
 
-
   # Deploys using a container that requires you to install rsync.
   integration-container:
     needs: integration-checkout-v2
@@ -172,7 +171,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branches: gh-pages
 
-  # Deploys using a custom env.
+  # Deploys using a custom env. (Includes subsequent commit)
   integration-env:
     needs: integration-ssh-third-party-client
     runs-on: ubuntu-latest
@@ -195,6 +194,15 @@ jobs:
           target-folder: cat/montezuma4
           silent: true
 
+      - name: Build and Deploy
+        uses: JamesIves/github-pages-deploy-action@releases/v4
+        with:
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
+          branch: gh-pages
+          folder: integration
+          target-folder: cat/subsequent
+          silent: true
+
       - name: Cleanup Generated Branch
         uses: dawidd6/action-delete-branch@v2.0.1
         with:
@@ -203,7 +211,15 @@ jobs:
 
   # Deploys using the CLEAN option.
   integration-clean:
-    needs: [integration-checkout-v1, integration-checkout-v2, integration-container, integration-ssh, integration-ssh-third-party-client, integration-env]
+    needs:
+      [
+        integration-checkout-v1,
+        integration-checkout-v2,
+        integration-container,
+        integration-ssh,
+        integration-ssh-third-party-client,
+        integration-env
+      ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -220,7 +236,7 @@ jobs:
           clean: true
           silent: true
 
-  # Deploys to a branch that doesn't exist with SINGLE_COMMIT.
+  # Deploys to a branch that doesn't exist with SINGLE_COMMIT. (Includes subsequent commit)
   integration-branch-creation:
     needs: integration-clean
     runs-on: ubuntu-latest
@@ -239,6 +255,16 @@ jobs:
           single-commit: true
           silent: true
 
+      - name: Build and Deploy
+        uses: JamesIves/github-pages-deploy-action@releases/v4
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+          branch: integration-test-delete-prod
+          folder: integration
+          single-commit: true
+          target-folder: jives
+          silent: true
+
       - name: Cleanup Generated Branch
         uses: dawidd6/action-delete-branch@v2.0.1
         with:

@@ -24,7 +24,7 @@ jobs:
         run: npm install -g yarn
 
       - name: Clobber lib
-        run:  rm -rf lib
+        run: rm -rf lib
 
       - name: Set up .gitignore
         run: |