From f173825ff1e6d8da4388df8e527764ad0da0cf06 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sun, 27 Sep 2020 19:09:45 +0000 Subject: [PATCH 01/42] =?UTF-8?q?Release=203.6.2=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 006eb8ff6..a7a3737e7 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": "3.6.1", + "version": "3.6.2", "license": "MIT", "main": "lib/lib.js", "types": "lib/lib.d.ts", From a7256d994ab24020f9df920ea2f7fba6215df5af Mon Sep 17 00:00:00 2001 From: James Ives Date: Sun, 27 Sep 2020 15:10:55 -0400 Subject: [PATCH 02/42] 3.6.2 --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b25465c19..73e4f959b 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ jobs: npm run build - name: Deploy πŸš€ - uses: JamesIves/github-pages-deploy-action@3.6.1 + uses: JamesIves/github-pages-deploy-action@3.6.2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH: gh-pages # The branch the action should deploy to. @@ -188,7 +188,7 @@ With this configured you must add the `ssh-agent` step to your workflow and set ssh-private-key: ${{ secrets.DEPLOY_KEY }} - name: Deploy πŸš€ - uses: JamesIves/github-pages-deploy-action@3.6.1 + uses: JamesIves/github-pages-deploy-action@3.6.2 with: SSH: true BRANCH: gh-pages @@ -224,7 +224,7 @@ jobs: ssh-private-key: ${{ secrets.DEPLOY_KEY }} - name: Deploy πŸš€ - uses: JamesIves/github-pages-deploy-action@3.6.1 + uses: JamesIves/github-pages-deploy-action@3.6.2 with: BASE_BRANCH: master BRANCH: gh-pages @@ -291,7 +291,7 @@ jobs: name: site - name: Deploy πŸš€ - uses: JamesIves/github-pages-deploy-action@3.6.1 + uses: JamesIves/github-pages-deploy-action@3.6.2 with: ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} BRANCH: gh-pages @@ -313,7 +313,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@3.6.1 + uses: JamesIves/github-pages-deploy-action@3.6.2 ``` --- From 167a72dc6ac9b81661b171ddf6771ca218bf158b Mon Sep 17 00:00:00 2001 From: James Ives Date: Thu, 1 Oct 2020 11:34:21 -0400 Subject: [PATCH 03/42] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8ad7a3f31..da790e29f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ # Contributing ✏️ 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. +[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 nay code incase it's already in flight! ## Before Making a Pull Request πŸŽ’ From faff0d3d2e5707311271444a9c91448bcabbeba2 Mon Sep 17 00:00:00 2001 From: James Ives Date: Thu, 1 Oct 2020 11:34:44 -0400 Subject: [PATCH 04/42] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index da790e29f..feabd77c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ # Contributing ✏️ 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 nay code incase it's already in flight! +[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 πŸŽ’ From eb54fe3562105a142a2c888d4aaf0f676a2ba1a1 Mon Sep 17 00:00:00 2001 From: Philipp Panteleev Date: Fri, 2 Oct 2020 06:20:40 +0400 Subject: [PATCH 05/42] Bump eslint-plugin-github version + fix eslint issues (#437) * Bump eslint-plugin-github and eslint rules update * ban-ts-comment rule was enabled --- .eslintrc.json | 21 +- package.json | 2 +- yarn.lock | 603 +++++++++++++------------------------------------ 3 files changed, 170 insertions(+), 456 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index e71c4f941..fa6b50dc5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,6 @@ { - "plugins": ["jest", "@typescript-eslint"], - "extends": ["plugin:github/es6"], + "plugins": ["jest", "@typescript-eslint", "github"], + "extends": ["plugin:github/recommended"], "parser": "@typescript-eslint/parser", "parserOptions": { "ecmaVersion": 9, @@ -19,13 +19,17 @@ "@typescript-eslint/no-require-imports": "error", "@typescript-eslint/array-type": "error", "@typescript-eslint/await-thenable": "error", - "@typescript-eslint/ban-ts-ignore": "error", + "@typescript-eslint/ban-ts-comment": "error", "camelcase": "off", - "@typescript-eslint/camelcase": "error", - "@typescript-eslint/class-name-casing": "error", + "@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/generic-type-naming": ["error", "^[A-Z][A-Za-z]*$"], "@typescript-eslint/no-array-constructor": "error", "@typescript-eslint/no-empty-interface": "error", "@typescript-eslint/no-explicit-any": "off", @@ -50,11 +54,12 @@ "@typescript-eslint/semi": ["error", "never"], "@typescript-eslint/type-annotation-spacing": "error", "@typescript-eslint/unbound-method": "error", - "no-console": "off" + "no-console": "off", + "no-shadow": ["error", { "builtinGlobals": false, "hoist": "all", "allow": ["Status"] }] }, "env": { "node": true, "es6": true, "jest/globals": true } -} \ No newline at end of file +} diff --git a/package.json b/package.json index a7a3737e7..c00ee5dd0 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@types/jest": "26.0.14", "@types/node": "14.11.2", "eslint": "7.9.0", - "eslint-plugin-github": "3.4.1", + "eslint-plugin-github": "4.1.1", "eslint-plugin-jest": "24.0.2", "eslint-plugin-prettier": "^3.1.2", "jest": "25.5.4", diff --git a/yarn.lock b/yarn.lock index 928b2f28e..181ff8453 100644 --- a/yarn.lock +++ b/yarn.lock @@ -232,19 +232,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/runtime-corejs3@^7.8.3": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz#8209d9dff2f33aa2616cb319c83fe159ffb07b8c" - dependencies: - core-js-pure "^3.0.0" - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.4.5": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d" - dependencies: - regenerator-runtime "^0.13.4" - "@babel/template@^7.3.3": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" @@ -786,10 +773,6 @@ version "1.1.1" resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" -"@types/eslint-visitor-keys@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" - "@types/graceful-fs@^4.1.2": version "4.1.3" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f" @@ -830,6 +813,11 @@ 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" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/node@*", "@types/node@14.11.2", "@types/node@>= 8": version "14.11.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256" @@ -860,23 +848,30 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@>=2.5.0": - version "2.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.22.0.tgz#218ce6d4aa0244c6a40baba39ca1e021b26bb017" +"@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" + integrity sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g== dependencies: - "@typescript-eslint/experimental-utils" "2.22.0" - eslint-utils "^1.4.3" + "@typescript-eslint/experimental-utils" "4.3.0" + "@typescript-eslint/scope-manager" "4.3.0" + debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" + semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.22.0": - version "2.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.22.0.tgz#4d00c91fbaaa68e56e7869be284999a265707f85" +"@typescript-eslint/experimental-utils@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87" + integrity sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.22.0" + "@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/experimental-utils@^4.0.1": version "4.1.0" @@ -889,14 +884,15 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@>=2.5.0": - version "2.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.22.0.tgz#8eeb6cb6de873f655e64153397d4790898e149d0" +"@typescript-eslint/parser@>=2.25.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.3.0.tgz#684fc0be6551a2bfcb253991eec3c786a8c063a3" + integrity sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g== dependencies: - "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.22.0" - "@typescript-eslint/typescript-estree" "2.22.0" - eslint-visitor-keys "^1.1.0" + "@typescript-eslint/scope-manager" "4.3.0" + "@typescript-eslint/types" "4.3.0" + "@typescript-eslint/typescript-estree" "4.3.0" + debug "^4.1.1" "@typescript-eslint/scope-manager@4.1.0": version "4.1.0" @@ -905,21 +901,22 @@ "@typescript-eslint/types" "4.1.0" "@typescript-eslint/visitor-keys" "4.1.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" + integrity sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig== + dependencies: + "@typescript-eslint/types" "4.3.0" + "@typescript-eslint/visitor-keys" "4.3.0" + "@typescript-eslint/types@4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.1.0.tgz#edbd3fec346f34e13ce7aa176b03b497a32c496a" -"@typescript-eslint/typescript-estree@2.22.0": - version "2.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.22.0.tgz#a16ed45876abf743e1f5857e2f4a1c3199fd219e" - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^6.3.0" - tsutils "^3.17.1" +"@typescript-eslint/types@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf" + integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw== "@typescript-eslint/typescript-estree@4.1.0": version "4.1.0" @@ -934,6 +931,20 @@ 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" + integrity sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw== + 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.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.0.tgz#b2d528c9484e7eda1aa4f86ccf0432fb16e4d545" @@ -941,6 +952,14 @@ "@typescript-eslint/types" "4.1.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" + integrity sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw== + dependencies: + "@typescript-eslint/types" "4.3.0" + eslint-visitor-keys "^2.0.0" + abab@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.2.tgz#a2fba1b122c69a85caa02d10f9270c7219709a9d" @@ -1051,13 +1070,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -aria-query@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc" - dependencies: - ast-types-flow "0.0.7" - commander "^2.11.0" - arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -1074,7 +1086,7 @@ array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" -array-includes@^3.0.3, array-includes@^3.1.1: +array-includes@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" dependencies: @@ -1090,9 +1102,10 @@ 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.1: +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" + integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== dependencies: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" @@ -1111,10 +1124,6 @@ assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" -ast-types-flow@0.0.7, ast-types-flow@^0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" - astral-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" @@ -1135,21 +1144,6 @@ aws4@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" -axobject-query@^2.0.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz#2bdffc0371e643e5f03ba99065d5179b9ca79799" - -babel-eslint@>=10.0.3: - version "10.1.0" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.7.0" - "@babel/traverse" "^7.7.0" - "@babel/types" "^7.7.0" - eslint-visitor-keys "^1.0.0" - resolve "^1.12.0" - babel-jest@^25.5.1: version "25.5.1" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.5.1.tgz#bc2e6101f849d6f6aec09720ffc7bc5332e62853" @@ -1390,10 +1384,6 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -1407,16 +1397,6 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - dependencies: - restore-cursor "^3.1.0" - -cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - cliui@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -1466,14 +1446,6 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@^2.11.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - -comment-parser@^0.7.2: - version "0.7.2" - resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-0.7.2.tgz#baf6d99b42038678b81096f15b630d18142f4b8a" - component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -1496,21 +1468,10 @@ copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" -core-js-pure@^3.0.0: - version "3.6.4" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a" - core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" -cross-fetch@2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.2.tgz#a47ff4f7fc712daba8f6a695a11c948440d45723" - dependencies: - node-fetch "2.1.2" - whatwg-fetch "2.0.4" - cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -1549,10 +1510,6 @@ cssstyle@^2.2.0: dependencies: cssom "~0.3.6" -damerau-levenshtein@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791" - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -1669,12 +1626,6 @@ doctrine@1.5.0: esutils "^2.0.2" isarray "^1.0.0" -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - dependencies: - esutils "^2.0.2" - doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -1704,7 +1655,7 @@ emittery@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451" -emoji-regex@^7.0.1, emoji-regex@^7.0.2: +emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -1784,22 +1735,25 @@ escodegen@^1.14.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@>=6.4.0: - version "6.10.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz#7b15e303bf9c956875c948f6b21500e48ded6a7f" +eslint-config-prettier@>=6.10.1: + version "6.12.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2" + integrity sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw== dependencies: get-stdin "^6.0.0" -eslint-import-resolver-node@^0.3.2: - version "0.3.3" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404" +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" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== dependencies: debug "^2.6.9" resolve "^1.13.1" -eslint-module-utils@^2.4.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" +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" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== dependencies: debug "^2.6.9" pkg-dir "^2.0.0" @@ -1811,59 +1765,39 @@ eslint-plugin-eslint-comments@>=3.0.1: escape-string-regexp "^1.0.5" ignore "^5.0.5" -eslint-plugin-flowtype@>=4.3.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz#82b2bd6f21770e0e5deede0228e456cb35308451" - dependencies: - lodash "^4.17.15" - -eslint-plugin-github@3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-github/-/eslint-plugin-github-3.4.1.tgz#3c351731194a55c405c9e49e53a5013beb3bceb0" +eslint-plugin-github@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-github/-/eslint-plugin-github-4.1.1.tgz#d3e38dbe3610043066edca622eb944aa02b09aee" + integrity sha512-MzCh4P4zVvR/13AHtumzZ3znq0cbUE7lXehyBEpFURD/EHdx/+7qW+0c+ySTrteImpX9LGLJFTYNtu10BifkbQ== dependencies: - "@typescript-eslint/eslint-plugin" ">=2.5.0" - "@typescript-eslint/parser" ">=2.5.0" - babel-eslint ">=10.0.3" - eslint-config-prettier ">=6.4.0" + "@typescript-eslint/eslint-plugin" ">=2.25.0" + "@typescript-eslint/parser" ">=2.25.0" + eslint-config-prettier ">=6.10.1" eslint-plugin-eslint-comments ">=3.0.1" - eslint-plugin-flowtype ">=4.3.0" - eslint-plugin-graphql ">=3.0.1" - eslint-plugin-import ">=2.18.2" - eslint-plugin-jsdoc ">=15.5.2" - eslint-plugin-jsx-a11y ">=6.0.0" - eslint-plugin-prettier ">=2.6.0" - eslint-plugin-react ">=7.7.0" - eslint-plugin-relay ">=1.0.0" + eslint-plugin-import ">=2.20.1" + eslint-plugin-prettier ">=3.1.2" eslint-rule-documentation ">=1.0.0" - inquirer ">=6.0.0" prettier ">=1.12.0" - read-pkg-up ">=6.0.0" - supports-color "^7.1.0" - svg-element-attributes ">=1.2.1" - -eslint-plugin-graphql@>=3.0.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-graphql/-/eslint-plugin-graphql-3.1.1.tgz#640f7f73f12cee2f7145140bd2ff21694018bff5" - dependencies: - graphql-config "^2.0.1" - lodash "^4.11.1" + svg-element-attributes ">=1.3.1" -eslint-plugin-import@>=2.18.2: - version "2.20.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" +eslint-plugin-import@>=2.20.1: + version "2.22.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" + integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== dependencies: - array-includes "^3.0.3" - array.prototype.flat "^1.2.1" + 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.2" - eslint-module-utils "^2.4.1" + 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.0" + object.values "^1.1.1" read-pkg-up "^2.0.0" - resolve "^1.12.0" + resolve "^1.17.0" + tsconfig-paths "^3.9.0" eslint-plugin-jest@24.0.2: version "24.0.2" @@ -1871,77 +1805,31 @@ eslint-plugin-jest@24.0.2: dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" -eslint-plugin-jsdoc@>=15.5.2: - version "22.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-22.0.0.tgz#371f1dbf4f61ee6e11c23fa1ea3275962f1bceaf" - dependencies: - comment-parser "^0.7.2" - debug "^4.1.1" - jsdoctypeparser "^6.1.0" - lodash "^4.17.15" - regextras "^0.7.0" - semver "^6.3.0" - spdx-expression-parse "^3.0.0" - -eslint-plugin-jsx-a11y@>=6.0.0: - version "6.2.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa" - dependencies: - "@babel/runtime" "^7.4.5" - aria-query "^3.0.0" - array-includes "^3.0.3" - ast-types-flow "^0.0.7" - axobject-query "^2.0.2" - damerau-levenshtein "^1.0.4" - emoji-regex "^7.0.2" - has "^1.0.3" - jsx-ast-utils "^2.2.1" - -eslint-plugin-prettier@>=2.6.0, eslint-plugin-prettier@^3.1.2: +eslint-plugin-prettier@>=3.1.2, eslint-plugin-prettier@^3.1.2: version "3.1.4" resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2" + integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg== dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-react@>=7.7.0: - version "7.19.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666" - dependencies: - array-includes "^3.1.1" - doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.2.3" - object.entries "^1.1.1" - object.fromentries "^2.0.2" - object.values "^1.1.1" - prop-types "^15.7.2" - resolve "^1.15.1" - semver "^6.3.0" - string.prototype.matchall "^4.0.2" - xregexp "^4.3.0" - -eslint-plugin-relay@>=1.0.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-relay/-/eslint-plugin-relay-1.7.0.tgz#f6cfae681381dc96db9bd700d8c33fbe9783143e" - dependencies: - graphql "^14.0.0 | ^15.0.0-rc.1" - 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.0: +eslint-scope@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" +eslint-scope@^5.1.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: - eslint-visitor-keys "^1.1.0" + esrecurse "^4.3.0" + estraverse "^4.1.1" eslint-utils@^2.0.0, eslint-utils@^2.1.0: version "2.1.0" @@ -1949,7 +1837,7 @@ eslint-utils@^2.0.0, eslint-utils@^2.1.0: dependencies: eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" @@ -1960,6 +1848,7 @@ eslint-visitor-keys@^2.0.0: eslint@7.9.0: version "7.9.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337" + integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.1.3" @@ -2023,6 +1912,13 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" @@ -2031,6 +1927,11 @@ estraverse@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" +estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -2121,14 +2022,6 @@ extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - extglob@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" @@ -2189,12 +2082,6 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -2319,7 +2206,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0: dependencies: is-glob "^4.0.1" -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" dependencies: @@ -2359,33 +2246,6 @@ graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" -graphql-config@^2.0.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-2.2.1.tgz#5fd0ec77ac7428ca5fb2026cf131be10151a0cb2" - dependencies: - graphql-import "^0.7.1" - graphql-request "^1.5.0" - js-yaml "^3.10.0" - lodash "^4.17.4" - minimatch "^3.0.4" - -graphql-import@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/graphql-import/-/graphql-import-0.7.1.tgz#4add8d91a5f752d764b0a4a7a461fcd93136f223" - dependencies: - lodash "^4.17.4" - resolve-from "^4.0.0" - -graphql-request@^1.5.0: - version "1.8.2" - resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-1.8.2.tgz#398d10ae15c585676741bde3fc01d5ca948f8fbe" - dependencies: - cross-fetch "2.2.2" - -"graphql@^14.0.0 | ^15.0.0-rc.1": - version "15.0.0-rc.2" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.0.0-rc.2.tgz#6549e52e5415ac08900c432b22d34500c0c3635f" - growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -2482,7 +2342,7 @@ human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" dependencies: @@ -2525,32 +2385,6 @@ inherits@2: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" -inquirer@>=6.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29" - dependencies: - ansi-escapes "^4.2.1" - chalk "^3.0.0" - cli-cursor "^3.1.0" - cli-width "^2.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.15" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.5.3" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - -internal-slot@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" - dependencies: - es-abstract "^1.17.0-next.1" - has "^1.0.3" - side-channel "^1.0.2" - ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -2679,10 +2513,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-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - is-regex@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" @@ -3433,11 +3263,11 @@ jest@25.5.4: import-local "^3.0.2" jest-cli "^25.5.4" -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: +js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" -js-yaml@^3.10.0, js-yaml@^3.13.1: +js-yaml@^3.13.1: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" dependencies: @@ -3448,10 +3278,6 @@ jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" -jsdoctypeparser@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-6.1.0.tgz#acfb936c26300d98f1405cb03e20b06748e512a8" - jsdom@^15.2.1: version "15.2.1" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" @@ -3544,6 +3370,13 @@ 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" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + 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" @@ -3553,13 +3386,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f" - dependencies: - array-includes "^3.0.3" - object.assign "^4.1.0" - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -3636,7 +3462,7 @@ lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" -lodash@^4.11.1, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4: +lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: version "4.17.19" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" @@ -3646,12 +3472,6 @@ lolex@^5.0.0: dependencies: "@sinonjs/commons" "^1.7.0" -loose-envify@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - macos-release@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f" @@ -3760,10 +3580,6 @@ ms@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -3788,10 +3604,6 @@ nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" -node-fetch@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5" - node-fetch@^2.3.0: version "2.6.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" @@ -3853,10 +3665,6 @@ oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" -object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" @@ -3888,31 +3696,13 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.entries@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b" - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" - has "^1.0.3" - -object.fromentries@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" - has "^1.0.3" - 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.0, object.values@^1.1.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: @@ -3962,10 +3752,6 @@ os-name@^3.1.0: macos-release "^2.2.0" windows-release "^3.1.0" -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - p-each-series@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" @@ -4166,14 +3952,6 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.3" -prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - psl@^1.1.24, psl@^1.1.28: version "1.4.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2" @@ -4201,11 +3979,14 @@ react-is@^16.12.0: version "16.12.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" -react-is@^16.8.1: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" +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@>=6.0.0, read-pkg-up@^7.0.1: +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" dependencies: @@ -4213,13 +3994,6 @@ read-pkg-up@>=6.0.0, read-pkg-up@^7.0.1: read-pkg "^5.2.0" type-fest "^0.8.1" -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@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" @@ -4241,10 +4015,6 @@ realpath-native@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866" -regenerator-runtime@^0.13.4: - version "0.13.4" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91" - regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -4252,21 +4022,10 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - regexpp@^3.0.0, regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" -regextras@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.7.0.tgz#2298bef8cfb92b1b7e3b9b12aa8f69547b7d71e4" - remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -4373,7 +4132,7 @@ resolve@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2: +resolve@^1.10.0, resolve@^1.13.1, resolve@^1.3.2: version "1.15.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" dependencies: @@ -4385,13 +4144,6 @@ resolve@^1.17.0: dependencies: path-parse "^1.0.6" -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" @@ -4416,22 +4168,10 @@ rsvp@^4.8.4: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" -run-async@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8" - dependencies: - is-promise "^2.1.0" - run-parallel@^1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" -rxjs@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" - dependencies: - tslib "^1.9.0" - safe-buffer@^5.0.1, safe-buffer@^5.1.2: version "5.2.0" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" @@ -4525,13 +4265,6 @@ shellwords@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" -side-channel@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" - dependencies: - es-abstract "^1.17.0-next.1" - object-inspect "^1.7.0" - signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -4702,17 +4435,6 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.matchall@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0" - has-symbols "^1.0.1" - internal-slot "^1.0.2" - regexp.prototype.flags "^1.3.0" - side-channel "^1.0.2" - 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" @@ -4778,9 +4500,10 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" -svg-element-attributes@>=1.2.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" + integrity sha512-Bh05dSOnJBf3miNMqpsormfNtfidA/GxQVakhtn0T4DECWKeXQRQUceYjJ+OxYiiLdGe4Jo9iFV8wICFapFeIA== symbol-tree@^3.2.2, symbol-tree@^3.2.4: version "3.2.4" @@ -4818,16 +4541,6 @@ throat@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - dependencies: - os-tmpdir "~1.0.2" - tmpl@1.0.x: version "1.0.4" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" @@ -4913,14 +4626,20 @@ ts-jest@25.5.1: semver "6.x" yargs-parser "18.x" +tsconfig-paths@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + 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" -tslib@^1.9.0: - version "1.11.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" - tsutils@^3.17.1: version "3.17.1" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" @@ -5098,10 +4817,6 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5: dependencies: iconv-lite "0.4.24" -whatwg-fetch@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" - whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" @@ -5191,12 +4906,6 @@ xmlchars@^2.1.1, xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" -xregexp@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50" - dependencies: - "@babel/runtime-corejs3" "^7.8.3" - y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" From 4f2d46185b299f2c88157914625a725f82d3fbf8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 2 Oct 2020 08:12:26 -0400 Subject: [PATCH 06/42] Bump eslint from 7.9.0 to 7.10.0 (#436) Bumps [eslint](https://github.com/eslint/eslint) from 7.9.0 to 7.10.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.9.0...v7.10.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 27 +++++++-------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index c00ee5dd0..5585e620e 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@types/jest": "26.0.14", "@types/node": "14.11.2", - "eslint": "7.9.0", + "eslint": "7.10.0", "eslint-plugin-github": "4.1.1", "eslint-plugin-jest": "24.0.2", "eslint-plugin-prettier": "^3.1.2", diff --git a/yarn.lock b/yarn.lock index 181ff8453..14183ccf4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1816,14 +1816,7 @@ 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: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - -eslint-scope@^5.1.0: +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" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -1845,10 +1838,10 @@ 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.9.0: - version "7.9.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337" - integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA== +eslint@7.10.0: + version "7.10.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9" + integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.1.3" @@ -1858,7 +1851,7 @@ eslint@7.9.0: debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" - eslint-scope "^5.1.0" + eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^1.3.0" espree "^7.3.0" @@ -1906,12 +1899,6 @@ esquery@^1.2.0: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - dependencies: - estraverse "^4.1.0" - esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" @@ -1919,7 +1906,7 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" From e7808b894d2b4924e84fb9494f17d275e9d49dab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Oct 2020 08:12:35 -0400 Subject: [PATCH 07/42] Bump node-fetch from 2.6.0 to 2.6.1 (#438) Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/bitinn/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 14183ccf4..49c3e91d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3592,8 +3592,9 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" node-fetch@^2.3.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== node-int64@^0.4.0: version "0.4.0" From fa67264818551183fc700c3b7a9115d8388e6fe2 Mon Sep 17 00:00:00 2001 From: James Ives Date: Fri, 2 Oct 2020 08:36:35 -0400 Subject: [PATCH 08/42] Update README.md (#439) --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 73e4f959b..bcd71f8b3 100644 --- a/README.md +++ b/README.md @@ -83,12 +83,16 @@ 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/) by running the following command. +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 ``` +``` +npm install @jamesives/github-pages-deploy-action +``` + It can then be imported into your project like so. ```javascript @@ -114,7 +118,7 @@ run({ }); ``` -For more information regarding the [action interface please click here](https://github.com/JamesIves/github-pages-deploy-action/blob/dev/src/constants.ts#L7). You can find the npm registry listing for the module [here](https://www.npmjs.com/package/@jamesives/github-pages-deploy-action), and the GitHub registry listing [here](https://github.com/JamesIves/github-pages-deploy-action/packages/229985). +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 πŸ“ From ad287676f498f7c1eeb546797263a489dd0a6fad Mon Sep 17 00:00:00 2001 From: James Ives Date: Fri, 2 Oct 2020 08:42:11 -0400 Subject: [PATCH 09/42] Creates Dependdabot yml file (#440) --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..3f8f5b239 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +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 From f69ed53dea7767e14e4e4fc0f3e0a3ac9bbcadaf Mon Sep 17 00:00:00 2001 From: James Ives Date: Fri, 2 Oct 2020 08:46:43 -0400 Subject: [PATCH 10/42] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bcd71f8b3..e48149ab0 100644 --- a/README.md +++ b/README.md @@ -17,16 +17,16 @@ - - + + - - + +

From e42fda2d729c4fb61d3160e154aecf3fde4e8f6d Mon Sep 17 00:00:00 2001 From: Subhashis Suara Date: Fri, 2 Oct 2020 20:42:21 +0530 Subject: [PATCH 11/42] Update Node from 10 to 12 (#442) --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index 9631d5d37..82f87fa0a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v10.19.0 +v12.18.4 From f0f2c3c859489159580c59d86165f5acab85de9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Oct 2020 21:53:45 -0400 Subject: [PATCH 12/42] Bump jest-circus from 26.4.2 to 26.5.1 (#446) Bumps [jest-circus](https://github.com/facebook/jest/tree/HEAD/packages/jest-circus) from 26.4.2 to 26.5.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v26.5.1/packages/jest-circus) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 587 +++++++++++++++++++++++++++++---------------------- 2 files changed, 340 insertions(+), 249 deletions(-) diff --git a/package.json b/package.json index 5585e620e..4bcaf9d95 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "eslint-plugin-jest": "24.0.2", "eslint-plugin-prettier": "^3.1.2", "jest": "25.5.4", - "jest-circus": "26.4.2", + "jest-circus": "26.5.1", "prettier": "2.1.2", "ts-jest": "25.5.1", "typescript": "3.9.7" diff --git a/yarn.lock b/yarn.lock index 49c3e91d1..ab0782442 100644 --- a/yarn.lock +++ b/yarn.lock @@ -343,15 +343,16 @@ jest-util "^25.5.0" slash "^3.0.0" -"@jest/console@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856" +"@jest/console@^26.5.0": + version "26.5.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.5.0.tgz#89a1c5ae8329907fda842ebc5b475d5c9f935766" + integrity sha512-oh59scth4yf8XUgMJb8ruY7BHm0X5JZDNgGGsVnlOt2XQuq9s2NMllIrN4n70Yds+++bjrTGZ9EoOKraaPKPlg== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^26.3.0" - jest-util "^26.3.0" + jest-message-util "^26.5.0" + jest-util "^26.5.0" slash "^3.0.0" "@jest/core@^25.5.4": @@ -395,14 +396,15 @@ "@jest/types" "^25.5.0" jest-mock "^25.5.0" -"@jest/environment@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0" +"@jest/environment@^26.5.0": + version "26.5.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.5.0.tgz#4381b6b2fc291dcff51e248780196bc035da7190" + integrity sha512-0F3G9EyZU2NAP0/c/5EqVx4DmldQtRxj0gMl3p3ciSCdyMiCyDmpdE7O0mKTSiFDyl1kU4TfgEVf0r0vMkmYcw== dependencies: - "@jest/fake-timers" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/fake-timers" "^26.5.0" + "@jest/types" "^26.5.0" "@types/node" "*" - jest-mock "^26.3.0" + jest-mock "^26.5.0" "@jest/fake-timers@^25.5.0": version "25.5.0" @@ -414,16 +416,17 @@ jest-util "^25.5.0" lolex "^5.0.0" -"@jest/fake-timers@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a" +"@jest/fake-timers@^26.5.0": + version "26.5.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.5.0.tgz#107ceeb580bc42dd6e0843df5bbc92cb4fe9cb00" + integrity sha512-sQK6xUembaZ0qLnZpSjJJuJiKvyrjCJhaYjbmatFpj5+cM8h2D7YEkeEBC26BMzvF1O3tNM9OL7roqyBmom0KA== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" "@sinonjs/fake-timers" "^6.0.1" "@types/node" "*" - jest-message-util "^26.3.0" - jest-mock "^26.3.0" - jest-util "^26.3.0" + jest-message-util "^26.5.0" + jest-mock "^26.5.0" + jest-util "^26.5.0" "@jest/globals@^25.5.2": version "25.5.2" @@ -433,13 +436,14 @@ "@jest/types" "^25.5.0" expect "^25.5.0" -"@jest/globals@^26.4.2": - version "26.4.2" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a" +"@jest/globals@^26.5.0": + version "26.5.0" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.0.tgz#b9b7d05ee6722c894ce67aff216ed6b04d3fe187" + integrity sha512-TCKx3XWR9h/yyhQbz0C1sXkK2e8WJOnkP40T9bewNpf2Ahr1UEyKXnCoQO0JCpXFkWGTXBNo1QAgTQ3+LhXfcA== dependencies: - "@jest/environment" "^26.3.0" - "@jest/types" "^26.3.0" - expect "^26.4.2" + "@jest/environment" "^26.5.0" + "@jest/types" "^26.5.0" + expect "^26.5.0" "@jest/reporters@^25.5.1": version "25.5.1" @@ -480,9 +484,10 @@ graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/source-map@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9" +"@jest/source-map@^26.5.0": + version "26.5.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.5.0.tgz#98792457c85bdd902365cd2847b58fff05d96367" + integrity sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" @@ -497,12 +502,13 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-result@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb" +"@jest/test-result@^26.5.0": + version "26.5.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.5.0.tgz#d5bdf2eaf12ceddd359c2506fe806afafecc9a9e" + integrity sha512-CaVXxDQi31LPOsz5/+iajNHQlA1Je/jQ8uYH/lCa6Y/UrkO+sDHeEH3x/inbx06PctVDnTwIlCcBvNNbC4FCvQ== dependencies: - "@jest/console" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/console" "^26.5.0" + "@jest/types" "^26.5.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" @@ -516,15 +522,16 @@ jest-runner "^25.5.4" jest-runtime "^25.5.4" -"@jest/test-sequencer@^26.4.2": - version "26.4.2" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba" +"@jest/test-sequencer@^26.5.0": + version "26.5.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.0.tgz#617808a1fa869c5181e43a5b841db084746b667e" + integrity sha512-23oofRXqPEy37HyHWIYf7lzzOqtGBkai5erZiL6RgxlyXE7a0lCihf6b5DfAvcD3yUtbXmh3EzpjJDVH57zQrg== dependencies: - "@jest/test-result" "^26.3.0" + "@jest/test-result" "^26.5.0" graceful-fs "^4.2.4" - jest-haste-map "^26.3.0" - jest-runner "^26.4.2" - jest-runtime "^26.4.2" + jest-haste-map "^26.5.0" + jest-runner "^26.5.0" + jest-runtime "^26.5.0" "@jest/transform@^25.5.1": version "25.5.1" @@ -547,20 +554,21 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/transform@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55" +"@jest/transform@^26.5.0": + version "26.5.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.5.0.tgz#16404eaddf6034fe713da37b236756fc6b956db0" + integrity sha512-Kt4WciOruTyTkJ2DZ+xtZiejRj3v22BrXCYZoGRbI0N6Q6tt2HdsWrrEtn6nlK24QWKC389xKkVk4Xr2gWBZQA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^26.3.0" + jest-haste-map "^26.5.0" jest-regex-util "^26.0.0" - jest-util "^26.3.0" + jest-util "^26.5.0" micromatch "^4.0.2" pirates "^4.0.1" slash "^3.0.0" @@ -576,9 +584,10 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" -"@jest/types@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71" +"@jest/types@^26.5.0": + version "26.5.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.5.0.tgz#163f6e00c5ac9bb6fc91c3802eaa9d0dd6e1474a" + integrity sha512-nH9DFLqaIhB+RVgjivemvMiFSWw/BKwbZGxBAMv8CCTvUyFoK8RwHhAlmlXIvMBrf5Z3YQ4p9cq3Qh9EDctGvA== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -763,9 +772,10 @@ "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz#2496e9ff56196cc1429c72034e07eab6121b6f3f" +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03" + integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A== dependencies: "@babel/types" "^7.3.0" @@ -838,6 +848,11 @@ version "1.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" +"@types/stack-utils@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" + integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== + "@types/yargs-parser@*": version "13.1.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228" @@ -1157,15 +1172,16 @@ babel-jest@^25.5.1: graceful-fs "^4.2.4" slash "^3.0.0" -babel-jest@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463" +babel-jest@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.5.0.tgz#afe11a083b4e584f63e9de29d2075cb96f42d2a4" + integrity sha512-Cy16ZJrds81C+JASaOIGNlpCeqW3PTOq36owv+Zzwde5NiWz+zNduwxUNF57vxc/3SnIWo8HHqTczhN8GLoXTw== dependencies: - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/transform" "^26.5.0" + "@jest/types" "^26.5.0" "@types/babel__core" "^7.1.7" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^26.3.0" + babel-preset-jest "^26.5.0" chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -1188,9 +1204,10 @@ babel-plugin-jest-hoist@^25.5.0: "@babel/types" "^7.3.3" "@types/babel__traverse" "^7.0.6" -babel-plugin-jest-hoist@^26.2.0: - version "26.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd" +babel-plugin-jest-hoist@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz#3916b3a28129c29528de91e5784a44680db46385" + integrity sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -1235,11 +1252,12 @@ babel-preset-jest@^25.5.0: babel-plugin-jest-hoist "^25.5.0" babel-preset-current-node-syntax "^0.1.2" -babel-preset-jest@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776" +babel-preset-jest@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz#f1b166045cd21437d1188d29f7fba470d5bdb0e7" + integrity sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA== dependencies: - babel-plugin-jest-hoist "^26.2.0" + babel-plugin-jest-hoist "^26.5.0" babel-preset-current-node-syntax "^0.1.3" balanced-match@^1.0.0: @@ -1405,6 +1423,15 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" +cliui@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.1.tgz#a4cb67aad45cd83d8d05128fc9f4d8fbb887e6b3" + integrity sha512-rcvHOWyGyid6I1WjT/3NatKj2kDt9OdSHSXpyLXaMWFbKpGACNW8pRhhdPUq9MWUOdwn8Rz9AVETjF4105rZZQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1609,9 +1636,10 @@ diff-sequences@^25.2.6: version "25.2.6" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" -diff-sequences@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2" +diff-sequences@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.5.0.tgz#ef766cf09d43ed40406611f11c6d8d9dd8b2fefd" + integrity sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q== dir-glob@^3.0.1: version "3.0.1" @@ -1705,6 +1733,11 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" +escalade@^3.0.2, escalade@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e" + integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig== + 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" @@ -1981,15 +2014,16 @@ expect@^25.5.0: jest-message-util "^25.5.0" jest-regex-util "^25.2.6" -expect@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1" +expect@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.5.0.tgz#089c0cc4d6c545c7388ddefffa0f1e2e8e38d282" + integrity sha512-oIOy3mHWjnF5ZICuaui5kdtJZQ+D7XHWyUQDxk1WhIRCkcIYc24X23bOfikgCNU6i9wcSqLQhwPOqeRp09naxg== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" ansi-styles "^4.0.0" jest-get-type "^26.3.0" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" + jest-matcher-utils "^26.5.0" + jest-message-util "^26.5.0" jest-regex-util "^26.0.0" extend-shallow@^2.0.1: @@ -2157,7 +2191,7 @@ gensync@^1.0.0-beta.1: version "1.0.0-beta.1" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" -get-caller-file@^2.0.1: +get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -2609,28 +2643,30 @@ jest-changed-files@^25.5.0: execa "^3.2.0" throat "^5.0.0" -jest-circus@26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-26.4.2.tgz#f84487d2ea635cadf1feb269b14ad0602135ad17" +jest-circus@26.5.1: + version "26.5.1" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-26.5.1.tgz#98d3cd49c2bead5d5ceca8f7b0a1951b59021446" + integrity sha512-8tXACLNh1FVGl6tDvu5d6rWVZ0N4peOL3/QlaqZme7a3DtprmjFG6NCQQnLgRYRsv2f5p12OvxVNekRnidNrYw== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/environment" "^26.5.0" + "@jest/test-result" "^26.5.0" + "@jest/types" "^26.5.0" + "@types/babel__traverse" "^7.0.4" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^26.4.2" + expect "^26.5.0" is-generator-fn "^2.0.0" - jest-each "^26.4.2" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" - jest-runner "^26.4.2" - jest-runtime "^26.4.2" - jest-snapshot "^26.4.2" - jest-util "^26.3.0" - pretty-format "^26.4.2" + jest-each "^26.5.0" + jest-matcher-utils "^26.5.0" + jest-message-util "^26.5.0" + jest-runner "^26.5.1" + jest-runtime "^26.5.0" + jest-snapshot "^26.5.0" + jest-util "^26.5.0" + pretty-format "^26.5.0" stack-utils "^2.0.2" throat "^5.0.0" @@ -2677,28 +2713,29 @@ jest-config@^25.5.4: pretty-format "^25.5.0" realpath-native "^2.0.0" -jest-config@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558" +jest-config@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.0.tgz#3959e47223496e2ae2605e073578a359cab99445" + integrity sha512-OM6eXIEmQXAuonCk8aNPMRjPFcKWa3IIoSlq5BPgIflmQBzM/COcI7XsWSIEPWPa9WcYTJBWj8kNqEYjczmIFw== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^26.4.2" - "@jest/types" "^26.3.0" - babel-jest "^26.3.0" + "@jest/test-sequencer" "^26.5.0" + "@jest/types" "^26.5.0" + babel-jest "^26.5.0" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-environment-jsdom "^26.3.0" - jest-environment-node "^26.3.0" + jest-environment-jsdom "^26.5.0" + jest-environment-node "^26.5.0" jest-get-type "^26.3.0" - jest-jasmine2 "^26.4.2" + jest-jasmine2 "^26.5.0" jest-regex-util "^26.0.0" - jest-resolve "^26.4.0" - jest-util "^26.3.0" - jest-validate "^26.4.2" + jest-resolve "^26.5.0" + jest-util "^26.5.0" + jest-validate "^26.5.0" micromatch "^4.0.2" - pretty-format "^26.4.2" + pretty-format "^26.5.0" jest-diff@^25.2.1, jest-diff@^25.5.0: version "25.5.0" @@ -2709,14 +2746,15 @@ jest-diff@^25.2.1, jest-diff@^25.5.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-diff@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa" +jest-diff@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.5.0.tgz#bd01cef2d00b2668a0207ef47ab8eb1e33613253" + integrity sha512-CmDMMPkVMxrrh0Dv/4M9kh1tsYsZnYTQMMTvIFpePBSk9wMVfcyfg30TCq+oR9AzGbw8vsI50Gk1HmlMMlhoJg== dependencies: chalk "^4.0.0" - diff-sequences "^26.3.0" + diff-sequences "^26.5.0" jest-get-type "^26.3.0" - pretty-format "^26.4.2" + pretty-format "^26.5.0" jest-docblock@^25.3.0: version "25.3.0" @@ -2740,15 +2778,16 @@ jest-each@^25.5.0: jest-util "^25.5.0" pretty-format "^25.5.0" -jest-each@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae" +jest-each@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.5.0.tgz#39197a9d1abdd32ff5b8a9931507ab117c551c02" + integrity sha512-+oO3ykDgypHSyyK2xOsh8XDUwMtg3HoJ4wMNFNHxhcACFbUgaCOfLy+eTCn5pIKhtigU3BmkYt7k3MtTb5pJOQ== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" chalk "^4.0.0" jest-get-type "^26.3.0" - jest-util "^26.3.0" - pretty-format "^26.4.2" + jest-util "^26.5.0" + pretty-format "^26.5.0" jest-environment-jsdom@^25.5.0: version "25.5.0" @@ -2761,17 +2800,18 @@ jest-environment-jsdom@^25.5.0: jest-util "^25.5.0" jsdom "^15.2.1" -jest-environment-jsdom@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c" +jest-environment-jsdom@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.5.0.tgz#f9a6726402fde787632a69df5ff3390ab04337a3" + integrity sha512-Xuqh3bx8egymaJR566ECkiztIIVOIWWPGIxo++ziWyCOqQChUguRCH1hRXBbfINPbb/SRFe7GCD+SunaUgTmCw== dependencies: - "@jest/environment" "^26.3.0" - "@jest/fake-timers" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/environment" "^26.5.0" + "@jest/fake-timers" "^26.5.0" + "@jest/types" "^26.5.0" "@types/node" "*" - jest-mock "^26.3.0" - jest-util "^26.3.0" - jsdom "^16.2.2" + jest-mock "^26.5.0" + jest-util "^26.5.0" + jsdom "^16.4.0" jest-environment-node@^25.5.0: version "25.5.0" @@ -2784,16 +2824,17 @@ jest-environment-node@^25.5.0: jest-util "^25.5.0" semver "^6.3.0" -jest-environment-node@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849" +jest-environment-node@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.5.0.tgz#3f49ba40abe87209df96f7991015cac996e04563" + integrity sha512-LaYl/ek5mb1VDP1/+jMH2N1Ec4fFUhSYmc8EZqigBgMov/2US8U5l7D3IlOf78e+wARUxPxUpTcybVVzAOu3jg== dependencies: - "@jest/environment" "^26.3.0" - "@jest/fake-timers" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/environment" "^26.5.0" + "@jest/fake-timers" "^26.5.0" + "@jest/types" "^26.5.0" "@types/node" "*" - jest-mock "^26.3.0" - jest-util "^26.3.0" + jest-mock "^26.5.0" + jest-util "^26.5.0" jest-get-type@^25.2.6: version "25.2.6" @@ -2822,20 +2863,21 @@ jest-haste-map@^25.5.1: optionalDependencies: fsevents "^2.1.2" -jest-haste-map@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726" +jest-haste-map@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.5.0.tgz#ba4c48dbf69e0529709bd0d76660d87eefce820a" + integrity sha512-AjB1b53uqN7Cf2VN80x0wJajVZ+BMZC+G2CmWoG143faaMw7IhIcs3FTPuSgOx7cn3/bag7lgCq93naAvLO6EQ== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.4" jest-regex-util "^26.0.0" - jest-serializer "^26.3.0" - jest-util "^26.3.0" - jest-worker "^26.3.0" + jest-serializer "^26.5.0" + jest-util "^26.5.0" + jest-worker "^26.5.0" micromatch "^4.0.2" sane "^4.0.3" walker "^1.0.7" @@ -2864,27 +2906,28 @@ jest-jasmine2@^25.5.4: pretty-format "^25.5.0" throat "^5.0.0" -jest-jasmine2@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257" +jest-jasmine2@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.0.tgz#49d57db63f49a183813263b41e61e2a5f988e6a3" + integrity sha512-NOA6PLORHTRTROOp5VysKCUVpFAjMMXUS1Xw7FvTMeYK5Ewx4rpxhFqiJ7JT4pENap9g9OuXo4cWR/MwCDTEeQ== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.3.0" - "@jest/source-map" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/environment" "^26.5.0" + "@jest/source-map" "^26.5.0" + "@jest/test-result" "^26.5.0" + "@jest/types" "^26.5.0" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^26.4.2" + expect "^26.5.0" is-generator-fn "^2.0.0" - jest-each "^26.4.2" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" - jest-runtime "^26.4.2" - jest-snapshot "^26.4.2" - jest-util "^26.3.0" - pretty-format "^26.4.2" + jest-each "^26.5.0" + jest-matcher-utils "^26.5.0" + jest-message-util "^26.5.0" + jest-runtime "^26.5.0" + jest-snapshot "^26.5.0" + jest-util "^26.5.0" + pretty-format "^26.5.0" throat "^5.0.0" jest-leak-detector@^25.5.0: @@ -2894,12 +2937,13 @@ jest-leak-detector@^25.5.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-leak-detector@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f" +jest-leak-detector@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.5.0.tgz#a5671ffbc6308e45ad31b42cb2ef0722488a4e57" + integrity sha512-xZHvvTBbj3gUTtunLjPqP594BT6IUEpwA0AQpEQjVR8eBq8+R3qgU/KhoAcVcV0iqRM6pXtX7hKPZ5mLdynVSQ== dependencies: jest-get-type "^26.3.0" - pretty-format "^26.4.2" + pretty-format "^26.5.0" jest-matcher-utils@^25.5.0: version "25.5.0" @@ -2910,14 +2954,15 @@ jest-matcher-utils@^25.5.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-matcher-utils@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06" +jest-matcher-utils@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.5.0.tgz#1195d6a35c4c710ad286b775b966f3fdb7a2102d" + integrity sha512-QgbbxqFT8wiTi4o/7MWj2vHlcmMjACG8vnJ9pJ7svVDmkzEnTUGdHXWLKB1aZhbnyXetMNRF+TSMcDS9aGfuzA== dependencies: chalk "^4.0.0" - jest-diff "^26.4.2" + jest-diff "^26.5.0" jest-get-type "^26.3.0" - pretty-format "^26.4.2" + pretty-format "^26.5.0" jest-message-util@^25.5.0: version "25.5.0" @@ -2932,13 +2977,14 @@ jest-message-util@^25.5.0: slash "^3.0.0" stack-utils "^1.0.1" -jest-message-util@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a" +jest-message-util@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.5.0.tgz#87f8c440dace55095d247442638c70b892836895" + integrity sha512-UEOqdoTfX0AFyReL4q5N3CfDBWt+AtQzeszZuuGapU39vwEk90rTSBghCA/3FFEZzvGfH2LE4+0NaBI81Cu2Ow== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/types" "^26.3.0" - "@types/stack-utils" "^1.0.1" + "@jest/types" "^26.5.0" + "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" micromatch "^4.0.2" @@ -2951,11 +2997,12 @@ jest-mock@^25.5.0: dependencies: "@jest/types" "^25.5.0" -jest-mock@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba" +jest-mock@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.5.0.tgz#56efcea2dfd550b77ceb5ef280cf8c6114ef32db" + integrity sha512-8D1UmbnmjdkvTdYygTW26KZr95Aw0/3gEmMZQWkxIEAgEESVDbwDG8ygRlXSY214x9hFjtKezvfQUp36Ogl75w== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" "@types/node" "*" jest-pnp-resolver@^1.2.1: @@ -2996,16 +3043,17 @@ jest-resolve@^25.5.1: resolve "^1.17.0" slash "^3.0.0" -jest-resolve@^26.4.0: - version "26.4.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7" +jest-resolve@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.5.0.tgz#31f68344dd88af70f00bc8bb531de6687565c680" + integrity sha512-c34L8Lrw4fFzRiCLzwePziKRfHitjsAnY15ID0e9Se4ISikmZ5T9icLEFAGHnfaxfb+9r8EKdrbg89gjRdrQvw== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" chalk "^4.0.0" + escalade "^3.1.0" graceful-fs "^4.2.4" jest-pnp-resolver "^1.2.2" - jest-util "^26.3.0" - read-pkg-up "^7.0.1" + jest-util "^26.5.0" resolve "^1.17.0" slash "^3.0.0" @@ -3033,28 +3081,29 @@ jest-runner@^25.5.4: source-map-support "^0.5.6" throat "^5.0.0" -jest-runner@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853" +jest-runner@^26.5.0, jest-runner@^26.5.1: + version "26.5.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.1.tgz#a56c1e1fbed7470ae69ebd5456ba4d4443c8701f" + integrity sha512-gFHXehvMZD8qwNzaIl2MDFFI99m4kKk06H2xh2u4IkC+tHYIJjE5J175l9cbL3RuU2slfS2m57KZgcPZfbTavQ== dependencies: - "@jest/console" "^26.3.0" - "@jest/environment" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/console" "^26.5.0" + "@jest/environment" "^26.5.0" + "@jest/test-result" "^26.5.0" + "@jest/types" "^26.5.0" "@types/node" "*" chalk "^4.0.0" emittery "^0.7.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^26.4.2" + jest-config "^26.5.0" jest-docblock "^26.0.0" - jest-haste-map "^26.3.0" - jest-leak-detector "^26.4.2" - jest-message-util "^26.3.0" - jest-resolve "^26.4.0" - jest-runtime "^26.4.2" - jest-util "^26.3.0" - jest-worker "^26.3.0" + jest-haste-map "^26.5.0" + jest-leak-detector "^26.5.0" + jest-message-util "^26.5.0" + jest-resolve "^26.5.0" + jest-runtime "^26.5.0" + jest-util "^26.5.0" + jest-worker "^26.5.0" source-map-support "^0.5.6" throat "^5.0.0" @@ -3089,36 +3138,37 @@ jest-runtime@^25.5.4: strip-bom "^4.0.0" yargs "^15.3.1" -jest-runtime@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42" - dependencies: - "@jest/console" "^26.3.0" - "@jest/environment" "^26.3.0" - "@jest/fake-timers" "^26.3.0" - "@jest/globals" "^26.4.2" - "@jest/source-map" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" +jest-runtime@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.0.tgz#c9b3eeb5ead70710ea17f6058df405cac31bb926" + integrity sha512-CujjQWpMcsvSg0L+G3iEz6s7Th5IbiZseAaw/5R7Eb+IfnJdyPdjJ+EoXNV8n07snvW5nZTwV9QIfy6Vjris8A== + dependencies: + "@jest/console" "^26.5.0" + "@jest/environment" "^26.5.0" + "@jest/fake-timers" "^26.5.0" + "@jest/globals" "^26.5.0" + "@jest/source-map" "^26.5.0" + "@jest/test-result" "^26.5.0" + "@jest/transform" "^26.5.0" + "@jest/types" "^26.5.0" "@types/yargs" "^15.0.0" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-config "^26.4.2" - jest-haste-map "^26.3.0" - jest-message-util "^26.3.0" - jest-mock "^26.3.0" + jest-config "^26.5.0" + jest-haste-map "^26.5.0" + jest-message-util "^26.5.0" + jest-mock "^26.5.0" jest-regex-util "^26.0.0" - jest-resolve "^26.4.0" - jest-snapshot "^26.4.2" - jest-util "^26.3.0" - jest-validate "^26.4.2" + jest-resolve "^26.5.0" + jest-snapshot "^26.5.0" + jest-util "^26.5.0" + jest-validate "^26.5.0" slash "^3.0.0" strip-bom "^4.0.0" - yargs "^15.3.1" + yargs "^16.0.3" jest-serializer@^25.5.0: version "25.5.0" @@ -3126,9 +3176,10 @@ jest-serializer@^25.5.0: dependencies: graceful-fs "^4.2.4" -jest-serializer@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef" +jest-serializer@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.5.0.tgz#f5425cc4c5f6b4b355f854b5f0f23ec6b962bc13" + integrity sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA== dependencies: "@types/node" "*" graceful-fs "^4.2.4" @@ -3153,24 +3204,26 @@ jest-snapshot@^25.5.1: pretty-format "^25.5.0" semver "^6.3.0" -jest-snapshot@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6" +jest-snapshot@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.0.tgz#2b76366e2d621775f39733e5764492b2e44b0bcd" + integrity sha512-WTNJef67o7cCvwAe5foVCNqG3MzIW/CyU4FZvMrhBPZsJeXwfBY7kfOlydZigxtcytnvmNE2pqznOfD5EcQgrQ== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" + "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.0.0" chalk "^4.0.0" - expect "^26.4.2" + expect "^26.5.0" graceful-fs "^4.2.4" - jest-diff "^26.4.2" + jest-diff "^26.5.0" jest-get-type "^26.3.0" - jest-haste-map "^26.3.0" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" - jest-resolve "^26.4.0" + jest-haste-map "^26.5.0" + jest-matcher-utils "^26.5.0" + jest-message-util "^26.5.0" + jest-resolve "^26.5.0" natural-compare "^1.4.0" - pretty-format "^26.4.2" + pretty-format "^26.5.0" semver "^7.3.2" jest-util@^25.5.0: @@ -3183,11 +3236,12 @@ jest-util@^25.5.0: is-ci "^2.0.0" make-dir "^3.0.0" -jest-util@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e" +jest-util@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.5.0.tgz#f4e0fb80cf82db127d68c7c5b2749a427a80b450" + integrity sha512-CSQ0uzE7JdHDCQo3K8jlyWRIF2xNLdpu9nbjo8okGDanaNsF7WonhusFvjOg7QiWn1SThe7wFRh8Jx2ls1Gx4Q== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" "@types/node" "*" chalk "^4.0.0" graceful-fs "^4.2.4" @@ -3205,16 +3259,17 @@ jest-validate@^25.5.0: leven "^3.1.0" pretty-format "^25.5.0" -jest-validate@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c" +jest-validate@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.0.tgz#6e417ec5066e315752da1350797a89fc5907f97a" + integrity sha512-603+CHUJD4nAZ+tY/A+wu3g8KEcBey2a7YOMU9W8e4u7mCezhaDasw20ITaZHoR2R2MZhThL6jApPSj0GvezrQ== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" camelcase "^6.0.0" chalk "^4.0.0" jest-get-type "^26.3.0" leven "^3.1.0" - pretty-format "^26.4.2" + pretty-format "^26.5.0" jest-watcher@^25.5.0: version "25.5.0" @@ -3234,9 +3289,10 @@ jest-worker@^25.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f" +jest-worker@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30" + integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug== dependencies: "@types/node" "*" merge-stream "^2.0.0" @@ -3296,9 +3352,10 @@ jsdom@^15.2.1: ws "^7.0.0" xml-name-validator "^3.0.0" -jsdom@^16.2.2: - version "16.2.2" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b" +jsdom@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" + integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== dependencies: abab "^2.0.3" acorn "^7.1.1" @@ -3320,7 +3377,7 @@ jsdom@^16.2.2: tough-cookie "^3.0.1" w3c-hr-time "^1.0.2" w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.0.0" + webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" @@ -3920,11 +3977,12 @@ pretty-format@^25.2.1, pretty-format@^25.5.0: ansi-styles "^4.0.0" react-is "^16.12.0" -pretty-format@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237" +pretty-format@^26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.5.0.tgz#3320e4952f8e6918fc8c26c6df7aad9734818ac2" + integrity sha512-NcgRuuTutUJ9+Br4P19DFThpJYnYBiugfRmZEA6pXrUeG+IcMSmppb88rU+iPA+XAJcjTYlCb5Ed6miHg/Qqqw== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.5.0" ansi-regex "^5.0.0" ansi-styles "^4.0.0" react-is "^16.12.0" @@ -4795,9 +4853,10 @@ webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" -webidl-conversions@^6.0.0: +webidl-conversions@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5: version "1.0.5" @@ -4859,6 +4918,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -4898,6 +4966,11 @@ y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" +y18n@^5.0.1: + version "5.0.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.2.tgz#48218df5da2731b4403115c39a1af709c873f829" + integrity sha512-CkwaeZw6dQgqgPGeTWKMXCRmMcBgETFlTml1+ZOO+q7kGst8NREJ+eWwFNPVUQ4QGdAaklbqCZHH6Zuep1RjiA== + yargs-parser@18.x, yargs-parser@^18.1.1: version "18.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1" @@ -4905,6 +4978,11 @@ yargs-parser@18.x, yargs-parser@^18.1.1: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^20.0.0: + version "20.2.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.1.tgz#28f3773c546cdd8a69ddae68116b48a5da328e77" + integrity sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA== + yargs@^15.3.1: version "15.3.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" @@ -4920,3 +4998,16 @@ yargs@^15.3.1: which-module "^2.0.0" y18n "^4.0.0" yargs-parser "^18.1.1" + +yargs@^16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.0.3.tgz#7a919b9e43c90f80d4a142a89795e85399a7e54c" + integrity sha512-6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA== + dependencies: + cliui "^7.0.0" + escalade "^3.0.2" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.1" + yargs-parser "^20.0.0" From cd119c4bd4eb478814bb12f3ccbee5f13ffad769 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Oct 2020 21:54:00 -0400 Subject: [PATCH 13/42] Bump eslint-plugin-jest from 24.0.2 to 24.1.0 (#447) Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 24.0.2 to 24.1.0. - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v24.0.2...v24.1.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 51 +++++---------------------------------------------- 2 files changed, 6 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 4bcaf9d95..45a455890 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@types/node": "14.11.2", "eslint": "7.10.0", "eslint-plugin-github": "4.1.1", - "eslint-plugin-jest": "24.0.2", + "eslint-plugin-jest": "24.1.0", "eslint-plugin-prettier": "^3.1.2", "jest": "25.5.4", "jest-circus": "26.5.1", diff --git a/yarn.lock b/yarn.lock index ab0782442..0cb473027 100644 --- a/yarn.lock +++ b/yarn.lock @@ -876,7 +876,7 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.3.0": +"@typescript-eslint/experimental-utils@4.3.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" integrity sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ== @@ -888,17 +888,6 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/experimental-utils@^4.0.1": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.0.tgz#263d7225645c09a411c8735eeffd417f50f49026" - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.1.0" - "@typescript-eslint/types" "4.1.0" - "@typescript-eslint/typescript-estree" "4.1.0" - 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" @@ -909,13 +898,6 @@ "@typescript-eslint/typescript-estree" "4.3.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.1.0.tgz#9e389745ee9cfe12252ed1e9958808abd6b3a683" - dependencies: - "@typescript-eslint/types" "4.1.0" - "@typescript-eslint/visitor-keys" "4.1.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" @@ -924,28 +906,11 @@ "@typescript-eslint/types" "4.3.0" "@typescript-eslint/visitor-keys" "4.3.0" -"@typescript-eslint/types@4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.1.0.tgz#edbd3fec346f34e13ce7aa176b03b497a32c496a" - "@typescript-eslint/types@4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf" integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw== -"@typescript-eslint/typescript-estree@4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.0.tgz#394046ead25164494218c0e3d6b960695ea967f6" - dependencies: - "@typescript-eslint/types" "4.1.0" - "@typescript-eslint/visitor-keys" "4.1.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/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" @@ -960,13 +925,6 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.0.tgz#b2d528c9484e7eda1aa4f86ccf0432fb16e4d545" - dependencies: - "@typescript-eslint/types" "4.1.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" @@ -1832,9 +1790,10 @@ eslint-plugin-import@>=2.20.1: resolve "^1.17.0" tsconfig-paths "^3.9.0" -eslint-plugin-jest@24.0.2: - version "24.0.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.0.2.tgz#4bf0fcdc86289d702a7dacb430b4363482af773b" +eslint-plugin-jest@24.1.0: + version "24.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.1.0.tgz#6708037d7602e5288ce877fd0103f329dc978361" + integrity sha512-827YJ+E8B9PvXu/0eiVSNFfxxndbKv+qE/3GSMhdorCaeaOehtqHGX2YDW9B85TEOre9n/zscledkFW/KbnyGg== dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" From b96b1d043d112c65510c9c2838830eb42d214e03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Oct 2020 22:47:22 -0400 Subject: [PATCH 14/42] Bump @types/node from 14.11.2 to 14.11.5 (#448) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.11.2 to 14.11.5. - [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 45a455890..da4d825da 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@types/jest": "26.0.14", - "@types/node": "14.11.2", + "@types/node": "14.11.5", "eslint": "7.10.0", "eslint-plugin-github": "4.1.1", "eslint-plugin-jest": "24.1.0", diff --git a/yarn.lock b/yarn.lock index 0cb473027..5e376b0f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -828,9 +828,10 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/node@*", "@types/node@14.11.2", "@types/node@>= 8": - version "14.11.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256" +"@types/node@*", "@types/node@14.11.5", "@types/node@>= 8": + version "14.11.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.5.tgz#fecad41c041cae7f2404ad4b2d0742fdb628b305" + integrity sha512-jVFzDV6NTbrLMxm4xDSIW/gKnk8rQLF9wAzLWIOg+5nU6ACrIMndeBdXci0FGtqJbP9tQvm6V39eshc96TO2wQ== "@types/normalize-package-data@^2.4.0": version "2.4.0" From 118cd3f75b715641bcf122fa6820fb71f0c50b0a Mon Sep 17 00:00:00 2001 From: Exuanbo Date: Wed, 7 Oct 2020 14:34:20 +0100 Subject: [PATCH 15/42] Feat: add support for absolute paths (#449) * Feat: add support for absolute paths * Refactor: `generateFolderPath` to generic function `action.root` is initialized at https://github.com/JamesIves/github-pages-deploy-action/blob/e42fda2d729c4fb61d3160e154aecf3fde4e8f6d/src/constants.ts#L98, so it should not be an optional property. * Test: rm unnecessary tests * Refactor: rm unused exports --- __tests__/git.test.ts | 45 ----------------------------- __tests__/util.test.ts | 64 ++++++++++++++++++++++++++++++++++++++++++ src/constants.ts | 6 +++- src/git.ts | 11 +++++--- src/lib.ts | 4 +-- src/util.ts | 23 ++++++++++----- 6 files changed, 93 insertions(+), 60 deletions(-) diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts index 0f2a0a411..404fb9a17 100644 --- a/__tests__/git.test.ts +++ b/__tests__/git.test.ts @@ -178,51 +178,6 @@ describe('git', () => { } }) - it('should fail if the build folder begins with a /', async () => { - Object.assign(action, { - silent: false, - accessToken: '123', - repositoryPath: 'JamesIves/github-pages-deploy-action', - branch: 'branch', - folder: '/', - pusher: { - name: 'asd', - email: 'as@cat' - } - }) - - try { - await init(action) - } catch (e) { - expect(execute).toBeCalledTimes(0) - expect(e.message).toMatch( - "There was an error initializing the repository: Incorrectly formatted build folder. The deployment folder cannot be prefixed with '/' or './'. Instead reference the folder name directly. ❌" - ) - } - }) - - it('should fail if the build folder begins with a ./', async () => { - Object.assign(action, { - silent: false, - accessToken: '123', - branch: 'branch', - folder: './', - pusher: { - name: 'asd', - email: 'as@cat' - } - }) - - try { - await init(action) - } catch (e) { - expect(execute).toBeCalledTimes(0) - expect(e.message).toMatch( - "There was an error initializing the repository: Incorrectly formatted build folder. The deployment folder cannot be prefixed with '/' or './'. Instead reference the folder name directly. ❌" - ) - } - }) - it('should not fail if root is used', async () => { Object.assign(action, { silent: false, diff --git a/__tests__/util.test.ts b/__tests__/util.test.ts index ba229758f..9d9724a1c 100644 --- a/__tests__/util.test.ts +++ b/__tests__/util.test.ts @@ -2,6 +2,7 @@ import { isNullOrUndefined, generateTokenType, generateRepositoryPath, + generateFolderPath, suppressSensitiveInformation } from '../src/util' @@ -177,4 +178,67 @@ describe('util', () => { }) }) }) + + describe('generateFolderPath', () => { + it('should return absolute path if folder name is provided', () => { + const action = { + branch: '123', + root: '.', + workspace: 'src/', + folder: 'build', + gitHubToken: null, + accessToken: null, + ssh: null, + silent: false + } + expect(generateFolderPath(action, 'folder')).toEqual('src/build') + }) + + it('should return original path if folder name begins with /', () => { + const action = { + branch: '123', + root: '.', + workspace: 'src/', + folder: '/home/user/repo/build', + gitHubToken: null, + accessToken: null, + ssh: null, + silent: false + } + expect(generateFolderPath(action, 'folder')).toEqual( + '/home/user/repo/build' + ) + }) + + it('should process as relative path if folder name begins with ./', () => { + const action = { + branch: '123', + root: '.', + workspace: 'src/', + folder: './build', + gitHubToken: null, + accessToken: null, + ssh: null, + silent: false + } + expect(generateFolderPath(action, 'folder')).toEqual('src/build') + }) + + it('should return absolute path if folder name begins with ~', () => { + const action = { + branch: '123', + root: '.', + workspace: 'src/', + folder: '~/repo/build', + gitHubToken: null, + accessToken: null, + ssh: null, + silent: false + } + process.env.HOME = '/home/user' + expect(generateFolderPath(action, 'folder')).toEqual( + '/home/user/repo/build' + ) + }) + }) }) diff --git a/src/constants.ts b/src/constants.ts index 46eaaf5da..5e43eef1e 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -39,7 +39,7 @@ export interface ActionInterface { /** The fully qualified repositpory path, this gets auto generated if repositoryName is provided. */ repositoryPath?: string /** The root directory where your project lives. */ - root?: string + root: string /** Wipes the commit history from the deployment branch in favor of a single commit. */ singleCommit?: boolean | null /** Determines if the action should run in silent mode or not. */ @@ -109,6 +109,10 @@ export const action: ActionInterface = { workspace: process.env.GITHUB_WORKSPACE || '' } +export type ActionFolders = NonNullable< + Pick +> + /** Status codes for the action. */ export enum Status { SUCCESS = 'success', diff --git a/src/git.ts b/src/git.ts index b32d217b4..bb7ffc22f 100644 --- a/src/git.ts +++ b/src/git.ts @@ -4,6 +4,7 @@ import fs from 'fs' import {ActionInterface, Status} from './constants' import {execute} from './execute' import { + generateFolderPath, hasRequiredParameters, isNullOrUndefined, suppressSensitiveInformation @@ -130,6 +131,8 @@ export async function generateBranch(action: ActionInterface): Promise { /* Runs the necessary steps to make the deployment. */ export async function deploy(action: ActionInterface): Promise { + const folderPath = generateFolderPath(action, 'folder') + const rootPath = generateFolderPath(action, 'root') const temporaryDeploymentDirectory = 'github-pages-deploy-action-temp-deployment-folder' const temporaryDeploymentBranch = `github-pages-deploy-action/${Math.random() @@ -229,22 +232,22 @@ export async function deploy(action: ActionInterface): Promise { Allows the user to specify the root if '.' is provided. rsync is used to prevent file duplication. */ await execute( - `rsync -q -av --checksum --progress ${action.folder}/. ${ + `rsync -q -av --checksum --progress ${folderPath}/. ${ action.targetFolder ? `${temporaryDeploymentDirectory}/${action.targetFolder}` : temporaryDeploymentDirectory } ${ action.clean ? `--delete ${excludes} ${ - !fs.existsSync(`${action.folder}/CNAME`) ? '--exclude CNAME' : '' + !fs.existsSync(`${folderPath}/CNAME`) ? '--exclude CNAME' : '' } ${ - !fs.existsSync(`${action.folder}/.nojekyll`) + !fs.existsSync(`${folderPath}/.nojekyll`) ? '--exclude .nojekyll' : '' }` : '' } --exclude .ssh --exclude .git --exclude .github ${ - action.folder === action.root + folderPath === rootPath ? `--exclude ${temporaryDeploymentDirectory}` : '' }`, diff --git a/src/lib.ts b/src/lib.ts index 3e8dc47b5..4286d8bf7 100644 --- a/src/lib.ts +++ b/src/lib.ts @@ -1,6 +1,6 @@ import {exportVariable, info, setFailed} from '@actions/core' import {action, ActionInterface, Status} from './constants' -import {deploy, generateBranch, init} from './git' +import {deploy, init} from './git' import {generateRepositoryPath, generateTokenType} from './util' /** Initializes and runs the action. @@ -53,5 +53,3 @@ export default async function run( exportVariable('DEPLOYMENT_STATUS', status) } } - -export {init, deploy, generateBranch, ActionInterface} diff --git a/src/util.ts b/src/util.ts index 36de9e0a9..d423b8145 100644 --- a/src/util.ts +++ b/src/util.ts @@ -1,5 +1,6 @@ +import path from 'path' import {isDebug} from '@actions/core' -import {ActionInterface} from './constants' +import {ActionInterface, ActionFolders} from './constants' const replaceAll = (input: string, find: string, replace: string): string => input.split(find).join(replace) @@ -26,6 +27,20 @@ export const generateRepositoryPath = (action: ActionInterface): string => action.accessToken || `x-access-token:${action.gitHubToken}` }@github.com/${action.repositoryName}.git` +/* Genetate absolute folder path by the provided folder name */ +export const generateFolderPath = ( + action: ActionInterface, + key: K +): string => { + const folderName = action[key] + const folderPath = path.isAbsolute(folderName) + ? folderName + : folderName.startsWith('~') + ? folderName.replace('~', process.env.HOME as string) + : path.join(action.workspace, folderName) + return folderPath +} + /* Checks for the required tokens and formatting. Throws an error if any case is matched. */ export const hasRequiredParameters = (action: ActionInterface): void => { if ( @@ -47,12 +62,6 @@ export const hasRequiredParameters = (action: ActionInterface): void => { if (!action.folder || isNullOrUndefined(action.folder)) { throw new Error('You must provide the action with a folder to deploy.') } - - if (action.folder.startsWith('/') || action.folder.startsWith('./')) { - throw new Error( - "Incorrectly formatted build folder. The deployment folder cannot be prefixed with '/' or './'. Instead reference the folder name directly." - ) - } } /* Suppresses sensitive information from being exposed in error messages. */ From b32c2bd80ccbb441a752d39c45a512d87da8db45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Oct 2020 09:40:17 -0400 Subject: [PATCH 16/42] Bump jest-circus from 26.5.1 to 26.5.2 (#450) Bumps [jest-circus](https://github.com/facebook/jest/tree/HEAD/packages/jest-circus) from 26.5.1 to 26.5.2. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v26.5.2/packages/jest-circus) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 541 +++++++++++++++++++++++++-------------------------- 2 files changed, 261 insertions(+), 282 deletions(-) diff --git a/package.json b/package.json index da4d825da..dc9260c8f 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "eslint-plugin-jest": "24.1.0", "eslint-plugin-prettier": "^3.1.2", "jest": "25.5.4", - "jest-circus": "26.5.1", + "jest-circus": "26.5.2", "prettier": "2.1.2", "ts-jest": "25.5.1", "typescript": "3.9.7" diff --git a/yarn.lock b/yarn.lock index 5e376b0f3..59c0dad86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -343,16 +343,16 @@ jest-util "^25.5.0" slash "^3.0.0" -"@jest/console@^26.5.0": - version "26.5.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.5.0.tgz#89a1c5ae8329907fda842ebc5b475d5c9f935766" - integrity sha512-oh59scth4yf8XUgMJb8ruY7BHm0X5JZDNgGGsVnlOt2XQuq9s2NMllIrN4n70Yds+++bjrTGZ9EoOKraaPKPlg== +"@jest/console@^26.5.2": + version "26.5.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.5.2.tgz#94fc4865b1abed7c352b5e21e6c57be4b95604a6" + integrity sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^26.5.0" - jest-util "^26.5.0" + jest-message-util "^26.5.2" + jest-util "^26.5.2" slash "^3.0.0" "@jest/core@^25.5.4": @@ -396,15 +396,15 @@ "@jest/types" "^25.5.0" jest-mock "^25.5.0" -"@jest/environment@^26.5.0": - version "26.5.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.5.0.tgz#4381b6b2fc291dcff51e248780196bc035da7190" - integrity sha512-0F3G9EyZU2NAP0/c/5EqVx4DmldQtRxj0gMl3p3ciSCdyMiCyDmpdE7O0mKTSiFDyl1kU4TfgEVf0r0vMkmYcw== +"@jest/environment@^26.5.2": + version "26.5.2" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.5.2.tgz#eba3cfc698f6e03739628f699c28e8a07f5e65fe" + integrity sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw== dependencies: - "@jest/fake-timers" "^26.5.0" - "@jest/types" "^26.5.0" + "@jest/fake-timers" "^26.5.2" + "@jest/types" "^26.5.2" "@types/node" "*" - jest-mock "^26.5.0" + jest-mock "^26.5.2" "@jest/fake-timers@^25.5.0": version "25.5.0" @@ -416,17 +416,17 @@ jest-util "^25.5.0" lolex "^5.0.0" -"@jest/fake-timers@^26.5.0": - version "26.5.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.5.0.tgz#107ceeb580bc42dd6e0843df5bbc92cb4fe9cb00" - integrity sha512-sQK6xUembaZ0qLnZpSjJJuJiKvyrjCJhaYjbmatFpj5+cM8h2D7YEkeEBC26BMzvF1O3tNM9OL7roqyBmom0KA== +"@jest/fake-timers@^26.5.2": + version "26.5.2" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.5.2.tgz#1291ac81680ceb0dc7daa1f92c059307eea6400a" + integrity sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" "@sinonjs/fake-timers" "^6.0.1" "@types/node" "*" - jest-message-util "^26.5.0" - jest-mock "^26.5.0" - jest-util "^26.5.0" + jest-message-util "^26.5.2" + jest-mock "^26.5.2" + jest-util "^26.5.2" "@jest/globals@^25.5.2": version "25.5.2" @@ -436,14 +436,14 @@ "@jest/types" "^25.5.0" expect "^25.5.0" -"@jest/globals@^26.5.0": - version "26.5.0" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.0.tgz#b9b7d05ee6722c894ce67aff216ed6b04d3fe187" - integrity sha512-TCKx3XWR9h/yyhQbz0C1sXkK2e8WJOnkP40T9bewNpf2Ahr1UEyKXnCoQO0JCpXFkWGTXBNo1QAgTQ3+LhXfcA== +"@jest/globals@^26.5.2": + version "26.5.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.2.tgz#c333f82c29e19ecb609a75d1a532915a5c956c59" + integrity sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw== dependencies: - "@jest/environment" "^26.5.0" - "@jest/types" "^26.5.0" - expect "^26.5.0" + "@jest/environment" "^26.5.2" + "@jest/types" "^26.5.2" + expect "^26.5.2" "@jest/reporters@^25.5.1": version "25.5.1" @@ -502,13 +502,13 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-result@^26.5.0": - version "26.5.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.5.0.tgz#d5bdf2eaf12ceddd359c2506fe806afafecc9a9e" - integrity sha512-CaVXxDQi31LPOsz5/+iajNHQlA1Je/jQ8uYH/lCa6Y/UrkO+sDHeEH3x/inbx06PctVDnTwIlCcBvNNbC4FCvQ== +"@jest/test-result@^26.5.2": + version "26.5.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.5.2.tgz#cc1a44cfd4db2ecee3fb0bc4e9fe087aa54b5230" + integrity sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw== dependencies: - "@jest/console" "^26.5.0" - "@jest/types" "^26.5.0" + "@jest/console" "^26.5.2" + "@jest/types" "^26.5.2" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" @@ -522,16 +522,16 @@ jest-runner "^25.5.4" jest-runtime "^25.5.4" -"@jest/test-sequencer@^26.5.0": - version "26.5.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.0.tgz#617808a1fa869c5181e43a5b841db084746b667e" - integrity sha512-23oofRXqPEy37HyHWIYf7lzzOqtGBkai5erZiL6RgxlyXE7a0lCihf6b5DfAvcD3yUtbXmh3EzpjJDVH57zQrg== +"@jest/test-sequencer@^26.5.2": + version "26.5.2" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz#c4559c7e134b27b020317303ee5399bf62917a4b" + integrity sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA== dependencies: - "@jest/test-result" "^26.5.0" + "@jest/test-result" "^26.5.2" graceful-fs "^4.2.4" - jest-haste-map "^26.5.0" - jest-runner "^26.5.0" - jest-runtime "^26.5.0" + jest-haste-map "^26.5.2" + jest-runner "^26.5.2" + jest-runtime "^26.5.2" "@jest/transform@^25.5.1": version "25.5.1" @@ -554,21 +554,21 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/transform@^26.5.0": - version "26.5.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.5.0.tgz#16404eaddf6034fe713da37b236756fc6b956db0" - integrity sha512-Kt4WciOruTyTkJ2DZ+xtZiejRj3v22BrXCYZoGRbI0N6Q6tt2HdsWrrEtn6nlK24QWKC389xKkVk4Xr2gWBZQA== +"@jest/transform@^26.5.2": + version "26.5.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.5.2.tgz#6a0033a1d24316a1c75184d010d864f2c681bef5" + integrity sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^26.5.0" + jest-haste-map "^26.5.2" jest-regex-util "^26.0.0" - jest-util "^26.5.0" + jest-util "^26.5.2" micromatch "^4.0.2" pirates "^4.0.1" slash "^3.0.0" @@ -584,10 +584,10 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" -"@jest/types@^26.5.0": - version "26.5.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.5.0.tgz#163f6e00c5ac9bb6fc91c3802eaa9d0dd6e1474a" - integrity sha512-nH9DFLqaIhB+RVgjivemvMiFSWw/BKwbZGxBAMv8CCTvUyFoK8RwHhAlmlXIvMBrf5Z3YQ4p9cq3Qh9EDctGvA== +"@jest/types@^26.5.2": + version "26.5.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.5.2.tgz#44c24f30c8ee6c7f492ead9ec3f3c62a5289756d" + integrity sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -1131,13 +1131,13 @@ babel-jest@^25.5.1: graceful-fs "^4.2.4" slash "^3.0.0" -babel-jest@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.5.0.tgz#afe11a083b4e584f63e9de29d2075cb96f42d2a4" - integrity sha512-Cy16ZJrds81C+JASaOIGNlpCeqW3PTOq36owv+Zzwde5NiWz+zNduwxUNF57vxc/3SnIWo8HHqTczhN8GLoXTw== +babel-jest@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.5.2.tgz#164f367a35946c6cf54eaccde8762dec50422250" + integrity sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A== dependencies: - "@jest/transform" "^26.5.0" - "@jest/types" "^26.5.0" + "@jest/transform" "^26.5.2" + "@jest/types" "^26.5.2" "@types/babel__core" "^7.1.7" babel-plugin-istanbul "^6.0.0" babel-preset-jest "^26.5.0" @@ -1382,15 +1382,6 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" -cliui@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.1.tgz#a4cb67aad45cd83d8d05128fc9f4d8fbb887e6b3" - integrity sha512-rcvHOWyGyid6I1WjT/3NatKj2kDt9OdSHSXpyLXaMWFbKpGACNW8pRhhdPUq9MWUOdwn8Rz9AVETjF4105rZZQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1692,11 +1683,6 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -escalade@^3.0.2, escalade@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e" - integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig== - 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" @@ -1974,16 +1960,16 @@ expect@^25.5.0: jest-message-util "^25.5.0" jest-regex-util "^25.2.6" -expect@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-26.5.0.tgz#089c0cc4d6c545c7388ddefffa0f1e2e8e38d282" - integrity sha512-oIOy3mHWjnF5ZICuaui5kdtJZQ+D7XHWyUQDxk1WhIRCkcIYc24X23bOfikgCNU6i9wcSqLQhwPOqeRp09naxg== +expect@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.5.2.tgz#3e0631c4a657a83dbec769ad246a2998953a55a6" + integrity sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" ansi-styles "^4.0.0" jest-get-type "^26.3.0" - jest-matcher-utils "^26.5.0" - jest-message-util "^26.5.0" + jest-matcher-utils "^26.5.2" + jest-message-util "^26.5.2" jest-regex-util "^26.0.0" extend-shallow@^2.0.1: @@ -2151,7 +2137,7 @@ gensync@^1.0.0-beta.1: version "1.0.0-beta.1" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" -get-caller-file@^2.0.1, get-caller-file@^2.0.5: +get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -2603,30 +2589,30 @@ jest-changed-files@^25.5.0: execa "^3.2.0" throat "^5.0.0" -jest-circus@26.5.1: - version "26.5.1" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-26.5.1.tgz#98d3cd49c2bead5d5ceca8f7b0a1951b59021446" - integrity sha512-8tXACLNh1FVGl6tDvu5d6rWVZ0N4peOL3/QlaqZme7a3DtprmjFG6NCQQnLgRYRsv2f5p12OvxVNekRnidNrYw== +jest-circus@26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-26.5.2.tgz#237d547c202d3f655774df36b6918ba894d4ef69" + integrity sha512-tWBzALbjCSOvSFhP+578/FN4HXBldiAeBGBzaNyX9ofA2+qxTtNkY4S08dg8828CAjpFUWFxMD805RRvtngWOQ== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.5.0" - "@jest/test-result" "^26.5.0" - "@jest/types" "^26.5.0" + "@jest/environment" "^26.5.2" + "@jest/test-result" "^26.5.2" + "@jest/types" "^26.5.2" "@types/babel__traverse" "^7.0.4" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^26.5.0" + expect "^26.5.2" is-generator-fn "^2.0.0" - jest-each "^26.5.0" - jest-matcher-utils "^26.5.0" - jest-message-util "^26.5.0" - jest-runner "^26.5.1" - jest-runtime "^26.5.0" - jest-snapshot "^26.5.0" - jest-util "^26.5.0" - pretty-format "^26.5.0" + jest-each "^26.5.2" + jest-matcher-utils "^26.5.2" + jest-message-util "^26.5.2" + jest-runner "^26.5.2" + jest-runtime "^26.5.2" + jest-snapshot "^26.5.2" + jest-util "^26.5.2" + pretty-format "^26.5.2" stack-utils "^2.0.2" throat "^5.0.0" @@ -2673,29 +2659,29 @@ jest-config@^25.5.4: pretty-format "^25.5.0" realpath-native "^2.0.0" -jest-config@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.0.tgz#3959e47223496e2ae2605e073578a359cab99445" - integrity sha512-OM6eXIEmQXAuonCk8aNPMRjPFcKWa3IIoSlq5BPgIflmQBzM/COcI7XsWSIEPWPa9WcYTJBWj8kNqEYjczmIFw== +jest-config@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.2.tgz#6e828e25f10124433dd008fbd83348636de0972a" + integrity sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^26.5.0" - "@jest/types" "^26.5.0" - babel-jest "^26.5.0" + "@jest/test-sequencer" "^26.5.2" + "@jest/types" "^26.5.2" + babel-jest "^26.5.2" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-environment-jsdom "^26.5.0" - jest-environment-node "^26.5.0" + jest-environment-jsdom "^26.5.2" + jest-environment-node "^26.5.2" jest-get-type "^26.3.0" - jest-jasmine2 "^26.5.0" + jest-jasmine2 "^26.5.2" jest-regex-util "^26.0.0" - jest-resolve "^26.5.0" - jest-util "^26.5.0" - jest-validate "^26.5.0" + jest-resolve "^26.5.2" + jest-util "^26.5.2" + jest-validate "^26.5.2" micromatch "^4.0.2" - pretty-format "^26.5.0" + pretty-format "^26.5.2" jest-diff@^25.2.1, jest-diff@^25.5.0: version "25.5.0" @@ -2706,15 +2692,15 @@ jest-diff@^25.2.1, jest-diff@^25.5.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-diff@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.5.0.tgz#bd01cef2d00b2668a0207ef47ab8eb1e33613253" - integrity sha512-CmDMMPkVMxrrh0Dv/4M9kh1tsYsZnYTQMMTvIFpePBSk9wMVfcyfg30TCq+oR9AzGbw8vsI50Gk1HmlMMlhoJg== +jest-diff@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.5.2.tgz#8e26cb32dc598e8b8a1b9deff55316f8313c8053" + integrity sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA== dependencies: chalk "^4.0.0" diff-sequences "^26.5.0" jest-get-type "^26.3.0" - pretty-format "^26.5.0" + pretty-format "^26.5.2" jest-docblock@^25.3.0: version "25.3.0" @@ -2738,16 +2724,16 @@ jest-each@^25.5.0: jest-util "^25.5.0" pretty-format "^25.5.0" -jest-each@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.5.0.tgz#39197a9d1abdd32ff5b8a9931507ab117c551c02" - integrity sha512-+oO3ykDgypHSyyK2xOsh8XDUwMtg3HoJ4wMNFNHxhcACFbUgaCOfLy+eTCn5pIKhtigU3BmkYt7k3MtTb5pJOQ== +jest-each@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.5.2.tgz#35e68d6906a7f826d3ca5803cfe91d17a5a34c31" + integrity sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" chalk "^4.0.0" jest-get-type "^26.3.0" - jest-util "^26.5.0" - pretty-format "^26.5.0" + jest-util "^26.5.2" + pretty-format "^26.5.2" jest-environment-jsdom@^25.5.0: version "25.5.0" @@ -2760,17 +2746,17 @@ jest-environment-jsdom@^25.5.0: jest-util "^25.5.0" jsdom "^15.2.1" -jest-environment-jsdom@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.5.0.tgz#f9a6726402fde787632a69df5ff3390ab04337a3" - integrity sha512-Xuqh3bx8egymaJR566ECkiztIIVOIWWPGIxo++ziWyCOqQChUguRCH1hRXBbfINPbb/SRFe7GCD+SunaUgTmCw== +jest-environment-jsdom@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz#5feab05b828fd3e4b96bee5e0493464ddd2bb4bc" + integrity sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw== dependencies: - "@jest/environment" "^26.5.0" - "@jest/fake-timers" "^26.5.0" - "@jest/types" "^26.5.0" + "@jest/environment" "^26.5.2" + "@jest/fake-timers" "^26.5.2" + "@jest/types" "^26.5.2" "@types/node" "*" - jest-mock "^26.5.0" - jest-util "^26.5.0" + jest-mock "^26.5.2" + jest-util "^26.5.2" jsdom "^16.4.0" jest-environment-node@^25.5.0: @@ -2784,17 +2770,17 @@ jest-environment-node@^25.5.0: jest-util "^25.5.0" semver "^6.3.0" -jest-environment-node@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.5.0.tgz#3f49ba40abe87209df96f7991015cac996e04563" - integrity sha512-LaYl/ek5mb1VDP1/+jMH2N1Ec4fFUhSYmc8EZqigBgMov/2US8U5l7D3IlOf78e+wARUxPxUpTcybVVzAOu3jg== +jest-environment-node@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.5.2.tgz#275a0f01b5e47447056f1541a15ed4da14acca03" + integrity sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA== dependencies: - "@jest/environment" "^26.5.0" - "@jest/fake-timers" "^26.5.0" - "@jest/types" "^26.5.0" + "@jest/environment" "^26.5.2" + "@jest/fake-timers" "^26.5.2" + "@jest/types" "^26.5.2" "@types/node" "*" - jest-mock "^26.5.0" - jest-util "^26.5.0" + jest-mock "^26.5.2" + jest-util "^26.5.2" jest-get-type@^25.2.6: version "25.2.6" @@ -2823,12 +2809,12 @@ jest-haste-map@^25.5.1: optionalDependencies: fsevents "^2.1.2" -jest-haste-map@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.5.0.tgz#ba4c48dbf69e0529709bd0d76660d87eefce820a" - integrity sha512-AjB1b53uqN7Cf2VN80x0wJajVZ+BMZC+G2CmWoG143faaMw7IhIcs3FTPuSgOx7cn3/bag7lgCq93naAvLO6EQ== +jest-haste-map@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.5.2.tgz#a15008abfc502c18aa56e4919ed8c96304ceb23d" + integrity sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" @@ -2836,7 +2822,7 @@ jest-haste-map@^26.5.0: graceful-fs "^4.2.4" jest-regex-util "^26.0.0" jest-serializer "^26.5.0" - jest-util "^26.5.0" + jest-util "^26.5.2" jest-worker "^26.5.0" micromatch "^4.0.2" sane "^4.0.3" @@ -2866,28 +2852,28 @@ jest-jasmine2@^25.5.4: pretty-format "^25.5.0" throat "^5.0.0" -jest-jasmine2@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.0.tgz#49d57db63f49a183813263b41e61e2a5f988e6a3" - integrity sha512-NOA6PLORHTRTROOp5VysKCUVpFAjMMXUS1Xw7FvTMeYK5Ewx4rpxhFqiJ7JT4pENap9g9OuXo4cWR/MwCDTEeQ== +jest-jasmine2@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz#0e33819d31b1f2aab5efd1e02ce502209c0e64a2" + integrity sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.5.0" + "@jest/environment" "^26.5.2" "@jest/source-map" "^26.5.0" - "@jest/test-result" "^26.5.0" - "@jest/types" "^26.5.0" + "@jest/test-result" "^26.5.2" + "@jest/types" "^26.5.2" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^26.5.0" + expect "^26.5.2" is-generator-fn "^2.0.0" - jest-each "^26.5.0" - jest-matcher-utils "^26.5.0" - jest-message-util "^26.5.0" - jest-runtime "^26.5.0" - jest-snapshot "^26.5.0" - jest-util "^26.5.0" - pretty-format "^26.5.0" + jest-each "^26.5.2" + jest-matcher-utils "^26.5.2" + jest-message-util "^26.5.2" + jest-runtime "^26.5.2" + jest-snapshot "^26.5.2" + jest-util "^26.5.2" + pretty-format "^26.5.2" throat "^5.0.0" jest-leak-detector@^25.5.0: @@ -2897,13 +2883,13 @@ jest-leak-detector@^25.5.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-leak-detector@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.5.0.tgz#a5671ffbc6308e45ad31b42cb2ef0722488a4e57" - integrity sha512-xZHvvTBbj3gUTtunLjPqP594BT6IUEpwA0AQpEQjVR8eBq8+R3qgU/KhoAcVcV0iqRM6pXtX7hKPZ5mLdynVSQ== +jest-leak-detector@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz#83fcf9a4a6ef157549552cb4f32ca1d6221eea69" + integrity sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw== dependencies: jest-get-type "^26.3.0" - pretty-format "^26.5.0" + pretty-format "^26.5.2" jest-matcher-utils@^25.5.0: version "25.5.0" @@ -2914,15 +2900,15 @@ jest-matcher-utils@^25.5.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-matcher-utils@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.5.0.tgz#1195d6a35c4c710ad286b775b966f3fdb7a2102d" - integrity sha512-QgbbxqFT8wiTi4o/7MWj2vHlcmMjACG8vnJ9pJ7svVDmkzEnTUGdHXWLKB1aZhbnyXetMNRF+TSMcDS9aGfuzA== +jest-matcher-utils@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz#6aa2c76ce8b9c33e66f8856ff3a52bab59e6c85a" + integrity sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA== dependencies: chalk "^4.0.0" - jest-diff "^26.5.0" + jest-diff "^26.5.2" jest-get-type "^26.3.0" - pretty-format "^26.5.0" + pretty-format "^26.5.2" jest-message-util@^25.5.0: version "25.5.0" @@ -2937,13 +2923,13 @@ jest-message-util@^25.5.0: slash "^3.0.0" stack-utils "^1.0.1" -jest-message-util@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.5.0.tgz#87f8c440dace55095d247442638c70b892836895" - integrity sha512-UEOqdoTfX0AFyReL4q5N3CfDBWt+AtQzeszZuuGapU39vwEk90rTSBghCA/3FFEZzvGfH2LE4+0NaBI81Cu2Ow== +jest-message-util@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.5.2.tgz#6c4c4c46dcfbabb47cd1ba2f6351559729bc11bb" + integrity sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" @@ -2957,12 +2943,12 @@ jest-mock@^25.5.0: dependencies: "@jest/types" "^25.5.0" -jest-mock@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.5.0.tgz#56efcea2dfd550b77ceb5ef280cf8c6114ef32db" - integrity sha512-8D1UmbnmjdkvTdYygTW26KZr95Aw0/3gEmMZQWkxIEAgEESVDbwDG8ygRlXSY214x9hFjtKezvfQUp36Ogl75w== +jest-mock@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.5.2.tgz#c9302e8ef807f2bfc749ee52e65ad11166a1b6a1" + integrity sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" "@types/node" "*" jest-pnp-resolver@^1.2.1: @@ -3003,17 +2989,17 @@ jest-resolve@^25.5.1: resolve "^1.17.0" slash "^3.0.0" -jest-resolve@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.5.0.tgz#31f68344dd88af70f00bc8bb531de6687565c680" - integrity sha512-c34L8Lrw4fFzRiCLzwePziKRfHitjsAnY15ID0e9Se4ISikmZ5T9icLEFAGHnfaxfb+9r8EKdrbg89gjRdrQvw== +jest-resolve@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.5.2.tgz#0d719144f61944a428657b755a0e5c6af4fc8602" + integrity sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" chalk "^4.0.0" - escalade "^3.1.0" graceful-fs "^4.2.4" jest-pnp-resolver "^1.2.2" - jest-util "^26.5.0" + jest-util "^26.5.2" + read-pkg-up "^7.0.1" resolve "^1.17.0" slash "^3.0.0" @@ -3041,28 +3027,28 @@ jest-runner@^25.5.4: source-map-support "^0.5.6" throat "^5.0.0" -jest-runner@^26.5.0, jest-runner@^26.5.1: - version "26.5.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.1.tgz#a56c1e1fbed7470ae69ebd5456ba4d4443c8701f" - integrity sha512-gFHXehvMZD8qwNzaIl2MDFFI99m4kKk06H2xh2u4IkC+tHYIJjE5J175l9cbL3RuU2slfS2m57KZgcPZfbTavQ== +jest-runner@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.2.tgz#4f9e6b0bb7eb4710c209a9e145b8a10894f4c19f" + integrity sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg== dependencies: - "@jest/console" "^26.5.0" - "@jest/environment" "^26.5.0" - "@jest/test-result" "^26.5.0" - "@jest/types" "^26.5.0" + "@jest/console" "^26.5.2" + "@jest/environment" "^26.5.2" + "@jest/test-result" "^26.5.2" + "@jest/types" "^26.5.2" "@types/node" "*" chalk "^4.0.0" emittery "^0.7.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^26.5.0" + jest-config "^26.5.2" jest-docblock "^26.0.0" - jest-haste-map "^26.5.0" - jest-leak-detector "^26.5.0" - jest-message-util "^26.5.0" - jest-resolve "^26.5.0" - jest-runtime "^26.5.0" - jest-util "^26.5.0" + jest-haste-map "^26.5.2" + jest-leak-detector "^26.5.2" + jest-message-util "^26.5.2" + jest-resolve "^26.5.2" + jest-runtime "^26.5.2" + jest-util "^26.5.2" jest-worker "^26.5.0" source-map-support "^0.5.6" throat "^5.0.0" @@ -3098,37 +3084,37 @@ jest-runtime@^25.5.4: strip-bom "^4.0.0" yargs "^15.3.1" -jest-runtime@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.0.tgz#c9b3eeb5ead70710ea17f6058df405cac31bb926" - integrity sha512-CujjQWpMcsvSg0L+G3iEz6s7Th5IbiZseAaw/5R7Eb+IfnJdyPdjJ+EoXNV8n07snvW5nZTwV9QIfy6Vjris8A== +jest-runtime@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.2.tgz#b72f5f79eb2fe0c46bfef4cdb9c1e01d1c69ba41" + integrity sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw== dependencies: - "@jest/console" "^26.5.0" - "@jest/environment" "^26.5.0" - "@jest/fake-timers" "^26.5.0" - "@jest/globals" "^26.5.0" + "@jest/console" "^26.5.2" + "@jest/environment" "^26.5.2" + "@jest/fake-timers" "^26.5.2" + "@jest/globals" "^26.5.2" "@jest/source-map" "^26.5.0" - "@jest/test-result" "^26.5.0" - "@jest/transform" "^26.5.0" - "@jest/types" "^26.5.0" + "@jest/test-result" "^26.5.2" + "@jest/transform" "^26.5.2" + "@jest/types" "^26.5.2" "@types/yargs" "^15.0.0" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-config "^26.5.0" - jest-haste-map "^26.5.0" - jest-message-util "^26.5.0" - jest-mock "^26.5.0" + jest-config "^26.5.2" + jest-haste-map "^26.5.2" + jest-message-util "^26.5.2" + jest-mock "^26.5.2" jest-regex-util "^26.0.0" - jest-resolve "^26.5.0" - jest-snapshot "^26.5.0" - jest-util "^26.5.0" - jest-validate "^26.5.0" + jest-resolve "^26.5.2" + jest-snapshot "^26.5.2" + jest-util "^26.5.2" + jest-validate "^26.5.2" slash "^3.0.0" strip-bom "^4.0.0" - yargs "^16.0.3" + yargs "^15.4.1" jest-serializer@^25.5.0: version "25.5.0" @@ -3164,26 +3150,26 @@ jest-snapshot@^25.5.1: pretty-format "^25.5.0" semver "^6.3.0" -jest-snapshot@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.0.tgz#2b76366e2d621775f39733e5764492b2e44b0bcd" - integrity sha512-WTNJef67o7cCvwAe5foVCNqG3MzIW/CyU4FZvMrhBPZsJeXwfBY7kfOlydZigxtcytnvmNE2pqznOfD5EcQgrQ== +jest-snapshot@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.2.tgz#0cf7642eaf8e8d2736bd443f619959bf237f9ccf" + integrity sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.0.0" chalk "^4.0.0" - expect "^26.5.0" + expect "^26.5.2" graceful-fs "^4.2.4" - jest-diff "^26.5.0" + jest-diff "^26.5.2" jest-get-type "^26.3.0" - jest-haste-map "^26.5.0" - jest-matcher-utils "^26.5.0" - jest-message-util "^26.5.0" - jest-resolve "^26.5.0" + jest-haste-map "^26.5.2" + jest-matcher-utils "^26.5.2" + jest-message-util "^26.5.2" + jest-resolve "^26.5.2" natural-compare "^1.4.0" - pretty-format "^26.5.0" + pretty-format "^26.5.2" semver "^7.3.2" jest-util@^25.5.0: @@ -3196,12 +3182,12 @@ jest-util@^25.5.0: is-ci "^2.0.0" make-dir "^3.0.0" -jest-util@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.5.0.tgz#f4e0fb80cf82db127d68c7c5b2749a427a80b450" - integrity sha512-CSQ0uzE7JdHDCQo3K8jlyWRIF2xNLdpu9nbjo8okGDanaNsF7WonhusFvjOg7QiWn1SThe7wFRh8Jx2ls1Gx4Q== +jest-util@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.5.2.tgz#8403f75677902cc52a1b2140f568e91f8ed4f4d7" + integrity sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" "@types/node" "*" chalk "^4.0.0" graceful-fs "^4.2.4" @@ -3219,17 +3205,17 @@ jest-validate@^25.5.0: leven "^3.1.0" pretty-format "^25.5.0" -jest-validate@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.0.tgz#6e417ec5066e315752da1350797a89fc5907f97a" - integrity sha512-603+CHUJD4nAZ+tY/A+wu3g8KEcBey2a7YOMU9W8e4u7mCezhaDasw20ITaZHoR2R2MZhThL6jApPSj0GvezrQ== +jest-validate@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.2.tgz#7ea266700b64234cd1c0cee982490c5a80e9b0f0" + integrity sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" camelcase "^6.0.0" chalk "^4.0.0" jest-get-type "^26.3.0" leven "^3.1.0" - pretty-format "^26.5.0" + pretty-format "^26.5.2" jest-watcher@^25.5.0: version "25.5.0" @@ -3937,12 +3923,12 @@ pretty-format@^25.2.1, pretty-format@^25.5.0: ansi-styles "^4.0.0" react-is "^16.12.0" -pretty-format@^26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.5.0.tgz#3320e4952f8e6918fc8c26c6df7aad9734818ac2" - integrity sha512-NcgRuuTutUJ9+Br4P19DFThpJYnYBiugfRmZEA6pXrUeG+IcMSmppb88rU+iPA+XAJcjTYlCb5Ed6miHg/Qqqw== +pretty-format@^26.5.2: + version "26.5.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.5.2.tgz#5d896acfdaa09210683d34b6dc0e6e21423cd3e1" + integrity sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og== dependencies: - "@jest/types" "^26.5.0" + "@jest/types" "^26.5.2" ansi-regex "^5.0.0" ansi-styles "^4.0.0" react-is "^16.12.0" @@ -4878,15 +4864,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -4926,11 +4903,6 @@ y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" -y18n@^5.0.1: - version "5.0.2" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.2.tgz#48218df5da2731b4403115c39a1af709c873f829" - integrity sha512-CkwaeZw6dQgqgPGeTWKMXCRmMcBgETFlTml1+ZOO+q7kGst8NREJ+eWwFNPVUQ4QGdAaklbqCZHH6Zuep1RjiA== - yargs-parser@18.x, yargs-parser@^18.1.1: version "18.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1" @@ -4938,10 +4910,13 @@ yargs-parser@18.x, yargs-parser@^18.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.0.0: - version "20.2.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.1.tgz#28f3773c546cdd8a69ddae68116b48a5da328e77" - integrity sha512-yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA== +yargs-parser@^18.1.2: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" yargs@^15.3.1: version "15.3.1" @@ -4959,15 +4934,19 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.1" -yargs@^16.0.3: - version "16.0.3" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.0.3.tgz#7a919b9e43c90f80d4a142a89795e85399a7e54c" - integrity sha512-6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA== +yargs@^15.4.1: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== dependencies: - cliui "^7.0.0" - escalade "^3.0.2" - get-caller-file "^2.0.5" + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" string-width "^4.2.0" - y18n "^5.0.1" - yargs-parser "^20.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" From 836faae3d92dc24d8b2f487a58cab6a2dc58ec9b Mon Sep 17 00:00:00 2001 From: koooge Date: Thu, 8 Oct 2020 15:25:43 +0200 Subject: [PATCH 17/42] chore: Replace rm -rf with rimraf (#444) Signed-off-by: koooge --- package.json | 3 ++- yarn.lock | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index dc9260c8f..2ac7b5a20 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "main": "lib/lib.js", "types": "lib/lib.d.ts", "scripts": { - "build": "rm -rf lib && tsc --declaration", + "build": "rimraf lib && tsc --declaration", "test": "jest", "lint": "eslint src/**/*.ts", "format": "prettier --write './**/*.ts'" @@ -48,6 +48,7 @@ "jest": "25.5.4", "jest-circus": "26.5.2", "prettier": "2.1.2", + "rimraf": "^3.0.2", "ts-jest": "25.5.1", "typescript": "3.9.7" } diff --git a/yarn.lock b/yarn.lock index 59c0dad86..c87341b4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4156,6 +4156,13 @@ rimraf@^3.0.0: dependencies: glob "^7.1.3" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + rsvp@^4.8.4: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" From 5b08472e0a19fba6cd15cb4560dde3fbe177c897 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Oct 2020 07:38:53 -0400 Subject: [PATCH 18/42] Bump @types/node from 14.11.5 to 14.11.8 (#453) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.11.5 to 14.11.8. - [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 2ac7b5a20..375c04d31 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@types/jest": "26.0.14", - "@types/node": "14.11.5", + "@types/node": "14.11.8", "eslint": "7.10.0", "eslint-plugin-github": "4.1.1", "eslint-plugin-jest": "24.1.0", diff --git a/yarn.lock b/yarn.lock index c87341b4f..e9be8725b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -828,10 +828,10 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/node@*", "@types/node@14.11.5", "@types/node@>= 8": - version "14.11.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.5.tgz#fecad41c041cae7f2404ad4b2d0742fdb628b305" - integrity sha512-jVFzDV6NTbrLMxm4xDSIW/gKnk8rQLF9wAzLWIOg+5nU6ACrIMndeBdXci0FGtqJbP9tQvm6V39eshc96TO2wQ== +"@types/node@*", "@types/node@14.11.8", "@types/node@>= 8": + version "14.11.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.8.tgz#fe2012f2355e4ce08bca44aeb3abbb21cf88d33f" + integrity sha512-KPcKqKm5UKDkaYPTuXSx8wEP7vE9GnuaXIZKijwRYcePpZFDVuy2a57LarFKiORbHOuTOOwYzxVxcUzsh2P2Pw== "@types/normalize-package-data@^2.4.0": version "2.4.0" From fbc5cb96d61df571dd04c6817c7983ce9d107bd1 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 10 Oct 2020 15:35:25 -0400 Subject: [PATCH 19/42] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e48149ab0..e6444ba3f 100644 --- a/README.md +++ b/README.md @@ -178,7 +178,7 @@ The action will export an environment variable called `DEPLOYMENT_STATUS` that y If you'd prefer to use an SSH deploy key as opposed to a token you must first generate a new SSH key by running the following terminal command, replacing the email with one connected to your GitHub account. ```bash -ssh-keygen -t rsa -b 4096 -C "youremailhere@example.com" -N "" +ssh-keygen -t rsa -m pem -b 4096 -C "youremailhere@example.com" -N "" ``` Once you've generated the key pair you must add the contents of the public key within your repository's [deploy keys menu](https://developer.github.com/v3/guides/managing-deploy-keys/). You can find this option by going to `Settings > Deploy Keys`, you can name the public key whatever you want, but you **do** need to give it write access. Afterwards add the contents of the private key to the `Settings > Secrets` menu as `DEPLOY_KEY`. @@ -187,7 +187,7 @@ With this configured you must add the `ssh-agent` step to your workflow and set ```yml - name: Install SSH Client πŸ”‘ - uses: webfactory/ssh-agent@v0.2.0 + uses: webfactory/ssh-agent@v0.4.1 with: ssh-private-key: ${{ secrets.DEPLOY_KEY }} From d99929c924ec195b39a4d645a4a24ba7bb6d7bd2 Mon Sep 17 00:00:00 2001 From: James Ives Date: Mon, 12 Oct 2020 10:27:27 -0400 Subject: [PATCH 20/42] Update README.md --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index e6444ba3f..465687ae5 100644 --- a/README.md +++ b/README.md @@ -96,12 +96,7 @@ npm install @jamesives/github-pages-deploy-action It can then be imported into your project like so. ```javascript -import run, { - init, - deploy, - generateBranch, - ActionInterface -} from "github-pages-deploy-action"; +import run, {ActionInterface} 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. From 31576af4cf02b1471a6018822d8f3d06fc438f1d Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 00:38:33 -0400 Subject: [PATCH 21/42] Update BUG_REPORT.md --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index 9a719d365..b6eac4021 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -6,7 +6,7 @@ labels: --- - + **Describe the bug** From d6d4333a1644d5cb56b4afe21cdb7b499f7c52d2 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 00:38:44 -0400 Subject: [PATCH 22/42] Update FEATURE_REQUEST.md --- .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md index 1db438a7f..7d5cc595d 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -6,7 +6,7 @@ labels: --- - + **Is your feature request related to a problem? Please describe.** From 62c7b6c787cdd70a2e67e3be5f995d84d892ff1d Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 00:38:54 -0400 Subject: [PATCH 23/42] Update SUPPORT.md --- .github/ISSUE_TEMPLATE/SUPPORT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/SUPPORT.md b/.github/ISSUE_TEMPLATE/SUPPORT.md index 766573176..ad7f197c1 100644 --- a/.github/ISSUE_TEMPLATE/SUPPORT.md +++ b/.github/ISSUE_TEMPLATE/SUPPORT.md @@ -6,7 +6,7 @@ labels: --- - + **Describe the Issue** From 565795d8a96c11f7a8c920c47040052ab0a0379e Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 07:58:13 -0400 Subject: [PATCH 24/42] Adds funding button --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..077f6c801 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +github: [JamesIves] From af60791f5ed7769aed9025c2fa798be4a516acab Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 07:58:53 -0400 Subject: [PATCH 25/42] Adds Support to Readme (#458) * Update README.md * Update README.md * Update README.md * Update README.md --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 465687ae5..0f0afa5c2 100644 --- a/README.md +++ b/README.md @@ -328,3 +328,15 @@ If you wish to remove these files you must go into the deployment branch directl ### Debugging 🐝 If you'd like to enable action debugging you can set the `ACTIONS_STEP_DEBUG` environment variable to true within the [Settings/Secrets](https://help.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets#creating-encrypted-secrets) menu. If you're using this action in your own project as a node module via yarn or npm **you may expose your secrets if you toggle this on in a production environment**. You can learn more about debugging GitHub actions [here](https://github.com/actions/toolkit/blob/master/docs/action-debugging.md). + +--- + +## Support πŸ’– + +This project would not be possible without all of our fantastic [contributors](https://github.com/JamesIves/github-pages-deploy-action/graphs/contributors). + + + + + +If you'd like to support the maintenance and upkeep of this project you can [donate via GitHub Sponsors](https://github.com/sponsors/JamesIves). This project is distributed under the [MIT](https://github.com/JamesIves/github-pages-deploy-action/blob/dev/LICENSE) license. \ No newline at end of file From 71b15f57635181beaf55b2d17b7855f7bba22722 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2020 08:00:14 -0400 Subject: [PATCH 26/42] Bump eslint from 7.10.0 to 7.11.0 (#464) Bumps [eslint](https://github.com/eslint/eslint) from 7.10.0 to 7.11.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.10.0...v7.11.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 375c04d31..d31d914de 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@types/jest": "26.0.14", "@types/node": "14.11.8", - "eslint": "7.10.0", + "eslint": "7.11.0", "eslint-plugin-github": "4.1.1", "eslint-plugin-jest": "24.1.0", "eslint-plugin-prettier": "^3.1.2", diff --git a/yarn.lock b/yarn.lock index e9be8725b..bfb84c53a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1817,10 +1817,10 @@ 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.10.0: - version "7.10.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9" - integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA== +eslint@7.11.0: + version "7.11.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.11.0.tgz#aaf2d23a0b5f1d652a08edacea0c19f7fadc0b3b" + integrity sha512-G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.1.3" @@ -1832,7 +1832,7 @@ eslint@7.10.0: enquirer "^2.3.5" eslint-scope "^5.1.1" eslint-utils "^2.1.0" - eslint-visitor-keys "^1.3.0" + eslint-visitor-keys "^2.0.0" espree "^7.3.0" esquery "^1.2.0" esutils "^2.0.2" From 955f5e0b233515b6dd447af92a97bc3853118575 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 11:42:03 -0400 Subject: [PATCH 27/42] Update SUPPORT.md --- .github/ISSUE_TEMPLATE/SUPPORT.md | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/SUPPORT.md b/.github/ISSUE_TEMPLATE/SUPPORT.md index ad7f197c1..2d284730b 100644 --- a/.github/ISSUE_TEMPLATE/SUPPORT.md +++ b/.github/ISSUE_TEMPLATE/SUPPORT.md @@ -1,18 +1,6 @@ --- -name: Support +name: Questions and Support about: If you're having problems setting up the action you can make a request for support here. -labels: - - support +url: https://github.com/JamesIves/github-pages-deploy-action/discussions?discussions_q=category%3AQ%26A --- - - - -**Describe the Issue** - - -**Logs** - - -**Additional Comments** - From d45f03e4a29b3290ab1bd4d978d9edd466c23238 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 11:45:27 -0400 Subject: [PATCH 28/42] Create config.yml --- .github/ISSUE_TEMPLATE/config.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..8c48d4bf9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: GitHub Community Support + url: https://github.community/ + about: Please ask and answer questions here. From 466eb2e9100ea12e42a6afdf911c14591d4637a1 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 11:46:29 -0400 Subject: [PATCH 29/42] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 8c48d4bf9..0c4622915 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - - name: GitHub Community Support + - name: Support and Questions url: https://github.community/ - about: Please ask and answer questions here. + about: https://github.com/JamesIves/github-pages-deploy-action/discussions/category_choices From a32487e0a0cc88057ca06ebf78bf440bab9f6f11 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 11:46:39 -0400 Subject: [PATCH 30/42] Delete SUPPORT.md --- .github/ISSUE_TEMPLATE/SUPPORT.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/SUPPORT.md diff --git a/.github/ISSUE_TEMPLATE/SUPPORT.md b/.github/ISSUE_TEMPLATE/SUPPORT.md deleted file mode 100644 index 2d284730b..000000000 --- a/.github/ISSUE_TEMPLATE/SUPPORT.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: Questions and Support -about: If you're having problems setting up the action you can make a request for support here. -url: https://github.com/JamesIves/github-pages-deploy-action/discussions?discussions_q=category%3AQ%26A - ---- From af01ac862cda5395f67a292007d11f4c26331082 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 11:47:30 -0400 Subject: [PATCH 31/42] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 0c4622915..73dd32934 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - name: Support and Questions - url: https://github.community/ - about: https://github.com/JamesIves/github-pages-deploy-action/discussions/category_choices + url: https://github.com/JamesIves/github-pages-deploy-action/discussions/category_choices + about: Need help or just have a general question? Please open a discussion thread here. From d3179cd911ed1a2523ab31d610d4bc992c8fea46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2020 11:53:14 -0400 Subject: [PATCH 32/42] Bump jest-circus from 26.5.2 to 26.5.3 (#465) Bumps [jest-circus](https://github.com/facebook/jest/tree/HEAD/packages/jest-circus) from 26.5.2 to 26.5.3. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v26.5.3/packages/jest-circus) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 120 +++++++++++++++++++++++++-------------------------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index d31d914de..8b3d01bfa 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "eslint-plugin-jest": "24.1.0", "eslint-plugin-prettier": "^3.1.2", "jest": "25.5.4", - "jest-circus": "26.5.2", + "jest-circus": "26.5.3", "prettier": "2.1.2", "rimraf": "^3.0.2", "ts-jest": "25.5.1", diff --git a/yarn.lock b/yarn.lock index bfb84c53a..ba5651f3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -436,14 +436,14 @@ "@jest/types" "^25.5.0" expect "^25.5.0" -"@jest/globals@^26.5.2": - version "26.5.2" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.2.tgz#c333f82c29e19ecb609a75d1a532915a5c956c59" - integrity sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw== +"@jest/globals@^26.5.3": + version "26.5.3" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.3.tgz#90769b40e0af3fa0b28f6d8c5bbe3712467243fd" + integrity sha512-7QztI0JC2CuB+Wx1VdnOUNeIGm8+PIaqngYsZXQCkH2QV0GFqzAYc9BZfU0nuqA6cbYrWh5wkuMzyii3P7deug== dependencies: "@jest/environment" "^26.5.2" "@jest/types" "^26.5.2" - expect "^26.5.2" + expect "^26.5.3" "@jest/reporters@^25.5.1": version "25.5.1" @@ -522,16 +522,16 @@ jest-runner "^25.5.4" jest-runtime "^25.5.4" -"@jest/test-sequencer@^26.5.2": - version "26.5.2" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz#c4559c7e134b27b020317303ee5399bf62917a4b" - integrity sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA== +"@jest/test-sequencer@^26.5.3": + version "26.5.3" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.3.tgz#9ae0ab9bc37d5171b28424029192e50229814f8d" + integrity sha512-Wqzb7aQ13L3T47xHdpUqYMOpiqz6Dx2QDDghp5AV/eUDXR7JieY+E1s233TQlNyl+PqtqgjVokmyjzX/HA51BA== dependencies: "@jest/test-result" "^26.5.2" graceful-fs "^4.2.4" jest-haste-map "^26.5.2" - jest-runner "^26.5.2" - jest-runtime "^26.5.2" + jest-runner "^26.5.3" + jest-runtime "^26.5.3" "@jest/transform@^25.5.1": version "25.5.1" @@ -1960,10 +1960,10 @@ expect@^25.5.0: jest-message-util "^25.5.0" jest-regex-util "^25.2.6" -expect@^26.5.2: - version "26.5.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-26.5.2.tgz#3e0631c4a657a83dbec769ad246a2998953a55a6" - integrity sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w== +expect@^26.5.3: + version "26.5.3" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.5.3.tgz#89d9795036f7358b0a9a5243238eb8086482d741" + integrity sha512-kkpOhGRWGOr+TEFUnYAjfGvv35bfP+OlPtqPIJpOCR9DVtv8QV+p8zG0Edqafh80fsjeE+7RBcVUq1xApnYglw== dependencies: "@jest/types" "^26.5.2" ansi-styles "^4.0.0" @@ -2589,10 +2589,10 @@ jest-changed-files@^25.5.0: execa "^3.2.0" throat "^5.0.0" -jest-circus@26.5.2: - version "26.5.2" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-26.5.2.tgz#237d547c202d3f655774df36b6918ba894d4ef69" - integrity sha512-tWBzALbjCSOvSFhP+578/FN4HXBldiAeBGBzaNyX9ofA2+qxTtNkY4S08dg8828CAjpFUWFxMD805RRvtngWOQ== +jest-circus@26.5.3: + version "26.5.3" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-26.5.3.tgz#9918231e23bd169d9832b6c23195dab8367fd62d" + integrity sha512-d3kCp2ASCG9aq63KZi1VyNDcWCiBwlUfEQfGuKd9aPs45L5J69SsjQjhjAqhVjX0eld8cZMJZS1VC4OuXoQ+8A== dependencies: "@babel/traverse" "^7.1.0" "@jest/environment" "^26.5.2" @@ -2603,14 +2603,14 @@ jest-circus@26.5.2: chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^26.5.2" + expect "^26.5.3" is-generator-fn "^2.0.0" jest-each "^26.5.2" jest-matcher-utils "^26.5.2" jest-message-util "^26.5.2" - jest-runner "^26.5.2" - jest-runtime "^26.5.2" - jest-snapshot "^26.5.2" + jest-runner "^26.5.3" + jest-runtime "^26.5.3" + jest-snapshot "^26.5.3" jest-util "^26.5.2" pretty-format "^26.5.2" stack-utils "^2.0.2" @@ -2659,13 +2659,13 @@ jest-config@^25.5.4: pretty-format "^25.5.0" realpath-native "^2.0.0" -jest-config@^26.5.2: - version "26.5.2" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.2.tgz#6e828e25f10124433dd008fbd83348636de0972a" - integrity sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg== +jest-config@^26.5.3: + version "26.5.3" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.3.tgz#baf51c9be078c2c755c8f8a51ec0f06c762c1d3f" + integrity sha512-NVhZiIuN0GQM6b6as4CI5FSCyXKxdrx5ACMCcv/7Pf+TeCajJhJc+6dwgdAVPyerUFB9pRBIz3bE7clSrRge/w== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^26.5.2" + "@jest/test-sequencer" "^26.5.3" "@jest/types" "^26.5.2" babel-jest "^26.5.2" chalk "^4.0.0" @@ -2675,11 +2675,11 @@ jest-config@^26.5.2: jest-environment-jsdom "^26.5.2" jest-environment-node "^26.5.2" jest-get-type "^26.3.0" - jest-jasmine2 "^26.5.2" + jest-jasmine2 "^26.5.3" jest-regex-util "^26.0.0" jest-resolve "^26.5.2" jest-util "^26.5.2" - jest-validate "^26.5.2" + jest-validate "^26.5.3" micromatch "^4.0.2" pretty-format "^26.5.2" @@ -2852,10 +2852,10 @@ jest-jasmine2@^25.5.4: pretty-format "^25.5.0" throat "^5.0.0" -jest-jasmine2@^26.5.2: - version "26.5.2" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz#0e33819d31b1f2aab5efd1e02ce502209c0e64a2" - integrity sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA== +jest-jasmine2@^26.5.3: + version "26.5.3" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.3.tgz#baad2114ce32d16aff25aeb877d18bb4e332dc4c" + integrity sha512-nFlZOpnGlNc7y/+UkkeHnvbOM+rLz4wB1AimgI9QhtnqSZte0wYjbAm8hf7TCwXlXgDwZxAXo6z0a2Wzn9FoOg== dependencies: "@babel/traverse" "^7.1.0" "@jest/environment" "^26.5.2" @@ -2865,13 +2865,13 @@ jest-jasmine2@^26.5.2: "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^26.5.2" + expect "^26.5.3" is-generator-fn "^2.0.0" jest-each "^26.5.2" jest-matcher-utils "^26.5.2" jest-message-util "^26.5.2" - jest-runtime "^26.5.2" - jest-snapshot "^26.5.2" + jest-runtime "^26.5.3" + jest-snapshot "^26.5.3" jest-util "^26.5.2" pretty-format "^26.5.2" throat "^5.0.0" @@ -3027,10 +3027,10 @@ jest-runner@^25.5.4: source-map-support "^0.5.6" throat "^5.0.0" -jest-runner@^26.5.2: - version "26.5.2" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.2.tgz#4f9e6b0bb7eb4710c209a9e145b8a10894f4c19f" - integrity sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg== +jest-runner@^26.5.3: + version "26.5.3" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.3.tgz#800787459ea59c68e7505952933e33981dc3db38" + integrity sha512-qproP0Pq7IIule+263W57k2+8kWCszVJTC9TJWGUz0xJBr+gNiniGXlG8rotd0XxwonD5UiJloYoSO5vbUr5FQ== dependencies: "@jest/console" "^26.5.2" "@jest/environment" "^26.5.2" @@ -3041,13 +3041,13 @@ jest-runner@^26.5.2: emittery "^0.7.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^26.5.2" + jest-config "^26.5.3" jest-docblock "^26.0.0" jest-haste-map "^26.5.2" jest-leak-detector "^26.5.2" jest-message-util "^26.5.2" jest-resolve "^26.5.2" - jest-runtime "^26.5.2" + jest-runtime "^26.5.3" jest-util "^26.5.2" jest-worker "^26.5.0" source-map-support "^0.5.6" @@ -3084,15 +3084,15 @@ jest-runtime@^25.5.4: strip-bom "^4.0.0" yargs "^15.3.1" -jest-runtime@^26.5.2: - version "26.5.2" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.2.tgz#b72f5f79eb2fe0c46bfef4cdb9c1e01d1c69ba41" - integrity sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw== +jest-runtime@^26.5.3: + version "26.5.3" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.3.tgz#5882ae91fd88304310f069549e6bf82f3f198bea" + integrity sha512-IDjalmn2s/Tc4GvUwhPHZ0iaXCdMRq5p6taW9P8RpU+FpG01O3+H8z+p3rDCQ9mbyyyviDgxy/LHPLzrIOKBkQ== dependencies: "@jest/console" "^26.5.2" "@jest/environment" "^26.5.2" "@jest/fake-timers" "^26.5.2" - "@jest/globals" "^26.5.2" + "@jest/globals" "^26.5.3" "@jest/source-map" "^26.5.0" "@jest/test-result" "^26.5.2" "@jest/transform" "^26.5.2" @@ -3103,15 +3103,15 @@ jest-runtime@^26.5.2: exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-config "^26.5.2" + jest-config "^26.5.3" jest-haste-map "^26.5.2" jest-message-util "^26.5.2" jest-mock "^26.5.2" jest-regex-util "^26.0.0" jest-resolve "^26.5.2" - jest-snapshot "^26.5.2" + jest-snapshot "^26.5.3" jest-util "^26.5.2" - jest-validate "^26.5.2" + jest-validate "^26.5.3" slash "^3.0.0" strip-bom "^4.0.0" yargs "^15.4.1" @@ -3150,17 +3150,17 @@ jest-snapshot@^25.5.1: pretty-format "^25.5.0" semver "^6.3.0" -jest-snapshot@^26.5.2: - version "26.5.2" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.2.tgz#0cf7642eaf8e8d2736bd443f619959bf237f9ccf" - integrity sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg== +jest-snapshot@^26.5.3: + version "26.5.3" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.3.tgz#f6b4b4b845f85d4b0dadd7cf119c55d0c1688601" + integrity sha512-ZgAk0Wm0JJ75WS4lGaeRfa0zIgpL0KD595+XmtwlIEMe8j4FaYHyZhP1LNOO+8fXq7HJ3hll54+sFV9X4+CGVw== dependencies: "@babel/types" "^7.0.0" "@jest/types" "^26.5.2" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.0.0" chalk "^4.0.0" - expect "^26.5.2" + expect "^26.5.3" graceful-fs "^4.2.4" jest-diff "^26.5.2" jest-get-type "^26.3.0" @@ -3205,10 +3205,10 @@ jest-validate@^25.5.0: leven "^3.1.0" pretty-format "^25.5.0" -jest-validate@^26.5.2: - version "26.5.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.2.tgz#7ea266700b64234cd1c0cee982490c5a80e9b0f0" - integrity sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ== +jest-validate@^26.5.3: + version "26.5.3" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.3.tgz#eefd5a5c87059550548c5ad8d6589746c66929e3" + integrity sha512-LX07qKeAtY+lsU0o3IvfDdN5KH9OulEGOMN1sFo6PnEf5/qjS1LZIwNk9blcBeW94pQUI9dLN9FlDYDWI5tyaA== dependencies: "@jest/types" "^26.5.2" camelcase "^6.0.0" From 43e0d0793aa320ebe18f7bcd44a61e9a755238a3 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 12:09:48 -0400 Subject: [PATCH 33/42] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 73dd32934..68a715285 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,10 @@ blank_issues_enabled: false 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 post it here. + - name: Support and Questions - url: https://github.com/JamesIves/github-pages-deploy-action/discussions/category_choices + 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 here. + From caad8a1e3d3f841e1c4de8af5db4ccf671c11510 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 12:10:16 -0400 Subject: [PATCH 34/42] Delete FEATURE_REQUEST.md --- .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md deleted file mode 100644 index 7d5cc595d..000000000 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Feature Request -about: If you'd like to make a suggestion please fill out the form below. -labels: - - feature request - ---- - - - -**Is your feature request related to a problem? Please describe.** - - -**Describe the solution you'd like** - - -**Additional Comments** - From dc96a8ff0003bc3e77f87ad7010ae4c9bf0bd369 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 14 Oct 2020 12:11:12 -0400 Subject: [PATCH 35/42] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 68a715285..308bb38a3 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,9 +2,9 @@ blank_issues_enabled: false 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 post it here. + 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 here. + about: Need help or just have a general question? Please open a discussion thread. From dc667b321774b15ddbee98d956a476e51d2e2de7 Mon Sep 17 00:00:00 2001 From: Exuanbo Date: Thu, 15 Oct 2020 15:20:15 +0100 Subject: [PATCH 36/42] Feat: add support for checking if source folder exists (#463) * Refactor: check parameters in `init` * Test: add test for checking if folder exist - rm unnecessary tests * Test: fix wrong error message * Refactor: mv initialization functions to `run` Refactor: rm `action.root`, `action.rootPath` Refactor: `generateFolderPath`, `hasRequiredParameters` Test: rm some tests for `init`, add tests for `checkParameters` --- __tests__/git.test.ts | 238 ----------------------------------------- __tests__/util.test.ts | 129 ++++++++++++++++++---- src/constants.ts | 9 +- src/git.ts | 27 ++--- src/lib.ts | 12 ++- src/util.ts | 43 ++++---- 6 files changed, 154 insertions(+), 304 deletions(-) diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts index 404fb9a17..1ef54c6db 100644 --- a/__tests__/git.test.ts +++ b/__tests__/git.test.ts @@ -32,171 +32,6 @@ describe('git', () => { }) describe('init', () => { - it('should execute commands if a GitHub token is provided', async () => { - Object.assign(action, { - silent: false, - repositoryPath: 'JamesIves/github-pages-deploy-action', - folder: 'assets', - branch: 'branch', - gitHubToken: '123', - pusher: { - name: 'asd', - email: 'as@cat' - } - }) - - await init(action) - expect(execute).toBeCalledTimes(6) - }) - - it('should execute commands if an Access Token is provided', async () => { - Object.assign(action, { - silent: false, - repositoryPath: 'JamesIves/github-pages-deploy-action', - folder: 'assets', - branch: 'branch', - accessToken: '123', - pusher: { - name: 'asd', - email: 'as@cat' - } - }) - - await init(action) - expect(execute).toBeCalledTimes(6) - }) - - it('should execute commands if SSH is true', async () => { - Object.assign(action, { - silent: false, - repositoryPath: 'JamesIves/github-pages-deploy-action', - folder: 'assets', - branch: 'branch', - ssh: true, - pusher: { - name: 'asd', - email: 'as@cat' - } - }) - - await init(action) - - expect(execute).toBeCalledTimes(6) - }) - - it('should fail if there is no provided GitHub Token, Access Token or SSH bool', async () => { - Object.assign(action, { - silent: false, - repositoryPath: null, - folder: 'assets', - branch: 'branch', - pusher: { - name: 'asd', - email: 'as@cat' - } - }) - - try { - await init(action) - } catch (e) { - expect(execute).toBeCalledTimes(0) - expect(e.message).toMatch( - 'There was an error initializing the repository: No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true. ❌' - ) - } - }) - - it('should fail if access token is defined but it is an empty string', async () => { - Object.assign(action, { - silent: false, - repositoryPath: null, - folder: 'assets', - branch: 'branch', - pusher: { - name: 'asd', - email: 'as@cat' - }, - accessToken: '' - }) - - try { - await init(action) - } catch (e) { - expect(execute).toBeCalledTimes(0) - expect(e.message).toMatch( - 'There was an error initializing the repository: No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true. ❌' - ) - } - }) - - it('should fail if there is no folder', async () => { - Object.assign(action, { - silent: false, - repositoryPath: 'JamesIves/github-pages-deploy-action', - gitHubToken: '123', - branch: 'branch', - pusher: { - name: 'asd', - email: 'as@cat' - }, - folder: null, - ssh: true - }) - - try { - await init(action) - } catch (e) { - expect(execute).toBeCalledTimes(0) - expect(e.message).toMatch( - 'There was an error initializing the repository: You must provide the action with a folder to deploy. ❌' - ) - } - }) - - it('should fail if there is no provided repository path', async () => { - Object.assign(action, { - silent: true, - repositoryPath: null, - folder: 'assets', - branch: 'branch', - pusher: { - name: 'asd', - email: 'as@cat' - }, - gitHubToken: '123', - accessToken: null, - ssh: null - }) - - try { - await init(action) - } catch (e) { - expect(execute).toBeCalledTimes(0) - expect(e.message).toMatch( - 'There was an error initializing the repository: No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true. ' - ) - } - }) - - it('should not fail if root is used', async () => { - Object.assign(action, { - silent: false, - repositoryPath: 'JamesIves/github-pages-deploy-action', - accessToken: '123', - branch: 'branch', - folder: '.', - root: '.', - pusher: { - name: 'asd', - email: 'as@cat' - } - }) - - await init(action) - - expect(execute).toBeCalledTimes(6) - }) - it('should stash changes if preserve is true', async () => { Object.assign(action, { silent: false, @@ -213,7 +48,6 @@ describe('git', () => { }) await init(action) - expect(execute).toBeCalledTimes(7) }) }) @@ -234,27 +68,6 @@ describe('git', () => { await generateBranch(action) expect(execute).toBeCalledTimes(6) }) - - it('should fail if there is no branch', async () => { - Object.assign(action, { - silent: false, - accessToken: '123', - branch: null, - folder: '.', - pusher: { - name: 'asd', - email: 'as@cat' - } - }) - - try { - await generateBranch(action) - } catch (e) { - expect(e.message).toMatch( - 'There was an error creating the deployment branch: Branch is required. ❌' - ) - } - }) }) describe('switchToBaseBranch', () => { @@ -290,31 +103,6 @@ describe('git', () => { await switchToBaseBranch(action) expect(execute).toBeCalledTimes(1) }) - - it('should fail if one of the required parameters is not available', async () => { - Object.assign(action, { - silent: false, - baseBranch: '123', - accessToken: null, - gitHubToken: null, - ssh: null, - branch: 'branch', - folder: null, - pusher: { - name: 'asd', - email: 'as@cat' - } - }) - - try { - await switchToBaseBranch(action) - } catch (e) { - expect(execute).toBeCalledTimes(0) - expect(e.message).toMatch( - 'There was an error switching to the base branch: No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true. ❌' - ) - } - }) }) describe('deploy', () => { @@ -488,31 +276,5 @@ describe('git', () => { expect(rmRF).toBeCalledTimes(1) expect(response).toBe(Status.SKIPPED) }) - - it('should throw an error if one of the required parameters is not available', async () => { - Object.assign(action, { - silent: false, - folder: 'assets', - branch: 'branch', - ssh: null, - accessToken: null, - gitHubToken: null, - pusher: { - name: 'asd', - email: 'as@cat' - }, - isTest: false // Setting this env variable to false means there will never be anything to commit and the action will exit early. - }) - - try { - await deploy(action) - } catch (e) { - expect(execute).toBeCalledTimes(1) - expect(rmRF).toBeCalledTimes(1) - expect(e.message).toMatch( - 'The deploy step encountered an error: No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true. ❌' - ) - } - }) }) }) diff --git a/__tests__/util.test.ts b/__tests__/util.test.ts index 9d9724a1c..0437586b3 100644 --- a/__tests__/util.test.ts +++ b/__tests__/util.test.ts @@ -1,9 +1,11 @@ +import {ActionInterface} from '../src/constants' import { isNullOrUndefined, generateTokenType, generateRepositoryPath, generateFolderPath, - suppressSensitiveInformation + suppressSensitiveInformation, + checkParameters } from '../src/util' describe('util', () => { @@ -22,13 +24,17 @@ describe('util', () => { const value = 'montezuma' expect(isNullOrUndefined(value)).toBeFalsy() }) + + it('should return false if the value is empty string', async () => { + const value = '' + expect(isNullOrUndefined(value)).toBeTruthy() + }) }) describe('generateTokenType', () => { it('should return ssh if ssh is provided', async () => { const action = { branch: '123', - root: '.', workspace: 'src/', folder: 'build', gitHubToken: null, @@ -42,7 +48,6 @@ describe('util', () => { it('should return access token if access token is provided', async () => { const action = { branch: '123', - root: '.', workspace: 'src/', folder: 'build', gitHubToken: null, @@ -56,7 +61,6 @@ describe('util', () => { it('should return github token if github token is provided', async () => { const action = { branch: '123', - root: '.', workspace: 'src/', folder: 'build', gitHubToken: '123', @@ -70,7 +74,6 @@ describe('util', () => { it('should return ... if no token is provided', async () => { const action = { branch: '123', - root: '.', workspace: 'src/', folder: 'build', gitHubToken: null, @@ -87,7 +90,6 @@ describe('util', () => { const action = { repositoryName: 'JamesIves/github-pages-deploy-action', branch: '123', - root: '.', workspace: 'src/', folder: 'build', gitHubToken: null, @@ -104,7 +106,6 @@ describe('util', () => { const action = { repositoryName: 'JamesIves/github-pages-deploy-action', branch: '123', - root: '.', workspace: 'src/', folder: 'build', gitHubToken: null, @@ -121,7 +122,6 @@ describe('util', () => { const action = { repositoryName: 'JamesIves/github-pages-deploy-action', branch: '123', - root: '.', workspace: 'src/', folder: 'build', gitHubToken: '123', @@ -141,7 +141,6 @@ describe('util', () => { repositoryPath: 'https://x-access-token:supersecret999%%%@github.com/anothersecret123333', branch: '123', - root: '.', workspace: 'src/', folder: 'build', accessToken: 'supersecret999%%%', @@ -161,7 +160,6 @@ describe('util', () => { repositoryPath: 'https://x-access-token:supersecret999%%%@github.com/anothersecret123333', branch: '123', - root: '.', workspace: 'src/', folder: 'build', accessToken: 'supersecret999%%%', @@ -183,7 +181,6 @@ describe('util', () => { it('should return absolute path if folder name is provided', () => { const action = { branch: '123', - root: '.', workspace: 'src/', folder: 'build', gitHubToken: null, @@ -191,13 +188,12 @@ describe('util', () => { ssh: null, silent: false } - expect(generateFolderPath(action, 'folder')).toEqual('src/build') + expect(generateFolderPath(action)).toEqual('src/build') }) it('should return original path if folder name begins with /', () => { const action = { branch: '123', - root: '.', workspace: 'src/', folder: '/home/user/repo/build', gitHubToken: null, @@ -205,15 +201,12 @@ describe('util', () => { ssh: null, silent: false } - expect(generateFolderPath(action, 'folder')).toEqual( - '/home/user/repo/build' - ) + expect(generateFolderPath(action)).toEqual('/home/user/repo/build') }) it('should process as relative path if folder name begins with ./', () => { const action = { branch: '123', - root: '.', workspace: 'src/', folder: './build', gitHubToken: null, @@ -221,13 +214,12 @@ describe('util', () => { ssh: null, silent: false } - expect(generateFolderPath(action, 'folder')).toEqual('src/build') + expect(generateFolderPath(action)).toEqual('src/build') }) it('should return absolute path if folder name begins with ~', () => { const action = { branch: '123', - root: '.', workspace: 'src/', folder: '~/repo/build', gitHubToken: null, @@ -236,9 +228,102 @@ describe('util', () => { silent: false } process.env.HOME = '/home/user' - expect(generateFolderPath(action, 'folder')).toEqual( - '/home/user/repo/build' - ) + expect(generateFolderPath(action)).toEqual('/home/user/repo/build') + }) + }) + + describe('hasRequiredParameters', () => { + it('should fail if there is no provided GitHub Token, Access Token or SSH bool', () => { + const action = { + silent: false, + repositoryPath: undefined, + branch: 'branch', + folder: 'build', + workspace: 'src/' + } + + try { + checkParameters(action) + } catch (e) { + expect(e.message).toMatch( + 'No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true.' + ) + } + }) + + it('should fail if access token is defined but it is an empty string', () => { + const action = { + silent: false, + repositoryPath: undefined, + accessToken: '', + branch: 'branch', + folder: 'build', + workspace: 'src/' + } + + try { + checkParameters(action) + } catch (e) { + expect(e.message).toMatch( + 'No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true.' + ) + } + }) + + it('should fail if there is no branch', () => { + const action = { + silent: false, + repositoryPath: undefined, + accessToken: '123', + branch: '', + folder: 'build', + workspace: 'src/' + } + + try { + checkParameters(action) + } catch (e) { + expect(e.message).toMatch('Branch is required.') + } + }) + + it('should fail if there is no folder', () => { + const action = { + silent: false, + repositoryPath: undefined, + gitHubToken: '123', + branch: 'branch', + folder: '', + workspace: 'src/' + } + + try { + checkParameters(action) + } catch (e) { + expect(e.message).toMatch( + 'You must provide the action with a folder to deploy.' + ) + } + }) + + it('should fail if the folder does not exist in the tree', () => { + const action: ActionInterface = { + silent: false, + repositoryPath: undefined, + gitHubToken: '123', + branch: 'branch', + folder: 'notARealFolder', + workspace: '.' + } + + try { + action.folderPath = generateFolderPath(action) + checkParameters(action) + } catch (e) { + expect(e.message).toMatch( + `The ${action.folderPath} directory you're trying to deploy doesn't exist.` + ) + } }) }) }) diff --git a/src/constants.ts b/src/constants.ts index 5e43eef1e..8c56f2a94 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -24,6 +24,7 @@ export interface ActionInterface { email?: string /** The folder to deploy. */ folder: string + folderPath?: string /** GitHub deployment token. */ gitHubToken?: string | null /** Determines if the action is running in test mode or not. */ @@ -38,8 +39,6 @@ export interface ActionInterface { repositoryName?: string /** The fully qualified repositpory path, this gets auto generated if repositoryName is provided. */ repositoryPath?: string - /** The root directory where your project lives. */ - root: string /** Wipes the commit history from the deployment branch in favor of a single commit. */ singleCommit?: boolean | null /** Determines if the action should run in silent mode or not. */ @@ -95,7 +94,6 @@ export const action: ActionInterface = { : repository && repository.full_name ? repository.full_name : process.env.GITHUB_REPOSITORY, - root: '.', singleCommit: !isNullOrUndefined(getInput('SINGLE_COMMIT')) ? getInput('SINGLE_COMMIT').toLowerCase() === 'true' : false, @@ -109,8 +107,9 @@ export const action: ActionInterface = { workspace: process.env.GITHUB_WORKSPACE || '' } -export type ActionFolders = NonNullable< - Pick +export type RequiredActionParameters = Pick< + ActionInterface, + 'accessToken' | 'gitHubToken' | 'ssh' | 'branch' | 'folder' > /** Status codes for the action. */ diff --git a/src/git.ts b/src/git.ts index bb7ffc22f..13a7344ab 100644 --- a/src/git.ts +++ b/src/git.ts @@ -3,18 +3,11 @@ import {mkdirP, rmRF} from '@actions/io' import fs from 'fs' import {ActionInterface, Status} from './constants' import {execute} from './execute' -import { - generateFolderPath, - hasRequiredParameters, - isNullOrUndefined, - suppressSensitiveInformation -} from './util' +import {isNullOrUndefined, suppressSensitiveInformation} from './util' /* Initializes git in the workspace. */ export async function init(action: ActionInterface): Promise { try { - hasRequiredParameters(action) - info(`Deploying using ${action.tokenType}… πŸ”‘`) info('Configuring git…') @@ -73,8 +66,6 @@ export async function switchToBaseBranch( action: ActionInterface ): Promise { try { - hasRequiredParameters(action) - await execute( `git checkout --progress --force ${ action.baseBranch ? action.baseBranch : action.defaultBranch @@ -95,8 +86,6 @@ export async function switchToBaseBranch( /* Generates the branch if it doesn't exist on the remote. */ export async function generateBranch(action: ActionInterface): Promise { try { - hasRequiredParameters(action) - info(`Creating the ${action.branch} branch…`) await switchToBaseBranch(action) @@ -131,8 +120,6 @@ export async function generateBranch(action: ActionInterface): Promise { /* Runs the necessary steps to make the deployment. */ export async function deploy(action: ActionInterface): Promise { - const folderPath = generateFolderPath(action, 'folder') - const rootPath = generateFolderPath(action, 'root') const temporaryDeploymentDirectory = 'github-pages-deploy-action-temp-deployment-folder' const temporaryDeploymentBranch = `github-pages-deploy-action/${Math.random() @@ -142,8 +129,6 @@ export async function deploy(action: ActionInterface): Promise { info('Starting to commit changes…') try { - hasRequiredParameters(action) - const commitMessage = !isNullOrUndefined(action.commitMessage) ? (action.commitMessage as string) : `Deploying to ${action.branch} from ${action.baseBranch} ${ @@ -232,22 +217,24 @@ export async function deploy(action: ActionInterface): Promise { Allows the user to specify the root if '.' is provided. rsync is used to prevent file duplication. */ await execute( - `rsync -q -av --checksum --progress ${folderPath}/. ${ + `rsync -q -av --checksum --progress ${action.folderPath}/. ${ action.targetFolder ? `${temporaryDeploymentDirectory}/${action.targetFolder}` : temporaryDeploymentDirectory } ${ action.clean ? `--delete ${excludes} ${ - !fs.existsSync(`${folderPath}/CNAME`) ? '--exclude CNAME' : '' + !fs.existsSync(`${action.folderPath}/CNAME`) + ? '--exclude CNAME' + : '' } ${ - !fs.existsSync(`${folderPath}/.nojekyll`) + !fs.existsSync(`${action.folderPath}/.nojekyll`) ? '--exclude .nojekyll' : '' }` : '' } --exclude .ssh --exclude .git --exclude .github ${ - folderPath === rootPath + action.folderPath === action.workspace ? `--exclude ${temporaryDeploymentDirectory}` : '' }`, diff --git a/src/lib.ts b/src/lib.ts index 4286d8bf7..6569351f1 100644 --- a/src/lib.ts +++ b/src/lib.ts @@ -1,7 +1,12 @@ import {exportVariable, info, setFailed} from '@actions/core' import {action, ActionInterface, Status} from './constants' import {deploy, init} from './git' -import {generateRepositoryPath, generateTokenType} from './util' +import { + generateFolderPath, + checkParameters, + generateRepositoryPath, + generateTokenType +} from './util' /** Initializes and runs the action. * @@ -30,6 +35,11 @@ export default async function run( ...configuration } + // Defines the folder paths + settings.folderPath = generateFolderPath(settings) + + checkParameters(settings) + // Defines the repository paths and token types. settings.repositoryPath = generateRepositoryPath(settings) settings.tokenType = generateTokenType(settings) diff --git a/src/util.ts b/src/util.ts index d423b8145..fc52f5413 100644 --- a/src/util.ts +++ b/src/util.ts @@ -1,6 +1,7 @@ +import {existsSync} from 'fs' import path from 'path' import {isDebug} from '@actions/core' -import {ActionInterface, ActionFolders} from './constants' +import {ActionInterface, RequiredActionParameters} from './constants' const replaceAll = (input: string, find: string, replace: string): string => input.split(find).join(replace) @@ -28,40 +29,46 @@ export const generateRepositoryPath = (action: ActionInterface): string => }@github.com/${action.repositoryName}.git` /* Genetate absolute folder path by the provided folder name */ -export const generateFolderPath = ( - action: ActionInterface, - key: K -): string => { - const folderName = action[key] - const folderPath = path.isAbsolute(folderName) +export const generateFolderPath = (action: ActionInterface): string => { + const folderName = action['folder'] + return path.isAbsolute(folderName) ? folderName : folderName.startsWith('~') ? folderName.replace('~', process.env.HOME as string) : path.join(action.workspace, folderName) - return folderPath } /* Checks for the required tokens and formatting. Throws an error if any case is matched. */ -export const hasRequiredParameters = (action: ActionInterface): void => { - if ( - (isNullOrUndefined(action.accessToken) && - isNullOrUndefined(action.gitHubToken) && - isNullOrUndefined(action.ssh)) || - isNullOrUndefined(action.repositoryPath) || - (action.accessToken && action.accessToken === '') - ) { +const hasRequiredParameters = ( + action: ActionInterface, + params: K[] +): boolean => { + const nonNullParams = params.filter( + param => !isNullOrUndefined(action[param]) + ) + return Boolean(nonNullParams.length) +} + +export const checkParameters = (action: ActionInterface): void => { + if (!hasRequiredParameters(action, ['accessToken', 'gitHubToken', 'ssh'])) { throw new Error( 'No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true.' ) } - if (isNullOrUndefined(action.branch)) { + if (!hasRequiredParameters(action, ['branch'])) { throw new Error('Branch is required.') } - if (!action.folder || isNullOrUndefined(action.folder)) { + if (!hasRequiredParameters(action, ['folder'])) { throw new Error('You must provide the action with a folder to deploy.') } + + if (!existsSync(action.folderPath as string)) { + throw new Error( + `The ${action.folderPath} directory you're trying to deploy doesn't exist. ❗` + ) + } } /* Suppresses sensitive information from being exposed in error messages. */ From 4d005d444f3e7a89f545e40c0b3dd57e4c4a170b Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 17 Oct 2020 11:47:44 -0400 Subject: [PATCH 37/42] Unit tests & Adjustments for 3.7.0 --- README.md | 9 ++-- __tests__/git.test.ts | 105 ++++++++++++++++++++++++++++++++++++++++- __tests__/util.test.ts | 2 +- src/constants.ts | 22 +++++++++ src/lib.ts | 20 ++++---- src/util.ts | 4 +- 6 files changed, 143 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 0f0afa5c2..ec14beea9 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ npm install @jamesives/github-pages-deploy-action It can then be imported into your project like so. ```javascript -import run, {ActionInterface} 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. @@ -109,11 +109,12 @@ run({ branch: "gh-pages", folder: "build", repositoryName: "JamesIves/github-pages-deploy-action", + silent: true, 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 πŸ“ @@ -335,8 +336,4 @@ If you'd like to enable action debugging you can set the `ACTIONS_STEP_DEBUG` en This project would not be possible without all of our fantastic [contributors](https://github.com/JamesIves/github-pages-deploy-action/graphs/contributors). - - - - If you'd like to support the maintenance and upkeep of this project you can [donate via GitHub Sponsors](https://github.com/sponsors/JamesIves). This project is distributed under the [MIT](https://github.com/JamesIves/github-pages-deploy-action/blob/dev/LICENSE) license. \ No newline at end of file diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts index 1ef54c6db..0ccb78bf7 100644 --- a/__tests__/git.test.ts +++ b/__tests__/git.test.ts @@ -23,7 +23,8 @@ jest.mock('@actions/io', () => ({ })) jest.mock('../src/execute', () => ({ - execute: jest.fn() + __esModule: true, + execute: jest.fn(), })) describe('git', () => { @@ -50,6 +51,33 @@ describe('git', () => { await init(action) expect(execute).toBeCalledTimes(7) }) + + it('should catch when a function throws an error', async () => { + + (execute as jest.Mock).mockImplementationOnce(() => { + throw new Error('Mocked throw'); + }); + + Object.assign(action, { + silent: false, + repositoryPath: 'JamesIves/github-pages-deploy-action', + accessToken: '123', + branch: 'branch', + folder: '.', + preserve: true, + isTest: true, + pusher: { + name: 'asd', + email: 'as@cat' + } + }) + + try { + await init(action) + } catch (error) { + expect(error.message).toBe('There was an error initializing the repository: Mocked throw ❌'); + } + }) }) describe('generateBranch', () => { @@ -68,6 +96,30 @@ describe('git', () => { await generateBranch(action) expect(execute).toBeCalledTimes(6) }) + + it('should catch when a function throws an error', async () => { + + (execute as jest.Mock).mockImplementationOnce(() => { + throw new Error('Mocked throw'); + }); + + Object.assign(action, { + silent: false, + accessToken: '123', + branch: 'branch', + folder: '.', + pusher: { + name: 'asd', + email: 'as@cat' + } + }) + + try { + await generateBranch(action) + } catch (error) { + expect(error.message).toBe('There was an error creating the deployment branch: There was an error switching to the base branch: Mocked throw ❌ ❌'); + } + }) }) describe('switchToBaseBranch', () => { @@ -103,6 +155,32 @@ describe('git', () => { await switchToBaseBranch(action) expect(execute).toBeCalledTimes(1) }) + + + it('should catch when a function throws an error', async () => { + + (execute as jest.Mock).mockImplementationOnce(() => { + throw new Error('Mocked throw'); + }); + + Object.assign(action, { + silent: false, + baseBranch: '123', + accessToken: '123', + branch: 'branch', + folder: '.', + pusher: { + name: 'asd', + email: 'as@cat' + } + }) + + try { + await switchToBaseBranch(action) + } catch (error) { + expect(error.message).toBe('There was an error switching to the base branch: Mocked throw ❌'); + } + }) }) describe('deploy', () => { @@ -276,5 +354,30 @@ describe('git', () => { expect(rmRF).toBeCalledTimes(1) expect(response).toBe(Status.SKIPPED) }) + + it('should catch when a function throws an error', async () => { + + (execute as jest.Mock).mockImplementationOnce(() => { + throw new Error('Mocked throw'); + }); + + Object.assign(action, { + silent: false, + folder: 'assets', + branch: 'branch', + gitHubToken: '123', + lfs: true, + pusher: { + name: 'asd', + email: 'as@cat' + } + }) + + try { + await deploy(action) + } catch (error) { + expect(error.message).toBe('The deploy step encountered an error: Mocked throw ❌'); + } + }) }) }) diff --git a/__tests__/util.test.ts b/__tests__/util.test.ts index 0437586b3..1f21cf396 100644 --- a/__tests__/util.test.ts +++ b/__tests__/util.test.ts @@ -321,7 +321,7 @@ describe('util', () => { checkParameters(action) } catch (e) { expect(e.message).toMatch( - `The ${action.folderPath} directory you're trying to deploy doesn't exist.` + `The directory you're trying to deploy named notARealFolder doesn't exist. Please double check the path and any prerequisite build scripts and try again. ❗` ) } }) diff --git a/src/constants.ts b/src/constants.ts index 8c56f2a94..448434457 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -24,6 +24,7 @@ export interface ActionInterface { email?: string /** The folder to deploy. */ folder: string + /** The auto generated folder path. */ folderPath?: string /** GitHub deployment token. */ gitHubToken?: string | null @@ -53,6 +54,26 @@ export interface ActionInterface { workspace: string } +/** The minimum required values to run the action as a node module. */ +export interface NodeActionInterface { + /** Deployment access token. */ + accessToken?: string | null + /** The branch that the action should deploy to. */ + branch: string + /** The folder to deploy. */ + folder: string + /** GitHub deployment token. */ + gitHubToken?: string | null + /** The repository path, for example JamesIves/github-pages-deploy-action. */ + repositoryName: string + /** Determines if the action should run in silent mode or not. */ + silent: boolean + /** Set to true if you're using an ssh client in your build step. */ + ssh?: boolean | null + /** The folder where your deployment project lives. */ + workspace: string +} + /* Required action data that gets initialized when running within the GitHub Actions environment. */ export const action: ActionInterface = { accessToken: getInput('ACCESS_TOKEN'), @@ -107,6 +128,7 @@ export const action: ActionInterface = { workspace: process.env.GITHUB_WORKSPACE || '' } +/** */ export type RequiredActionParameters = Pick< ActionInterface, 'accessToken' | 'gitHubToken' | 'ssh' | 'branch' | 'folder' diff --git a/src/lib.ts b/src/lib.ts index 6569351f1..47ddb7a3c 100644 --- a/src/lib.ts +++ b/src/lib.ts @@ -1,5 +1,5 @@ import {exportVariable, info, setFailed} from '@actions/core' -import {action, ActionInterface, Status} from './constants' +import {ActionInterface, Status, NodeActionInterface} from './constants' import {deploy, init} from './git' import { generateFolderPath, @@ -13,7 +13,7 @@ import { * @param {object} configuration - The action configuration. */ export default async function run( - configuration: ActionInterface + configuration: ActionInterface | NodeActionInterface ): Promise { let status: Status = Status.RUNNING @@ -22,25 +22,25 @@ export default async function run( GitHub Pages Deploy Action πŸš€ πŸš€ Getting Started Guide: https://github.com/marketplace/actions/deploy-to-github-pages - ❓ FAQ/Wiki: https://github.com/JamesIves/github-pages-deploy-action/wiki - πŸ”§ Support: https://github.com/JamesIves/github-pages-deploy-action/issues + ❓ Discussions / Q&A: https://github.com/JamesIves/github-pages-deploy-action/discussions + πŸ”§ Report a Bug: https://github.com/JamesIves/github-pages-deploy-action/issues ⭐ Contribute: https://github.com/JamesIves/github-pages-deploy-action/blob/dev/CONTRIBUTING.md - - πŸ“£ Maintained by James Ives (https://jamesiv.es)`) + + πŸ“£ Maintained by James Ives (https://jamesiv.es) + ❀ Support: https://github.com/sponsors/JamesIves`) info('Checking configuration and starting deployment… 🚦') - const settings = { - ...action, + const settings: ActionInterface = { ...configuration } - // Defines the folder paths + // Defines the repository/folder paths and token types. + // Also verifies that the action has all of the required parameters. settings.folderPath = generateFolderPath(settings) checkParameters(settings) - // Defines the repository paths and token types. settings.repositoryPath = generateRepositoryPath(settings) settings.tokenType = generateTokenType(settings) diff --git a/src/util.ts b/src/util.ts index fc52f5413..cde4c3de2 100644 --- a/src/util.ts +++ b/src/util.ts @@ -3,6 +3,7 @@ import path from 'path' import {isDebug} from '@actions/core' import {ActionInterface, RequiredActionParameters} from './constants' +/* Replaces all instances of a match in a string. */ const replaceAll = (input: string, find: string, replace: string): string => input.split(find).join(replace) @@ -49,6 +50,7 @@ const hasRequiredParameters = ( return Boolean(nonNullParams.length) } +/* Verifies the action has the required parameters to run, otherwise throw an error. */ export const checkParameters = (action: ActionInterface): void => { if (!hasRequiredParameters(action, ['accessToken', 'gitHubToken', 'ssh'])) { throw new Error( @@ -66,7 +68,7 @@ export const checkParameters = (action: ActionInterface): void => { if (!existsSync(action.folderPath as string)) { throw new Error( - `The ${action.folderPath} directory you're trying to deploy doesn't exist. ❗` + `The directory you're trying to deploy named ${action.folderPath} doesn't exist. Please double check the path and any prerequisite build scripts and try again. ❗` ) } } From 1d5e1bc6d313008a993259cdbcf495d176e87c06 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 17 Oct 2020 11:48:06 -0400 Subject: [PATCH 38/42] Formatting for 3.7.0 --- __tests__/git.test.ts | 47 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts index 0ccb78bf7..699db276f 100644 --- a/__tests__/git.test.ts +++ b/__tests__/git.test.ts @@ -24,7 +24,7 @@ jest.mock('@actions/io', () => ({ jest.mock('../src/execute', () => ({ __esModule: true, - execute: jest.fn(), + execute: jest.fn() })) describe('git', () => { @@ -53,10 +53,9 @@ describe('git', () => { }) it('should catch when a function throws an error', async () => { - - (execute as jest.Mock).mockImplementationOnce(() => { - throw new Error('Mocked throw'); - }); + ;(execute as jest.Mock).mockImplementationOnce(() => { + throw new Error('Mocked throw') + }) Object.assign(action, { silent: false, @@ -75,7 +74,9 @@ describe('git', () => { try { await init(action) } catch (error) { - expect(error.message).toBe('There was an error initializing the repository: Mocked throw ❌'); + expect(error.message).toBe( + 'There was an error initializing the repository: Mocked throw ❌' + ) } }) }) @@ -98,10 +99,9 @@ describe('git', () => { }) it('should catch when a function throws an error', async () => { - - (execute as jest.Mock).mockImplementationOnce(() => { - throw new Error('Mocked throw'); - }); + ;(execute as jest.Mock).mockImplementationOnce(() => { + throw new Error('Mocked throw') + }) Object.assign(action, { silent: false, @@ -117,7 +117,9 @@ describe('git', () => { try { await generateBranch(action) } catch (error) { - expect(error.message).toBe('There was an error creating the deployment branch: There was an error switching to the base branch: Mocked throw ❌ ❌'); + expect(error.message).toBe( + 'There was an error creating the deployment branch: There was an error switching to the base branch: Mocked throw ❌ ❌' + ) } }) }) @@ -156,12 +158,10 @@ describe('git', () => { expect(execute).toBeCalledTimes(1) }) - it('should catch when a function throws an error', async () => { - - (execute as jest.Mock).mockImplementationOnce(() => { - throw new Error('Mocked throw'); - }); + ;(execute as jest.Mock).mockImplementationOnce(() => { + throw new Error('Mocked throw') + }) Object.assign(action, { silent: false, @@ -178,7 +178,9 @@ describe('git', () => { try { await switchToBaseBranch(action) } catch (error) { - expect(error.message).toBe('There was an error switching to the base branch: Mocked throw ❌'); + expect(error.message).toBe( + 'There was an error switching to the base branch: Mocked throw ❌' + ) } }) }) @@ -356,10 +358,9 @@ describe('git', () => { }) it('should catch when a function throws an error', async () => { - - (execute as jest.Mock).mockImplementationOnce(() => { - throw new Error('Mocked throw'); - }); + ;(execute as jest.Mock).mockImplementationOnce(() => { + throw new Error('Mocked throw') + }) Object.assign(action, { silent: false, @@ -376,7 +377,9 @@ describe('git', () => { try { await deploy(action) } catch (error) { - expect(error.message).toBe('The deploy step encountered an error: Mocked throw ❌'); + expect(error.message).toBe( + 'The deploy step encountered an error: Mocked throw ❌' + ) } }) }) From 65691af8c1db8541206091bcf3278dd7867fb82a Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 17 Oct 2020 12:23:52 -0400 Subject: [PATCH 39/42] Additional 3.7.0 tests --- __tests__/git.test.ts | 60 +++++++++++++++++++++++++++++++++++-------- src/git.ts | 4 --- 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts index 699db276f..baf84d9aa 100644 --- a/__tests__/git.test.ts +++ b/__tests__/git.test.ts @@ -211,6 +211,7 @@ describe('git', () => { Object.assign(action, { silent: false, folder: 'assets', + folderPath: 'assets', branch: 'branch', gitHubToken: '123', lfs: true, @@ -230,26 +231,33 @@ describe('git', () => { expect(response).toBe(Status.SUCCESS) }) - it('should not ignore CNAME or nojekyll if they exist in the deployment folder', async () => { + it('should appropriately move along if git stash errors', async () => { + ;(execute as jest.Mock).mockImplementation(cmd => { + if (cmd === 'git stash apply') { + // Mocks the case where git stash apply errors. + throw new Error() + } + }) + Object.assign(action, { silent: false, folder: 'assets', + folderPath: 'assets', branch: 'branch', gitHubToken: '123', + lfs: true, + preserve: true, + isTest: true, pusher: { name: 'asd', email: 'as@cat' - }, - clean: true + } }) const response = await deploy(action) - fs.createWriteStream('assets/.nojekyll') - fs.createWriteStream('assets/CNAME') - // Includes the call to generateBranch - expect(execute).toBeCalledTimes(12) + expect(execute).toBeCalledTimes(14) expect(rmRF).toBeCalledTimes(1) expect(response).toBe(Status.SUCCESS) }) @@ -257,14 +265,16 @@ describe('git', () => { it('should execute commands with single commit toggled', async () => { Object.assign(action, { silent: false, - folder: 'assets', + folder: 'other', + folderPath: 'other', branch: 'branch', gitHubToken: '123', singleCommit: true, pusher: { name: 'asd', email: 'as@cat' - } + }, + clean: true }) await deploy(action) @@ -274,11 +284,37 @@ describe('git', () => { expect(rmRF).toBeCalledTimes(1) }) + it('should not ignore CNAME or nojekyll if they exist in the deployment folder', async () => { + Object.assign(action, { + silent: false, + folder: 'assets', + folderPath: 'assets', + branch: 'branch', + gitHubToken: '123', + pusher: { + name: 'asd', + email: 'as@cat' + }, + clean: true + }) + + fs.createWriteStream('assets/.nojekyll') + fs.createWriteStream('assets/CNAME') + + const response = await deploy(action) + + // Includes the call to generateBranch + expect(execute).toBeCalledTimes(12) + expect(rmRF).toBeCalledTimes(1) + expect(response).toBe(Status.SUCCESS) + }) + it('should execute commands with clean options, ommits sha commit message', async () => { process.env.GITHUB_SHA = '' Object.assign(action, { silent: false, - folder: 'assets', + folder: 'other', + folderPath: 'other', branch: 'branch', gitHubToken: '123', pusher: { @@ -286,7 +322,8 @@ describe('git', () => { email: 'as@cat' }, clean: true, - cleanExclude: '["cat", "montezuma"]' + cleanExclude: '["cat", "montezuma"]', + workspace: 'other' }) await deploy(action) @@ -300,6 +337,7 @@ describe('git', () => { Object.assign(action, { silent: false, folder: 'assets', + folderPath: 'assets', branch: 'branch', gitHubToken: '123', pusher: { diff --git a/src/git.ts b/src/git.ts index 13a7344ab..2c421274d 100644 --- a/src/git.ts +++ b/src/git.ts @@ -173,10 +173,6 @@ export async function deploy(action: ActionInterface): Promise { try { await execute(`git stash apply`, action.workspace, action.silent) - - if (action.isTest) { - throw new Error() - } } catch { info('Unable to apply from stash, continuing…') } From 2c8117fdd05efdc4637be2576ef4950111deab48 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 17 Oct 2020 12:26:46 -0400 Subject: [PATCH 40/42] Update constants.ts --- src/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants.ts b/src/constants.ts index 448434457..af15edcf8 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -128,7 +128,7 @@ export const action: ActionInterface = { workspace: process.env.GITHUB_WORKSPACE || '' } -/** */ +/** Types for the required action parameters. */ export type RequiredActionParameters = Pick< ActionInterface, 'accessToken' | 'gitHubToken' | 'ssh' | 'branch' | 'folder' From b452f53eb7138c77c9ee8f9dce26c09b06c31682 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 17 Oct 2020 12:28:39 -0400 Subject: [PATCH 41/42] Update README.md (#457) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec14beea9..7c40bec3d 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,7 @@ In addition to the deployment options you must also configure the following. | 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. **Folder paths cannot have a leading `/` or `./`**. If you wish to deploy the root directory you can place a `.` here. | `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** | #### Optional Choices From 77c39bbee969462bb310862ae2b5b897f44915a6 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 17 Oct 2020 12:35:48 -0400 Subject: [PATCH 42/42] Minor Spacing Errors --- src/lib.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib.ts b/src/lib.ts index 47ddb7a3c..8f7b2c5c7 100644 --- a/src/lib.ts +++ b/src/lib.ts @@ -24,10 +24,9 @@ export default async function run( πŸš€ Getting Started Guide: https://github.com/marketplace/actions/deploy-to-github-pages ❓ Discussions / Q&A: https://github.com/JamesIves/github-pages-deploy-action/discussions πŸ”§ Report a Bug: https://github.com/JamesIves/github-pages-deploy-action/issues - ⭐ Contribute: https://github.com/JamesIves/github-pages-deploy-action/blob/dev/CONTRIBUTING.md - πŸ“£ Maintained by James Ives (https://jamesiv.es) - ❀ Support: https://github.com/sponsors/JamesIves`) + πŸ“£ Maintained by James Ives: https://jamesiv.es + πŸ’– Support: https://github.com/sponsors/JamesIves`) info('Checking configuration and starting deployment… 🚦')