From 2e66b836fc01bca39c9bd4f244c9b883fc1c7d59 Mon Sep 17 00:00:00 2001
From: James Ives
Date: Sun, 4 Apr 2021 17:10:20 +0000
Subject: [PATCH 01/45] =?UTF-8?q?Release=204.1.1=20=F0=9F=93=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 8f4c3b30..8192b0e1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "@jamesives/github-pages-deploy-action",
"description": "GitHub action for building a project and deploying it to GitHub pages.",
"author": "James Ives (https://jamesiv.es)",
- "version": "4.1.0",
+ "version": "4.1.1",
"license": "MIT",
"main": "lib/lib.js",
"types": "lib/lib.d.ts",
From ca4a797d206d5932174eaa3c6dcf0a649b32e7be Mon Sep 17 00:00:00 2001
From: James Ives
Date: Mon, 5 Apr 2021 21:42:29 -0400
Subject: [PATCH 02/45] Version README -> 4.1.1
---
README.md | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index cd3ce2af..060ec33f 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ jobs:
npm run build
- name: Deploy π
- uses: JamesIves/github-pages-deploy-action@4.1.0
+ uses: JamesIves/github-pages-deploy-action@4.1.1
with:
branch: gh-pages # The branch the action should deploy to.
folder: build # The folder the action should deploy.
@@ -178,7 +178,7 @@ With this configured you can then set the `ssh-key` part of the action to your p
```yml
- name: Deploy π
- uses: JamesIves/github-pages-deploy-action@4.1.0
+ uses: JamesIves/github-pages-deploy-action@4.1.1
with:
branch: gh-pages
folder: site
@@ -207,7 +207,7 @@ jobs:
npm run build
- name: Deploy π
- uses: JamesIves/github-pages-deploy-action@4.1.0
+ uses: JamesIves/github-pages-deploy-action@4.1.1
with:
branch: gh-pages
folder: build
@@ -274,7 +274,7 @@ jobs:
name: site
- name: Deploy π
- uses: JamesIves/github-pages-deploy-action@4.1.0
+ uses: JamesIves/github-pages-deploy-action@4.1.1
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages
@@ -296,7 +296,7 @@ If you use a [container](https://help.github.com/en/actions/automating-your-work
apt-get update && apt-get install -y rsync
- name: Deploy π
- uses: JamesIves/github-pages-deploy-action@4.1.0
+ uses: JamesIves/github-pages-deploy-action@4.1.1
```
---
@@ -327,7 +327,7 @@ jobs:
npm run build
- name: Deploy π
- uses: JamesIves/github-pages-deploy-action@4.1.0
+ uses: JamesIves/github-pages-deploy-action@4.1.1
with:
branch: gh-pages
folder: build
From da31dcd7321b5c2f42d16a771e97912a11bcc658 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 21:51:35 -0400
Subject: [PATCH 03/45] Bump eslint-plugin-jest from 24.3.2 to 24.3.4 (#658)
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 24.3.2 to 24.3.4.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v24.3.2...v24.3.4)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 8192b0e1..d9782516 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"@types/node": "14.14.37",
"eslint": "7.23.0",
"eslint-plugin-github": "4.1.2",
- "eslint-plugin-jest": "24.3.2",
+ "eslint-plugin-jest": "24.3.4",
"eslint-plugin-prettier": "3.1.2",
"jest": "26.6.3",
"jest-circus": "26.6.3",
diff --git a/yarn.lock b/yarn.lock
index e3a10601..3e46013a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1525,9 +1525,9 @@ eslint-plugin-import@>=2.20.1:
resolve "^1.17.0"
tsconfig-paths "^3.9.0"
-eslint-plugin-jest@24.3.2:
- version "24.3.2"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.2.tgz#30a8b2dea6278d0da1d6fb9d6cd530aaf58050a1"
+eslint-plugin-jest@24.3.4:
+ version "24.3.4"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.4.tgz#6d90c3554de0302e879603dd6405474c98849f19"
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
From cda955df15e75166d6beb9f0c59b0eb5a49e1657 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 21:51:43 -0400
Subject: [PATCH 04/45] Bump @actions/io from 1.0.2 to 1.1.0 (#659)
Bumps [@actions/io](https://github.com/actions/toolkit/tree/HEAD/packages/io) from 1.0.2 to 1.1.0.
- [Release notes](https://github.com/actions/toolkit/releases)
- [Changelog](https://github.com/actions/toolkit/blob/main/packages/io/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/@actions/core@1.1.0/packages/io)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index d9782516..2284f7d4 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
"@actions/core": "1.2.6",
"@actions/exec": "1.0.4",
"@actions/github": "4.0.0",
- "@actions/io": "1.0.2"
+ "@actions/io": "1.1.0"
},
"devDependencies": {
"@types/jest": "26.0.22",
diff --git a/yarn.lock b/yarn.lock
index 3e46013a..936941ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27,9 +27,9 @@
dependencies:
tunnel "0.0.6"
-"@actions/io@1.0.2", "@actions/io@^1.0.1":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.0.2.tgz#2f614b6e69ce14d191180451eb38e6576a6e6b27"
+"@actions/io@1.1.0", "@actions/io@^1.0.1":
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.0.tgz#02c98b5ed93c3331981c9a075494066400eadb7a"
"@babel/code-frame@7.12.11", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
version "7.12.11"
From 59633914d617c8fd30588770a10d6b564f294b59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 22:07:08 -0400
Subject: [PATCH 05/45] Bump eslint-plugin-prettier from 3.1.2 to 3.3.1 (#660)
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.2 to 3.3.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.2...v3.3.1)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/package.json b/package.json
index 2284f7d4..fed449d0 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"eslint": "7.23.0",
"eslint-plugin-github": "4.1.2",
"eslint-plugin-jest": "24.3.4",
- "eslint-plugin-prettier": "3.1.2",
+ "eslint-plugin-prettier": "3.3.1",
"jest": "26.6.3",
"jest-circus": "26.6.3",
"prettier": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index 936941ed..0c6ca642 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1531,13 +1531,7 @@ eslint-plugin-jest@24.3.4:
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
-eslint-plugin-prettier@3.1.2:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz#432e5a667666ab84ce72f945c72f77d996a5c9ba"
- dependencies:
- prettier-linter-helpers "^1.0.0"
-
-eslint-plugin-prettier@>=3.1.2:
+eslint-plugin-prettier@3.3.1, eslint-plugin-prettier@>=3.1.2:
version "3.3.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
dependencies:
From 9457e13f3393392ad08f69a8f9d6f8ec7b6fb8e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Apr 2021 11:20:30 -0400
Subject: [PATCH 06/45] Bump eslint-plugin-github from 4.1.2 to 4.1.3 (#662)
Bumps [eslint-plugin-github](https://github.com/github/eslint-plugin-github) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/github/eslint-plugin-github/releases)
- [Commits](https://github.com/github/eslint-plugin-github/compare/v4.1.2...v4.1.3)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 100 ++++++++++++++++++++++++++++++++++++---------------
2 files changed, 72 insertions(+), 30 deletions(-)
diff --git a/package.json b/package.json
index fed449d0..451ff55c 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
"@types/jest": "26.0.22",
"@types/node": "14.14.37",
"eslint": "7.23.0",
- "eslint-plugin-github": "4.1.2",
+ "eslint-plugin-github": "4.1.3",
"eslint-plugin-jest": "24.3.4",
"eslint-plugin-prettier": "3.3.1",
"jest": "26.6.3",
diff --git a/yarn.lock b/yarn.lock
index 0c6ca642..34ee924a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -752,19 +752,31 @@
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/eslint-plugin@>=2.25.0":
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz#1a23d904bf8ea248d09dc3761af530d90f39c8fa"
+"@typescript-eslint/eslint-plugin@^4.20.0":
+ version "4.21.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.21.0.tgz#3fce2bfa76d95c00ac4f33dff369cb593aab8878"
dependencies:
- "@typescript-eslint/experimental-utils" "4.3.0"
- "@typescript-eslint/scope-manager" "4.3.0"
+ "@typescript-eslint/experimental-utils" "4.21.0"
+ "@typescript-eslint/scope-manager" "4.21.0"
debug "^4.1.1"
functional-red-black-tree "^1.0.1"
+ lodash "^4.17.15"
regexpp "^3.0.0"
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/experimental-utils@4.3.0", "@typescript-eslint/experimental-utils@^4.0.1":
+"@typescript-eslint/experimental-utils@4.21.0":
+ version "4.21.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.21.0.tgz#0b0bb7c15d379140a660c003bdbafa71ae9134b6"
+ dependencies:
+ "@types/json-schema" "^7.0.3"
+ "@typescript-eslint/scope-manager" "4.21.0"
+ "@typescript-eslint/types" "4.21.0"
+ "@typescript-eslint/typescript-estree" "4.21.0"
+ eslint-scope "^5.0.0"
+ eslint-utils "^2.0.0"
+
+"@typescript-eslint/experimental-utils@^4.0.1":
version "4.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87"
dependencies:
@@ -775,15 +787,22 @@
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
-"@typescript-eslint/parser@>=2.25.0":
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.3.0.tgz#684fc0be6551a2bfcb253991eec3c786a8c063a3"
+"@typescript-eslint/parser@^4.20.0":
+ version "4.21.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.21.0.tgz#a227fc2af4001668c3e3f7415d4feee5093894c1"
dependencies:
- "@typescript-eslint/scope-manager" "4.3.0"
- "@typescript-eslint/types" "4.3.0"
- "@typescript-eslint/typescript-estree" "4.3.0"
+ "@typescript-eslint/scope-manager" "4.21.0"
+ "@typescript-eslint/types" "4.21.0"
+ "@typescript-eslint/typescript-estree" "4.21.0"
debug "^4.1.1"
+"@typescript-eslint/scope-manager@4.21.0":
+ version "4.21.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.21.0.tgz#c81b661c4b8af1ec0c010d847a8f9ab76ab95b4d"
+ dependencies:
+ "@typescript-eslint/types" "4.21.0"
+ "@typescript-eslint/visitor-keys" "4.21.0"
+
"@typescript-eslint/scope-manager@4.3.0":
version "4.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7"
@@ -791,10 +810,26 @@
"@typescript-eslint/types" "4.3.0"
"@typescript-eslint/visitor-keys" "4.3.0"
+"@typescript-eslint/types@4.21.0":
+ version "4.21.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.21.0.tgz#abdc3463bda5d31156984fa5bc316789c960edef"
+
"@typescript-eslint/types@4.3.0":
version "4.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf"
+"@typescript-eslint/typescript-estree@4.21.0":
+ version "4.21.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.21.0.tgz#3817bd91857beeaeff90f69f1f112ea58d350b0a"
+ dependencies:
+ "@typescript-eslint/types" "4.21.0"
+ "@typescript-eslint/visitor-keys" "4.21.0"
+ debug "^4.1.1"
+ globby "^11.0.1"
+ is-glob "^4.0.1"
+ semver "^7.3.2"
+ tsutils "^3.17.1"
+
"@typescript-eslint/typescript-estree@4.3.0":
version "4.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8"
@@ -808,6 +843,13 @@
semver "^7.3.2"
tsutils "^3.17.1"
+"@typescript-eslint/visitor-keys@4.21.0":
+ version "4.21.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.21.0.tgz#990a9acdc124331f5863c2cf21c88ba65233cd8d"
+ dependencies:
+ "@typescript-eslint/types" "4.21.0"
+ eslint-visitor-keys "^2.0.0"
+
"@typescript-eslint/visitor-keys@4.3.0":
version "4.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0"
@@ -1486,28 +1528,28 @@ eslint-module-utils@^2.6.0:
debug "^2.6.9"
pkg-dir "^2.0.0"
-eslint-plugin-eslint-comments@>=3.0.1:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.2.tgz#4ef6c488dbe06aa1627fea107b3e5d059fc8a395"
+eslint-plugin-eslint-comments@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz#9e1cd7b4413526abb313933071d7aba05ca12ffa"
dependencies:
escape-string-regexp "^1.0.5"
ignore "^5.0.5"
-eslint-plugin-github@4.1.2:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/eslint-plugin-github/-/eslint-plugin-github-4.1.2.tgz#b2897af1398f8efaf9bc351a9f4dee98dc04fe04"
+eslint-plugin-github@4.1.3:
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-github/-/eslint-plugin-github-4.1.3.tgz#f84d2f7e848d38ba82eeadcb898328bd3d02e175"
dependencies:
- "@typescript-eslint/eslint-plugin" ">=2.25.0"
- "@typescript-eslint/parser" ">=2.25.0"
+ "@typescript-eslint/eslint-plugin" "^4.20.0"
+ "@typescript-eslint/parser" "^4.20.0"
eslint-config-prettier ">=8.0.0"
- eslint-plugin-eslint-comments ">=3.0.1"
- eslint-plugin-import ">=2.20.1"
- eslint-plugin-prettier ">=3.1.2"
+ eslint-plugin-eslint-comments "^3.2.0"
+ eslint-plugin-import "^2.22.1"
+ eslint-plugin-prettier "^3.3.1"
eslint-rule-documentation ">=1.0.0"
- prettier ">=1.12.0"
- svg-element-attributes ">=1.3.1"
+ prettier "^2.2.1"
+ svg-element-attributes "^1.3.1"
-eslint-plugin-import@>=2.20.1:
+eslint-plugin-import@^2.22.1:
version "2.22.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
dependencies:
@@ -1531,7 +1573,7 @@ eslint-plugin-jest@24.3.4:
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
-eslint-plugin-prettier@3.3.1, eslint-plugin-prettier@>=3.1.2:
+eslint-plugin-prettier@3.3.1, eslint-plugin-prettier@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
dependencies:
@@ -3300,7 +3342,7 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"
-prettier@2.2.1, prettier@>=1.12.0:
+prettier@2.2.1, prettier@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
@@ -3820,7 +3862,7 @@ supports-hyperlinks@^2.0.0:
has-flag "^4.0.0"
supports-color "^7.0.0"
-svg-element-attributes@>=1.3.1:
+svg-element-attributes@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/svg-element-attributes/-/svg-element-attributes-1.3.1.tgz#0c55afac6284291ab563d0913c062cf78a8c0ddb"
From a87cfcff78954c60ea0a23fe3fa4cf8cc5b2e3a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 10:26:52 -0400
Subject: [PATCH 07/45] Bump typescript from 4.2.3 to 4.2.4 (#663)
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.2.3 to 4.2.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/commits)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 451ff55c..742be0fd 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,6 @@
"prettier": "2.2.1",
"rimraf": "3.0.2",
"ts-jest": "26.5.4",
- "typescript": "4.2.3"
+ "typescript": "4.2.4"
}
}
diff --git a/yarn.lock b/yarn.lock
index 34ee924a..7543031d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4041,9 +4041,9 @@ typedarray-to-buffer@^3.1.5:
dependencies:
is-typedarray "^1.0.0"
-typescript@4.2.3:
- version "4.2.3"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
+typescript@4.2.4:
+ version "4.2.4"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
union-value@^1.0.0:
version "1.0.1"
From c053ad0315ac89ce5010ddc1b4ed35406d3cc146 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 07:31:38 -0400
Subject: [PATCH 08/45] Bump eslint-plugin-jest from 24.3.4 to 24.3.5 (#666)
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 24.3.4 to 24.3.5.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v24.3.4...v24.3.5)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 50 ++++----------------------------------------------
2 files changed, 5 insertions(+), 47 deletions(-)
diff --git a/package.json b/package.json
index 742be0fd..05241d30 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"@types/node": "14.14.37",
"eslint": "7.23.0",
"eslint-plugin-github": "4.1.3",
- "eslint-plugin-jest": "24.3.4",
+ "eslint-plugin-jest": "24.3.5",
"eslint-plugin-prettier": "3.3.1",
"jest": "26.6.3",
"jest-circus": "26.6.3",
diff --git a/yarn.lock b/yarn.lock
index 7543031d..bef5b71f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -765,7 +765,7 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/experimental-utils@4.21.0":
+"@typescript-eslint/experimental-utils@4.21.0", "@typescript-eslint/experimental-utils@^4.0.1":
version "4.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.21.0.tgz#0b0bb7c15d379140a660c003bdbafa71ae9134b6"
dependencies:
@@ -776,17 +776,6 @@
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
-"@typescript-eslint/experimental-utils@^4.0.1":
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87"
- dependencies:
- "@types/json-schema" "^7.0.3"
- "@typescript-eslint/scope-manager" "4.3.0"
- "@typescript-eslint/types" "4.3.0"
- "@typescript-eslint/typescript-estree" "4.3.0"
- eslint-scope "^5.0.0"
- eslint-utils "^2.0.0"
-
"@typescript-eslint/parser@^4.20.0":
version "4.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.21.0.tgz#a227fc2af4001668c3e3f7415d4feee5093894c1"
@@ -803,21 +792,10 @@
"@typescript-eslint/types" "4.21.0"
"@typescript-eslint/visitor-keys" "4.21.0"
-"@typescript-eslint/scope-manager@4.3.0":
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7"
- dependencies:
- "@typescript-eslint/types" "4.3.0"
- "@typescript-eslint/visitor-keys" "4.3.0"
-
"@typescript-eslint/types@4.21.0":
version "4.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.21.0.tgz#abdc3463bda5d31156984fa5bc316789c960edef"
-"@typescript-eslint/types@4.3.0":
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf"
-
"@typescript-eslint/typescript-estree@4.21.0":
version "4.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.21.0.tgz#3817bd91857beeaeff90f69f1f112ea58d350b0a"
@@ -830,19 +808,6 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/typescript-estree@4.3.0":
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8"
- dependencies:
- "@typescript-eslint/types" "4.3.0"
- "@typescript-eslint/visitor-keys" "4.3.0"
- debug "^4.1.1"
- globby "^11.0.1"
- is-glob "^4.0.1"
- lodash "^4.17.15"
- semver "^7.3.2"
- tsutils "^3.17.1"
-
"@typescript-eslint/visitor-keys@4.21.0":
version "4.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.21.0.tgz#990a9acdc124331f5863c2cf21c88ba65233cd8d"
@@ -850,13 +815,6 @@
"@typescript-eslint/types" "4.21.0"
eslint-visitor-keys "^2.0.0"
-"@typescript-eslint/visitor-keys@4.3.0":
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0"
- dependencies:
- "@typescript-eslint/types" "4.3.0"
- eslint-visitor-keys "^2.0.0"
-
abab@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
@@ -1567,9 +1525,9 @@ eslint-plugin-import@^2.22.1:
resolve "^1.17.0"
tsconfig-paths "^3.9.0"
-eslint-plugin-jest@24.3.4:
- version "24.3.4"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.4.tgz#6d90c3554de0302e879603dd6405474c98849f19"
+eslint-plugin-jest@24.3.5:
+ version "24.3.5"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.5.tgz#71f0b580f87915695c286c3f0eb88cf23664d044"
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
From 3415671756eada8f3cd777aac3a201f63b892316 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 07:31:45 -0400
Subject: [PATCH 09/45] Bump eslint from 7.23.0 to 7.24.0 (#667)
Bumps [eslint](https://github.com/eslint/eslint) from 7.23.0 to 7.24.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.23.0...v7.24.0)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 05241d30..509b9a16 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"devDependencies": {
"@types/jest": "26.0.22",
"@types/node": "14.14.37",
- "eslint": "7.23.0",
+ "eslint": "7.24.0",
"eslint-plugin-github": "4.1.3",
"eslint-plugin-jest": "24.3.5",
"eslint-plugin-prettier": "3.3.1",
diff --git a/yarn.lock b/yarn.lock
index bef5b71f..e0eadd0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1562,9 +1562,9 @@ eslint-visitor-keys@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
-eslint@7.23.0:
- version "7.23.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.23.0.tgz#8d029d252f6e8cf45894b4bee08f5493f8e94325"
+eslint@7.24.0:
+ version "7.24.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz#2e44fa62d93892bfdb100521f17345ba54b8513a"
dependencies:
"@babel/code-frame" "7.12.11"
"@eslint/eslintrc" "^0.4.0"
From 1867d1e4935ffa0ae4aa6342e60eb3a9edf5b0f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 10:34:23 -0400
Subject: [PATCH 10/45] Bump @actions/core from 1.2.6 to 1.2.7 (#669)
Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.2.6 to 1.2.7.
- [Release notes](https://github.com/actions/toolkit/releases)
- [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 509b9a16..4d0452fc 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
"deployment"
],
"dependencies": {
- "@actions/core": "1.2.6",
+ "@actions/core": "1.2.7",
"@actions/exec": "1.0.4",
"@actions/github": "4.0.0",
"@actions/io": "1.1.0"
diff --git a/yarn.lock b/yarn.lock
index e0eadd0f..452b7c4d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,9 +2,9 @@
# yarn lockfile v1
-"@actions/core@1.2.6":
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.6.tgz#a78d49f41a4def18e88ce47c2cac615d5694bf09"
+"@actions/core@1.2.7":
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.7.tgz#594f8c45b213f0146e4be7eda8ae5cf4e198e5ab"
"@actions/exec@1.0.4":
version "1.0.4"
From 46b21812b4aed6b0a99c8f22306bae015fd4298c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 10:34:32 -0400
Subject: [PATCH 11/45] Bump @types/node from 14.14.37 to 14.14.39 (#670)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.37 to 14.14.39.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 4d0452fc..418c6de5 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"devDependencies": {
"@types/jest": "26.0.22",
- "@types/node": "14.14.37",
+ "@types/node": "14.14.39",
"eslint": "7.24.0",
"eslint-plugin-github": "4.1.3",
"eslint-plugin-jest": "24.3.5",
diff --git a/yarn.lock b/yarn.lock
index 452b7c4d..e5cd30ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -726,9 +726,9 @@
version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-"@types/node@*", "@types/node@14.14.37", "@types/node@>= 8":
- version "14.14.37"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
+"@types/node@*", "@types/node@14.14.39", "@types/node@>= 8":
+ version "14.14.39"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.39.tgz#9ef394d4eb52953d2890e4839393c309aa25d2d1"
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
From 15a9f0aca26595c9d07459373fe45a5eb72452f2 Mon Sep 17 00:00:00 2001
From: Lambert Schulze
Date: Fri, 16 Apr 2021 21:43:29 +0200
Subject: [PATCH 12/45] changed branch master to main (#676)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 060ec33f..6ee4c031 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ If you'd like to make it so the workflow only triggers on push events to specifi
on:
push:
branches:
- - master
+ - main
```
It's recommended that you use [Dependabot](https://dependabot.com/github-actions/) to keep your workflow up-to-date. You can find the latest tagged version on the [GitHub Marketplace](https://github.com/marketplace/actions/deploy-to-github-pages) or on the [releases page](https://github.com/JamesIves/github-pages-deploy-action/releases).
From 013466abccebe76fa506e43303e3041ca2e9ee20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 15:45:47 -0400
Subject: [PATCH 13/45] Bump eslint-plugin-prettier from 3.3.1 to 3.4.0 (#671)
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.3.1 to 3.4.0.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/commits)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 418c6de5..ea1308b1 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"eslint": "7.24.0",
"eslint-plugin-github": "4.1.3",
"eslint-plugin-jest": "24.3.5",
- "eslint-plugin-prettier": "3.3.1",
+ "eslint-plugin-prettier": "3.4.0",
"jest": "26.6.3",
"jest-circus": "26.6.3",
"prettier": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index e5cd30ab..351fac72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1531,9 +1531,9 @@ eslint-plugin-jest@24.3.5:
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
-eslint-plugin-prettier@3.3.1, eslint-plugin-prettier@^3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
+eslint-plugin-prettier@3.4.0, eslint-plugin-prettier@^3.3.1:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"
dependencies:
prettier-linter-helpers "^1.0.0"
From ce7c6d03249933c6858ef5f56ebeef195caac8e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 15:45:54 -0400
Subject: [PATCH 14/45] Bump @types/node from 14.14.39 to 14.14.41 (#673)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.39 to 14.14.41.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index ea1308b1..5ace215c 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"devDependencies": {
"@types/jest": "26.0.22",
- "@types/node": "14.14.39",
+ "@types/node": "14.14.41",
"eslint": "7.24.0",
"eslint-plugin-github": "4.1.3",
"eslint-plugin-jest": "24.3.5",
diff --git a/yarn.lock b/yarn.lock
index 351fac72..61039da0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -726,9 +726,9 @@
version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-"@types/node@*", "@types/node@14.14.39", "@types/node@>= 8":
- version "14.14.39"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.39.tgz#9ef394d4eb52953d2890e4839393c309aa25d2d1"
+"@types/node@*", "@types/node@14.14.41", "@types/node@>= 8":
+ version "14.14.41"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.41.tgz#d0b939d94c1d7bd53d04824af45f1139b8c45615"
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
From 7e40b83dc23ffc53e223142b565a44ef4a793313 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 15:46:00 -0400
Subject: [PATCH 15/45] Bump ts-jest from 26.5.4 to 26.5.5 (#674)
Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 26.5.4 to 26.5.5.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kulshekhar/ts-jest/compare/v26.5.4...v26.5.5)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 5ace215c..ab684b86 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
"jest-circus": "26.6.3",
"prettier": "2.2.1",
"rimraf": "3.0.2",
- "ts-jest": "26.5.4",
+ "ts-jest": "26.5.5",
"typescript": "4.2.4"
}
}
diff --git a/yarn.lock b/yarn.lock
index 61039da0..d4725344 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3917,9 +3917,9 @@ tr46@^2.0.0:
dependencies:
punycode "^2.1.1"
-ts-jest@26.5.4:
- version "26.5.4"
- resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.4.tgz#207f4c114812a9c6d5746dd4d1cdf899eafc9686"
+ts-jest@26.5.5:
+ version "26.5.5"
+ resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.5.tgz#e40481b6ee4dd162626ba481a2be05fa57160ea5"
dependencies:
bs-logger "0.x"
buffer-from "1.x"
From f8dc4cf21d029801ee1d3aea300a3c3beb64d45b Mon Sep 17 00:00:00 2001
From: James Ives
Date: Wed, 21 Apr 2021 11:03:15 -0400
Subject: [PATCH 16/45] Check buffer length (#668)
* Check buffer len
* Update execute.ts
* Format
---
src/execute.ts | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/execute.ts b/src/execute.ts
index 02caa011..92da0437 100644
--- a/src/execute.ts
+++ b/src/execute.ts
@@ -1,6 +1,7 @@
import {exec} from '@actions/exec'
+import buffer from 'buffer'
-let output: string
+let output = ''
/** Wrapper around the GitHub toolkit exec command which returns the output.
* Also allows you to easily toggle the current working directory.
@@ -29,5 +30,7 @@ export async function execute(
}
export function stdout(data: any): string | void {
- output += data.toString().trim()
+ if (output.length < buffer.constants.MAX_STRING_LENGTH) {
+ output += data.toString().trim()
+ }
}
From 8254e028e6fd1f1fe5dd80ec4cd261ca24828584 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 14:18:33 -0400
Subject: [PATCH 17/45] Bump eslint from 7.24.0 to 7.25.0 (#684)
Bumps [eslint](https://github.com/eslint/eslint) from 7.24.0 to 7.25.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.24.0...v7.25.0)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index ab684b86..09605cab 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"devDependencies": {
"@types/jest": "26.0.22",
"@types/node": "14.14.41",
- "eslint": "7.24.0",
+ "eslint": "7.25.0",
"eslint-plugin-github": "4.1.3",
"eslint-plugin-jest": "24.3.5",
"eslint-plugin-prettier": "3.4.0",
diff --git a/yarn.lock b/yarn.lock
index d4725344..e3623c63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1562,9 +1562,9 @@ eslint-visitor-keys@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
-eslint@7.24.0:
- version "7.24.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz#2e44fa62d93892bfdb100521f17345ba54b8513a"
+eslint@7.25.0:
+ version "7.25.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
dependencies:
"@babel/code-frame" "7.12.11"
"@eslint/eslintrc" "^0.4.0"
From 408dc2b070eee098de4b4ff292c2189f3fc257ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 16:53:45 -0400
Subject: [PATCH 18/45] Bump eslint-plugin-jest from 24.3.5 to 24.3.6 (#683)
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 24.3.5 to 24.3.6.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v24.3.5...v24.3.6)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 09605cab..f27097b1 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"@types/node": "14.14.41",
"eslint": "7.25.0",
"eslint-plugin-github": "4.1.3",
- "eslint-plugin-jest": "24.3.5",
+ "eslint-plugin-jest": "24.3.6",
"eslint-plugin-prettier": "3.4.0",
"jest": "26.6.3",
"jest-circus": "26.6.3",
diff --git a/yarn.lock b/yarn.lock
index e3623c63..19d9acbc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1525,9 +1525,9 @@ eslint-plugin-import@^2.22.1:
resolve "^1.17.0"
tsconfig-paths "^3.9.0"
-eslint-plugin-jest@24.3.5:
- version "24.3.5"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.5.tgz#71f0b580f87915695c286c3f0eb88cf23664d044"
+eslint-plugin-jest@24.3.6:
+ version "24.3.6"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz#5f0ca019183c3188c5ad3af8e80b41de6c8e9173"
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
From 4bb15711fbc8ff2387bb1690dc9e16bb8326301c Mon Sep 17 00:00:00 2001
From: James Ives
Date: Mon, 26 Apr 2021 18:57:10 -0400
Subject: [PATCH 19/45] Eslint improvements (#686)
* Initial Pass at new configs
* Improved Linting/Formatting
* Update execute.ts
* Update main.test.ts
* Change typing
* Update git.ts
* Update worktree.ts
* Update worktree.ts
* Update worktree.ts
* Maybe
* Update execute.ts
---
.devcontainer/devcontainer.json | 26 +-
.eslintrc.json | 108 +++----
.github/ISSUE_TEMPLATE/BUG_REPORT.md | 5 +-
.github/ISSUE_TEMPLATE/config.yml | 3 +-
.github/PULL_REQUEST_TEMPLATE.md | 3 +
.github/dependabot.yml | 12 +-
.github/workflows/build.yml | 6 +-
.github/workflows/codeql-analysis.yml | 18 +-
.github/workflows/deploy.yml | 2 +-
.github/workflows/integration.yml | 13 +-
.github/workflows/production.yml | 2 +-
.github/workflows/publish.yml | 76 ++---
.prettierrc.json | 5 +-
CODE_OF_CONDUCT.md | 26 +-
CONTRIBUTING.md | 16 +-
README.md | 73 ++---
__tests__/git.test.ts | 1 -
__tests__/main.test.ts | 1 -
action.yml | 14 +-
package.json | 6 +-
src/execute.ts | 4 +-
src/util.ts | 2 +-
src/worktree.ts | 2 +-
tsconfig.json | 65 +----
tsconfig.lint.json | 10 +-
yarn.lock | 403 +++++---------------------
26 files changed, 308 insertions(+), 594 deletions(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7717c093..04030ab3 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -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"
}
diff --git a/.eslintrc.json b/.eslintrc.json
index adf484fb..45b649db 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -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
},
- "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": [
- "error",
- {
- "selector": "default",
- "format": ["camelCase", "UPPER_CASE", "StrictPascalCase"]
- }
- ],
- "@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"
- },
"env": {
"node": true,
"es6": true,
"jest/globals": true
+ },
+ "rules": {
+ "@typescript-eslint/ban-types": [
+ "error",
+ {
+ "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/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
+ },
+ {
+ "enforceForRenamedProperties": false
+ }
+ ],
+ "no-console": ["error", {"allow": ["warn", "error"]}],
+ "no-alert": "error",
+ "no-debugger": "error"
}
}
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index c5cbb3c7..cc7ba93b 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -3,19 +3,22 @@ name: Bug Report
about: Create a bug report to help us improve the action.
labels:
- bug
-
---
## Describe the bug
+
## Reproduction Steps
+
## Logs
+
## Additional Comments
+
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 308bb38a..963d5cde 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -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.
-
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8e4d2a43..78b8880c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,11 @@
## Description
+
## Testing Instructions
+
## Additional Notes
+
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3f8f5b23..8b4845b8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,8 +1,8 @@
version: 2
updates:
-- package-ecosystem: npm
- directory: "/"
- schedule:
- interval: daily
- time: "10:00"
- open-pull-requests-limit: 10
\ No newline at end of file
+ - package-ecosystem: npm
+ directory: '/'
+ schedule:
+ interval: daily
+ time: '10:00'
+ open-pull-requests-limit: 10
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 491270a1..0554b2f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c1454fed..cc451945 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -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
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c75b8886..56a4ab08 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -18,4 +18,4 @@ jobs:
branch: releases/v4
folder: .
clean: false
- single-commit: true
\ No newline at end of file
+ single-commit: true
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index c16f51f7..1b1b1e91 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -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
@@ -203,7 +202,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
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
index e9e1f66c..f2171974 100644
--- a/.github/workflows/production.yml
+++ b/.github/workflows/production.yml
@@ -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: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3871332d..00b9da88 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -5,53 +5,53 @@ on:
version:
description: 'The updated registry version number.'
required: true
-
+
jobs:
build:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- with:
- ref: dev
+ - uses: actions/checkout@v2
+ with:
+ ref: dev
- # Setup .npmrc file to publish to npm
- - uses: actions/setup-node@v1.4.4
- with:
- node-version: '10.15.1'
- registry-url: 'https://registry.npmjs.org'
- scope: '@jamesives'
+ # Setup .npmrc file to publish to npm
+ - uses: actions/setup-node@v1.4.4
+ with:
+ node-version: '10.15.1'
+ registry-url: 'https://registry.npmjs.org'
+ scope: '@jamesives'
- - name: Configure Git
- run: |
- git config user.email "iam@jamesiv.es"
- git config user.name "James Ives"
+ - name: Configure Git
+ run: |
+ git config user.email "iam@jamesiv.es"
+ git config user.name "James Ives"
- - name: Install Yarn
- run: npm install -g yarn
+ - name: Install Yarn
+ run: npm install -g yarn
- - run: yarn install --frozen-lockfile
- - run: yarn build
- - run: npm version ${{ github.event.inputs.version }} -m "Release ${{ github.event.inputs.version }} π£"
- - run: git push
+ - run: yarn install --frozen-lockfile
+ - run: yarn build
+ - run: npm version ${{ github.event.inputs.version }} -m "Release ${{ github.event.inputs.version }} π£"
+ - run: git push
- # Publish to npm
- - run: npm publish --access public
- env:
- NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+ # Publish to npm
+ - run: npm publish --access public
+ env:
+ NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- # Setup .npmrc file to publish to GitHub Packages
- - uses: actions/setup-node@v1.4.4
- with:
- node-version: 12
- registry-url: 'https://npm.pkg.github.com'
- scope: '@jamesives'
+ # Setup .npmrc file to publish to GitHub Packages
+ - uses: actions/setup-node@v1.4.4
+ with:
+ node-version: 12
+ registry-url: 'https://npm.pkg.github.com'
+ scope: '@jamesives'
- - name: Authenticate with the GitHub Package Registry
- run:
- echo "//npm.pkg.github.com:_authToken=${{ secrets.GITHUB_TOKEN }}" >
- ~/.npmrc
+ - name: Authenticate with the GitHub Package Registry
+ run:
+ echo "//npm.pkg.github.com:_authToken=${{ secrets.GITHUB_TOKEN }}" >
+ ~/.npmrc
- # Publish to GitHub Packages
- - run: npm publish
- env:
- NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ # Publish to GitHub Packages
+ - run: npm publish
+ env:
+ NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.prettierrc.json b/.prettierrc.json
index 386485a7..c34bafcb 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -6,6 +6,5 @@
"singleQuote": true,
"trailingComma": "none",
"bracketSpacing": false,
- "arrowParens": "avoid",
- "parser": "typescript"
-}
\ No newline at end of file
+ "arrowParens": "avoid"
+}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index ad25d444..c1b7046a 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
Examples of behavior that contributes to creating a positive environment
include:
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+ professional setting
## Our Responsibilities
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1ec71553..756e1b52 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,15 @@
# Contributing βοΈ
-When contributing to this repository, please first discuss the change you wish to make via issue,
+When contributing to this repository, please first discuss the change you wish to make via issue,
[email, or any other method with the owners of this repository](https://jamesiv.es) before making a change. If you are planning to work on an issue that already exists please let us know before writing any code incase it's already in flight!
-## Before Making a Pull Request π
+## Before Making a Pull Request π
1. Ensure that you've tested your feature/change yourself. As the primary focus of this project is deployment, providing a link to a deployed repository using your branch is preferred. You can reference the forked action using your GitHub username, for example `yourname/github-pages-deplpy-action@dev`.
2. Ensure your change passes all of the integration tests.
-3. Make sure you update the README if you've made a change that requires documentation.
+3. Make sure you update the README if you've made a change that requires documentation.
4. When making a pull request, highlight any areas that may cause a breaking change so the maintainer can update the version number accordingly on the GitHub marketplace and package registries.
-5. Make sure you've formatted and linted your code. You can do this by running `yarn format` and `yarn lint`.
+5. Make sure you've formatted and linted your code. You can do this by running `yarn format` and `yarn lint`.
6. Fix or add any tests where applicable. You can run `yarn test` to run the suite. As this action is small in scope it's important that a high level of test coverage is maintained. All tests are written using [Jest](https://jestjs.io/).
7. As this package is written in [TypeScript](https://www.typescriptlang.org/) please ensure all typing is accurate and the action compiles correctly by running `yarn build`.
@@ -32,7 +32,7 @@ Comment out the following in distribution branches:
# lib/
```
-Build the project:
+Build the project:
```
yarn build
@@ -49,6 +49,6 @@ The `node_modules` and `lib` folders should _not_ be included when making a pull
## Resources π‘
-* [TypeScript](https://www.typescriptlang.org/)
-* [Jest](https://jestjs.io/)
-* [GitHub Actions Documentation](https://help.github.com/en/actions)
+- [TypeScript](https://www.typescriptlang.org/)
+- [Jest](https://jestjs.io/)
+- [GitHub Actions Documentation](https://help.github.com/en/actions)
diff --git a/README.md b/README.md
index 6ee4c031..c809aad8 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ It's recommended that you use [Dependabot](https://dependabot.com/github-actions
#### Install as a Node Module π¦
-If you'd like to use the functionality provided by this action in your own action you can install it using [yarn](https://yarnpkg.com/) or [npm](https://www.npmjs.com/get-npm) by running the following commands. It's available on both the [npm](https://www.npmjs.com/package/@jamesives/github-pages-deploy-action) and [GitHub registry](https://github.com/JamesIves/github-pages-deploy-action/packages/229985).
+If you'd like to use the functionality provided by this action in your own action you can install it using [yarn](https://yarnpkg.com/) or [npm](https://www.npmjs.com/get-npm) by running the following commands. It's available on both the [npm](https://www.npmjs.com/package/@jamesives/github-pages-deploy-action) and [GitHub registry](https://github.com/JamesIves/github-pages-deploy-action/packages/229985).
```
yarn add @jamesives/github-pages-deploy-action
@@ -92,25 +92,25 @@ npm install @jamesives/github-pages-deploy-action
It can then be imported into your project like so.
```javascript
-import run from "github-pages-deploy-action";
+import run from 'github-pages-deploy-action'
```
Calling the functions directly will require you to pass in an object containing the variables found in the configuration section, you'll also need to provide a `workspace` with a path to your project.
```javascript
-import run from "github-pages-deploy-action";
+import run from 'github-pages-deploy-action'
run({
- token: process.env["ACCESS_TOKEN"],
- branch: "gh-pages",
- folder: "build",
- repositoryName: "JamesIves/github-pages-deploy-action",
+ token: process.env['ACCESS_TOKEN'],
+ branch: 'gh-pages',
+ folder: 'build',
+ repositoryName: 'JamesIves/github-pages-deploy-action',
silent: true,
- workspace: "src/project/location",
-});
+ workspace: 'src/project/location'
+})
```
-For more information regarding the [action interface please click here](https://github.com/JamesIves/github-pages-deploy-action/blob/dev/src/constants.ts#L7).
+For more information regarding the [action interface please click here](https://github.com/JamesIves/github-pages-deploy-action/blob/dev/src/constants.ts#L7).
## Configuration π
@@ -120,33 +120,33 @@ The `with` portion of the workflow **must** be configured before the action will
The following options must be configured in order to make a deployment.
-| Key | Value Information | Type | Required |
-| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | -------- |
-| `branch` | This is the branch you wish to deploy to, for example `gh-pages` or `docs`. | `with` | **Yes** |
+| Key | Value Information | Type | Required |
+| -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | -------- |
+| `branch` | This is the branch you wish to deploy to, for example `gh-pages` or `docs`. | `with` | **Yes** |
| `folder` | The folder in your repository that you want to deploy. If your build script compiles into a directory named `build` you'd put it here. If you wish to deploy the root directory you can place a `.` here. You can also utilize absolute file paths by appending `~` to your folder path. | `with` | **Yes** |
By default the action does not need any token configuration and uses the provided repository scoped GitHub token to make the deployment. If you require more customization you can modify the deployment type using the following options.
-| Key | Value Information | Type | Required |
-| -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------- | -------- |
-| `token` | This option defaults to the repository scoped GitHub Token. However if you need more permissions for things such as deploying to another repository, you can add a Personal Access Token (PAT) here. This should be stored in the `secrets / with` menu **as a secret**. We recommend using a service account with the least permissions necessary and recommend when generating a new PAT that you select the least permission scopes necessary. [Learn more about creating and using encrypted secrets here.](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets) | `with` | **No** |
-| `ssh-key` | You can configure the action to deploy using SSH by setting this option to a private SSH key stored **as a secret**. It can also be set to `true` to use an existing SSH client configuration. For more detailed information on how to add your public/private ssh key pair please refer to the [Using a Deploy Key section of this README](https://github.com/JamesIves/github-pages-deploy-action/tree/dev#using-an-ssh-deploy-key-). | `with` | **No** |
+| Key | Value Information | Type | Required |
+| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | -------- |
+| `token` | This option defaults to the repository scoped GitHub Token. However if you need more permissions for things such as deploying to another repository, you can add a Personal Access Token (PAT) here. This should be stored in the `secrets / with` menu **as a secret**. We recommend using a service account with the least permissions necessary and recommend when generating a new PAT that you select the least permission scopes necessary. [Learn more about creating and using encrypted secrets here.](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets) | `with` | **No** |
+| `ssh-key` | You can configure the action to deploy using SSH by setting this option to a private SSH key stored **as a secret**. It can also be set to `true` to use an existing SSH client configuration. For more detailed information on how to add your public/private ssh key pair please refer to the [Using a Deploy Key section of this README](https://github.com/JamesIves/github-pages-deploy-action/tree/dev#using-an-ssh-deploy-key-). | `with` | **No** |
#### Optional Choices
-| Key | Value Information | Type | Required |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | -------- |
-| `git-config-name` | Allows you to customize the name that is attached to the git config which is used when pushing the deployment commits. If this is not included it will use the name in the GitHub context, followed by the name of the action. | `with` | **No** |
-| `git-config-email` | Allows you to customize the email that is attached to the git config which is used when pushing the deployment commits. If this is not included it will use the email in the GitHub context, followed by a generic noreply GitHub email. | `with` | **No** |
-| `repository-name` | Allows you to specify a different repository path so long as you have permissions to push to it. This should be formatted like so: `JamesIves/github-pages-deploy-action`. You'll need to use a PAT in the `token` input for this configuration option to work properly. | `with` | **No** |
-| `target-folder` | If you'd like to push the contents of the deployment folder into a specific directory on the deployment branch you can specify it here. | `with` | **No** |
-| `commit-message` | If you need to customize the commit message for an integration you can do so. | `with` | **No** |
-| `clean` | If your project generates hashed files on build you can use this option to automatically delete them from the target folder on the deployment branch with each deploy. This option is turned on by default, and can be toggled off by setting it to `false`. | `with` | **No** |
-| `clean-exclude` | If you need to use `clean` but you'd like to preserve certain files or folders you can use this option. This should contain each pattern as a single line in a multiline string. | `with` | **No** |
-| `dry-run` | Do not actually push back, but use `--dry-run` on `git push` invocations instead. | `with` | **No** |
-| `single-commit` | This option can be toggled to `true` if you'd prefer to have a single commit on the deployment branch instead of maintaining the full history. **Using this option will also cause any existing history to be wiped from the deployment branch**. | `with` | **No** |
-| `silent` | Silences the action output preventing it from displaying git messages. | `with` | **No** |
-| `workspace` | This should point to where your project lives on the virtual machine. The GitHub Actions environment will set this for you. It is only necessary to set this variable if you're using the node module. | `with` | **No** |
+| Key | Value Information | Type | Required |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------ | -------- |
+| `git-config-name` | Allows you to customize the name that is attached to the git config which is used when pushing the deployment commits. If this is not included it will use the name in the GitHub context, followed by the name of the action. | `with` | **No** |
+| `git-config-email` | Allows you to customize the email that is attached to the git config which is used when pushing the deployment commits. If this is not included it will use the email in the GitHub context, followed by a generic noreply GitHub email. | `with` | **No** |
+| `repository-name` | Allows you to specify a different repository path so long as you have permissions to push to it. This should be formatted like so: `JamesIves/github-pages-deploy-action`. You'll need to use a PAT in the `token` input for this configuration option to work properly. | `with` | **No** |
+| `target-folder` | If you'd like to push the contents of the deployment folder into a specific directory on the deployment branch you can specify it here. | `with` | **No** |
+| `commit-message` | If you need to customize the commit message for an integration you can do so. | `with` | **No** |
+| `clean` | If your project generates hashed files on build you can use this option to automatically delete them from the target folder on the deployment branch with each deploy. This option is turned on by default, and can be toggled off by setting it to `false`. | `with` | **No** |
+| `clean-exclude` | If you need to use `clean` but you'd like to preserve certain files or folders you can use this option. This should contain each pattern as a single line in a multiline string. | `with` | **No** |
+| `dry-run` | Do not actually push back, but use `--dry-run` on `git push` invocations instead. | `with` | **No** |
+| `single-commit` | This option can be toggled to `true` if you'd prefer to have a single commit on the deployment branch instead of maintaining the full history. **Using this option will also cause any existing history to be wiped from the deployment branch**. | `with` | **No** |
+| `silent` | Silences the action output preventing it from displaying git messages. | `with` | **No** |
+| `workspace` | This should point to where your project lives on the virtual machine. The GitHub Actions environment will set this for you. It is only necessary to set this variable if you're using the node module. | `with` | **No** |
With the action correctly configured you should see the workflow trigger the deployment under the configured conditions.
@@ -154,11 +154,11 @@ With the action correctly configured you should see the workflow trigger the dep
The action will export an environment variable called `deployment_status` that you can use in your workflow to determine if the deployment was successful or not. You can find an explanation of each status type below.
-| Status | Description |
-| ------------- |-------------|
-| `success` | The `success` status indicates that the action was able to successfully deploy to the branch. |
-| `failed` | The `failed` status indicates that the action encountered an error while trying to deploy. |
-| `skipped` | The `skipped` status indicates that the action exited early as there was nothing new to deploy. |
+| Status | Description |
+| --------- | ----------------------------------------------------------------------------------------------- |
+| `success` | The `success` status indicates that the action was able to successfully deploy to the branch. |
+| `failed` | The `failed` status indicates that the action encountered an error while trying to deploy. |
+| `skipped` | The `skipped` status indicates that the action exited early as there was nothing new to deploy. |
This value is also set as a step output as `deployment-status`.
@@ -278,7 +278,7 @@ jobs:
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages
- folder: "site" # The deployment folder should match the name of the artifact. Even though our project builds into the 'build' folder the artifact name of 'site' must be placed here.
+ folder: 'site' # The deployment folder should match the name of the artifact. Even though our project builds into the 'build' folder the artifact name of 'site' must be placed here.
```
@@ -336,6 +336,7 @@ jobs:
special-file.txt
some/*.txt
```
+
diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts
index 5f704c7c..3f976a6a 100644
--- a/__tests__/git.test.ts
+++ b/__tests__/git.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable import/first */
// Initial env variable setup for tests.
process.env['INPUT_FOLDER'] = 'build'
process.env['GITHUB_SHA'] = '123'
diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
index a1708ecb..d82d2e77 100644
--- a/__tests__/main.test.ts
+++ b/__tests__/main.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable import/first */
// Initial env variable setup for tests.
process.env['INPUT_FOLDER'] = 'build'
process.env['GITHUB_SHA'] = '123'
diff --git a/action.yml b/action.yml
index 8c1786c3..3f27369c 100644
--- a/action.yml
+++ b/action.yml
@@ -26,7 +26,7 @@ inputs:
We recommend using a service account with the least permissions neccersary
and when generating a new PAT that you select the least permission scopes required.
-
+
[Learn more about creating and using encrypted secrets here.](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)
required: false
default: ${{ github.token }}
@@ -53,23 +53,23 @@ inputs:
default: true
clean-exclude:
- description: "If you need to use clean but you would like to preserve certain files or folders you can use this option. This should contain each pattern as a single line in a multiline string."
+ description: 'If you need to use clean but you would like to preserve certain files or folders you can use this option. This should contain each pattern as a single line in a multiline string.'
required: false
dry-run:
- description: "Do not actually push back, but use `--dry-run` on `git push` invocations insead."
+ description: 'Do not actually push back, but use `--dry-run` on `git push` invocations insead.'
required: false
git-config-name:
- description: "Allows you to customize the name that is attached to the GitHub config which is used when pushing the deployment commits. If this is not included it will use the name in the GitHub context, followed by the name of the action."
+ description: 'Allows you to customize the name that is attached to the GitHub config which is used when pushing the deployment commits. If this is not included it will use the name in the GitHub context, followed by the name of the action.'
required: false
git-config-email:
- description: "Allows you to customize the email that is attached to the GitHub config which is used when pushing the deployment commits. If this is not included it will use the email in the GitHub context, followed by a generic noreply GitHub email."
+ description: 'Allows you to customize the email that is attached to the GitHub config which is used when pushing the deployment commits. If this is not included it will use the email in the GitHub context, followed by a generic noreply GitHub email.'
required: false
repository-name:
- description: "Allows you to speicfy a different repository path so long as you have permissions to push to it. This should be formatted like so: JamesIves/github-pages-deploy-action"
+ description: 'Allows you to speicfy a different repository path so long as you have permissions to push to it. This should be formatted like so: JamesIves/github-pages-deploy-action'
required: false
workspace:
@@ -81,7 +81,7 @@ inputs:
required: false
silent:
- description: "Silences the action output preventing it from displaying git messages."
+ description: 'Silences the action output preventing it from displaying git messages.'
required: false
outputs:
diff --git a/package.json b/package.json
index f27097b1..b567b684 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"build": "rimraf lib && tsc --declaration",
"test": "jest",
"lint": "eslint src/**/*.ts __tests__/**/*.ts",
- "lint:format": "prettier --write './**/*.ts'"
+ "lint:format": "prettier --write './**/*.{ts,js,json,yml,md}' './*.{ts,js,json,yml,md}'"
},
"repository": {
"type": "git",
@@ -41,8 +41,10 @@
"devDependencies": {
"@types/jest": "26.0.22",
"@types/node": "14.14.41",
+ "@typescript-eslint/eslint-plugin": "4.22.0",
+ "@typescript-eslint/parser": "4.22.0",
"eslint": "7.25.0",
- "eslint-plugin-github": "4.1.3",
+ "eslint-config-prettier": "8.3.0",
"eslint-plugin-jest": "24.3.6",
"eslint-plugin-prettier": "3.4.0",
"jest": "26.6.3",
diff --git a/src/execute.ts b/src/execute.ts
index 92da0437..84994dd9 100644
--- a/src/execute.ts
+++ b/src/execute.ts
@@ -14,7 +14,7 @@ export async function execute(
cmd: string,
cwd: string,
silent: boolean
-): Promise {
+): Promise {
output = ''
await exec(cmd, [], {
@@ -29,7 +29,7 @@ export async function execute(
return Promise.resolve(output)
}
-export function stdout(data: any): string | void {
+export function stdout(data: Buffer | string): void {
if (output.length < buffer.constants.MAX_STRING_LENGTH) {
output += data.toString().trim()
}
diff --git a/src/util.ts b/src/util.ts
index 8c052e19..dd9a10d3 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -8,7 +8,7 @@ const replaceAll = (input: string, find: string, replace: string): string =>
input.split(find).join(replace)
/* Utility function that checks to see if a value is undefined or not. */
-export const isNullOrUndefined = (value: any): boolean =>
+export const isNullOrUndefined = (value: unknown): boolean =>
typeof value === 'undefined' || value === null || value === ''
/* Generates a token type used for the action. */
diff --git a/src/worktree.ts b/src/worktree.ts
index 9a820e74..e6cde73e 100644
--- a/src/worktree.ts
+++ b/src/worktree.ts
@@ -25,7 +25,7 @@ export class GitCheckout {
export async function generateWorktree(
action: ActionInterface,
worktreedir: string,
- branchExists: boolean
+ branchExists: unknown
): Promise {
try {
info('Creating worktreeβ¦')
diff --git a/tsconfig.json b/tsconfig.json
index 960dc9fa..ae79bf2b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,63 +1,12 @@
{
"compilerOptions": {
- /* Basic Options */
- // "incremental": true, /* Enable incremental compilation */
- "target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
- "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
- // "allowJs": true, /* Allow javascript files to be compiled. */
- // "checkJs": true, /* Report errors in .js files. */
- // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
- // "declaration": true, /* Generates corresponding '.d.ts' file. */
- // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
- // "sourceMap": true, /* Generates corresponding '.map' file. */
- // "outFile": "./", /* Concatenate and emit output to single file. */
- "outDir": "./lib", /* Redirect output structure to the directory. */
- "rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
- // "composite": true, /* Enable project compilation */
- // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
- // "removeComments": true, /* Do not emit comments to output. */
- // "noEmit": true, /* Do not emit outputs. */
- // "importHelpers": true, /* Import emit helpers from 'tslib'. */
- // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
- // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
- /* Strict Type-Checking Options */
- "strict": true, /* Enable all strict type-checking options. */
- "noImplicitAny": false, /* Raise error on expressions and declarations with an implied 'any' type. */
- // "strictNullChecks": true, /* Enable strict null checks. */
- // "strictFunctionTypes": true, /* Enable strict checking of function types. */
- // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
- // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
- // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
- // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
-
- /* Additional Checks */
- // "noUnusedLocals": true, /* Report errors on unused locals. */
- // "noUnusedParameters": true, /* Report errors on unused parameters. */
- // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
- // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
-
- /* Module Resolution Options */
- // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
- // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
- // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
- // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
- // "typeRoots": [], /* List of folders to include type definitions from. */
- // "types": [], /* Type declaration files to be included in compilation. */
- // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
- "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
- // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
- // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
-
- /* Source Map Options */
- // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
- // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
- // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
- // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
- /* Experimental Options */
- // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
- // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
+ "target": "es6",
+ "module": "commonjs",
+ "outDir": "./lib",
+ "rootDir": "./src",
+ "strict": true,
+ "noImplicitAny": false,
+ "esModuleInterop": true
},
"exclude": ["node_modules", "**/*.test.ts"]
}
diff --git a/tsconfig.lint.json b/tsconfig.lint.json
index be0508f7..d76f64cf 100644
--- a/tsconfig.lint.json
+++ b/tsconfig.lint.json
@@ -1,7 +1,7 @@
{
- "extends": "./tsconfig.json",
- "compilerOptions": {
- "rootDir": "."
- },
- "exclude": ["node_modules"]
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "rootDir": "."
+ },
+ "exclude": ["node_modules"]
}
diff --git a/yarn.lock b/yarn.lock
index 19d9acbc..15cd2633 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -722,10 +722,6 @@
version "7.0.4"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
-"@types/json5@^0.0.29":
- version "0.0.29"
- resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-
"@types/node@*", "@types/node@14.14.41", "@types/node@>= 8":
version "14.14.41"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.41.tgz#d0b939d94c1d7bd53d04824af45f1139b8c45615"
@@ -752,12 +748,13 @@
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/eslint-plugin@^4.20.0":
- version "4.21.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.21.0.tgz#3fce2bfa76d95c00ac4f33dff369cb593aab8878"
+"@typescript-eslint/eslint-plugin@4.22.0":
+ version "4.22.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz#3d5f29bb59e61a9dba1513d491b059e536e16dbc"
+ integrity sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==
dependencies:
- "@typescript-eslint/experimental-utils" "4.21.0"
- "@typescript-eslint/scope-manager" "4.21.0"
+ "@typescript-eslint/experimental-utils" "4.22.0"
+ "@typescript-eslint/scope-manager" "4.22.0"
debug "^4.1.1"
functional-red-black-tree "^1.0.1"
lodash "^4.17.15"
@@ -765,7 +762,19 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/experimental-utils@4.21.0", "@typescript-eslint/experimental-utils@^4.0.1":
+"@typescript-eslint/experimental-utils@4.22.0":
+ version "4.22.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz#68765167cca531178e7b650a53456e6e0bef3b1f"
+ integrity sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==
+ dependencies:
+ "@types/json-schema" "^7.0.3"
+ "@typescript-eslint/scope-manager" "4.22.0"
+ "@typescript-eslint/types" "4.22.0"
+ "@typescript-eslint/typescript-estree" "4.22.0"
+ eslint-scope "^5.0.0"
+ eslint-utils "^2.0.0"
+
+"@typescript-eslint/experimental-utils@^4.0.1":
version "4.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.21.0.tgz#0b0bb7c15d379140a660c003bdbafa71ae9134b6"
dependencies:
@@ -776,13 +785,14 @@
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
-"@typescript-eslint/parser@^4.20.0":
- version "4.21.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.21.0.tgz#a227fc2af4001668c3e3f7415d4feee5093894c1"
+"@typescript-eslint/parser@4.22.0":
+ version "4.22.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.0.tgz#e1637327fcf796c641fe55f73530e90b16ac8fe8"
+ integrity sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==
dependencies:
- "@typescript-eslint/scope-manager" "4.21.0"
- "@typescript-eslint/types" "4.21.0"
- "@typescript-eslint/typescript-estree" "4.21.0"
+ "@typescript-eslint/scope-manager" "4.22.0"
+ "@typescript-eslint/types" "4.22.0"
+ "@typescript-eslint/typescript-estree" "4.22.0"
debug "^4.1.1"
"@typescript-eslint/scope-manager@4.21.0":
@@ -792,10 +802,23 @@
"@typescript-eslint/types" "4.21.0"
"@typescript-eslint/visitor-keys" "4.21.0"
+"@typescript-eslint/scope-manager@4.22.0":
+ version "4.22.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz#ed411545e61161a8d702e703a4b7d96ec065b09a"
+ integrity sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==
+ dependencies:
+ "@typescript-eslint/types" "4.22.0"
+ "@typescript-eslint/visitor-keys" "4.22.0"
+
"@typescript-eslint/types@4.21.0":
version "4.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.21.0.tgz#abdc3463bda5d31156984fa5bc316789c960edef"
+"@typescript-eslint/types@4.22.0":
+ version "4.22.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.0.tgz#0ca6fde5b68daf6dba133f30959cc0688c8dd0b6"
+ integrity sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==
+
"@typescript-eslint/typescript-estree@4.21.0":
version "4.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.21.0.tgz#3817bd91857beeaeff90f69f1f112ea58d350b0a"
@@ -808,6 +831,19 @@
semver "^7.3.2"
tsutils "^3.17.1"
+"@typescript-eslint/typescript-estree@4.22.0":
+ version "4.22.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz#b5d95d6d366ff3b72f5168c75775a3e46250d05c"
+ integrity sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==
+ dependencies:
+ "@typescript-eslint/types" "4.22.0"
+ "@typescript-eslint/visitor-keys" "4.22.0"
+ debug "^4.1.1"
+ globby "^11.0.1"
+ is-glob "^4.0.1"
+ semver "^7.3.2"
+ tsutils "^3.17.1"
+
"@typescript-eslint/visitor-keys@4.21.0":
version "4.21.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.21.0.tgz#990a9acdc124331f5863c2cf21c88ba65233cd8d"
@@ -815,6 +851,14 @@
"@typescript-eslint/types" "4.21.0"
eslint-visitor-keys "^2.0.0"
+"@typescript-eslint/visitor-keys@4.22.0":
+ version "4.22.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz#169dae26d3c122935da7528c839f42a8a42f6e47"
+ integrity sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==
+ dependencies:
+ "@typescript-eslint/types" "4.22.0"
+ eslint-visitor-keys "^2.0.0"
+
abab@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
@@ -910,14 +954,6 @@ arr-union@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-array-includes@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
- dependencies:
- define-properties "^1.1.3"
- es-abstract "^1.17.0"
- is-string "^1.0.5"
-
array-union@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -926,13 +962,6 @@ array-unique@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-array.prototype.flat@^1.2.3:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
- dependencies:
- define-properties "^1.1.3"
- es-abstract "^1.17.0-next.1"
-
asn1@~0.2.3:
version "0.2.4"
resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
@@ -1226,10 +1255,6 @@ concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-contains-path@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-
convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
@@ -1290,7 +1315,7 @@ data-urls@^2.0.0:
whatwg-mimetype "^2.3.0"
whatwg-url "^8.0.0"
-debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
+debug@^2.2.0, debug@^2.3.3:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies:
@@ -1326,12 +1351,6 @@ deepmerge@^4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-define-properties@^1.1.2, define-properties@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
- dependencies:
- object-keys "^1.0.12"
-
define-property@^0.2.5:
version "0.2.5"
resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -1373,13 +1392,6 @@ dir-glob@^3.0.1:
dependencies:
path-type "^4.0.0"
-doctrine@1.5.0:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
- dependencies:
- esutils "^2.0.2"
- isarray "^1.0.0"
-
doctrine@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -1419,36 +1431,12 @@ enquirer@^2.3.5:
dependencies:
ansi-colors "^3.2.1"
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
version "1.3.2"
resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
dependencies:
is-arrayish "^0.2.1"
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1:
- version "1.17.4"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184"
- dependencies:
- es-to-primitive "^1.2.1"
- function-bind "^1.1.1"
- has "^1.0.3"
- has-symbols "^1.0.1"
- is-callable "^1.1.5"
- is-regex "^1.0.5"
- object-inspect "^1.7.0"
- object-keys "^1.1.1"
- object.assign "^4.1.0"
- string.prototype.trimleft "^2.1.1"
- string.prototype.trimright "^2.1.1"
-
-es-to-primitive@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
- dependencies:
- is-callable "^1.1.4"
- is-date-object "^1.0.1"
- is-symbol "^1.0.2"
-
escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -1468,62 +1456,10 @@ escodegen@^1.14.1:
optionalDependencies:
source-map "~0.6.1"
-eslint-config-prettier@>=8.0.0:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6"
-
-eslint-import-resolver-node@^0.3.4:
- version "0.3.4"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
- dependencies:
- debug "^2.6.9"
- resolve "^1.13.1"
-
-eslint-module-utils@^2.6.0:
- version "2.6.0"
- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
- dependencies:
- debug "^2.6.9"
- pkg-dir "^2.0.0"
-
-eslint-plugin-eslint-comments@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz#9e1cd7b4413526abb313933071d7aba05ca12ffa"
- dependencies:
- escape-string-regexp "^1.0.5"
- ignore "^5.0.5"
-
-eslint-plugin-github@4.1.3:
- version "4.1.3"
- resolved "https://registry.yarnpkg.com/eslint-plugin-github/-/eslint-plugin-github-4.1.3.tgz#f84d2f7e848d38ba82eeadcb898328bd3d02e175"
- dependencies:
- "@typescript-eslint/eslint-plugin" "^4.20.0"
- "@typescript-eslint/parser" "^4.20.0"
- eslint-config-prettier ">=8.0.0"
- eslint-plugin-eslint-comments "^3.2.0"
- eslint-plugin-import "^2.22.1"
- eslint-plugin-prettier "^3.3.1"
- eslint-rule-documentation ">=1.0.0"
- prettier "^2.2.1"
- svg-element-attributes "^1.3.1"
-
-eslint-plugin-import@^2.22.1:
- version "2.22.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
- dependencies:
- array-includes "^3.1.1"
- array.prototype.flat "^1.2.3"
- contains-path "^0.1.0"
- debug "^2.6.9"
- doctrine "1.5.0"
- eslint-import-resolver-node "^0.3.4"
- eslint-module-utils "^2.6.0"
- has "^1.0.3"
- minimatch "^3.0.4"
- object.values "^1.1.1"
- read-pkg-up "^2.0.0"
- resolve "^1.17.0"
- tsconfig-paths "^3.9.0"
+eslint-config-prettier@8.3.0:
+ version "8.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
+ integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
eslint-plugin-jest@24.3.6:
version "24.3.6"
@@ -1531,16 +1467,13 @@ eslint-plugin-jest@24.3.6:
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"
-eslint-plugin-prettier@3.4.0, eslint-plugin-prettier@^3.3.1:
+eslint-plugin-prettier@3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"
+ integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==
dependencies:
prettier-linter-helpers "^1.0.0"
-eslint-rule-documentation@>=1.0.0:
- version "1.0.23"
- resolved "https://registry.yarnpkg.com/eslint-rule-documentation/-/eslint-rule-documentation-1.0.23.tgz#4e0886145597a78d24524ec7e0cf18c6fedc23a8"
-
eslint-scope@^5.0.0, eslint-scope@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -1746,6 +1679,7 @@ fast-deep-equal@^3.1.1:
fast-diff@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+ integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
fast-glob@^3.1.1:
version "3.2.4"
@@ -1799,12 +1733,6 @@ fill-range@^7.0.1:
dependencies:
to-regex-range "^5.0.1"
-find-up@^2.0.0, find-up@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
- dependencies:
- locate-path "^2.0.0"
-
find-up@^4.0.0, find-up@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -1935,10 +1863,6 @@ globby@^11.0.1:
merge2 "^1.3.0"
slash "^3.0.0"
-graceful-fs@^4.1.2:
- version "4.2.3"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-
graceful-fs@^4.2.4:
version "4.2.4"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
@@ -1966,14 +1890,6 @@ has-flag@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-has-symbols@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-
-has-symbols@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-
has-value@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -2043,7 +1959,7 @@ ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-ignore@^5.0.5, ignore@^5.1.4:
+ignore@^5.1.4:
version "5.1.8"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
@@ -2100,14 +2016,6 @@ is-buffer@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-is-callable@^1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-
-is-callable@^1.1.5:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-
is-ci@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -2132,10 +2040,6 @@ is-data-descriptor@^1.0.0:
dependencies:
kind-of "^6.0.0"
-is-date-object@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-
is-descriptor@^0.1.0:
version "0.1.6"
resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -2210,12 +2114,6 @@ is-potential-custom-element-name@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
-is-regex@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
- dependencies:
- has "^1.0.3"
-
is-stream@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -2224,16 +2122,6 @@ is-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
-is-string@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-
-is-symbol@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
- dependencies:
- has-symbols "^1.0.0"
-
is-typedarray@^1.0.0, is-typedarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -2248,7 +2136,7 @@ is-wsl@^2.2.0:
dependencies:
is-docker "^2.0.0"
-isarray@1.0.0, isarray@^1.0.0:
+isarray@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -2769,12 +2657,6 @@ json5@2.x, json5@^2.1.0:
dependencies:
minimist "^1.2.0"
-json5@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
- dependencies:
- minimist "^1.2.0"
-
jsprim@^1.2.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -2830,22 +2712,6 @@ lines-and-columns@^1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
-load-json-file@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
- dependencies:
- graceful-fs "^4.1.2"
- parse-json "^2.2.0"
- pify "^2.0.0"
- strip-bom "^3.0.0"
-
-locate-path@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
- dependencies:
- p-locate "^2.0.0"
- path-exists "^3.0.0"
-
locate-path@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -3019,7 +2885,7 @@ node-notifier@^8.0.0:
uuid "^8.3.0"
which "^2.0.2"
-normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
+normalize-package-data@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
dependencies:
@@ -3066,44 +2932,18 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
-object-inspect@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-
object-visit@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
dependencies:
isobject "^3.0.0"
-object.assign@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
- dependencies:
- define-properties "^1.1.2"
- function-bind "^1.1.1"
- has-symbols "^1.0.0"
- object-keys "^1.0.11"
-
object.pick@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
dependencies:
isobject "^3.0.1"
-object.values@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
- dependencies:
- define-properties "^1.1.3"
- es-abstract "^1.17.0-next.1"
- function-bind "^1.1.1"
- has "^1.0.3"
-
once@^1.3.0, once@^1.3.1, once@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -3153,34 +2993,18 @@ p-finally@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-p-limit@^1.1.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
- dependencies:
- p-try "^1.0.0"
-
p-limit@^2.2.0:
version "2.2.2"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
dependencies:
p-try "^2.0.0"
-p-locate@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
- dependencies:
- p-limit "^1.1.0"
-
p-locate@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
dependencies:
p-limit "^2.2.0"
-p-try@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-
p-try@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -3191,12 +3015,6 @@ parent-module@^1.0.0:
dependencies:
callsites "^3.0.0"
-parse-json@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
- dependencies:
- error-ex "^1.2.0"
-
parse-json@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f"
@@ -3214,10 +3032,6 @@ pascalcase@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-path-exists@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-
path-exists@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -3238,12 +3052,6 @@ path-parse@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-path-type@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
- dependencies:
- pify "^2.0.0"
-
path-type@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -3260,22 +3068,12 @@ picomatch@^2.2.1:
version "2.2.2"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-pify@^2.0.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
pirates@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
dependencies:
node-modules-regexp "^1.0.0"
-pkg-dir@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
- dependencies:
- find-up "^2.1.0"
-
pkg-dir@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
@@ -3297,10 +3095,11 @@ prelude-ls@~1.1.2:
prettier-linter-helpers@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+ integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
dependencies:
fast-diff "^1.1.2"
-prettier@2.2.1, prettier@^2.2.1:
+prettier@2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
@@ -3347,13 +3146,6 @@ react-is@^17.0.1:
version "17.0.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
-read-pkg-up@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
- dependencies:
- find-up "^2.0.0"
- read-pkg "^2.0.0"
-
read-pkg-up@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
@@ -3362,14 +3154,6 @@ read-pkg-up@^7.0.1:
read-pkg "^5.2.0"
type-fest "^0.8.1"
-read-pkg@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
- dependencies:
- load-json-file "^2.0.0"
- normalize-package-data "^2.3.2"
- path-type "^2.0.0"
-
read-pkg@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
@@ -3467,18 +3251,12 @@ resolve-url@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-resolve@^1.10.0, resolve@^1.13.1, resolve@^1.3.2:
+resolve@^1.10.0, resolve@^1.3.2:
version "1.15.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
dependencies:
path-parse "^1.0.6"
-resolve@^1.17.0:
- version "1.17.0"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
- dependencies:
- path-parse "^1.0.6"
-
resolve@^1.18.1:
version "1.18.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
@@ -3761,30 +3539,12 @@ string-width@^4.1.0, string-width@^4.2.0:
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.0"
-string.prototype.trimleft@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
- dependencies:
- define-properties "^1.1.3"
- function-bind "^1.1.1"
-
-string.prototype.trimright@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
- dependencies:
- define-properties "^1.1.3"
- function-bind "^1.1.1"
-
strip-ansi@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
dependencies:
ansi-regex "^5.0.0"
-strip-bom@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
strip-bom@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
@@ -3820,10 +3580,6 @@ supports-hyperlinks@^2.0.0:
has-flag "^4.0.0"
supports-color "^7.0.0"
-svg-element-attributes@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/svg-element-attributes/-/svg-element-attributes-1.3.1.tgz#0c55afac6284291ab563d0913c062cf78a8c0ddb"
-
symbol-tree@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -3932,15 +3688,6 @@ ts-jest@26.5.5:
semver "7.x"
yargs-parser "20.x"
-tsconfig-paths@^3.9.0:
- version "3.9.0"
- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
- dependencies:
- "@types/json5" "^0.0.29"
- json5 "^1.0.1"
- minimist "^1.2.0"
- strip-bom "^3.0.0"
-
tslib@^1.8.1:
version "1.10.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
From 941d3a7ddbe11a329c11b48ffee08ff949b0476e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 19:07:09 -0400
Subject: [PATCH 20/45] Bump @types/jest from 26.0.22 to 26.0.23 (#688)
Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 26.0.22 to 26.0.23.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index b567b684..a19ab827 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
"@actions/io": "1.1.0"
},
"devDependencies": {
- "@types/jest": "26.0.22",
+ "@types/jest": "26.0.23",
"@types/node": "14.14.41",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
diff --git a/yarn.lock b/yarn.lock
index 15cd2633..2187aaee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -711,9 +711,10 @@
dependencies:
"@types/istanbul-lib-report" "*"
-"@types/jest@26.0.22":
- version "26.0.22"
- resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.22.tgz#8308a1debdf1b807aa47be2838acdcd91e88fbe6"
+"@types/jest@26.0.23":
+ version "26.0.23"
+ resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz#a1b7eab3c503b80451d019efb588ec63522ee4e7"
+ integrity sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA==
dependencies:
jest-diff "^26.0.0"
pretty-format "^26.0.0"
From ea1ecc5f0af6206210884ddbab7e11dd8fe15c2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 19:33:17 -0400
Subject: [PATCH 21/45] Bump @types/node from 14.14.41 to 15.0.0 (#689)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.41 to 15.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index a19ab827..391059bc 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"devDependencies": {
"@types/jest": "26.0.23",
- "@types/node": "14.14.41",
+ "@types/node": "15.0.0",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"eslint": "7.25.0",
diff --git a/yarn.lock b/yarn.lock
index 2187aaee..f782d80f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -723,9 +723,10 @@
version "7.0.4"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
-"@types/node@*", "@types/node@14.14.41", "@types/node@>= 8":
- version "14.14.41"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.41.tgz#d0b939d94c1d7bd53d04824af45f1139b8c45615"
+"@types/node@*", "@types/node@15.0.0", "@types/node@>= 8":
+ version "15.0.0"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.0.tgz#557dd0da4a6dca1407481df3bbacae0cd6f68042"
+ integrity sha512-YN1d+ae2MCb4U0mMa+Zlb5lWTdpFShbAj5nmte6lel27waMMBfivrm0prC16p/Di3DyTrmerrYUT8/145HXxVw==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
From c74fc1e25a46996f10e91adaa5a64297b4803b89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:17:46 -0400
Subject: [PATCH 22/45] Bump @types/node from 15.0.0 to 15.0.1 (#691)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 15.0.0 to 15.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 391059bc..ac1dfde9 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"devDependencies": {
"@types/jest": "26.0.23",
- "@types/node": "15.0.0",
+ "@types/node": "15.0.1",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"eslint": "7.25.0",
diff --git a/yarn.lock b/yarn.lock
index f782d80f..a199e746 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -723,10 +723,10 @@
version "7.0.4"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
-"@types/node@*", "@types/node@15.0.0", "@types/node@>= 8":
- version "15.0.0"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.0.tgz#557dd0da4a6dca1407481df3bbacae0cd6f68042"
- integrity sha512-YN1d+ae2MCb4U0mMa+Zlb5lWTdpFShbAj5nmte6lel27waMMBfivrm0prC16p/Di3DyTrmerrYUT8/145HXxVw==
+"@types/node@*", "@types/node@15.0.1", "@types/node@>= 8":
+ version "15.0.1"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a"
+ integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
From 04816dcced1946b4401d9b532a7cfce49f6601eb Mon Sep 17 00:00:00 2001
From: James Ives
Date: Tue, 4 May 2021 12:13:10 -0400
Subject: [PATCH 23/45] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index c809aad8..c61b0122 100644
--- a/README.md
+++ b/README.md
@@ -92,13 +92,13 @@ npm install @jamesives/github-pages-deploy-action
It can then be imported into your project like so.
```javascript
-import run from 'github-pages-deploy-action'
+import run from '@jamesives/github-pages-deploy-action'
```
Calling the functions directly will require you to pass in an object containing the variables found in the configuration section, you'll also need to provide a `workspace` with a path to your project.
```javascript
-import run from 'github-pages-deploy-action'
+import run from '@jamesives/github-pages-deploy-action'
run({
token: process.env['ACCESS_TOKEN'],
From 6bbab6ae47b3749a31f8cf581325d4986cacff8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 May 2021 11:48:15 -0400
Subject: [PATCH 24/45] Bump @types/node from 15.0.1 to 15.0.2 (#692)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 15.0.1 to 15.0.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index ac1dfde9..65c16774 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"devDependencies": {
"@types/jest": "26.0.23",
- "@types/node": "15.0.1",
+ "@types/node": "15.0.2",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"eslint": "7.25.0",
diff --git a/yarn.lock b/yarn.lock
index a199e746..299a61cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -723,10 +723,10 @@
version "7.0.4"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
-"@types/node@*", "@types/node@15.0.1", "@types/node@>= 8":
- version "15.0.1"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a"
- integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==
+"@types/node@*", "@types/node@15.0.2", "@types/node@>= 8":
+ version "15.0.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67"
+ integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
From e68dabeebeb912d7d1e95b0b42df66a8d4bfcab1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 May 2021 11:50:59 -0400
Subject: [PATCH 25/45] Bump @typescript-eslint/eslint-plugin from 4.22.0 to
4.22.1 (#693)
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.22.0 to 4.22.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.22.1/packages/eslint-plugin)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 93 ++++++++++++++++++++++++----------------------------
2 files changed, 44 insertions(+), 51 deletions(-)
diff --git a/package.json b/package.json
index 65c16774..53e411e8 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"devDependencies": {
"@types/jest": "26.0.23",
"@types/node": "15.0.2",
- "@typescript-eslint/eslint-plugin": "4.22.0",
+ "@typescript-eslint/eslint-plugin": "4.22.1",
"@typescript-eslint/parser": "4.22.0",
"eslint": "7.25.0",
"eslint-config-prettier": "8.3.0",
diff --git a/yarn.lock b/yarn.lock
index 299a61cf..26486826 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -750,13 +750,13 @@
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/eslint-plugin@4.22.0":
- version "4.22.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz#3d5f29bb59e61a9dba1513d491b059e536e16dbc"
- integrity sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==
+"@typescript-eslint/eslint-plugin@4.22.1":
+ version "4.22.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.1.tgz#6bcdbaa4548553ab861b4e5f34936ead1349a543"
+ integrity sha512-kVTAghWDDhsvQ602tHBc6WmQkdaYbkcTwZu+7l24jtJiYvm9l+/y/b2BZANEezxPDiX5MK2ZecE+9BFi/YJryw==
dependencies:
- "@typescript-eslint/experimental-utils" "4.22.0"
- "@typescript-eslint/scope-manager" "4.22.0"
+ "@typescript-eslint/experimental-utils" "4.22.1"
+ "@typescript-eslint/scope-manager" "4.22.1"
debug "^4.1.1"
functional-red-black-tree "^1.0.1"
lodash "^4.17.15"
@@ -764,26 +764,15 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/experimental-utils@4.22.0":
- version "4.22.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz#68765167cca531178e7b650a53456e6e0bef3b1f"
- integrity sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==
+"@typescript-eslint/experimental-utils@4.22.1", "@typescript-eslint/experimental-utils@^4.0.1":
+ version "4.22.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.1.tgz#3938a5c89b27dc9a39b5de63a62ab1623ab27497"
+ integrity sha512-svYlHecSMCQGDO2qN1v477ax/IDQwWhc7PRBiwAdAMJE7GXk5stF4Z9R/8wbRkuX/5e9dHqbIWxjeOjckK3wLQ==
dependencies:
"@types/json-schema" "^7.0.3"
- "@typescript-eslint/scope-manager" "4.22.0"
- "@typescript-eslint/types" "4.22.0"
- "@typescript-eslint/typescript-estree" "4.22.0"
- eslint-scope "^5.0.0"
- eslint-utils "^2.0.0"
-
-"@typescript-eslint/experimental-utils@^4.0.1":
- version "4.21.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.21.0.tgz#0b0bb7c15d379140a660c003bdbafa71ae9134b6"
- dependencies:
- "@types/json-schema" "^7.0.3"
- "@typescript-eslint/scope-manager" "4.21.0"
- "@typescript-eslint/types" "4.21.0"
- "@typescript-eslint/typescript-estree" "4.21.0"
+ "@typescript-eslint/scope-manager" "4.22.1"
+ "@typescript-eslint/types" "4.22.1"
+ "@typescript-eslint/typescript-estree" "4.22.1"
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
@@ -797,13 +786,6 @@
"@typescript-eslint/typescript-estree" "4.22.0"
debug "^4.1.1"
-"@typescript-eslint/scope-manager@4.21.0":
- version "4.21.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.21.0.tgz#c81b661c4b8af1ec0c010d847a8f9ab76ab95b4d"
- dependencies:
- "@typescript-eslint/types" "4.21.0"
- "@typescript-eslint/visitor-keys" "4.21.0"
-
"@typescript-eslint/scope-manager@4.22.0":
version "4.22.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz#ed411545e61161a8d702e703a4b7d96ec065b09a"
@@ -812,26 +794,23 @@
"@typescript-eslint/types" "4.22.0"
"@typescript-eslint/visitor-keys" "4.22.0"
-"@typescript-eslint/types@4.21.0":
- version "4.21.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.21.0.tgz#abdc3463bda5d31156984fa5bc316789c960edef"
+"@typescript-eslint/scope-manager@4.22.1":
+ version "4.22.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4"
+ integrity sha512-d5bAiPBiessSmNi8Amq/RuLslvcumxLmyhf1/Xa9IuaoFJ0YtshlJKxhlbY7l2JdEk3wS0EnmnfeJWSvADOe0g==
+ dependencies:
+ "@typescript-eslint/types" "4.22.1"
+ "@typescript-eslint/visitor-keys" "4.22.1"
"@typescript-eslint/types@4.22.0":
version "4.22.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.0.tgz#0ca6fde5b68daf6dba133f30959cc0688c8dd0b6"
integrity sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==
-"@typescript-eslint/typescript-estree@4.21.0":
- version "4.21.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.21.0.tgz#3817bd91857beeaeff90f69f1f112ea58d350b0a"
- dependencies:
- "@typescript-eslint/types" "4.21.0"
- "@typescript-eslint/visitor-keys" "4.21.0"
- debug "^4.1.1"
- globby "^11.0.1"
- is-glob "^4.0.1"
- semver "^7.3.2"
- tsutils "^3.17.1"
+"@typescript-eslint/types@4.22.1":
+ version "4.22.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a"
+ integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw==
"@typescript-eslint/typescript-estree@4.22.0":
version "4.22.0"
@@ -846,12 +825,18 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/visitor-keys@4.21.0":
- version "4.21.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.21.0.tgz#990a9acdc124331f5863c2cf21c88ba65233cd8d"
+"@typescript-eslint/typescript-estree@4.22.1":
+ version "4.22.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9"
+ integrity sha512-p3We0pAPacT+onSGM+sPR+M9CblVqdA9F1JEdIqRVlxK5Qth4ochXQgIyb9daBomyQKAXbygxp1aXQRV0GC79A==
dependencies:
- "@typescript-eslint/types" "4.21.0"
- eslint-visitor-keys "^2.0.0"
+ "@typescript-eslint/types" "4.22.1"
+ "@typescript-eslint/visitor-keys" "4.22.1"
+ debug "^4.1.1"
+ globby "^11.0.1"
+ is-glob "^4.0.1"
+ semver "^7.3.2"
+ tsutils "^3.17.1"
"@typescript-eslint/visitor-keys@4.22.0":
version "4.22.0"
@@ -861,6 +846,14 @@
"@typescript-eslint/types" "4.22.0"
eslint-visitor-keys "^2.0.0"
+"@typescript-eslint/visitor-keys@4.22.1":
+ version "4.22.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6"
+ integrity sha512-WPkOrIRm+WCLZxXQHCi+WG8T2MMTUFR70rWjdWYddLT7cEfb2P4a3O/J2U1FBVsSFTocXLCoXWY6MZGejeStvQ==
+ dependencies:
+ "@typescript-eslint/types" "4.22.1"
+ eslint-visitor-keys "^2.0.0"
+
abab@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
From 0232645905b302ca3bc5e30abd07541406ce95e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 May 2021 12:03:40 -0400
Subject: [PATCH 26/45] Bump @typescript-eslint/parser from 4.22.0 to 4.22.1
(#694)
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.22.0 to 4.22.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.22.1/packages/parser)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 48 +++++++-----------------------------------------
2 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/package.json b/package.json
index 53e411e8..544010d7 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
"@types/jest": "26.0.23",
"@types/node": "15.0.2",
"@typescript-eslint/eslint-plugin": "4.22.1",
- "@typescript-eslint/parser": "4.22.0",
+ "@typescript-eslint/parser": "4.22.1",
"eslint": "7.25.0",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-jest": "24.3.6",
diff --git a/yarn.lock b/yarn.lock
index 26486826..4a58d1bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -776,24 +776,16 @@
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
-"@typescript-eslint/parser@4.22.0":
- version "4.22.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.0.tgz#e1637327fcf796c641fe55f73530e90b16ac8fe8"
- integrity sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==
+"@typescript-eslint/parser@4.22.1":
+ version "4.22.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.1.tgz#a95bda0fd01d994a15fc3e99dc984294f25c19cc"
+ integrity sha512-l+sUJFInWhuMxA6rtirzjooh8cM/AATAe3amvIkqKFeMzkn85V+eLzb1RyuXkHak4dLfYzOmF6DXPyflJvjQnw==
dependencies:
- "@typescript-eslint/scope-manager" "4.22.0"
- "@typescript-eslint/types" "4.22.0"
- "@typescript-eslint/typescript-estree" "4.22.0"
+ "@typescript-eslint/scope-manager" "4.22.1"
+ "@typescript-eslint/types" "4.22.1"
+ "@typescript-eslint/typescript-estree" "4.22.1"
debug "^4.1.1"
-"@typescript-eslint/scope-manager@4.22.0":
- version "4.22.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz#ed411545e61161a8d702e703a4b7d96ec065b09a"
- integrity sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==
- dependencies:
- "@typescript-eslint/types" "4.22.0"
- "@typescript-eslint/visitor-keys" "4.22.0"
-
"@typescript-eslint/scope-manager@4.22.1":
version "4.22.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4"
@@ -802,29 +794,11 @@
"@typescript-eslint/types" "4.22.1"
"@typescript-eslint/visitor-keys" "4.22.1"
-"@typescript-eslint/types@4.22.0":
- version "4.22.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.0.tgz#0ca6fde5b68daf6dba133f30959cc0688c8dd0b6"
- integrity sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==
-
"@typescript-eslint/types@4.22.1":
version "4.22.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a"
integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw==
-"@typescript-eslint/typescript-estree@4.22.0":
- version "4.22.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz#b5d95d6d366ff3b72f5168c75775a3e46250d05c"
- integrity sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==
- dependencies:
- "@typescript-eslint/types" "4.22.0"
- "@typescript-eslint/visitor-keys" "4.22.0"
- debug "^4.1.1"
- globby "^11.0.1"
- is-glob "^4.0.1"
- semver "^7.3.2"
- tsutils "^3.17.1"
-
"@typescript-eslint/typescript-estree@4.22.1":
version "4.22.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9"
@@ -838,14 +812,6 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/visitor-keys@4.22.0":
- version "4.22.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz#169dae26d3c122935da7528c839f42a8a42f6e47"
- integrity sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==
- dependencies:
- "@typescript-eslint/types" "4.22.0"
- eslint-visitor-keys "^2.0.0"
-
"@typescript-eslint/visitor-keys@4.22.1":
version "4.22.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6"
From 3ee97cff89ee39d3623d87c7840fb42c93282265 Mon Sep 17 00:00:00 2001
From: James Ives
Date: Wed, 5 May 2021 23:20:11 -0400
Subject: [PATCH 27/45] Adds Sponsors
---
.github/assets/icon.png | Bin 0 -> 99507 bytes
{assets => .github/assets}/screenshot.png | Bin
.github/workflows/sponsors.yml | 25 ++++++++++++++++++++++
README.md | 11 ++++++----
assets/icon.png | Bin 64156 -> 0 bytes
5 files changed, 32 insertions(+), 4 deletions(-)
create mode 100644 .github/assets/icon.png
rename {assets => .github/assets}/screenshot.png (100%)
create mode 100644 .github/workflows/sponsors.yml
delete mode 100644 assets/icon.png
diff --git a/.github/assets/icon.png b/.github/assets/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2edaa4e2b9cd424666542bd7d90ba087955119de
GIT binary patch
literal 99507
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