From 93f6fd24824a43d61bd3538eaa79fe842890990f Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 16 Sep 2022 21:27:46 -0700
Subject: [PATCH 01/58] refactor: remove stylelint
---
.stylelintrc.yaml | 2 -
ci/dev/lint.sh | 1 -
package.json | 2 -
yarn.lock | 1033 +--------------------------------------------
4 files changed, 21 insertions(+), 1017 deletions(-)
delete mode 100644 .stylelintrc.yaml
diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml
deleted file mode 100644
index af5c94bc4f3e..000000000000
--- a/.stylelintrc.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-extends:
- - stylelint-config-recommended
diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh
index 58a999c4f2f0..036ec1190a01 100755
--- a/ci/dev/lint.sh
+++ b/ci/dev/lint.sh
@@ -5,7 +5,6 @@ main() {
cd "$(dirname "$0")/../.."
eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js" | grep -v "lib/vscode")
- stylelint $(git ls-files "*.css" | grep -v "lib/vscode")
tsc --noEmit --skipLibCheck
shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh" | grep -v "lib/vscode")
if command -v helm && helm kubeval --help > /dev/null; then
diff --git a/package.json b/package.json
index 4e07c91f02c1..683bd50f71c8 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,6 @@
"prettier": "^2.2.1",
"prettier-plugin-sh": "^0.12.0",
"shellcheck": "^1.0.0",
- "stylelint": "^13.0.0",
- "stylelint-config-recommended": "^5.0.0",
"ts-node": "^10.0.0",
"typescript": "^4.6.2"
},
diff --git a/yarn.lock b/yarn.lock
index 279ac4df087e..29c5409808b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,153 +9,12 @@
dependencies:
"@babel/highlight" "^7.10.4"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
- integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
- dependencies:
- "@babel/highlight" "^7.12.13"
-
-"@babel/compat-data@^7.13.12":
- version "7.13.15"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
- integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
-
-"@babel/core@>=7.9.0":
- version "7.13.15"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.15.tgz#a6d40917df027487b54312202a06812c4f7792d0"
- integrity sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==
- dependencies:
- "@babel/code-frame" "^7.12.13"
- "@babel/generator" "^7.13.9"
- "@babel/helper-compilation-targets" "^7.13.13"
- "@babel/helper-module-transforms" "^7.13.14"
- "@babel/helpers" "^7.13.10"
- "@babel/parser" "^7.13.15"
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.13.15"
- "@babel/types" "^7.13.14"
- convert-source-map "^1.7.0"
- debug "^4.1.0"
- gensync "^1.0.0-beta.2"
- json5 "^2.1.2"
- semver "^6.3.0"
- source-map "^0.5.0"
-
-"@babel/generator@^7.13.9":
- version "7.13.9"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
- integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
- dependencies:
- "@babel/types" "^7.13.0"
- jsesc "^2.5.1"
- source-map "^0.5.0"
-
-"@babel/helper-compilation-targets@^7.13.13":
- version "7.13.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
- integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
- dependencies:
- "@babel/compat-data" "^7.13.12"
- "@babel/helper-validator-option" "^7.12.17"
- browserslist "^4.14.5"
- semver "^6.3.0"
-
-"@babel/helper-function-name@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
- integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
- dependencies:
- "@babel/helper-get-function-arity" "^7.12.13"
- "@babel/template" "^7.12.13"
- "@babel/types" "^7.12.13"
-
-"@babel/helper-get-function-arity@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
- integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
- dependencies:
- "@babel/types" "^7.12.13"
-
-"@babel/helper-member-expression-to-functions@^7.13.12":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
- integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
- dependencies:
- "@babel/types" "^7.13.12"
-
-"@babel/helper-module-imports@^7.13.12":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
- integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
- dependencies:
- "@babel/types" "^7.13.12"
-
-"@babel/helper-module-transforms@^7.13.14":
- version "7.13.14"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
- integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
- dependencies:
- "@babel/helper-module-imports" "^7.13.12"
- "@babel/helper-replace-supers" "^7.13.12"
- "@babel/helper-simple-access" "^7.13.12"
- "@babel/helper-split-export-declaration" "^7.12.13"
- "@babel/helper-validator-identifier" "^7.12.11"
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.13.13"
- "@babel/types" "^7.13.14"
-
-"@babel/helper-optimise-call-expression@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
- integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
- dependencies:
- "@babel/types" "^7.12.13"
-
-"@babel/helper-replace-supers@^7.13.12":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
- integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
- dependencies:
- "@babel/helper-member-expression-to-functions" "^7.13.12"
- "@babel/helper-optimise-call-expression" "^7.12.13"
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.12"
-
-"@babel/helper-simple-access@^7.13.12":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
- integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
- dependencies:
- "@babel/types" "^7.13.12"
-
-"@babel/helper-split-export-declaration@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
- integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
- dependencies:
- "@babel/types" "^7.12.13"
-
"@babel/helper-validator-identifier@^7.12.11":
version "7.12.11"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
-"@babel/helper-validator-option@^7.12.17":
- version "7.12.17"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
- integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
-
-"@babel/helpers@^7.13.10":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
- integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
- dependencies:
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.0"
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
+"@babel/highlight@^7.10.4":
version "7.13.10"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
@@ -164,43 +23,6 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.12.13", "@babel/parser@^7.13.15":
- version "7.13.15"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8"
- integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==
-
-"@babel/template@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
- integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
- dependencies:
- "@babel/code-frame" "^7.12.13"
- "@babel/parser" "^7.12.13"
- "@babel/types" "^7.12.13"
-
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15":
- version "7.13.15"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7"
- integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==
- dependencies:
- "@babel/code-frame" "^7.12.13"
- "@babel/generator" "^7.13.9"
- "@babel/helper-function-name" "^7.12.13"
- "@babel/helper-split-export-declaration" "^7.12.13"
- "@babel/parser" "^7.13.15"
- "@babel/types" "^7.13.14"
- debug "^4.1.0"
- globals "^11.1.0"
-
-"@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14":
- version "7.13.14"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
- integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
- dependencies:
- "@babel/helper-validator-identifier" "^7.12.11"
- lodash "^4.17.19"
- to-fast-properties "^2.0.0"
-
"@coder/logger@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@coder/logger/-/logger-3.0.0.tgz#fd4d2332ca375412c75cb5ba7767d3290b106dec"
@@ -281,21 +103,6 @@
resolved "https://registry.yarnpkg.com/@schemastore/package/-/package-0.0.6.tgz#9a76713da1c7551293b7e72e4f387f802bfd5d81"
integrity sha512-uNloNHoyHttSSdeuEkkSC+mdxJXMKlcUPOMb//qhQbIQijXg8x54VmAw3jm6GJZQ5DBtIqGBd66zEQCDCChQVA==
-"@stylelint/postcss-css-in-js@^0.37.2":
- version "0.37.2"
- resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"
- integrity sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==
- dependencies:
- "@babel/core" ">=7.9.0"
-
-"@stylelint/postcss-markdown@^0.36.2":
- version "0.36.2"
- resolved "https://registry.yarnpkg.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz#0a540c4692f8dcdfc13c8e352c17e7bfee2bb391"
- integrity sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==
- dependencies:
- remark "^13.0.0"
- unist-util-find-all-after "^3.0.2"
-
"@textlint/ast-node-types@^4.2.5":
version "4.4.1"
resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.4.1.tgz#715dd42b3ec7ff02729fa81cdc9557fe2cdd4f10"
@@ -409,38 +216,16 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
-"@types/mdast@^3.0.0":
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
- integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==
- dependencies:
- "@types/unist" "*"
-
"@types/mime@^1":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
-"@types/minimist@^1.2.0":
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
- integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
-
"@types/node@*", "@types/node@^16.0.0":
version "16.11.41"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.41.tgz#88eb485b1bfdb4c224d878b7832239536aa2f813"
integrity sha512-mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ==
-"@types/normalize-package-data@^2.4.0":
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
- integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
-
-"@types/parse-json@^4.0.0":
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
- integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
"@types/pem@^1.9.5":
version "1.9.6"
resolved "https://registry.yarnpkg.com/@types/pem/-/pem-1.9.6.tgz#c3686832e935947fdd9d848dec3b8fe830068de7"
@@ -495,7 +280,7 @@
resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==
-"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
+"@types/unist@^2.0.0", "@types/unist@^2.0.2":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
@@ -755,11 +540,6 @@ array.prototype.flat@^1.2.4:
define-properties "^1.1.3"
es-abstract "^1.18.0-next.1"
-arrify@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
- integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
ast-types@^0.13.2:
version "0.13.4"
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782"
@@ -786,19 +566,6 @@ audit-ci@^6.0.0:
semver "^7.0.0"
yargs "^17.0.0"
-autoprefixer@^9.8.6:
- version "9.8.6"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
- integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
- dependencies:
- browserslist "^4.12.0"
- caniuse-lite "^1.0.30001109"
- colorette "^1.2.1"
- normalize-range "^0.1.2"
- num2fraction "^1.2.2"
- postcss "^7.0.32"
- postcss-value-parser "^4.1.0"
-
bail@^1.0.0:
version "1.0.5"
resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
@@ -809,11 +576,6 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-balanced-match@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
- integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
-
body-parser@1.19.0:
version "1.19.0"
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
@@ -850,7 +612,7 @@ braces@^3.0.1:
dependencies:
fill-range "^7.0.1"
-browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.5:
+browserslist@^4.16.5:
version "4.16.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@@ -912,25 +674,6 @@ callsites@^3.0.0:
resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-camelcase-keys@^6.2.2:
- version "6.2.2"
- resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
- integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
- dependencies:
- camelcase "^5.3.1"
- map-obj "^4.0.0"
- quick-lru "^4.0.1"
-
-camelcase@^5.3.1:
- version "5.3.1"
- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
- integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-caniuse-lite@^1.0.30001109:
- version "1.0.30001209"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001209.tgz#1bb4be0bd118e98e21cfb7ef617b1ef2164622f4"
- integrity sha512-2Ktt4OeRM7EM/JaOZjuLzPYAIqmbwQMNnYbgooT+icoRGrKOyAxA1xhlnotBD1KArRSPsuJp3TdYcZYrL7qNxA==
-
caniuse-lite@^1.0.30001219:
version "1.0.30001228"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
@@ -945,7 +688,7 @@ chalk@^2.0.0:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
@@ -987,13 +730,6 @@ cliui@^7.0.2:
strip-ansi "^6.0.0"
wrap-ansi "^7.0.0"
-clone-regexp@^2.1.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f"
- integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==
- dependencies:
- is-regexp "^2.0.0"
-
collapse-white-space@^1.0.2:
version "1.0.6"
resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
@@ -1028,7 +764,7 @@ color-support@^1.1.2:
resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-colorette@^1.2.1, colorette@^1.2.2:
+colorette@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
@@ -1075,13 +811,6 @@ content-type@~1.0.4:
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-convert-source-map@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
- integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
- dependencies:
- safe-buffer "~5.1.1"
-
cookie-parser@^1.4.5:
version "1.4.5"
resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz#3e572d4b7c0c80f9c61daf604e4336831b5d1d49"
@@ -1105,17 +834,6 @@ core-util-is@~1.0.0:
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-cosmiconfig@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
- integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
- dependencies:
- "@types/parse-json" "^4.0.0"
- import-fresh "^3.2.1"
- parse-json "^5.0.0"
- path-type "^4.0.0"
- yaml "^1.10.0"
-
create-require@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -1135,11 +853,6 @@ crypt@0.0.2:
resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-cssesc@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
- integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
data-uri-to-buffer@3:
version "3.0.1"
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
@@ -1173,26 +886,13 @@ debug@^3.2.7:
dependencies:
ms "^2.1.1"
-debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+debug@^4.0.1, debug@^4.1.1, debug@^4.3.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
dependencies:
ms "2.1.2"
-decamelize-keys@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
- integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
- dependencies:
- decamelize "^1.1.0"
- map-obj "^1.0.0"
-
-decamelize@^1.1.0, decamelize@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
- integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
deep-is@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -1278,14 +978,6 @@ doctrine@^3.0.0:
dependencies:
esutils "^2.0.2"
-dom-serializer@0:
- version "0.2.2"
- resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
- integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
- dependencies:
- domelementtype "^2.0.1"
- entities "^2.0.0"
-
dom-serializer@^1.0.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1"
@@ -1295,23 +987,11 @@ dom-serializer@^1.0.1:
domhandler "^4.0.0"
entities "^2.0.0"
-domelementtype@1, domelementtype@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
- integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
domelementtype@^2.0.1, domelementtype@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
-domhandler@^2.3.0:
- version "2.4.2"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
- integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
- dependencies:
- domelementtype "1"
-
domhandler@^3.0.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a"
@@ -1326,14 +1006,6 @@ domhandler@^4.0.0, domhandler@^4.2.0:
dependencies:
domelementtype "^2.2.0"
-domutils@^1.5.1:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
- integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
- dependencies:
- dom-serializer "0"
- domelementtype "1"
-
domutils@^2.0.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz#2e15c04185d43fb16ae7057cb76433c6edb938b7"
@@ -1380,11 +1052,6 @@ enquirer@^2.3.5:
dependencies:
ansi-colors "^4.1.1"
-entities@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
- integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
entities@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -1679,13 +1346,6 @@ eventemitter3@^4.0.0:
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-execall@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45"
- integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==
- dependencies:
- clone-regexp "^2.1.0"
-
express@5.0.0-alpha.8:
version "5.0.0-alpha.8"
resolved "https://registry.yarnpkg.com/express/-/express-5.0.0-alpha.8.tgz#b9dd3a568eab791e3391db47f9e6ab91e61b13fe"
@@ -1738,7 +1398,7 @@ fast-diff@^1.1.2:
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-fast-glob@^3.1.1, fast-glob@^3.2.5:
+fast-glob@^3.1.1:
version "3.2.5"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
@@ -1760,11 +1420,6 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-fastest-levenshtein@^1.0.12:
- version "1.0.12"
- resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
- integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
-
fastq@^1.6.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
@@ -1818,14 +1473,6 @@ find-up@^2.0.0, find-up@^2.1.0:
dependencies:
locate-path "^2.0.0"
-find-up@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
- integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
- dependencies:
- locate-path "^5.0.0"
- path-exists "^4.0.0"
-
flat-cache@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -1918,11 +1565,6 @@ gauge@^3.0.0:
strip-ansi "^6.0.1"
wide-align "^1.1.2"
-gensync@^1.0.0-beta.2:
- version "1.0.0-beta.2"
- resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
- integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
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"
@@ -1937,11 +1579,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
has "^1.0.3"
has-symbols "^1.0.1"
-get-stdin@^8.0.0:
- version "8.0.0"
- resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
- integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
-
get-uri@3:
version "3.0.2"
resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c"
@@ -1985,27 +1622,6 @@ glob@^7.1.7:
once "^1.3.0"
path-is-absolute "^1.0.0"
-global-modules@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
- integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
- dependencies:
- global-prefix "^3.0.0"
-
-global-prefix@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
- integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
- dependencies:
- ini "^1.3.5"
- kind-of "^6.0.2"
- which "^1.3.1"
-
-globals@^11.1.0:
- version "11.12.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
- integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
globals@^13.6.0, globals@^13.9.0:
version "13.9.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"
@@ -2013,18 +1629,6 @@ globals@^13.6.0, globals@^13.9.0:
dependencies:
type-fest "^0.20.2"
-globby@^11.0.3:
- version "11.0.3"
- resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
- integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
- dependencies:
- array-union "^2.1.0"
- dir-glob "^3.0.1"
- fast-glob "^3.1.1"
- ignore "^5.1.4"
- merge2 "^1.3.0"
- slash "^3.0.0"
-
globby@^11.0.4:
version "11.0.4"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
@@ -2037,18 +1641,6 @@ globby@^11.0.4:
merge2 "^1.3.0"
slash "^3.0.0"
-globjoin@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
- integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
-
-gonzales-pe@^4.3.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
- integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
- dependencies:
- minimist "^1.2.5"
-
graceful-fs@^4.1.2:
version "4.2.6"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
@@ -2059,11 +1651,6 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
-hard-rejection@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
- integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
-
has-bigints@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -2103,23 +1690,6 @@ hosted-git-info@^5.0.0:
dependencies:
lru-cache "^7.5.1"
-html-tags@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
- integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
-
-htmlparser2@^3.10.0:
- version "3.10.1"
- resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
- integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
- dependencies:
- domelementtype "^1.3.1"
- domhandler "^2.3.0"
- domutils "^1.5.1"
- entities "^1.1.1"
- inherits "^2.0.1"
- readable-stream "^3.1.1"
-
htmlparser2@~4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz#9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"
@@ -2219,21 +1789,11 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
parent-module "^1.0.0"
resolve-from "^4.0.0"
-import-lazy@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
- integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
-
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-indent-string@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
- integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -2242,7 +1802,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
-inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1:
+inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.3, inherits@~2.0.1:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -2252,11 +1812,6 @@ inherits@2.0.3:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-ini@^1.3.5:
- version "1.3.8"
- resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
- integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
ip@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -2302,11 +1857,6 @@ is-buffer@^1.1.4, is-buffer@~1.1.6:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-is-buffer@^2.0.0:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
- integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-
is-callable@^1.1.4, is-callable@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
@@ -2385,11 +1935,6 @@ is-plain-obj@^1.1.0:
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-is-plain-obj@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
- integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
-
is-regex@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
@@ -2398,11 +1943,6 @@ is-regex@^1.1.2:
call-bind "^1.0.2"
has-symbols "^1.0.1"
-is-regexp@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
- integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
-
is-string@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
@@ -2415,16 +1955,6 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
dependencies:
has-symbols "^1.0.1"
-is-typedarray@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
- integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-unicode-supported@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
- integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
is-whitespace-character@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
@@ -2470,21 +2000,11 @@ js-yaml@^4.0.0:
dependencies:
argparse "^2.0.1"
-jsesc@^2.5.1:
- version "2.5.2"
- resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
- integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
json-parse-better-errors@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-json-parse-even-better-errors@^2.3.0:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
- integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
json-schema-traverse@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -2507,13 +2027,6 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"
-json5@^2.1.2:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
- integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
- dependencies:
- minimist "^1.2.5"
-
jsonfile@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -2526,16 +2039,6 @@ jsonparse@^1.2.0:
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
-kind-of@^6.0.2, kind-of@^6.0.3:
- version "6.0.3"
- resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
- integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-known-css-properties@^0.21.0:
- version "0.21.0"
- resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.21.0.tgz#15fbd0bbb83447f3ce09d8af247ed47c68ede80d"
- integrity sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==
-
levn@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -2557,11 +2060,6 @@ limiter@^1.1.5:
resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
-lines-and-columns@^1.1.6:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
- integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
-
load-json-file@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -2580,13 +2078,6 @@ locate-path@^2.0.0:
p-locate "^2.0.0"
path-exists "^3.0.0"
-locate-path@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
- integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
- dependencies:
- p-locate "^4.1.0"
-
lodash.clonedeep@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -2602,24 +2093,6 @@ lodash.truncate@^4.4.2:
resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-lodash@^4.17.19, lodash@^4.17.21:
- version "4.17.21"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
- integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-symbols@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
- integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
- dependencies:
- chalk "^4.1.0"
- is-unicode-supported "^0.1.0"
-
-longest-streak@^2.0.0:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
- integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
-
lru-cache@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -2651,16 +2124,6 @@ make-error@^1.1.1:
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-map-obj@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
- integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
-map-obj@^4.0.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.0.tgz#0e8bc823e2aaca8a0942567d12ed14f389eec153"
- integrity sha512-NAq0fCmZYGz9UFEQyndp7sisrow4GroyGeKluyKC/chuITZsPyOyC1UJZPJlVFImhXdROIP5xqouRLThT3BbpQ==
-
map-stream@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
@@ -2671,11 +2134,6 @@ markdown-escapes@^1.0.0:
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
-mathml-tag-names@^2.1.3:
- version "2.1.3"
- resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
- integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
-
md5@^2.2.1:
version "2.3.0"
resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
@@ -2685,57 +2143,11 @@ md5@^2.2.1:
crypt "0.0.2"
is-buffer "~1.1.6"
-mdast-util-from-markdown@^0.8.0:
- version "0.8.5"
- resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
- integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
- dependencies:
- "@types/mdast" "^3.0.0"
- mdast-util-to-string "^2.0.0"
- micromark "~2.11.0"
- parse-entities "^2.0.0"
- unist-util-stringify-position "^2.0.0"
-
-mdast-util-to-markdown@^0.6.0:
- version "0.6.5"
- resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe"
- integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
- dependencies:
- "@types/unist" "^2.0.0"
- longest-streak "^2.0.0"
- mdast-util-to-string "^2.0.0"
- parse-entities "^2.0.0"
- repeat-string "^1.0.0"
- zwitch "^1.0.0"
-
-mdast-util-to-string@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
- integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
-
media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-meow@^9.0.0:
- version "9.0.0"
- resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
- integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
- dependencies:
- "@types/minimist" "^1.2.0"
- camelcase-keys "^6.2.2"
- decamelize "^1.2.0"
- decamelize-keys "^1.1.0"
- hard-rejection "^2.1.0"
- minimist-options "4.1.0"
- normalize-package-data "^3.0.0"
- read-pkg-up "^7.0.1"
- redent "^3.0.0"
- trim-newlines "^3.0.0"
- type-fest "^0.18.0"
- yargs-parser "^20.2.3"
-
merge-descriptors@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -2751,15 +2163,7 @@ methods@~1.1.2:
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-micromark@~2.11.0:
- version "2.11.4"
- resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
- integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
- dependencies:
- debug "^4.0.0"
- parse-entities "^2.0.0"
-
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.2:
version "4.0.4"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
@@ -2784,11 +2188,6 @@ mime@1.6.0:
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-min-indent@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
- integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
-
minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -2796,16 +2195,7 @@ minimatch@^3.0.4:
dependencies:
brace-expansion "^1.1.7"
-minimist-options@4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
- integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
- dependencies:
- arrify "^1.0.1"
- is-plain-obj "^1.1.0"
- kind-of "^6.0.3"
-
-minimist@^1.2.0, minimist@^1.2.5, "minimist@npm:minimist-lite@2.2.1", minimist@~1.2.5:
+minimist@^1.2.0, "minimist@npm:minimist-lite@2.2.1", minimist@~1.2.5:
version "2.2.1"
resolved "https://registry.yarnpkg.com/minimist-lite/-/minimist-lite-2.2.1.tgz#abb71db2c9b454d7cf4496868c03e9802de9934d"
integrity sha512-RSrWIRWGYoM2TDe102s7aIyeSipXMIXKb1fSHYx1tAbxAV0z4g2xR6ra3oPzkTqFb0EIUz1H3A/qvYYeDd+/qQ==
@@ -2899,7 +2289,7 @@ nopt@^5.0.0:
dependencies:
abbrev "1"
-normalize-package-data@^2.3.2, normalize-package-data@^2.5.0, normalize-package-data@^3.0.0, normalize-package-data@^4.0.0:
+normalize-package-data@^2.3.2, normalize-package-data@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.0.tgz#1122d5359af21d4cd08718b92b058a658594177c"
integrity sha512-m+GL22VXJKkKbw62ZaBBjv8u6IE3UI4Mh5QakIqs3fWiKe0Xyi6L97hakwZK41/LD4R/2ly71Bayx0NLMwLA/g==
@@ -2909,16 +2299,6 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0, normalize-package-
semver "^7.3.5"
validate-npm-package-license "^3.0.4"
-normalize-range@^0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
- integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
-normalize-selector@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
- integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
-
npmlog@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
@@ -2929,11 +2309,6 @@ npmlog@^5.0.1:
gauge "^3.0.0"
set-blocking "^2.0.0"
-num2fraction@^1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
- integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -3024,13 +2399,6 @@ p-limit@^1.1.0:
dependencies:
p-try "^1.0.0"
-p-limit@^2.2.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
- integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
- dependencies:
- p-try "^2.0.0"
-
p-locate@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -3038,23 +2406,11 @@ p-locate@^2.0.0:
dependencies:
p-limit "^1.1.0"
-p-locate@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
- integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
- dependencies:
- p-limit "^2.2.0"
-
p-try@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-p-try@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
- integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
pac-proxy-agent@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz#b718f76475a6a5415c2efbe256c1c971c84f635e"
@@ -3098,18 +2454,6 @@ parse-entities@^1.1.0:
is-decimal "^1.0.0"
is-hexadecimal "^1.0.0"
-parse-entities@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
- integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
- dependencies:
- character-entities "^1.0.0"
- character-entities-legacy "^1.0.0"
- character-reference-invalid "^1.0.0"
- is-alphanumerical "^1.0.0"
- is-decimal "^1.0.0"
- is-hexadecimal "^1.0.0"
-
parse-json@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -3118,16 +2462,6 @@ parse-json@^4.0.0:
error-ex "^1.3.1"
json-parse-better-errors "^1.0.1"
-parse-json@^5.0.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
- integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
- dependencies:
- "@babel/code-frame" "^7.0.0"
- error-ex "^1.3.1"
- json-parse-even-better-errors "^2.3.0"
- lines-and-columns "^1.1.6"
-
parseurl@~1.3.2, parseurl@~1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -3138,11 +2472,6 @@ path-exists@^3.0.0:
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-path-exists@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
- integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -3221,71 +2550,7 @@ pkg-up@^2.0.0:
dependencies:
find-up "^2.1.0"
-postcss-html@^0.36.0:
- version "0.36.0"
- resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204"
- integrity sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==
- dependencies:
- htmlparser2 "^3.10.0"
-
-postcss-less@^3.1.4:
- version "3.1.4"
- resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
- integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
- dependencies:
- postcss "^7.0.14"
-
-postcss-media-query-parser@^0.2.3:
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
- integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
-
-postcss-resolve-nested-selector@^0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
- integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
-
-postcss-safe-parser@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"
- integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
- dependencies:
- postcss "^7.0.26"
-
-postcss-sass@^0.4.4:
- version "0.4.4"
- resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.4.tgz#91f0f3447b45ce373227a98b61f8d8f0785285a3"
- integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==
- dependencies:
- gonzales-pe "^4.3.0"
- postcss "^7.0.21"
-
-postcss-scss@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383"
- integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
- dependencies:
- postcss "^7.0.6"
-
-postcss-selector-parser@^6.0.5:
- version "6.0.5"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4"
- integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==
- dependencies:
- cssesc "^3.0.0"
- util-deprecate "^1.0.2"
-
-postcss-syntax@^0.36.2:
- version "0.36.2"
- resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
- integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==
-
-postcss-value-parser@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
- integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
-
-postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6, postcss@^8.2.1:
+postcss@^8.2.1:
version "8.2.15"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
@@ -3377,11 +2642,6 @@ queue-microtask@^1.2.2:
resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3"
integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==
-quick-lru@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
- integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
-
range-parser@~1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
@@ -3415,15 +2675,6 @@ read-pkg-up@^3.0.0:
find-up "^2.0.0"
read-pkg "^3.0.0"
-read-pkg-up@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
- integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
- dependencies:
- find-up "^4.1.0"
- read-pkg "^5.2.0"
- type-fest "^0.8.1"
-
read-pkg@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -3433,16 +2684,6 @@ read-pkg@^3.0.0:
normalize-package-data "^2.3.2"
path-type "^3.0.0"
-read-pkg@^5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
- integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
- dependencies:
- "@types/normalize-package-data" "^2.4.0"
- normalize-package-data "^2.5.0"
- parse-json "^5.0.0"
- type-fest "^0.6.0"
-
readable-stream@1.1.x:
version "1.1.14"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -3453,7 +2694,7 @@ readable-stream@1.1.x:
isarray "0.0.1"
string_decoder "~0.10.x"
-readable-stream@^3.1.1, readable-stream@^3.6.0:
+readable-stream@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -3467,14 +2708,6 @@ readline-transform@1.0.0:
resolved "https://registry.yarnpkg.com/readline-transform/-/readline-transform-1.0.0.tgz#3157f97428acaec0f05a5c1ff2c3120f4e6d904b"
integrity sha512-7KA6+N9IGat52d83dvxnApAWN+MtVb1MiVuMR/cf1O4kYsJG+g/Aav0AHcHKsb6StinayfPLne0+fMX2sOzAKg==
-redent@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
- integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
- dependencies:
- indent-string "^4.0.0"
- strip-indent "^3.0.0"
-
regexpp@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
@@ -3514,30 +2747,7 @@ remark-parse@^5.0.0:
vfile-location "^2.0.0"
xtend "^4.0.1"
-remark-parse@^9.0.0:
- version "9.0.0"
- resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
- integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
- dependencies:
- mdast-util-from-markdown "^0.8.0"
-
-remark-stringify@^9.0.0:
- version "9.0.1"
- resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz#576d06e910548b0a7191a71f27b33f1218862894"
- integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==
- dependencies:
- mdast-util-to-markdown "^0.6.0"
-
-remark@^13.0.0:
- version "13.0.0"
- resolved "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz#d15d9bf71a402f40287ebe36067b66d54868e425"
- integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==
- dependencies:
- remark-parse "^9.0.0"
- remark-stringify "^9.0.0"
- unified "^9.1.0"
-
-repeat-string@^1.0.0, repeat-string@^1.5.4:
+repeat-string@^1.5.4:
version "1.6.1"
resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -3567,11 +2777,6 @@ resolve-from@^4.0.0:
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-resolve-from@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
- integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
resolve@^1.13.1, resolve@^1.20.0:
version "1.20.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
@@ -3617,7 +2822,7 @@ run-parallel@^1.1.9:
dependencies:
queue-microtask "^1.2.2"
-safe-buffer@5.1.2, safe-buffer@^5.1.1, safe-buffer@~5.1.1, safe-buffer@~5.2.0:
+safe-buffer@5.1.2, safe-buffer@^5.1.1, safe-buffer@~5.2.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -3634,7 +2839,7 @@ safe-compare@^1.1.4:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-semver@^6.0.0, semver@^6.3.0:
+semver@^6.0.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -3726,11 +2931,6 @@ signal-exit@^3.0.0:
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-signal-exit@^3.0.2:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
- integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
slash@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -3775,11 +2975,6 @@ source-map-support@^0.5.17:
buffer-from "^1.0.0"
source-map "^0.6.0"
-source-map@^0.5.0:
- version "0.5.7"
- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
- integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -3811,11 +3006,6 @@ spdx-license-ids@^3.0.0:
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
-specificity@^0.4.1:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
- integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
-
split2@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809"
@@ -3860,7 +3050,7 @@ stream-combiner@^0.2.2:
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2:
+string-width@^4.1.0, string-width@^4.2.0:
version "4.2.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
@@ -3916,13 +3106,6 @@ strip-bom@^3.0.0:
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-strip-indent@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
- integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
- dependencies:
- min-indent "^1.0.0"
-
strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -3935,77 +3118,6 @@ structured-source@^3.0.2:
dependencies:
boundary "^1.0.1"
-style-search@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
- integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=
-
-stylelint-config-recommended@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz#fb5653f495a60b4938f2ad3e77712d9e1039ae78"
- integrity sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA==
-
-stylelint@^13.0.0:
- version "13.13.1"
- resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.13.1.tgz#fca9c9f5de7990ab26a00f167b8978f083a18f3c"
- integrity sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==
- dependencies:
- "@stylelint/postcss-css-in-js" "^0.37.2"
- "@stylelint/postcss-markdown" "^0.36.2"
- autoprefixer "^9.8.6"
- balanced-match "^2.0.0"
- chalk "^4.1.1"
- cosmiconfig "^7.0.0"
- debug "^4.3.1"
- execall "^2.0.0"
- fast-glob "^3.2.5"
- fastest-levenshtein "^1.0.12"
- file-entry-cache "^6.0.1"
- get-stdin "^8.0.0"
- global-modules "^2.0.0"
- globby "^11.0.3"
- globjoin "^0.1.4"
- html-tags "^3.1.0"
- ignore "^5.1.8"
- import-lazy "^4.0.0"
- imurmurhash "^0.1.4"
- known-css-properties "^0.21.0"
- lodash "^4.17.21"
- log-symbols "^4.1.0"
- mathml-tag-names "^2.1.3"
- meow "^9.0.0"
- micromatch "^4.0.4"
- normalize-selector "^0.2.0"
- postcss "^7.0.35"
- postcss-html "^0.36.0"
- postcss-less "^3.1.4"
- postcss-media-query-parser "^0.2.3"
- postcss-resolve-nested-selector "^0.1.1"
- postcss-safe-parser "^4.0.2"
- postcss-sass "^0.4.4"
- postcss-scss "^2.1.1"
- postcss-selector-parser "^6.0.5"
- postcss-syntax "^0.36.2"
- postcss-value-parser "^4.1.0"
- resolve-from "^5.0.0"
- slash "^3.0.0"
- specificity "^0.4.1"
- string-width "^4.2.2"
- strip-ansi "^6.0.0"
- style-search "^0.1.0"
- sugarss "^2.0.0"
- svg-tags "^1.0.0"
- table "^6.6.0"
- v8-compile-cache "^2.3.0"
- write-file-atomic "^3.0.3"
-
-sugarss@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"
- integrity sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==
- dependencies:
- postcss "^7.0.2"
-
supports-color@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -4020,12 +3132,7 @@ supports-color@^7.1.0:
dependencies:
has-flag "^4.0.0"
-svg-tags@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
- integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
-
-table@^6.0.9, table@^6.6.0:
+table@^6.0.9:
version "6.7.1"
resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
@@ -4059,11 +3166,6 @@ through@2, "through@>=2.2.7 <3", through@^2.3.8, through@~2.3, through@~2.3.4:
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-to-fast-properties@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
- integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
to-regex-range@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -4091,11 +3193,6 @@ traverse@^0.6.6:
resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
-trim-newlines@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
- integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
-
trim-trailing-lines@^1.0.0:
version "1.1.4"
resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"
@@ -4168,26 +3265,11 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
-type-fest@^0.18.0:
- version "0.18.1"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
- integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
-
type-fest@^0.20.2:
version "0.20.2"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-type-fest@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
- integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-fest@^0.8.1:
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
- integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
type-is@~1.6.17, type-is@~1.6.18:
version "1.6.18"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -4196,13 +3278,6 @@ type-is@~1.6.17, type-is@~1.6.18:
media-typer "0.3.0"
mime-types "~2.1.24"
-typedarray-to-buffer@^3.1.5:
- version "3.1.5"
- resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
- integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
- dependencies:
- is-typedarray "^1.0.0"
-
typescript@^4.6.2:
version "4.6.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
@@ -4243,35 +3318,11 @@ unified@^6.1.6:
vfile "^2.0.0"
x-is-string "^0.1.0"
-unified@^9.1.0:
- version "9.2.1"
- resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3"
- integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==
- dependencies:
- bail "^1.0.0"
- extend "^3.0.0"
- is-buffer "^2.0.0"
- is-plain-obj "^2.0.0"
- trough "^1.0.0"
- vfile "^4.0.0"
-
-unist-util-find-all-after@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"
- integrity sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==
- dependencies:
- unist-util-is "^4.0.0"
-
unist-util-is@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd"
integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
-unist-util-is@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
- integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
-
unist-util-remove-position@^1.0.0:
version "1.1.4"
resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz#ec037348b6102c897703eee6d0294ca4755a2020"
@@ -4327,7 +3378,7 @@ uri-js@^4.2.2:
dependencies:
punycode "^2.1.0"
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+util-deprecate@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -4337,7 +3388,7 @@ utils-merge@1.0.1:
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
+v8-compile-cache@^2.0.3:
version "2.3.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -4360,7 +3411,7 @@ vfile-location@^2.0.0:
resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz#8a274f39411b8719ea5728802e10d9e0dff1519e"
integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==
-vfile-message@^1.0.0, vfile-message@^2.0.0, vfile-message@^2.0.2:
+vfile-message@^1.0.0, vfile-message@^2.0.2:
version "2.0.4"
resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
@@ -4378,16 +3429,6 @@ vfile@^2.0.0:
unist-util-stringify-position "^1.0.0"
vfile-message "^1.0.0"
-vfile@^4.0.0:
- version "4.2.1"
- resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
- integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
- dependencies:
- "@types/unist" "^2.0.0"
- is-buffer "^2.0.0"
- unist-util-stringify-position "^2.0.0"
- vfile-message "^2.0.0"
-
vm2@^3.9.3, vm2@^3.9.6:
version "3.9.7"
resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.7.tgz#bb87aa677c97c61e23a6cb6547e44e990517a6f6"
@@ -4420,13 +3461,6 @@ which-boxed-primitive@^1.0.2:
is-string "^1.0.5"
is-symbol "^1.0.3"
-which@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
- integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
- dependencies:
- isexe "^2.0.0"
-
which@^2.0.1, which@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -4460,16 +3494,6 @@ wrappy@1:
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-write-file-atomic@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
- integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
- dependencies:
- imurmurhash "^0.1.4"
- is-typedarray "^1.0.0"
- signal-exit "^3.0.2"
- typedarray-to-buffer "^3.1.5"
-
ws@^8.0.0:
version "8.2.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.0.tgz#0b738cd484bfc9303421914b11bb4011e07615bb"
@@ -4510,16 +3534,6 @@ yallist@^4.0.0:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-yaml@^1.10.0:
- version "1.10.0"
- resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
- integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
-
-yargs-parser@^20.2.3:
- version "20.2.7"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
- integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
-
yargs-parser@^21.0.0:
version "21.0.1"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
@@ -4542,8 +3556,3 @@ yn@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
-zwitch@^1.0.0:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
- integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==
From f36c1f5b919dcf8c8e8f3ed6b882af393dd72fda Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 16 Sep 2022 21:53:16 -0700
Subject: [PATCH 02/58] refactor: move shellcheck to separate job
---
.github/workflows/build.yaml | 44 ++++++++++++++++++++++++++++++++++++
ci/dev/lint.sh | 1 -
package.json | 1 +
3 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 85f8efdec1bf..b53ceb9dfc4c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -64,6 +64,50 @@ jobs:
run: yarn lint
if: success()
+ lint-sh:
+ name: Lint shell files
+ runs-on: ubuntu-latest
+ timeout-minutes: 5
+ steps:
+ - name: Checkout repo
+ uses: actions/checkout@v3
+
+ - name: Get changed files
+ id: changed-files
+ uses: tj-actions/changed-files@v23.2
+ with:
+ files: |
+ **.sh
+ **.bats
+
+ - name: Install Node.js v16
+ if: steps.changed-files.outputs.any_changed == 'true'
+ uses: actions/setup-node@v3
+ with:
+ node-version: "16"
+
+ - name: Fetch dependencies from cache
+ if: steps.changed-files.outputs.any_changed == 'true'
+ id: cache-yarn
+ uses: actions/cache@v3
+ with:
+ path: "node_modules"
+ key: yarn-build-${{ hashFiles('yarn.lock') }}
+ restore-keys: |
+ yarn-build-
+
+ - name: Install dependencies
+ if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
+ run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
+ - name: Lint shell files
+ if: steps.changed-files.outputs.any_changed == 'true'
+ run: yarn lint:sh
+
+ - name: Fail workflow
+ if: failure()
+ uses: andymckay/cancel-action@0.2
+
build:
name: Build
needs: prebuild
diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh
index 036ec1190a01..ac6be75ce979 100755
--- a/ci/dev/lint.sh
+++ b/ci/dev/lint.sh
@@ -6,7 +6,6 @@ main() {
eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js" | grep -v "lib/vscode")
tsc --noEmit --skipLibCheck
- shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh" | grep -v "lib/vscode")
if command -v helm && helm kubeval --help > /dev/null; then
helm kubeval ci/helm-chart
fi
diff --git a/package.json b/package.json
index 683bd50f71c8..4a2c64add020 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"_audit": "./ci/dev/audit.sh",
"fmt": "./ci/dev/fmt.sh",
"lint": "./ci/dev/lint.sh",
+ "lint:sh": "shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files '*.sh' | grep -v 'lib/vscode')",
"test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
"ci": "./ci/dev/ci.sh",
"watch": "VSCODE_DEV=1 VSCODE_IPC_HOOK_CLI= NODE_OPTIONS='--max_old_space_size=32384 --trace-warnings' ts-node ./ci/dev/watch.ts",
From 3028e8ebf8622d6423cd56249d0d255802e9b1f5 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 16 Sep 2022 22:17:32 -0700
Subject: [PATCH 03/58] refactor: add helm script and job
---
.github/workflows/build.yaml | 28 ++++++++++++++++++++++++++++
ci/dev/helm.sh | 14 ++++++++++++++
ci/dev/lint.sh | 3 ---
package.json | 1 +
4 files changed, 43 insertions(+), 3 deletions(-)
create mode 100755 ci/dev/helm.sh
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b53ceb9dfc4c..8669ce9f6755 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -108,6 +108,34 @@ jobs:
if: failure()
uses: andymckay/cancel-action@0.2
+ lint-helm:
+ name: Lint Helm chart
+ runs-on: ubuntu-latest
+ timeout-minutes: 5
+ steps:
+ - name: Checkout repo
+ uses: actions/checkout@v3
+
+ - name: Get changed files
+ id: changed-files
+ uses: tj-actions/changed-files@v23.2
+ with:
+ files: |
+ ci/helm-chart/**
+
+ - name: Install helm
+ uses: azure/setup-helm@v3.3
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Lint Helm chart
+ if: steps.changed-files.outputs.any_changed == 'true'
+ run: ./ci/dev/helm.sh
+
+ - name: Fail workflow
+ if: failure()
+ uses: andymckay/cancel-action@0.2
+
build:
name: Build
needs: prebuild
diff --git a/ci/dev/helm.sh b/ci/dev/helm.sh
new file mode 100755
index 000000000000..895db6542112
--- /dev/null
+++ b/ci/dev/helm.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+main() {
+ cd "$(dirname "$0")/../.."
+
+ if command -v helm && helm kubeval --help > /dev/null; then
+ helm kubeval ci/helm-chart
+ fi
+
+ cd "$OLDPWD"
+}
+
+main "$@"
diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh
index ac6be75ce979..f0d7ae58677a 100755
--- a/ci/dev/lint.sh
+++ b/ci/dev/lint.sh
@@ -6,9 +6,6 @@ main() {
eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js" | grep -v "lib/vscode")
tsc --noEmit --skipLibCheck
- if command -v helm && helm kubeval --help > /dev/null; then
- helm kubeval ci/helm-chart
- fi
cd "$OLDPWD"
}
diff --git a/package.json b/package.json
index 4a2c64add020..72659fffcfc1 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"_audit": "./ci/dev/audit.sh",
"fmt": "./ci/dev/fmt.sh",
"lint": "./ci/dev/lint.sh",
+ "lint:helm": "./ci/dedv/helm.sh",
"lint:sh": "shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files '*.sh' | grep -v 'lib/vscode')",
"test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
"ci": "./ci/dev/ci.sh",
From d8e0dc96ac7e8e69497447eea7e5d3543f5927d7 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 16 Sep 2022 22:25:45 -0700
Subject: [PATCH 04/58] refactor: add eslint job and yarn script
---
.github/workflows/build.yaml | 47 ++++++++++++++++++++++++++++++++++++
ci/dev/lint.sh | 1 -
package.json | 1 +
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8669ce9f6755..08b36b247815 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -108,6 +108,53 @@ jobs:
if: failure()
uses: andymckay/cancel-action@0.2
+ lint-ts:
+ name: Lint TypeScript files
+ runs-on: ubuntu-latest
+ timeout-minutes: 5
+ steps:
+ - name: Checkout repo
+ uses: actions/checkout@v3
+
+ - name: Get changed files
+ id: changed-files
+ uses: tj-actions/changed-files@v23.2
+ with:
+ files: |
+ **.ts
+ **.tsx
+ **.js
+ files_ignore: |
+ lib/vscode
+
+ - name: Install Node.js v16
+ if: steps.changed-files.outputs.any_changed == 'true'
+ uses: actions/setup-node@v3
+ with:
+ node-version: "16"
+
+ - name: Fetch dependencies from cache
+ if: steps.changed-files.outputs.any_changed == 'true'
+ id: cache-yarn
+ uses: actions/cache@v3
+ with:
+ path: "node_modules"
+ key: yarn-build-${{ hashFiles('yarn.lock') }}
+ restore-keys: |
+ yarn-build-
+
+ - name: Install dependencies
+ if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
+ run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
+ - name: Lint TypeScript files
+ if: steps.changed-files.outputs.any_changed == 'true'
+ run: yarn lint:ts
+
+ - name: Fail workflow
+ if: failure()
+ uses: andymckay/cancel-action@0.2
+
lint-helm:
name: Lint Helm chart
runs-on: ubuntu-latest
diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh
index f0d7ae58677a..1542dc224d70 100755
--- a/ci/dev/lint.sh
+++ b/ci/dev/lint.sh
@@ -4,7 +4,6 @@ set -euo pipefail
main() {
cd "$(dirname "$0")/../.."
- eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js" | grep -v "lib/vscode")
tsc --noEmit --skipLibCheck
cd "$OLDPWD"
diff --git a/package.json b/package.json
index 72659fffcfc1..dd0cef0237d8 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
"lint": "./ci/dev/lint.sh",
"lint:helm": "./ci/dedv/helm.sh",
"lint:sh": "shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files '*.sh' | grep -v 'lib/vscode')",
+ "lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.tsx' '*.js' | grep -v 'lib/vscode')",
"test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
"ci": "./ci/dev/ci.sh",
"watch": "VSCODE_DEV=1 VSCODE_IPC_HOOK_CLI= NODE_OPTIONS='--max_old_space_size=32384 --trace-warnings' ts-node ./ci/dev/watch.ts",
From 0b1cfc91d904f14dc8689c34d2422b505dc36949 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 16 Sep 2022 22:37:04 -0700
Subject: [PATCH 05/58] fix(test/tsconfig): exclude test-plugin
---
test/tsconfig.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 5197ce2769f4..3e568e887dd6 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,4 +1,5 @@
{
"extends": "../tsconfig.json",
- "include": ["./**/*.ts"]
+ "include": ["./**/*.ts"],
+ "exclude": ["./unit/node/test-plugin"]
}
From fe70ebf4d6bd95339ed339ea91f813671059e78b Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 16 Sep 2022 22:37:16 -0700
Subject: [PATCH 06/58] refactor: delete lint, add typecheck job
---
.github/workflows/build.yaml | 47 +++++++++++++++++++++++++++++++++---
ci/dev/lint.sh | 12 ---------
package.json | 2 +-
3 files changed, 44 insertions(+), 17 deletions(-)
delete mode 100755 ci/dev/lint.sh
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 08b36b247815..b695c7785122 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -60,10 +60,6 @@ jobs:
run: yarn fmt
if: success()
- - name: Run yarn lint
- run: yarn lint
- if: success()
-
lint-sh:
name: Lint shell files
runs-on: ubuntu-latest
@@ -108,6 +104,49 @@ jobs:
if: failure()
uses: andymckay/cancel-action@0.2
+ typecheck:
+ name: Check TypeScript types
+ runs-on: ubuntu-latest
+ timeout-minutes: 5
+ steps:
+ - name: Checkout repo
+ uses: actions/checkout@v3
+
+ - name: Get changed files
+ id: changed-files
+ uses: tj-actions/changed-files@v23.2
+ with:
+ files: |
+ ./src/**/*
+
+ - name: Install Node.js v16
+ if: steps.changed-files.outputs.any_changed == 'true'
+ uses: actions/setup-node@v3
+ with:
+ node-version: "16"
+
+ - name: Fetch dependencies from cache
+ if: steps.changed-files.outputs.any_changed == 'true'
+ id: cache-yarn
+ uses: actions/cache@v3
+ with:
+ path: "node_modules"
+ key: yarn-build-${{ hashFiles('yarn.lock') }}
+ restore-keys: |
+ yarn-build-
+
+ - name: Install dependencies
+ if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
+ run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
+ - name: Run tsc on TypeScript files
+ if: steps.changed-files.outputs.any_changed == 'true'
+ run: yarn typecheck
+
+ - name: Fail workflow
+ if: failure()
+ uses: andymckay/cancel-action@0.2
+
lint-ts:
name: Lint TypeScript files
runs-on: ubuntu-latest
diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh
deleted file mode 100755
index 1542dc224d70..000000000000
--- a/ci/dev/lint.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-main() {
- cd "$(dirname "$0")/../.."
-
- tsc --noEmit --skipLibCheck
-
- cd "$OLDPWD"
-}
-
-main "$@"
diff --git a/package.json b/package.json
index dd0cef0237d8..2833c02dfaa4 100644
--- a/package.json
+++ b/package.json
@@ -26,11 +26,11 @@
"publish:docker": "./ci/steps/docker-buildx-push.sh",
"_audit": "./ci/dev/audit.sh",
"fmt": "./ci/dev/fmt.sh",
- "lint": "./ci/dev/lint.sh",
"lint:helm": "./ci/dedv/helm.sh",
"lint:sh": "shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files '*.sh' | grep -v 'lib/vscode')",
"lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.tsx' '*.js' | grep -v 'lib/vscode')",
"test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
+ "typecheck": "tsc -p tsconfig.json --noEmit --skipLibCheck",
"ci": "./ci/dev/ci.sh",
"watch": "VSCODE_DEV=1 VSCODE_IPC_HOOK_CLI= NODE_OPTIONS='--max_old_space_size=32384 --trace-warnings' ts-node ./ci/dev/watch.ts",
"icons": "./ci/dev/gen_icons.sh"
From bbfbab40db710107384b8ea98b817bed69abf7c1 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 16 Sep 2022 22:42:28 -0700
Subject: [PATCH 07/58] refactor: remove prebuild
---
.github/workflows/build.yaml | 94 ++++++++++++++++++------------------
1 file changed, 48 insertions(+), 46 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b695c7785122..6fb661496e1b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -22,10 +22,10 @@ concurrency:
# will skip running `yarn install` if it successfully fetched from cache
jobs:
- prebuild:
- name: Pre-build checks
+ fmt:
+ name: Format with Prettier
runs-on: ubuntu-latest
- timeout-minutes: 20
+ timeout-minutes: 5
steps:
- name: Checkout repo
uses: actions/checkout@v3
@@ -47,21 +47,24 @@ jobs:
id: cache-node-modules
uses: actions/cache@v3
with:
- path: "**/node_modules"
- key: yarn-build-${{ hashFiles('**/yarn.lock') }}
+ path: "node_modules"
+ key: yarn-build-${{ hashFiles('yarn.lock') }}
restore-keys: |
yarn-build-
- name: Install dependencies
- if: steps.cache-node-modules.outputs.cache-hit != 'true'
+ if: steps.cache-yarn.outputs.cache-hit != 'true'
run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
- - name: Run yarn fmt
+ - name: Format files with Prettier
run: yarn fmt
- if: success()
- lint-sh:
- name: Lint shell files
+ - name: Fail workflow
+ if: failure()
+ uses: andymckay/cancel-action@0.2
+
+ lint-helm:
+ name: Lint Helm chart
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
@@ -73,39 +76,23 @@ jobs:
uses: tj-actions/changed-files@v23.2
with:
files: |
- **.sh
- **.bats
-
- - name: Install Node.js v16
- if: steps.changed-files.outputs.any_changed == 'true'
- uses: actions/setup-node@v3
- with:
- node-version: "16"
+ ci/helm-chart/**
- - name: Fetch dependencies from cache
- if: steps.changed-files.outputs.any_changed == 'true'
- id: cache-yarn
- uses: actions/cache@v3
+ - name: Install helm
+ uses: azure/setup-helm@v3.3
with:
- path: "node_modules"
- key: yarn-build-${{ hashFiles('yarn.lock') }}
- restore-keys: |
- yarn-build-
-
- - name: Install dependencies
- if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
- run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+ token: ${{ secrets.GITHUB_TOKEN }}
- - name: Lint shell files
+ - name: Lint Helm chart
if: steps.changed-files.outputs.any_changed == 'true'
- run: yarn lint:sh
+ run: ./ci/dev/helm.sh
- name: Fail workflow
if: failure()
uses: andymckay/cancel-action@0.2
- typecheck:
- name: Check TypeScript types
+ lint-sh:
+ name: Lint shell files
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
@@ -117,7 +104,8 @@ jobs:
uses: tj-actions/changed-files@v23.2
with:
files: |
- ./src/**/*
+ **.sh
+ **.bats
- name: Install Node.js v16
if: steps.changed-files.outputs.any_changed == 'true'
@@ -139,9 +127,9 @@ jobs:
if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
- - name: Run tsc on TypeScript files
+ - name: Lint shell files
if: steps.changed-files.outputs.any_changed == 'true'
- run: yarn typecheck
+ run: yarn lint:sh
- name: Fail workflow
if: failure()
@@ -194,8 +182,8 @@ jobs:
if: failure()
uses: andymckay/cancel-action@0.2
- lint-helm:
- name: Lint Helm chart
+ typecheck:
+ name: Check TypeScript types
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
@@ -207,16 +195,31 @@ jobs:
uses: tj-actions/changed-files@v23.2
with:
files: |
- ci/helm-chart/**
+ ./src/**/*
- - name: Install helm
- uses: azure/setup-helm@v3.3
+ - name: Install Node.js v16
+ if: steps.changed-files.outputs.any_changed == 'true'
+ uses: actions/setup-node@v3
with:
- token: ${{ secrets.GITHUB_TOKEN }}
+ node-version: "16"
- - name: Lint Helm chart
+ - name: Fetch dependencies from cache
if: steps.changed-files.outputs.any_changed == 'true'
- run: ./ci/dev/helm.sh
+ id: cache-yarn
+ uses: actions/cache@v3
+ with:
+ path: "node_modules"
+ key: yarn-build-${{ hashFiles('yarn.lock') }}
+ restore-keys: |
+ yarn-build-
+
+ - name: Install dependencies
+ if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
+ run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
+ - name: Run tsc on TypeScript files
+ if: steps.changed-files.outputs.any_changed == 'true'
+ run: yarn typecheck
- name: Fail workflow
if: failure()
@@ -224,7 +227,6 @@ jobs:
build:
name: Build
- needs: prebuild
runs-on: ubuntu-latest
timeout-minutes: 30
env:
From 74330a1e05c064bc72351fd14cd1874a910f10ab Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Sat, 17 Sep 2022 10:02:23 -0700
Subject: [PATCH 08/58] wip: add notes about unit test refactor
---
ci/dev/test-unit.sh | 4 +++-
test/unit/node/app.test.ts | 4 +++-
test/unit/node/routes/vscode.test.ts | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ci/dev/test-unit.sh b/ci/dev/test-unit.sh
index b3e0b14c908c..21bce8bdf173 100755
--- a/ci/dev/test-unit.sh
+++ b/ci/dev/test-unit.sh
@@ -6,6 +6,8 @@ main() {
source ./ci/lib.sh
+ # TODO@jsjoeio - skip if already built
+ # TODO@jsjoeio - move to integration test suite too
echo "Building test plugin"
pushd test/unit/node/test-plugin
make -s out/index.js
@@ -22,7 +24,7 @@ main() {
else
echo "Could not find lib/vscode/out or lib/vscode-reh-web-*"
echo "Code must be built before running unit tests"
- exit 1
+ # exit 1
fi
popd
fi
diff --git a/test/unit/node/app.test.ts b/test/unit/node/app.test.ts
index b2c169a2e429..a6c9c0f276de 100644
--- a/test/unit/node/app.test.ts
+++ b/test/unit/node/app.test.ts
@@ -107,6 +107,8 @@ describe("createApp", () => {
app.dispose()
})
+ // TODO@jsjoeio - delete because this test it buggy?
+ // or move into it's own describe block
it("should change the file mode of a socket", async () => {
const defaultArgs = await setDefaults({
socket: tmpFilePath,
@@ -248,7 +250,7 @@ describe("listen", () => {
jest.clearAllMocks()
})
- it("should throw an error if a directory is passed in instead of a file", async () => {
+ it.skip("should throw an error if a directory is passed in instead of a file", async () => {
const errorMessage = "EISDIR: illegal operation on a directory, unlink"
const port = await getAvailablePort()
const mockArgs = { port, host: "0.0.0.0", socket: tmpDirPath }
diff --git a/test/unit/node/routes/vscode.test.ts b/test/unit/node/routes/vscode.test.ts
index 9f453369322a..5d3dbb63d944 100644
--- a/test/unit/node/routes/vscode.test.ts
+++ b/test/unit/node/routes/vscode.test.ts
@@ -4,7 +4,9 @@ import { clean, tmpdir } from "../../../utils/helpers"
import * as httpserver from "../../../utils/httpserver"
import * as integration from "../../../utils/integration"
-describe("vscode", () => {
+// TODO@jsjoeio - move these to integration tests since they rely on Code
+// to be built
+describe.skip("vscode", () => {
let codeServer: httpserver.HttpServer | undefined
const testName = "vscode"
From a0944006e793b6aaf6a84ec859cfb4a244cdd831 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Sat, 17 Sep 2022 10:20:28 -0700
Subject: [PATCH 09/58] refactor: delete buggy socket test
This test was really added to in get cover specific lines but it's buggy
and only passes sometimes locally. I think it's okay to remove because:
- it's an implementation detail (not user facing)
- not preventing any specific regressions
---
test/unit/node/app.test.ts | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/test/unit/node/app.test.ts b/test/unit/node/app.test.ts
index a6c9c0f276de..36c004e460eb 100644
--- a/test/unit/node/app.test.ts
+++ b/test/unit/node/app.test.ts
@@ -107,20 +107,6 @@ describe("createApp", () => {
app.dispose()
})
- // TODO@jsjoeio - delete because this test it buggy?
- // or move into it's own describe block
- it("should change the file mode of a socket", async () => {
- const defaultArgs = await setDefaults({
- socket: tmpFilePath,
- "socket-mode": "777",
- })
-
- const app = await createApp(defaultArgs)
-
- expect((await promises.stat(tmpFilePath)).mode & 0o777).toBe(0o777)
- app.dispose()
- })
-
it("should create an https server if args.cert exists", async () => {
const testCertificate = await generateCertificate("localhost")
const cert = new OptionalString(testCertificate.cert)
From bc02005dc097a10b5216b616ff0bd7a911240748 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Sat, 17 Sep 2022 10:33:03 -0700
Subject: [PATCH 10/58] refactor: move test-plugin to integration suite
This seems more appropriate given this tests how a plugin might work
within code-server.
---
ci/dev/test-integration.sh | 9 ++++++++-
ci/dev/test-unit.sh | 7 -------
test/{unit/node => integration}/plugin.test.ts | 10 +++++-----
.../node => integration}/test-plugin/.eslintrc.js | 0
.../node => integration}/test-plugin/.gitignore | 0
.../node => integration}/test-plugin/Makefile | 0
.../node => integration}/test-plugin/package.json | 0
.../test-plugin/public/icon.svg | 0
.../test-plugin/public/index.html | 0
.../node => integration}/test-plugin/src/index.ts | 14 +++++++++-----
.../node => integration}/test-plugin/tsconfig.json | 0
.../node => integration}/test-plugin/yarn.lock | 0
test/tsconfig.json | 1 -
13 files changed, 22 insertions(+), 19 deletions(-)
rename test/{unit/node => integration}/plugin.test.ts (92%)
rename test/{unit/node => integration}/test-plugin/.eslintrc.js (100%)
rename test/{unit/node => integration}/test-plugin/.gitignore (100%)
rename test/{unit/node => integration}/test-plugin/Makefile (100%)
rename test/{unit/node => integration}/test-plugin/package.json (100%)
rename test/{unit/node => integration}/test-plugin/public/icon.svg (100%)
rename test/{unit/node => integration}/test-plugin/public/index.html (100%)
rename test/{unit/node => integration}/test-plugin/src/index.ts (72%)
rename test/{unit/node => integration}/test-plugin/tsconfig.json (100%)
rename test/{unit/node => integration}/test-plugin/yarn.lock (100%)
diff --git a/ci/dev/test-integration.sh b/ci/dev/test-integration.sh
index 2d46bb895561..e9d260883e79 100755
--- a/ci/dev/test-integration.sh
+++ b/ci/dev/test-integration.sh
@@ -24,6 +24,13 @@ main() {
path="$CODE_SERVER_PATH"
fi
+ # TODO@jsjoeio - skip if already built
+ # TODO@jsjoeio - move to integration test suite too
+ echo "Building test plugin"
+ pushd test/integration/test-plugin
+ make -s out/index.js
+ popd
+
echo "Running tests with code-server binary: '$path'"
if [[ ! -f $path ]]; then
@@ -33,7 +40,7 @@ main() {
exit 1
fi
- CODE_SERVER_PATH="$path" CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --coverage=false --testRegex "./test/integration" --testPathIgnorePatterns "./test/integration/fixtures"
+ CODE_SERVER_PATH="$path" CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --coverage=false --testRegex "./test/integration" --testPathIgnorePatterns "./test/integration/fixtures" --testPathIgnorePatterns "./test/integration/test-plugin"
}
main "$@"
diff --git a/ci/dev/test-unit.sh b/ci/dev/test-unit.sh
index 21bce8bdf173..e832c1031201 100755
--- a/ci/dev/test-unit.sh
+++ b/ci/dev/test-unit.sh
@@ -6,13 +6,6 @@ main() {
source ./ci/lib.sh
- # TODO@jsjoeio - skip if already built
- # TODO@jsjoeio - move to integration test suite too
- echo "Building test plugin"
- pushd test/unit/node/test-plugin
- make -s out/index.js
- popd
-
# Our code imports from `out` in order to work during development but if you
# have only built for production you will have not have this directory. In
# that case symlink `out` to a production build directory.
diff --git a/test/unit/node/plugin.test.ts b/test/integration/plugin.test.ts
similarity index 92%
rename from test/unit/node/plugin.test.ts
rename to test/integration/plugin.test.ts
index 88210fd8594a..2df91d0c515c 100644
--- a/test/unit/node/plugin.test.ts
+++ b/test/integration/plugin.test.ts
@@ -2,11 +2,11 @@ import { logger } from "@coder/logger"
import * as express from "express"
import * as fs from "fs"
import * as path from "path"
-import { HttpCode } from "../../../src/common/http"
-import { AuthType } from "../../../src/node/cli"
-import { codeServer, PluginAPI } from "../../../src/node/plugin"
-import * as apps from "../../../src/node/routes/apps"
-import * as httpserver from "../../utils/httpserver"
+import { HttpCode } from "../../src/common/http"
+import { AuthType } from "../../src/node/cli"
+import { codeServer, PluginAPI } from "../../src/node/plugin"
+import * as apps from "../../src/node/routes/apps"
+import * as httpserver from "../utils/httpserver"
const fsp = fs.promises
// Jest overrides `require` so our usual override doesn't work.
diff --git a/test/unit/node/test-plugin/.eslintrc.js b/test/integration/test-plugin/.eslintrc.js
similarity index 100%
rename from test/unit/node/test-plugin/.eslintrc.js
rename to test/integration/test-plugin/.eslintrc.js
diff --git a/test/unit/node/test-plugin/.gitignore b/test/integration/test-plugin/.gitignore
similarity index 100%
rename from test/unit/node/test-plugin/.gitignore
rename to test/integration/test-plugin/.gitignore
diff --git a/test/unit/node/test-plugin/Makefile b/test/integration/test-plugin/Makefile
similarity index 100%
rename from test/unit/node/test-plugin/Makefile
rename to test/integration/test-plugin/Makefile
diff --git a/test/unit/node/test-plugin/package.json b/test/integration/test-plugin/package.json
similarity index 100%
rename from test/unit/node/test-plugin/package.json
rename to test/integration/test-plugin/package.json
diff --git a/test/unit/node/test-plugin/public/icon.svg b/test/integration/test-plugin/public/icon.svg
similarity index 100%
rename from test/unit/node/test-plugin/public/icon.svg
rename to test/integration/test-plugin/public/icon.svg
diff --git a/test/unit/node/test-plugin/public/index.html b/test/integration/test-plugin/public/index.html
similarity index 100%
rename from test/unit/node/test-plugin/public/index.html
rename to test/integration/test-plugin/public/index.html
diff --git a/test/unit/node/test-plugin/src/index.ts b/test/integration/test-plugin/src/index.ts
similarity index 72%
rename from test/unit/node/test-plugin/src/index.ts
rename to test/integration/test-plugin/src/index.ts
index 22ef723bac1a..2d34ad17a3c7 100644
--- a/test/unit/node/test-plugin/src/index.ts
+++ b/test/integration/test-plugin/src/index.ts
@@ -1,22 +1,26 @@
+// TODO@jsjoeio - how do I fix this?
+// @ts-ignore - we know code-server exists
import * as cs from "code-server"
import * as fspath from "path"
+type FixMeLater = any
+
export const plugin: cs.Plugin = {
displayName: "Test Plugin",
routerPath: "/test-plugin",
homepageURL: "https://example.com",
description: "Plugin used in code-server tests.",
- init(config) {
+ init(config: FixMeLater) {
config.logger.debug("test-plugin loaded!")
},
router() {
const r = cs.express.Router()
- r.get("/test-app", (_, res) => {
+ r.get("/test-app", (_: FixMeLater, res: FixMeLater) => {
res.sendFile(fspath.resolve(__dirname, "../public/index.html"))
})
- r.get("/goland/icon.svg", (_, res) => {
+ r.get("/goland/icon.svg", (_: FixMeLater, res: FixMeLater) => {
res.sendFile(fspath.resolve(__dirname, "../public/icon.svg"))
})
r.get("/error", () => {
@@ -27,8 +31,8 @@ export const plugin: cs.Plugin = {
wsRouter() {
const wr = cs.WsRouter()
- wr.ws("/test-app", (req) => {
- cs.wss.handleUpgrade(req, req.ws, req.head, (ws) => {
+ wr.ws("/test-app", (req: FixMeLater) => {
+ cs.wss.handleUpgrade(req, req.ws, req.head, (ws: FixMeLater) => {
req.ws.resume()
ws.send("hello")
})
diff --git a/test/unit/node/test-plugin/tsconfig.json b/test/integration/test-plugin/tsconfig.json
similarity index 100%
rename from test/unit/node/test-plugin/tsconfig.json
rename to test/integration/test-plugin/tsconfig.json
diff --git a/test/unit/node/test-plugin/yarn.lock b/test/integration/test-plugin/yarn.lock
similarity index 100%
rename from test/unit/node/test-plugin/yarn.lock
rename to test/integration/test-plugin/yarn.lock
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 3e568e887dd6..179ac1d810d0 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,5 +1,4 @@
{
"extends": "../tsconfig.json",
"include": ["./**/*.ts"],
- "exclude": ["./unit/node/test-plugin"]
}
From 64d234e0848387afb70b143929fc9f2e72318120 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Sat, 17 Sep 2022 10:36:10 -0700
Subject: [PATCH 11/58] wip
---
ci/dev/test-integration.sh | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/ci/dev/test-integration.sh b/ci/dev/test-integration.sh
index e9d260883e79..b2868154f67d 100755
--- a/ci/dev/test-integration.sh
+++ b/ci/dev/test-integration.sh
@@ -24,12 +24,13 @@ main() {
path="$CODE_SERVER_PATH"
fi
- # TODO@jsjoeio - skip if already built
- # TODO@jsjoeio - move to integration test suite too
- echo "Building test plugin"
- pushd test/integration/test-plugin
- make -s out/index.js
- popd
+ # WIP jsjoeio
+ if [[ ! -f "test/integration/test-plugin/out/index.js" ]]; then
+ echo "Building test plugin"
+ pushd test/integration/test-plugin
+ make -s out/index.js
+ popd
+ fi
echo "Running tests with code-server binary: '$path'"
From 13286bf4c9762b7d6c6176464d94b1fc316fb568 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Sat, 17 Sep 2022 20:20:01 -0700
Subject: [PATCH 12/58] wip: refactor vscode integration tests
---
ci/dev/test-integration.sh | 20 +++++++++++++++++++
.../routes => integration}/vscode.test.ts | 9 ++++-----
2 files changed, 24 insertions(+), 5 deletions(-)
rename test/{unit/node/routes => integration}/vscode.test.ts (94%)
diff --git a/ci/dev/test-integration.sh b/ci/dev/test-integration.sh
index b2868154f67d..4f31c7d72b0b 100755
--- a/ci/dev/test-integration.sh
+++ b/ci/dev/test-integration.sh
@@ -32,6 +32,26 @@ main() {
popd
fi
+ # TODO@jsjoeio get this working like in test-unit.sh
+ # ln -s "/usr/local/Cellar/code-server/4.7.0/libexec/lib/vscode/out" ./lib/vscode/out
+ # source ./ci/lib.sh
+
+ # Our code imports from `out` in order to work during development but if you
+ # have only built for production you will have not have this directory. In
+ # that case symlink `out` to a production build directory.
+ # if [[ ! -e lib/vscode/out ]]; then
+ # pushd lib
+ # local out=(vscode-reh-web-*)
+ # if [[ -d "${out[0]}" ]]; then
+ # ln -s "../${out[0]}/out" ./vscode/out
+ # else
+ # echo "Could not find lib/vscode/out or lib/vscode-reh-web-*"
+ # echo "Code must be built before running unit tests"
+ # # exit 1
+ # fi
+ # popd
+ # fi
+
echo "Running tests with code-server binary: '$path'"
if [[ ! -f $path ]]; then
diff --git a/test/unit/node/routes/vscode.test.ts b/test/integration/vscode.test.ts
similarity index 94%
rename from test/unit/node/routes/vscode.test.ts
rename to test/integration/vscode.test.ts
index 5d3dbb63d944..2b67b9ae4001 100644
--- a/test/unit/node/routes/vscode.test.ts
+++ b/test/integration/vscode.test.ts
@@ -1,11 +1,10 @@
import { promises as fs } from "fs"
import * as path from "path"
-import { clean, tmpdir } from "../../../utils/helpers"
-import * as httpserver from "../../../utils/httpserver"
-import * as integration from "../../../utils/integration"
+import { clean, tmpdir } from "../utils/helpers"
+import * as httpserver from "../utils/httpserver"
+import * as integration from "../utils/integration"
-// TODO@jsjoeio - move these to integration tests since they rely on Code
-// to be built
+// TODO@jsjoeio - remove skip when script fixed
describe.skip("vscode", () => {
let codeServer: httpserver.HttpServer | undefined
From 6c87b540b49c8d56266c8925c4fd32ed760b23bf Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Sat, 17 Sep 2022 20:42:32 -0700
Subject: [PATCH 13/58] refactor: move unit tests to separate job
---
.github/workflows/build.yaml | 62 ++++++++++++++++++++++++++++--------
ci/dev/test-unit.sh | 31 ------------------
package.json | 2 +-
3 files changed, 50 insertions(+), 45 deletions(-)
delete mode 100755 ci/dev/test-unit.sh
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6fb661496e1b..65e47f336317 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -182,6 +182,55 @@ jobs:
if: failure()
uses: andymckay/cancel-action@0.2
+ test-unit:
+ name: Run unit tests
+ runs-on: ubuntu-latest
+ timeout-minutes: 5
+ steps:
+ - name: Checkout repo
+ uses: actions/checkout@v3
+
+ - name: Get changed files
+ id: changed-files
+ uses: tj-actions/changed-files@v23.2
+ with:
+ files: |
+ src/**
+
+ - name: Install Node.js v16
+ if: steps.changed-files.outputs.any_changed == 'true'
+ uses: actions/setup-node@v3
+ with:
+ node-version: "16"
+
+ - name: Fetch dependencies from cache
+ if: steps.changed-files.outputs.any_changed == 'true'
+ id: cache-yarn
+ uses: actions/cache@v3
+ with:
+ path: "node_modules"
+ key: yarn-build-${{ hashFiles('yarn.lock') }}
+ restore-keys: |
+ yarn-build-
+
+ - name: Install dependencies
+ if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
+ run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
+ - name: Run unit tests
+ if: steps.changed-files.outputs.any_changed == 'true'
+ run: yarn test:unit
+
+ - name: Upload coverage report to Codecov
+ uses: codecov/codecov-action@v3
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ if: success()
+
+ - name: Fail workflow
+ if: failure()
+ uses: andymckay/cancel-action@0.2
+
typecheck:
name: Check TypeScript types
runs-on: ubuntu-latest
@@ -292,19 +341,6 @@ jobs:
if: steps.cache-vscode.outputs.cache-hit != 'true'
run: yarn build:vscode
- # Our code imports code from VS Code's `out` directory meaning VS Code
- # must be built before running these tests.
- # TODO: Move to its own step?
- - name: Run code-server unit tests
- run: yarn test:unit
- if: success()
-
- - name: Upload coverage report to Codecov
- uses: codecov/codecov-action@v3
- with:
- token: ${{ secrets.CODECOV_TOKEN }}
- if: success()
-
# The release package does not contain any native modules
# and is neutral to architecture/os/libc version.
- name: Create release package
diff --git a/ci/dev/test-unit.sh b/ci/dev/test-unit.sh
deleted file mode 100755
index e832c1031201..000000000000
--- a/ci/dev/test-unit.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-main() {
- cd "$(dirname "$0")/../.."
-
- source ./ci/lib.sh
-
- # Our code imports from `out` in order to work during development but if you
- # have only built for production you will have not have this directory. In
- # that case symlink `out` to a production build directory.
- if [[ ! -e lib/vscode/out ]]; then
- pushd lib
- local out=(vscode-reh-web-*)
- if [[ -d "${out[0]}" ]]; then
- ln -s "../${out[0]}/out" ./vscode/out
- else
- echo "Could not find lib/vscode/out or lib/vscode-reh-web-*"
- echo "Code must be built before running unit tests"
- # exit 1
- fi
- popd
- fi
-
- # We must keep jest in a sub-directory. See ../../test/package.json for more
- # information. We must also run it from the root otherwise coverage will not
- # include our source files.
- CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --testRegex "./test/unit/.*ts" --testPathIgnorePatterns "./test/unit/node/test-plugin"
-}
-
-main "$@"
diff --git a/package.json b/package.json
index 2833c02dfaa4..9a5d61968f51 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"release:prep": "./ci/build/release-prep.sh",
"test:e2e": "VSCODE_IPC_HOOK_CLI= ./ci/dev/test-e2e.sh",
"test:e2e:proxy": "USE_PROXY=1 ./ci/dev/test-e2e.sh",
- "test:unit": "./ci/dev/test-unit.sh --forceExit --detectOpenHandles",
+ "test:unit": "CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest --testRegex './test/unit/.*ts' --forceExit --detectOpenHandles",
"test:integration": "./ci/dev/test-integration.sh",
"test:scripts": "./ci/dev/test-scripts.sh",
"package": "./ci/build/build-packages.sh",
From 42bafc3a095180e4c502e7bc87195a3a709c1ff6 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Sat, 17 Sep 2022 20:44:33 -0700
Subject: [PATCH 14/58] fix: formatting
---
test/tsconfig.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 179ac1d810d0..5197ce2769f4 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,4 +1,4 @@
{
"extends": "../tsconfig.json",
- "include": ["./**/*.ts"],
+ "include": ["./**/*.ts"]
}
From 917d92ef52fd6183363d0df82c48afeb55643ed2 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 12:43:39 -0700
Subject: [PATCH 15/58] Revert "wip: refactor vscode integration tests"
This reverts commit 13286bf4c9762b7d6c6176464d94b1fc316fb568.
---
ci/dev/test-integration.sh | 20 -------------------
.../node/routes}/vscode.test.ts | 9 +++++----
2 files changed, 5 insertions(+), 24 deletions(-)
rename test/{integration => unit/node/routes}/vscode.test.ts (94%)
diff --git a/ci/dev/test-integration.sh b/ci/dev/test-integration.sh
index 4f31c7d72b0b..b2868154f67d 100755
--- a/ci/dev/test-integration.sh
+++ b/ci/dev/test-integration.sh
@@ -32,26 +32,6 @@ main() {
popd
fi
- # TODO@jsjoeio get this working like in test-unit.sh
- # ln -s "/usr/local/Cellar/code-server/4.7.0/libexec/lib/vscode/out" ./lib/vscode/out
- # source ./ci/lib.sh
-
- # Our code imports from `out` in order to work during development but if you
- # have only built for production you will have not have this directory. In
- # that case symlink `out` to a production build directory.
- # if [[ ! -e lib/vscode/out ]]; then
- # pushd lib
- # local out=(vscode-reh-web-*)
- # if [[ -d "${out[0]}" ]]; then
- # ln -s "../${out[0]}/out" ./vscode/out
- # else
- # echo "Could not find lib/vscode/out or lib/vscode-reh-web-*"
- # echo "Code must be built before running unit tests"
- # # exit 1
- # fi
- # popd
- # fi
-
echo "Running tests with code-server binary: '$path'"
if [[ ! -f $path ]]; then
diff --git a/test/integration/vscode.test.ts b/test/unit/node/routes/vscode.test.ts
similarity index 94%
rename from test/integration/vscode.test.ts
rename to test/unit/node/routes/vscode.test.ts
index 2b67b9ae4001..5d3dbb63d944 100644
--- a/test/integration/vscode.test.ts
+++ b/test/unit/node/routes/vscode.test.ts
@@ -1,10 +1,11 @@
import { promises as fs } from "fs"
import * as path from "path"
-import { clean, tmpdir } from "../utils/helpers"
-import * as httpserver from "../utils/httpserver"
-import * as integration from "../utils/integration"
+import { clean, tmpdir } from "../../../utils/helpers"
+import * as httpserver from "../../../utils/httpserver"
+import * as integration from "../../../utils/integration"
-// TODO@jsjoeio - remove skip when script fixed
+// TODO@jsjoeio - move these to integration tests since they rely on Code
+// to be built
describe.skip("vscode", () => {
let codeServer: httpserver.HttpServer | undefined
From 6ad5d9a7c398fe735c0bc60365e5b9170d907555 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 12:44:08 -0700
Subject: [PATCH 16/58] Revert "refactor: move unit tests to separate job"
This reverts commit 6c87b540b49c8d56266c8925c4fd32ed760b23bf.
---
.github/workflows/build.yaml | 62 ++++++++----------------------------
ci/dev/test-unit.sh | 31 ++++++++++++++++++
package.json | 2 +-
3 files changed, 45 insertions(+), 50 deletions(-)
create mode 100755 ci/dev/test-unit.sh
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 65e47f336317..6fb661496e1b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -182,55 +182,6 @@ jobs:
if: failure()
uses: andymckay/cancel-action@0.2
- test-unit:
- name: Run unit tests
- runs-on: ubuntu-latest
- timeout-minutes: 5
- steps:
- - name: Checkout repo
- uses: actions/checkout@v3
-
- - name: Get changed files
- id: changed-files
- uses: tj-actions/changed-files@v23.2
- with:
- files: |
- src/**
-
- - name: Install Node.js v16
- if: steps.changed-files.outputs.any_changed == 'true'
- uses: actions/setup-node@v3
- with:
- node-version: "16"
-
- - name: Fetch dependencies from cache
- if: steps.changed-files.outputs.any_changed == 'true'
- id: cache-yarn
- uses: actions/cache@v3
- with:
- path: "node_modules"
- key: yarn-build-${{ hashFiles('yarn.lock') }}
- restore-keys: |
- yarn-build-
-
- - name: Install dependencies
- if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
- run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
-
- - name: Run unit tests
- if: steps.changed-files.outputs.any_changed == 'true'
- run: yarn test:unit
-
- - name: Upload coverage report to Codecov
- uses: codecov/codecov-action@v3
- with:
- token: ${{ secrets.CODECOV_TOKEN }}
- if: success()
-
- - name: Fail workflow
- if: failure()
- uses: andymckay/cancel-action@0.2
-
typecheck:
name: Check TypeScript types
runs-on: ubuntu-latest
@@ -341,6 +292,19 @@ jobs:
if: steps.cache-vscode.outputs.cache-hit != 'true'
run: yarn build:vscode
+ # Our code imports code from VS Code's `out` directory meaning VS Code
+ # must be built before running these tests.
+ # TODO: Move to its own step?
+ - name: Run code-server unit tests
+ run: yarn test:unit
+ if: success()
+
+ - name: Upload coverage report to Codecov
+ uses: codecov/codecov-action@v3
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ if: success()
+
# The release package does not contain any native modules
# and is neutral to architecture/os/libc version.
- name: Create release package
diff --git a/ci/dev/test-unit.sh b/ci/dev/test-unit.sh
new file mode 100755
index 000000000000..e832c1031201
--- /dev/null
+++ b/ci/dev/test-unit.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+main() {
+ cd "$(dirname "$0")/../.."
+
+ source ./ci/lib.sh
+
+ # Our code imports from `out` in order to work during development but if you
+ # have only built for production you will have not have this directory. In
+ # that case symlink `out` to a production build directory.
+ if [[ ! -e lib/vscode/out ]]; then
+ pushd lib
+ local out=(vscode-reh-web-*)
+ if [[ -d "${out[0]}" ]]; then
+ ln -s "../${out[0]}/out" ./vscode/out
+ else
+ echo "Could not find lib/vscode/out or lib/vscode-reh-web-*"
+ echo "Code must be built before running unit tests"
+ # exit 1
+ fi
+ popd
+ fi
+
+ # We must keep jest in a sub-directory. See ../../test/package.json for more
+ # information. We must also run it from the root otherwise coverage will not
+ # include our source files.
+ CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --testRegex "./test/unit/.*ts" --testPathIgnorePatterns "./test/unit/node/test-plugin"
+}
+
+main "$@"
diff --git a/package.json b/package.json
index 9a5d61968f51..2833c02dfaa4 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"release:prep": "./ci/build/release-prep.sh",
"test:e2e": "VSCODE_IPC_HOOK_CLI= ./ci/dev/test-e2e.sh",
"test:e2e:proxy": "USE_PROXY=1 ./ci/dev/test-e2e.sh",
- "test:unit": "CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest --testRegex './test/unit/.*ts' --forceExit --detectOpenHandles",
+ "test:unit": "./ci/dev/test-unit.sh --forceExit --detectOpenHandles",
"test:integration": "./ci/dev/test-integration.sh",
"test:scripts": "./ci/dev/test-scripts.sh",
"package": "./ci/build/build-packages.sh",
From 90308733ce0cc4b75700453c6158406f2edcddb1 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 12:50:56 -0700
Subject: [PATCH 17/58] feat: collect codecov integration tests
---
.github/workflows/build.yaml | 8 ++++++++
ci/dev/test-integration.sh | 1 -
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6fb661496e1b..20aba5e92b1b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -382,6 +382,8 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 15
container: "centos:7"
+ env:
+ CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
steps:
- name: Checkout repo
@@ -438,6 +440,12 @@ jobs:
- name: Run integration tests on standalone release
run: yarn test:integration
+ - name: Upload coverage report to Codecov
+ uses: codecov/codecov-action@v3
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ if: success()
+
- name: Build packages with nfpm
run: yarn package
diff --git a/ci/dev/test-integration.sh b/ci/dev/test-integration.sh
index b2868154f67d..29051c72faa5 100755
--- a/ci/dev/test-integration.sh
+++ b/ci/dev/test-integration.sh
@@ -24,7 +24,6 @@ main() {
path="$CODE_SERVER_PATH"
fi
- # WIP jsjoeio
if [[ ! -f "test/integration/test-plugin/out/index.js" ]]; then
echo "Building test plugin"
pushd test/integration/test-plugin
From 1243d19c862ef804317bb8362f1551d503e5029e Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 12:51:13 -0700
Subject: [PATCH 18/58] fixup! feat: collect codecov integration tests
---
ci/dev/test-unit.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/dev/test-unit.sh b/ci/dev/test-unit.sh
index e832c1031201..fe631335aa33 100755
--- a/ci/dev/test-unit.sh
+++ b/ci/dev/test-unit.sh
@@ -17,7 +17,7 @@ main() {
else
echo "Could not find lib/vscode/out or lib/vscode-reh-web-*"
echo "Code must be built before running unit tests"
- # exit 1
+ exit 1
fi
popd
fi
From f339d0d47a00d98709c853fb55359db12b8fb8ca Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 12:52:02 -0700
Subject: [PATCH 19/58] fixup! feat: collect codecov integration tests
---
test/unit/node/app.test.ts | 2 +-
test/unit/node/routes/vscode.test.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/unit/node/app.test.ts b/test/unit/node/app.test.ts
index 36c004e460eb..a8b1dbd3ad32 100644
--- a/test/unit/node/app.test.ts
+++ b/test/unit/node/app.test.ts
@@ -236,7 +236,7 @@ describe("listen", () => {
jest.clearAllMocks()
})
- it.skip("should throw an error if a directory is passed in instead of a file", async () => {
+ it("should throw an error if a directory is passed in instead of a file", async () => {
const errorMessage = "EISDIR: illegal operation on a directory, unlink"
const port = await getAvailablePort()
const mockArgs = { port, host: "0.0.0.0", socket: tmpDirPath }
diff --git a/test/unit/node/routes/vscode.test.ts b/test/unit/node/routes/vscode.test.ts
index 5d3dbb63d944..105d732ebd28 100644
--- a/test/unit/node/routes/vscode.test.ts
+++ b/test/unit/node/routes/vscode.test.ts
@@ -6,7 +6,7 @@ import * as integration from "../../../utils/integration"
// TODO@jsjoeio - move these to integration tests since they rely on Code
// to be built
-describe.skip("vscode", () => {
+describe("vscode", () => {
let codeServer: httpserver.HttpServer | undefined
const testName = "vscode"
From 614f047e53d57b0b20aa5b56f85186ce680ec398 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 12:58:50 -0700
Subject: [PATCH 20/58] fixup!: move helm step
---
.github/workflows/build.yaml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 20aba5e92b1b..734dd7f6b512 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,14 +35,6 @@ jobs:
with:
node-version: "16"
- - name: Install helm
- uses: azure/setup-helm@v3.3
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Install helm kubeval plugin
- run: helm plugin install https://github.com/instrumenta/helm-kubeval
-
- name: Fetch dependencies from cache
id: cache-node-modules
uses: actions/cache@v3
@@ -83,6 +75,9 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
+ - name: Install helm kubeval plugin
+ run: helm plugin install https://github.com/instrumenta/helm-kubeval
+
- name: Lint Helm chart
if: steps.changed-files.outputs.any_changed == 'true'
run: ./ci/dev/helm.sh
From f9b3bda9d5ce0e3185b7dfd9205615871302e1d5 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 13:01:32 -0700
Subject: [PATCH 21/58] fixup!: update ids for caching
---
.github/workflows/build.yaml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 734dd7f6b512..52a650466eb9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -45,7 +45,7 @@ jobs:
yarn-build-
- name: Install dependencies
- if: steps.cache-yarn.outputs.cache-hit != 'true'
+ if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
- name: Format files with Prettier
@@ -110,7 +110,7 @@ jobs:
- name: Fetch dependencies from cache
if: steps.changed-files.outputs.any_changed == 'true'
- id: cache-yarn
+ id: cache-node-modules
uses: actions/cache@v3
with:
path: "node_modules"
@@ -119,7 +119,7 @@ jobs:
yarn-build-
- name: Install dependencies
- if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
+ if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-node-modules.outputs.cache-hit != 'true'
run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
- name: Lint shell files
@@ -157,7 +157,7 @@ jobs:
- name: Fetch dependencies from cache
if: steps.changed-files.outputs.any_changed == 'true'
- id: cache-yarn
+ id: cache-node-modules
uses: actions/cache@v3
with:
path: "node_modules"
@@ -166,7 +166,7 @@ jobs:
yarn-build-
- name: Install dependencies
- if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
+ if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-node-modules.outputs.cache-hit != 'true'
run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
- name: Lint TypeScript files
@@ -200,7 +200,7 @@ jobs:
- name: Fetch dependencies from cache
if: steps.changed-files.outputs.any_changed == 'true'
- id: cache-yarn
+ id: cache-node-modules
uses: actions/cache@v3
with:
path: "node_modules"
@@ -209,7 +209,7 @@ jobs:
yarn-build-
- name: Install dependencies
- if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-yarn.outputs.cache-hit != 'true'
+ if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-node-modules.outputs.cache-hit != 'true'
run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
- name: Run tsc on TypeScript files
From 4527d46a72ebba19db6f4f2e571ffacf5610a76a Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 13:07:32 -0700
Subject: [PATCH 22/58] trigger ci
From 6f7133b1490ff90d348f20250ff614e5b7df2483 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 13:08:26 -0700
Subject: [PATCH 23/58] trigger ci
From 08a7fdf93f89765fb13f269bd379a994935d2db5 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 19 Sep 2022 13:11:46 -0700
Subject: [PATCH 24/58] chore: clean up names in security.yaml
---
.github/workflows/security.yaml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml
index 80d73ddbfcc9..a0d2f1813c6f 100644
--- a/.github/workflows/security.yaml
+++ b/.github/workflows/security.yaml
@@ -1,4 +1,4 @@
-name: "Security Scanning"
+name: Security
on:
push:
@@ -19,7 +19,7 @@ concurrency:
jobs:
audit-ci:
- name: Run audit-ci
+ name: Audit node modules
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
@@ -51,6 +51,7 @@ jobs:
if: success()
trivy-scan-repo:
+ name: Scan repo with Trivy
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
@@ -82,7 +83,7 @@ jobs:
actions: read # for github/codeql-action/init to get workflow details
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/autobuild to send a status report
- name: Analyze
+ name: Analyze with CodeQL
runs-on: ubuntu-20.04
steps:
From e41dc6a55aef2b58daa845573c98f7a7e2143d09 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 14:18:16 -0700
Subject: [PATCH 25/58] fixup!: remove .tsx
---
.github/workflows/build.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 52a650466eb9..8016e60c2389 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -144,7 +144,6 @@ jobs:
with:
files: |
**.ts
- **.tsx
**.js
files_ignore: |
lib/vscode
From 65b74fc59fecfef2fe5a731ead59bd00174e5d74 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 14:19:36 -0700
Subject: [PATCH 26/58] fixup!: change to src/**"
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8016e60c2389..aebe77320d05 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -189,7 +189,7 @@ jobs:
uses: tj-actions/changed-files@v23.2
with:
files: |
- ./src/**/*
+ src/**
- name: Install Node.js v16
if: steps.changed-files.outputs.any_changed == 'true'
From 72d69b6cfd098231b7eebb94a79ac4347cc4a117 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 14:26:10 -0700
Subject: [PATCH 27/58] fixup!: move helm cmd to yaml
---
.github/workflows/build.yaml | 2 +-
ci/dev/helm.sh | 14 --------------
package.json | 1 -
3 files changed, 1 insertion(+), 16 deletions(-)
delete mode 100755 ci/dev/helm.sh
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index aebe77320d05..a5a5dc779cb4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -80,7 +80,7 @@ jobs:
- name: Lint Helm chart
if: steps.changed-files.outputs.any_changed == 'true'
- run: ./ci/dev/helm.sh
+ run: helm kubeval ci/helm-chart
- name: Fail workflow
if: failure()
diff --git a/ci/dev/helm.sh b/ci/dev/helm.sh
deleted file mode 100755
index 895db6542112..000000000000
--- a/ci/dev/helm.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-main() {
- cd "$(dirname "$0")/../.."
-
- if command -v helm && helm kubeval --help > /dev/null; then
- helm kubeval ci/helm-chart
- fi
-
- cd "$OLDPWD"
-}
-
-main "$@"
diff --git a/package.json b/package.json
index 2833c02dfaa4..73b1e4c9facf 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
"publish:docker": "./ci/steps/docker-buildx-push.sh",
"_audit": "./ci/dev/audit.sh",
"fmt": "./ci/dev/fmt.sh",
- "lint:helm": "./ci/dedv/helm.sh",
"lint:sh": "shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files '*.sh' | grep -v 'lib/vscode')",
"lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.tsx' '*.js' | grep -v 'lib/vscode')",
"test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
From 88119c2893bc78bc379c0ca59c1b21d5063f4567 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 14:27:34 -0700
Subject: [PATCH 28/58] fixup!: always build test plugin
---
ci/dev/test-integration.sh | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/ci/dev/test-integration.sh b/ci/dev/test-integration.sh
index 29051c72faa5..fa2adb59a234 100755
--- a/ci/dev/test-integration.sh
+++ b/ci/dev/test-integration.sh
@@ -24,12 +24,10 @@ main() {
path="$CODE_SERVER_PATH"
fi
- if [[ ! -f "test/integration/test-plugin/out/index.js" ]]; then
- echo "Building test plugin"
- pushd test/integration/test-plugin
- make -s out/index.js
- popd
- fi
+ echo "Building test plugin"
+ pushd test/integration/test-plugin
+ make -s out/index.js
+ popd
echo "Running tests with code-server binary: '$path'"
From f7dd9a672dd8e19f72e221e59a479f02d5b5baf4 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 14:31:14 -0700
Subject: [PATCH 29/58] fixup!: fix plugin typings
---
test/integration/test-plugin/src/index.ts | 2 --
test/integration/test-plugin/tsconfig.json | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/test/integration/test-plugin/src/index.ts b/test/integration/test-plugin/src/index.ts
index 2d34ad17a3c7..3ecbe721991f 100644
--- a/test/integration/test-plugin/src/index.ts
+++ b/test/integration/test-plugin/src/index.ts
@@ -1,5 +1,3 @@
-// TODO@jsjoeio - how do I fix this?
-// @ts-ignore - we know code-server exists
import * as cs from "code-server"
import * as fspath from "path"
diff --git a/test/integration/test-plugin/tsconfig.json b/test/integration/test-plugin/tsconfig.json
index 194af1418df9..bb30a1adc018 100644
--- a/test/integration/test-plugin/tsconfig.json
+++ b/test/integration/test-plugin/tsconfig.json
@@ -44,7 +44,7 @@
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
"baseUrl": "./" /* Base directory to resolve non-absolute module names. */,
"paths": {
- "code-server": ["../../../../typings/pluginapi"]
+ "code-server": ["../../../typings/pluginapi"]
} /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */,
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
From f9ecaaa882f5b7c8bb838d65cd19be6f93691d10 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 14:32:59 -0700
Subject: [PATCH 30/58] fixup! add back flakey test
---
test/unit/node/app.test.ts | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/test/unit/node/app.test.ts b/test/unit/node/app.test.ts
index a8b1dbd3ad32..b2c169a2e429 100644
--- a/test/unit/node/app.test.ts
+++ b/test/unit/node/app.test.ts
@@ -107,6 +107,18 @@ describe("createApp", () => {
app.dispose()
})
+ it("should change the file mode of a socket", async () => {
+ const defaultArgs = await setDefaults({
+ socket: tmpFilePath,
+ "socket-mode": "777",
+ })
+
+ const app = await createApp(defaultArgs)
+
+ expect((await promises.stat(tmpFilePath)).mode & 0o777).toBe(0o777)
+ app.dispose()
+ })
+
it("should create an https server if args.cert exists", async () => {
const testCertificate = await generateCertificate("localhost")
const cert = new OptionalString(testCertificate.cert)
From ed1cd54d5e0d338313922aab7c07549179844c26 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 14:34:08 -0700
Subject: [PATCH 31/58] fixup!: only install helm deps if changes
---
.github/workflows/build.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a5a5dc779cb4..ff205107ed2a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,11 +71,13 @@ jobs:
ci/helm-chart/**
- name: Install helm
+ if: steps.changed-files.outputs.any_changed == 'true'
uses: azure/setup-helm@v3.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Install helm kubeval plugin
+ if: steps.changed-files.outputs.any_changed == 'true'
run: helm plugin install https://github.com/instrumenta/helm-kubeval
- name: Lint Helm chart
From d95a3b556626ffb4314d00adbac0bca34fc4f24c Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 14:41:29 -0700
Subject: [PATCH 32/58] fixup!: revert node mod caching
---
.github/workflows/build.yaml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ff205107ed2a..32770f2013a3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -39,8 +39,8 @@ jobs:
id: cache-node-modules
uses: actions/cache@v3
with:
- path: "node_modules"
- key: yarn-build-${{ hashFiles('yarn.lock') }}
+ path: "**/node_modules"
+ key: yarn-build-${{ hashFiles('**yarn.lock') }}
restore-keys: |
yarn-build-
@@ -115,8 +115,8 @@ jobs:
id: cache-node-modules
uses: actions/cache@v3
with:
- path: "node_modules"
- key: yarn-build-${{ hashFiles('yarn.lock') }}
+ path: "**/node_modules"
+ key: yarn-build-${{ hashFiles('**yarn.lock') }}
restore-keys: |
yarn-build-
@@ -161,8 +161,8 @@ jobs:
id: cache-node-modules
uses: actions/cache@v3
with:
- path: "node_modules"
- key: yarn-build-${{ hashFiles('yarn.lock') }}
+ path: "**/node_modules"
+ key: yarn-build-${{ hashFiles('**yarn.lock') }}
restore-keys: |
yarn-build-
@@ -204,8 +204,8 @@ jobs:
id: cache-node-modules
uses: actions/cache@v3
with:
- path: "node_modules"
- key: yarn-build-${{ hashFiles('yarn.lock') }}
+ path: "**/node_modules"
+ key: yarn-build-${{ hashFiles('**yarn.lock') }}
restore-keys: |
yarn-build-
From 7d5ad00061668b574b50fb9e6e79265dce75a967 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 14:46:04 -0700
Subject: [PATCH 33/58] dont keep, test for asher
---
package.json | 2 +-
yarn.lock | 97 +++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 94 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 73b1e4c9facf..d6db46f7df9b 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
"eslint-plugin-prettier": "^4.0.0",
"prettier": "^2.2.1",
"prettier-plugin-sh": "^0.12.0",
- "shellcheck": "^1.0.0",
+ "shellcheck": "^1.1.0",
"ts-node": "^10.0.0",
"typescript": "^4.6.2"
},
diff --git a/yarn.lock b/yarn.lock
index 29c5409808b3..b2f2ee166053 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -592,6 +592,11 @@ body-parser@1.19.0:
raw-body "2.4.0"
type-is "~1.6.17"
+boolean@^3.0.1:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
+ integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
+
boundary@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz#4d67dc2602c0cc16dd9bce7ebf87e948290f5812"
@@ -940,6 +945,11 @@ detect-libc@^2.0.0:
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
+detect-node@^2.0.4:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+ integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
+
diff@^4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -1100,6 +1110,11 @@ es-to-primitive@^1.2.1:
is-date-object "^1.0.1"
is-symbol "^1.0.2"
+es6-error@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
+ integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
+
es6-promisify@^6.0.0:
version "6.1.1"
resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz#46837651b7b06bf6fff893d03f29393668d01621"
@@ -1622,6 +1637,18 @@ glob@^7.1.7:
once "^1.3.0"
path-is-absolute "^1.0.0"
+global-agent@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
+ integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
+ dependencies:
+ boolean "^3.0.1"
+ es6-error "^4.1.1"
+ matcher "^3.0.0"
+ roarr "^2.15.3"
+ semver "^7.3.2"
+ serialize-error "^7.0.1"
+
globals@^13.6.0, globals@^13.9.0:
version "13.9.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"
@@ -1629,6 +1656,13 @@ globals@^13.6.0, globals@^13.9.0:
dependencies:
type-fest "^0.20.2"
+globalthis@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+ integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+ dependencies:
+ define-properties "^1.1.3"
+
globby@^11.0.4:
version "11.0.4"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
@@ -2020,6 +2054,11 @@ json-stable-stringify-without-jsonify@^1.0.1:
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+json-stringify-safe@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+ integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
json5@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -2134,6 +2173,13 @@ markdown-escapes@^1.0.0:
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
+matcher@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
+ integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==
+ dependencies:
+ escape-string-regexp "^4.0.0"
+
md5@^2.2.1:
version "2.3.0"
resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
@@ -2797,6 +2843,18 @@ rimraf@^3.0.2:
dependencies:
glob "^7.1.3"
+roarr@^2.15.3:
+ version "2.15.4"
+ resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
+ integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==
+ dependencies:
+ boolean "^3.0.1"
+ detect-node "^2.0.4"
+ globalthis "^1.0.1"
+ json-stringify-safe "^5.0.1"
+ semver-compare "^1.0.0"
+ sprintf-js "^1.1.2"
+
rotating-file-stream@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/rotating-file-stream/-/rotating-file-stream-3.0.0.tgz#5193da921808dc98e1e60595fb2f32d33d622884"
@@ -2839,6 +2897,11 @@ safe-compare@^1.1.4:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+semver-compare@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+ integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
+
semver@^6.0.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -2851,6 +2914,13 @@ semver@^7.0.0, semver@^7.1.3, semver@^7.2.1, semver@^7.3.5:
dependencies:
lru-cache "^6.0.0"
+semver@^7.3.2:
+ version "7.3.7"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+ integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+ dependencies:
+ lru-cache "^6.0.0"
+
send@0.17.1:
version "0.17.1"
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -2870,6 +2940,13 @@ send@0.17.1:
range-parser "~1.2.1"
statuses "~1.5.0"
+serialize-error@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
+ integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==
+ dependencies:
+ type-fest "^0.13.1"
+
serve-static@1.14.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
@@ -2912,10 +2989,12 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-shellcheck@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/shellcheck/-/shellcheck-1.0.0.tgz#263479d92c3708d63d98883f896481461cf17cd0"
- integrity sha512-CdKbWXOknBwE1wNQzAnwfLf7QNOu/yqyLSGBKoq2WuChEqfg7dnZJ1pHR2P463PbVpBRz3KGkYnXJCoQrPwtYA==
+shellcheck@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/shellcheck/-/shellcheck-1.1.0.tgz#ccf1f1815acef0b337d9f2deeecd62ba509e85e1"
+ integrity sha512-WtLqgjHg7667gGU+0dPV1EtoQgYL/Zxc4fhRt6Z3kfpASG3J08TBJ990HVIUnN/YWUBKMr3FVbBYlEvPVJ24bA==
+ dependencies:
+ global-agent "^3.0.0"
side-channel@^1.0.4:
version "1.0.4"
@@ -3018,6 +3097,11 @@ split@^1.0.1:
dependencies:
through "2"
+sprintf-js@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+ integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
sprintf-js@~1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -3265,6 +3349,11 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
+type-fest@^0.13.1:
+ version "0.13.1"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
+ integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
+
type-fest@^0.20.2:
version "0.20.2"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
From af37f1f62c884c7088f7c26cfa7007e2b76a6fcf Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 20 Sep 2022 15:07:47 -0700
Subject: [PATCH 34/58] fixup!: add make to centos
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 32770f2013a3..d445e9057c22 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -392,7 +392,7 @@ jobs:
- name: Install development tools
run: |
- yum install -y epel-release centos-release-scl
+ yum install -y epel-release centos-release-scl make
yum install -y devtoolset-9-{make,gcc,gcc-c++} jq rsync python3
- name: Install nfpm and envsubst
From eae094c0d60e2cc3de19dd3c8ffedd3b768bb76d Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 21 Sep 2022 11:28:27 -0700
Subject: [PATCH 35/58] refactor: add test:native
This adds a new script to run native tests (i.e. --help which should run
in ci on all platforms).
---
.github/workflows/build.yaml | 4 ++--
ci/dev/test-native.sh | 39 ++++++++++++++++++++++++++++++++++++
package.json | 1 +
3 files changed, 42 insertions(+), 2 deletions(-)
create mode 100755 ci/dev/test-native.sh
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d445e9057c22..2d2d91bca383 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -581,8 +581,8 @@ jobs:
if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: SKIP_SUBMODULE_DEPS=1 yarn install
- - name: Run integration tests on standalone release
- run: yarn test:integration
+ - name: Run native module tests on standalone release
+ run: yarn test:native
- name: Build packages with nfpm
run: yarn package
diff --git a/ci/dev/test-native.sh b/ci/dev/test-native.sh
new file mode 100755
index 000000000000..9362be05393e
--- /dev/null
+++ b/ci/dev/test-native.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+help() {
+ echo >&2 " You can build the standalone release with 'yarn release:standalone'"
+ echo >&2 " Or you can pass in a custom path."
+ echo >&2 " CODE_SERVER_PATH='/var/tmp/coder/code-server/bin/code-server' yarn test:integration"
+}
+
+# Make sure a code-server release works. You can pass in the path otherwise it
+# will look for release-standalone in the current directory.
+#
+# This is to make sure we don't have Node version errors or any other
+# compilation-related errors.
+main() {
+ cd "$(dirname "$0")/../.."
+
+ source ./ci/lib.sh
+
+ local path="$RELEASE_PATH-standalone/bin/code-server"
+ if [[ ! ${CODE_SERVER_PATH-} ]]; then
+ echo "Set CODE_SERVER_PATH to test another build of code-server"
+ else
+ path="$CODE_SERVER_PATH"
+ fi
+
+ echo "Running tests with code-server binary: '$path'"
+
+ if [[ ! -f $path ]]; then
+ echo >&2 "No code-server build detected"
+ echo >&2 "Looked in $path"
+ help
+ exit 1
+ fi
+
+ CODE_SERVER_PATH="$path" ./test/node_modules/.bin/jest "$@" --coverage=false --testRegex "./test/integration/help.test.ts"
+}
+
+main "$@"
diff --git a/package.json b/package.json
index d6db46f7df9b..523b0b7772ed 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
"test:e2e:proxy": "USE_PROXY=1 ./ci/dev/test-e2e.sh",
"test:unit": "./ci/dev/test-unit.sh --forceExit --detectOpenHandles",
"test:integration": "./ci/dev/test-integration.sh",
+ "test:native": "./ci/dev/test-native.sh",
"test:scripts": "./ci/dev/test-scripts.sh",
"package": "./ci/build/build-packages.sh",
"postinstall": "./ci/dev/postinstall.sh",
From 02ed560f223a8505cb5e6e2014055cb256a407b0 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 21 Sep 2022 11:47:12 -0700
Subject: [PATCH 36/58] try updating glibc
---
.github/workflows/build.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2d2d91bca383..d6b23f9dbf70 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -394,6 +394,7 @@ jobs:
run: |
yum install -y epel-release centos-release-scl make
yum install -y devtoolset-9-{make,gcc,gcc-c++} jq rsync python3
+ yum update -y glibc
- name: Install nfpm and envsubst
run: |
From 9a1cd349a17a9a896c06e7f1fea6711340b5854b Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 21 Sep 2022 12:03:54 -0700
Subject: [PATCH 37/58] try 2.25
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d6b23f9dbf70..51a5f65d31cf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -394,7 +394,7 @@ jobs:
run: |
yum install -y epel-release centos-release-scl make
yum install -y devtoolset-9-{make,gcc,gcc-c++} jq rsync python3
- yum update -y glibc
+ yum update -y glibc-2.25
- name: Install nfpm and envsubst
run: |
From 7d43eaac95a4e410ea4c66770cf3b3c9140cd3e0 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 21 Sep 2022 12:13:15 -0700
Subject: [PATCH 38/58] Revert "refactor: move test-plugin to integration
suite"
This reverts commit bc02005dc097a10b5216b616ff0bd7a911240748.
I couldn't get past some GLIBC errors in CI so moving back to unit
tests.
---
ci/dev/test-integration.sh | 7 +------
ci/dev/test-unit.sh | 7 +++++++
test/tsconfig.json | 3 ++-
test/{integration => unit/node}/plugin.test.ts | 10 +++++-----
.../node}/test-plugin/.eslintrc.js | 0
.../node}/test-plugin/.gitignore | 0
test/{integration => unit/node}/test-plugin/Makefile | 0
.../node}/test-plugin/package.json | 0
.../node}/test-plugin/public/icon.svg | 0
.../node}/test-plugin/public/index.html | 0
.../node}/test-plugin/src/index.ts | 12 +++++-------
.../node}/test-plugin/tsconfig.json | 0
.../{integration => unit/node}/test-plugin/yarn.lock | 0
13 files changed, 20 insertions(+), 19 deletions(-)
rename test/{integration => unit/node}/plugin.test.ts (92%)
rename test/{integration => unit/node}/test-plugin/.eslintrc.js (100%)
rename test/{integration => unit/node}/test-plugin/.gitignore (100%)
rename test/{integration => unit/node}/test-plugin/Makefile (100%)
rename test/{integration => unit/node}/test-plugin/package.json (100%)
rename test/{integration => unit/node}/test-plugin/public/icon.svg (100%)
rename test/{integration => unit/node}/test-plugin/public/index.html (100%)
rename test/{integration => unit/node}/test-plugin/src/index.ts (77%)
rename test/{integration => unit/node}/test-plugin/tsconfig.json (100%)
rename test/{integration => unit/node}/test-plugin/yarn.lock (100%)
diff --git a/ci/dev/test-integration.sh b/ci/dev/test-integration.sh
index fa2adb59a234..2d46bb895561 100755
--- a/ci/dev/test-integration.sh
+++ b/ci/dev/test-integration.sh
@@ -24,11 +24,6 @@ main() {
path="$CODE_SERVER_PATH"
fi
- echo "Building test plugin"
- pushd test/integration/test-plugin
- make -s out/index.js
- popd
-
echo "Running tests with code-server binary: '$path'"
if [[ ! -f $path ]]; then
@@ -38,7 +33,7 @@ main() {
exit 1
fi
- CODE_SERVER_PATH="$path" CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --coverage=false --testRegex "./test/integration" --testPathIgnorePatterns "./test/integration/fixtures" --testPathIgnorePatterns "./test/integration/test-plugin"
+ CODE_SERVER_PATH="$path" CS_DISABLE_PLUGINS=true ./test/node_modules/.bin/jest "$@" --coverage=false --testRegex "./test/integration" --testPathIgnorePatterns "./test/integration/fixtures"
}
main "$@"
diff --git a/ci/dev/test-unit.sh b/ci/dev/test-unit.sh
index fe631335aa33..07cb4d9ab53c 100755
--- a/ci/dev/test-unit.sh
+++ b/ci/dev/test-unit.sh
@@ -6,6 +6,13 @@ main() {
source ./ci/lib.sh
+ # TODO@jsjoeio - skip if already built
+ # TODO@jsjoeio - move to integration test suite too
+ echo "Building test plugin"
+ pushd test/unit/node/test-plugin
+ make -s out/index.js
+ popd
+
# Our code imports from `out` in order to work during development but if you
# have only built for production you will have not have this directory. In
# that case symlink `out` to a production build directory.
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 5197ce2769f4..3e568e887dd6 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,4 +1,5 @@
{
"extends": "../tsconfig.json",
- "include": ["./**/*.ts"]
+ "include": ["./**/*.ts"],
+ "exclude": ["./unit/node/test-plugin"]
}
diff --git a/test/integration/plugin.test.ts b/test/unit/node/plugin.test.ts
similarity index 92%
rename from test/integration/plugin.test.ts
rename to test/unit/node/plugin.test.ts
index 2df91d0c515c..88210fd8594a 100644
--- a/test/integration/plugin.test.ts
+++ b/test/unit/node/plugin.test.ts
@@ -2,11 +2,11 @@ import { logger } from "@coder/logger"
import * as express from "express"
import * as fs from "fs"
import * as path from "path"
-import { HttpCode } from "../../src/common/http"
-import { AuthType } from "../../src/node/cli"
-import { codeServer, PluginAPI } from "../../src/node/plugin"
-import * as apps from "../../src/node/routes/apps"
-import * as httpserver from "../utils/httpserver"
+import { HttpCode } from "../../../src/common/http"
+import { AuthType } from "../../../src/node/cli"
+import { codeServer, PluginAPI } from "../../../src/node/plugin"
+import * as apps from "../../../src/node/routes/apps"
+import * as httpserver from "../../utils/httpserver"
const fsp = fs.promises
// Jest overrides `require` so our usual override doesn't work.
diff --git a/test/integration/test-plugin/.eslintrc.js b/test/unit/node/test-plugin/.eslintrc.js
similarity index 100%
rename from test/integration/test-plugin/.eslintrc.js
rename to test/unit/node/test-plugin/.eslintrc.js
diff --git a/test/integration/test-plugin/.gitignore b/test/unit/node/test-plugin/.gitignore
similarity index 100%
rename from test/integration/test-plugin/.gitignore
rename to test/unit/node/test-plugin/.gitignore
diff --git a/test/integration/test-plugin/Makefile b/test/unit/node/test-plugin/Makefile
similarity index 100%
rename from test/integration/test-plugin/Makefile
rename to test/unit/node/test-plugin/Makefile
diff --git a/test/integration/test-plugin/package.json b/test/unit/node/test-plugin/package.json
similarity index 100%
rename from test/integration/test-plugin/package.json
rename to test/unit/node/test-plugin/package.json
diff --git a/test/integration/test-plugin/public/icon.svg b/test/unit/node/test-plugin/public/icon.svg
similarity index 100%
rename from test/integration/test-plugin/public/icon.svg
rename to test/unit/node/test-plugin/public/icon.svg
diff --git a/test/integration/test-plugin/public/index.html b/test/unit/node/test-plugin/public/index.html
similarity index 100%
rename from test/integration/test-plugin/public/index.html
rename to test/unit/node/test-plugin/public/index.html
diff --git a/test/integration/test-plugin/src/index.ts b/test/unit/node/test-plugin/src/index.ts
similarity index 77%
rename from test/integration/test-plugin/src/index.ts
rename to test/unit/node/test-plugin/src/index.ts
index 3ecbe721991f..22ef723bac1a 100644
--- a/test/integration/test-plugin/src/index.ts
+++ b/test/unit/node/test-plugin/src/index.ts
@@ -1,24 +1,22 @@
import * as cs from "code-server"
import * as fspath from "path"
-type FixMeLater = any
-
export const plugin: cs.Plugin = {
displayName: "Test Plugin",
routerPath: "/test-plugin",
homepageURL: "https://example.com",
description: "Plugin used in code-server tests.",
- init(config: FixMeLater) {
+ init(config) {
config.logger.debug("test-plugin loaded!")
},
router() {
const r = cs.express.Router()
- r.get("/test-app", (_: FixMeLater, res: FixMeLater) => {
+ r.get("/test-app", (_, res) => {
res.sendFile(fspath.resolve(__dirname, "../public/index.html"))
})
- r.get("/goland/icon.svg", (_: FixMeLater, res: FixMeLater) => {
+ r.get("/goland/icon.svg", (_, res) => {
res.sendFile(fspath.resolve(__dirname, "../public/icon.svg"))
})
r.get("/error", () => {
@@ -29,8 +27,8 @@ export const plugin: cs.Plugin = {
wsRouter() {
const wr = cs.WsRouter()
- wr.ws("/test-app", (req: FixMeLater) => {
- cs.wss.handleUpgrade(req, req.ws, req.head, (ws: FixMeLater) => {
+ wr.ws("/test-app", (req) => {
+ cs.wss.handleUpgrade(req, req.ws, req.head, (ws) => {
req.ws.resume()
ws.send("hello")
})
diff --git a/test/integration/test-plugin/tsconfig.json b/test/unit/node/test-plugin/tsconfig.json
similarity index 100%
rename from test/integration/test-plugin/tsconfig.json
rename to test/unit/node/test-plugin/tsconfig.json
diff --git a/test/integration/test-plugin/yarn.lock b/test/unit/node/test-plugin/yarn.lock
similarity index 100%
rename from test/integration/test-plugin/yarn.lock
rename to test/unit/node/test-plugin/yarn.lock
From 4c9413795930c24de6546739acb71eb187b65bcd Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 21 Sep 2022 12:14:29 -0700
Subject: [PATCH 39/58] Revert "try updating glibc"
This reverts commit 02ed560f223a8505cb5e6e2014055cb256a407b0.
---
.github/workflows/build.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 51a5f65d31cf..2d2d91bca383 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -394,7 +394,6 @@ jobs:
run: |
yum install -y epel-release centos-release-scl make
yum install -y devtoolset-9-{make,gcc,gcc-c++} jq rsync python3
- yum update -y glibc-2.25
- name: Install nfpm and envsubst
run: |
From 5de48da8bf971a6b0ff22527aadfa5c91bf48f4a Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 21 Sep 2022 12:20:18 -0700
Subject: [PATCH 40/58] fixup!
---
ci/dev/test-unit.sh | 2 --
test/unit/node/test-plugin/tsconfig.json | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/ci/dev/test-unit.sh b/ci/dev/test-unit.sh
index 07cb4d9ab53c..b3e0b14c908c 100755
--- a/ci/dev/test-unit.sh
+++ b/ci/dev/test-unit.sh
@@ -6,8 +6,6 @@ main() {
source ./ci/lib.sh
- # TODO@jsjoeio - skip if already built
- # TODO@jsjoeio - move to integration test suite too
echo "Building test plugin"
pushd test/unit/node/test-plugin
make -s out/index.js
diff --git a/test/unit/node/test-plugin/tsconfig.json b/test/unit/node/test-plugin/tsconfig.json
index bb30a1adc018..194af1418df9 100644
--- a/test/unit/node/test-plugin/tsconfig.json
+++ b/test/unit/node/test-plugin/tsconfig.json
@@ -44,7 +44,7 @@
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
"baseUrl": "./" /* Base directory to resolve non-absolute module names. */,
"paths": {
- "code-server": ["../../../typings/pluginapi"]
+ "code-server": ["../../../../typings/pluginapi"]
} /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */,
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
From 77adf7bda85a2471ee661491bd3c73da5aafc563 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 21 Sep 2022 14:32:23 -0700
Subject: [PATCH 41/58] asher: again
---
.github/workflows/build.yaml | 8 ++++----
package.json | 2 +-
src/node/entry.ts | 1 +
yarn.lock | 8 ++++----
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2d2d91bca383..81f2e459ecb2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -101,8 +101,8 @@ jobs:
uses: tj-actions/changed-files@v23.2
with:
files: |
- **.sh
- **.bats
+ *.sh
+ *.bats
- name: Install Node.js v16
if: steps.changed-files.outputs.any_changed == 'true'
@@ -145,8 +145,8 @@ jobs:
uses: tj-actions/changed-files@v23.2
with:
files: |
- **.ts
- **.js
+ *.ts
+ *.js
files_ignore: |
lib/vscode
diff --git a/package.json b/package.json
index 523b0b7772ed..3412def2304f 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
"audit-ci": "^6.0.0",
"doctoc": "^2.0.0",
"eslint": "^7.7.0",
- "eslint-config-prettier": "^8.1.0",
+ "eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^2.5.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-prettier": "^4.0.0",
diff --git a/src/node/entry.ts b/src/node/entry.ts
index 2a62ac77a1da..328a49026ac8 100644
--- a/src/node/entry.ts
+++ b/src/node/entry.ts
@@ -60,6 +60,7 @@ async function entry(): Promise<void> {
return wrapper.start(args)
}
+// ignore me
entry().catch((error) => {
logger.error(error.message)
wrapper.exit(error)
diff --git a/yarn.lock b/yarn.lock
index b2f2ee166053..189961b3c586 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1152,10 +1152,10 @@ escodegen@^1.8.1:
optionalDependencies:
source-map "~0.6.1"
-eslint-config-prettier@^8.1.0:
- version "8.3.0"
- resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
- integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
+eslint-config-prettier@^8.5.0:
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
+ integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
eslint-import-resolver-node@^0.3.4:
version "0.3.4"
From 97842c403d10944ff4d29e49ecdf99bf87b4313a Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 21 Sep 2022 15:24:17 -0700
Subject: [PATCH 42/58] try this for ts changes
---
.github/workflows/build.yaml | 4 ++--
src/node/entry.ts | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 81f2e459ecb2..91c83b49b1b1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -145,8 +145,8 @@ jobs:
uses: tj-actions/changed-files@v23.2
with:
files: |
- *.ts
- *.js
+ **/*.ts
+ **/*.js
files_ignore: |
lib/vscode
diff --git a/src/node/entry.ts b/src/node/entry.ts
index 328a49026ac8..2a62ac77a1da 100644
--- a/src/node/entry.ts
+++ b/src/node/entry.ts
@@ -60,7 +60,6 @@ async function entry(): Promise<void> {
return wrapper.start(args)
}
-// ignore me
entry().catch((error) => {
logger.error(error.message)
wrapper.exit(error)
From 6c8261a1617782dae82e5139a3694bbbef869e15 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 21 Sep 2022 15:26:29 -0700
Subject: [PATCH 43/58] fixup
---
.github/workflows/build.yaml | 4 ++--
package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 91c83b49b1b1..bc60b71f63e3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -101,8 +101,8 @@ jobs:
uses: tj-actions/changed-files@v23.2
with:
files: |
- *.sh
- *.bats
+ **/*.sh
+ **/*.bats
- name: Install Node.js v16
if: steps.changed-files.outputs.any_changed == 'true'
diff --git a/package.json b/package.json
index 3412def2304f..0a8bce3e768b 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
"_audit": "./ci/dev/audit.sh",
"fmt": "./ci/dev/fmt.sh",
"lint:sh": "shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files '*.sh' | grep -v 'lib/vscode')",
- "lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.tsx' '*.js' | grep -v 'lib/vscode')",
+ "lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.js' | grep -v 'lib/vscode')",
"test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
"typecheck": "tsc -p tsconfig.json --noEmit --skipLibCheck",
"ci": "./ci/dev/ci.sh",
From c57dfe513199509ea6b2abce68442816e7df957a Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 09:56:35 -0700
Subject: [PATCH 44/58] refactor: scripts.yml -> scripts.yaml
---
.github/workflows/{scripts.yml => scripts.yaml} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename .github/workflows/{scripts.yml => scripts.yaml} (100%)
diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yaml
similarity index 100%
rename from .github/workflows/scripts.yml
rename to .github/workflows/scripts.yaml
From 5a6d4862fb2548ade1b0cbce8b93078cb88f1728 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:21:41 -0700
Subject: [PATCH 45/58] fixup!: move lint-sh to scripts.yaml
---
.github/workflows/build.yaml | 44 ----------------------------------
.github/workflows/scripts.yaml | 28 ++++++++++++++++++++++
2 files changed, 28 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bc60b71f63e3..92aa25140435 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -88,50 +88,6 @@ jobs:
if: failure()
uses: andymckay/cancel-action@0.2
- lint-sh:
- name: Lint shell files
- runs-on: ubuntu-latest
- timeout-minutes: 5
- steps:
- - name: Checkout repo
- uses: actions/checkout@v3
-
- - name: Get changed files
- id: changed-files
- uses: tj-actions/changed-files@v23.2
- with:
- files: |
- **/*.sh
- **/*.bats
-
- - name: Install Node.js v16
- if: steps.changed-files.outputs.any_changed == 'true'
- uses: actions/setup-node@v3
- with:
- node-version: "16"
-
- - name: Fetch dependencies from cache
- if: steps.changed-files.outputs.any_changed == 'true'
- id: cache-node-modules
- uses: actions/cache@v3
- with:
- path: "**/node_modules"
- key: yarn-build-${{ hashFiles('**yarn.lock') }}
- restore-keys: |
- yarn-build-
-
- - name: Install dependencies
- if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-node-modules.outputs.cache-hit != 'true'
- run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
-
- - name: Lint shell files
- if: steps.changed-files.outputs.any_changed == 'true'
- run: yarn lint:sh
-
- - name: Fail workflow
- if: failure()
- uses: andymckay/cancel-action@0.2
-
lint-ts:
name: Lint TypeScript files
runs-on: ubuntu-latest
diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml
index d2b3f7203abf..8c2e72682d55 100644
--- a/.github/workflows/scripts.yaml
+++ b/.github/workflows/scripts.yaml
@@ -51,3 +51,31 @@ jobs:
- name: Run script unit tests
run: ./ci/dev/test-scripts.sh
+ lint:
+ name: Lint shell files
+ runs-on: ubuntu-latest
+ timeout-minutes: 5
+ steps:
+ - name: Checkout repo
+ uses: actions/checkout@v3
+
+ - name: Install Node.js v16
+ uses: actions/setup-node@v3
+ with:
+ node-version: "16"
+
+ - name: Fetch dependencies from cache
+ id: cache-node-modules
+ uses: actions/cache@v3
+ with:
+ path: "**/node_modules"
+ key: yarn-build-${{ hashFiles('**yarn.lock') }}
+ restore-keys: |
+ yarn-build-
+
+ - name: Install dependencies
+ if: steps.cache-node-modules.outputs.cache-hit != 'true'
+ run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+
+ - name: Lint shell files
+ run: yarn lint:sh
From 33163e84c8df26b861bc991cccc86ce39ec58041 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:26:37 -0700
Subject: [PATCH 46/58] fixup!: use apk for lint scripts
---
.github/workflows/scripts.yaml | 22 ++------
package.json | 3 +-
yarn.lock | 94 ----------------------------------
3 files changed, 5 insertions(+), 114 deletions(-)
diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml
index 8c2e72682d55..911768ddbb5a 100644
--- a/.github/workflows/scripts.yaml
+++ b/.github/workflows/scripts.yaml
@@ -51,6 +51,7 @@ jobs:
- name: Run script unit tests
run: ./ci/dev/test-scripts.sh
+
lint:
name: Lint shell files
runs-on: ubuntu-latest
@@ -59,23 +60,8 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v3
- - name: Install Node.js v16
- uses: actions/setup-node@v3
- with:
- node-version: "16"
-
- - name: Fetch dependencies from cache
- id: cache-node-modules
- uses: actions/cache@v3
- with:
- path: "**/node_modules"
- key: yarn-build-${{ hashFiles('**yarn.lock') }}
- restore-keys: |
- yarn-build-
-
- - name: Install dependencies
- if: steps.cache-node-modules.outputs.cache-hit != 'true'
- run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+ - name: Install lint utilities
+ run: apk add shellcheck
- name: Lint shell files
- run: yarn lint:sh
+ run: ./ci/dev/lint-scripts.sh
diff --git a/package.json b/package.json
index 0a8bce3e768b..145b49a1b929 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
"publish:docker": "./ci/steps/docker-buildx-push.sh",
"_audit": "./ci/dev/audit.sh",
"fmt": "./ci/dev/fmt.sh",
- "lint:sh": "shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files '*.sh' | grep -v 'lib/vscode')",
+ "lint:scripts": "./ci/dev/lint-scripts.sh",
"lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.js' | grep -v 'lib/vscode')",
"test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
"typecheck": "tsc -p tsconfig.json --noEmit --skipLibCheck",
@@ -62,7 +62,6 @@
"eslint-plugin-prettier": "^4.0.0",
"prettier": "^2.2.1",
"prettier-plugin-sh": "^0.12.0",
- "shellcheck": "^1.1.0",
"ts-node": "^10.0.0",
"typescript": "^4.6.2"
},
diff --git a/yarn.lock b/yarn.lock
index 189961b3c586..6097c74bccde 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -592,11 +592,6 @@ body-parser@1.19.0:
raw-body "2.4.0"
type-is "~1.6.17"
-boolean@^3.0.1:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
- integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
-
boundary@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz#4d67dc2602c0cc16dd9bce7ebf87e948290f5812"
@@ -945,11 +940,6 @@ detect-libc@^2.0.0:
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
-detect-node@^2.0.4:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
- integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
-
diff@^4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -1110,11 +1100,6 @@ es-to-primitive@^1.2.1:
is-date-object "^1.0.1"
is-symbol "^1.0.2"
-es6-error@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
- integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
-
es6-promisify@^6.0.0:
version "6.1.1"
resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz#46837651b7b06bf6fff893d03f29393668d01621"
@@ -1637,18 +1622,6 @@ glob@^7.1.7:
once "^1.3.0"
path-is-absolute "^1.0.0"
-global-agent@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
- integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
- dependencies:
- boolean "^3.0.1"
- es6-error "^4.1.1"
- matcher "^3.0.0"
- roarr "^2.15.3"
- semver "^7.3.2"
- serialize-error "^7.0.1"
-
globals@^13.6.0, globals@^13.9.0:
version "13.9.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"
@@ -1656,13 +1629,6 @@ globals@^13.6.0, globals@^13.9.0:
dependencies:
type-fest "^0.20.2"
-globalthis@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
- integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
- dependencies:
- define-properties "^1.1.3"
-
globby@^11.0.4:
version "11.0.4"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
@@ -2054,11 +2020,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-json-stringify-safe@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
- integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
-
json5@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -2173,13 +2134,6 @@ markdown-escapes@^1.0.0:
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
-matcher@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
- integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==
- dependencies:
- escape-string-regexp "^4.0.0"
-
md5@^2.2.1:
version "2.3.0"
resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
@@ -2843,18 +2797,6 @@ rimraf@^3.0.2:
dependencies:
glob "^7.1.3"
-roarr@^2.15.3:
- version "2.15.4"
- resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
- integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==
- dependencies:
- boolean "^3.0.1"
- detect-node "^2.0.4"
- globalthis "^1.0.1"
- json-stringify-safe "^5.0.1"
- semver-compare "^1.0.0"
- sprintf-js "^1.1.2"
-
rotating-file-stream@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/rotating-file-stream/-/rotating-file-stream-3.0.0.tgz#5193da921808dc98e1e60595fb2f32d33d622884"
@@ -2897,11 +2839,6 @@ safe-compare@^1.1.4:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-semver-compare@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
- integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
-
semver@^6.0.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -2914,13 +2851,6 @@ semver@^7.0.0, semver@^7.1.3, semver@^7.2.1, semver@^7.3.5:
dependencies:
lru-cache "^6.0.0"
-semver@^7.3.2:
- version "7.3.7"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
- integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
- dependencies:
- lru-cache "^6.0.0"
-
send@0.17.1:
version "0.17.1"
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -2940,13 +2870,6 @@ send@0.17.1:
range-parser "~1.2.1"
statuses "~1.5.0"
-serialize-error@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
- integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==
- dependencies:
- type-fest "^0.13.1"
-
serve-static@1.14.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
@@ -2989,13 +2912,6 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-shellcheck@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/shellcheck/-/shellcheck-1.1.0.tgz#ccf1f1815acef0b337d9f2deeecd62ba509e85e1"
- integrity sha512-WtLqgjHg7667gGU+0dPV1EtoQgYL/Zxc4fhRt6Z3kfpASG3J08TBJ990HVIUnN/YWUBKMr3FVbBYlEvPVJ24bA==
- dependencies:
- global-agent "^3.0.0"
-
side-channel@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -3097,11 +3013,6 @@ split@^1.0.1:
dependencies:
through "2"
-sprintf-js@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
- integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
-
sprintf-js@~1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -3349,11 +3260,6 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
-type-fest@^0.13.1:
- version "0.13.1"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
- integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
-
type-fest@^0.20.2:
version "0.20.2"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
From 76168c96bcfe63c3fc1fd5e7fd2d879c9b3d29b4 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:28:39 -0700
Subject: [PATCH 47/58] fixup! fixup!: use apk for lint scripts
---
ci/dev/lint-scripts.sh | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100755 ci/dev/lint-scripts.sh
diff --git a/ci/dev/lint-scripts.sh b/ci/dev/lint-scripts.sh
new file mode 100755
index 000000000000..742030affc62
--- /dev/null
+++ b/ci/dev/lint-scripts.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+main() {
+ cd "$(dirname "$0")/../.."
+ shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files '*.sh' | grep -v 'lib/vscode')
+}
+
+main "$@"
From 91fdc7e2a43a5e22ef5cb68e3a498d08469f8236 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:32:00 -0700
Subject: [PATCH 48/58] fixup!: remove typecheck step
---
.github/workflows/build.yaml | 43 ------------------------------------
package.json | 1 -
2 files changed, 44 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 92aa25140435..7855141d8ad8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -134,49 +134,6 @@ jobs:
if: failure()
uses: andymckay/cancel-action@0.2
- typecheck:
- name: Check TypeScript types
- runs-on: ubuntu-latest
- timeout-minutes: 5
- steps:
- - name: Checkout repo
- uses: actions/checkout@v3
-
- - name: Get changed files
- id: changed-files
- uses: tj-actions/changed-files@v23.2
- with:
- files: |
- src/**
-
- - name: Install Node.js v16
- if: steps.changed-files.outputs.any_changed == 'true'
- uses: actions/setup-node@v3
- with:
- node-version: "16"
-
- - name: Fetch dependencies from cache
- if: steps.changed-files.outputs.any_changed == 'true'
- id: cache-node-modules
- uses: actions/cache@v3
- with:
- path: "**/node_modules"
- key: yarn-build-${{ hashFiles('**yarn.lock') }}
- restore-keys: |
- yarn-build-
-
- - name: Install dependencies
- if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-node-modules.outputs.cache-hit != 'true'
- run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
-
- - name: Run tsc on TypeScript files
- if: steps.changed-files.outputs.any_changed == 'true'
- run: yarn typecheck
-
- - name: Fail workflow
- if: failure()
- uses: andymckay/cancel-action@0.2
-
build:
name: Build
runs-on: ubuntu-latest
diff --git a/package.json b/package.json
index 145b49a1b929..f23609d5cb42 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,6 @@
"lint:scripts": "./ci/dev/lint-scripts.sh",
"lint:ts": "eslint --max-warnings=0 --fix $(git ls-files '*.ts' '*.js' | grep -v 'lib/vscode')",
"test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
- "typecheck": "tsc -p tsconfig.json --noEmit --skipLibCheck",
"ci": "./ci/dev/ci.sh",
"watch": "VSCODE_DEV=1 VSCODE_IPC_HOOK_CLI= NODE_OPTIONS='--max_old_space_size=32384 --trace-warnings' ts-node ./ci/dev/watch.ts",
"icons": "./ci/dev/gen_icons.sh"
From 1ed536bde918c17403d2397ea127beffbb94b2d7 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:39:46 -0700
Subject: [PATCH 49/58] fix: pattern for lint ts files
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 7855141d8ad8..347352e111fc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -104,7 +104,7 @@ jobs:
**/*.ts
**/*.js
files_ignore: |
- lib/vscode
+ lib/vscode/**
- name: Install Node.js v16
if: steps.changed-files.outputs.any_changed == 'true'
From 158c64db044c24f2f8ffd082cc769f06876d6957 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:40:26 -0700
Subject: [PATCH 50/58] test: lint should fail
---
src/node/cli.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/node/cli.ts b/src/node/cli.ts
index df843eda2cee..e0ad3af19c5a 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -17,7 +17,8 @@ export enum AuthType {
None = "none",
}
-export class Optional<T> {
+// lint me
+export class Optional<> {
public constructor(public readonly value?: T) {}
}
From 3b9e677dcc29667e1d8968a46029bcbe11838222 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:43:36 -0700
Subject: [PATCH 51/58] fixup! fixup!: use apk for lint scripts
---
.github/workflows/scripts.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml
index 911768ddbb5a..b3837f19514a 100644
--- a/.github/workflows/scripts.yaml
+++ b/.github/workflows/scripts.yaml
@@ -56,6 +56,7 @@ jobs:
name: Lint shell files
runs-on: ubuntu-latest
timeout-minutes: 5
+ container: "alpine:3.16"
steps:
- name: Checkout repo
uses: actions/checkout@v3
From 27312a56d30edd8713689398c6a2995dcfee23fb Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:46:16 -0700
Subject: [PATCH 52/58] Revert "test: lint should fail"
This reverts commit 158c64db044c24f2f8ffd082cc769f06876d6957.
---
src/node/cli.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/node/cli.ts b/src/node/cli.ts
index e0ad3af19c5a..df843eda2cee 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -17,8 +17,7 @@ export enum AuthType {
None = "none",
}
-// lint me
-export class Optional<> {
+export class Optional<T> {
public constructor(public readonly value?: T) {}
}
From eb2b181511771d580378f32c049b8f344f4e96ad Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:50:54 -0700
Subject: [PATCH 53/58] fixup!: skip cancel workflow on forks
Looks like the cancel action workflow can't run on forks due to secrets.
See https://github.com/andymckay/cancel-action/issues/4
---
.github/workflows/build.yaml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 347352e111fc..5ab721d5b59d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -52,7 +52,8 @@ jobs:
run: yarn fmt
- name: Fail workflow
- if: failure()
+ # Skip on forks
+ if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name) != 'pull_request' && failure()
uses: andymckay/cancel-action@0.2
lint-helm:
@@ -85,7 +86,8 @@ jobs:
run: helm kubeval ci/helm-chart
- name: Fail workflow
- if: failure()
+ # Skip on forks
+ if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name) != 'pull_request' && failure()
uses: andymckay/cancel-action@0.2
lint-ts:
@@ -131,7 +133,8 @@ jobs:
run: yarn lint:ts
- name: Fail workflow
- if: failure()
+ # Skip on forks
+ if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name) != 'pull_request' && failure()
uses: andymckay/cancel-action@0.2
build:
From 3c15bf125673252ace126a2a734f13b6714c4224 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 10:59:53 -0700
Subject: [PATCH 54/58] fixup: remove cancel-workflow
---
.github/workflows/build.yaml | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5ab721d5b59d..fa90c7257646 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -51,11 +51,6 @@ jobs:
- name: Format files with Prettier
run: yarn fmt
- - name: Fail workflow
- # Skip on forks
- if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name) != 'pull_request' && failure()
- uses: andymckay/cancel-action@0.2
-
lint-helm:
name: Lint Helm chart
runs-on: ubuntu-latest
@@ -85,11 +80,6 @@ jobs:
if: steps.changed-files.outputs.any_changed == 'true'
run: helm kubeval ci/helm-chart
- - name: Fail workflow
- # Skip on forks
- if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name) != 'pull_request' && failure()
- uses: andymckay/cancel-action@0.2
-
lint-ts:
name: Lint TypeScript files
runs-on: ubuntu-latest
@@ -132,11 +122,6 @@ jobs:
if: steps.changed-files.outputs.any_changed == 'true'
run: yarn lint:ts
- - name: Fail workflow
- # Skip on forks
- if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name) != 'pull_request' && failure()
- uses: andymckay/cancel-action@0.2
-
build:
name: Build
runs-on: ubuntu-latest
From 185d259bc2d54dd9304d42d71177e00a737f0185 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 11:04:36 -0700
Subject: [PATCH 55/58] fixup! fixup! fixup!: use apk for lint scripts
---
.github/workflows/scripts.yaml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml
index b3837f19514a..394b915c880a 100644
--- a/.github/workflows/scripts.yaml
+++ b/.github/workflows/scripts.yaml
@@ -62,7 +62,9 @@ jobs:
uses: actions/checkout@v3
- name: Install lint utilities
- run: apk add shellcheck
+ run: |
+ apk add shellcheck
+ apk add --no-cache --upgrade bash
- name: Lint shell files
run: ./ci/dev/lint-scripts.sh
From bfb6c01c978be9a05c4e283448f0d73b08972c2f Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 11:07:41 -0700
Subject: [PATCH 56/58] fixup! fixup! fixup!: use apk for lint scripts
---
.github/workflows/scripts.yaml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml
index 394b915c880a..79a9eb29e518 100644
--- a/.github/workflows/scripts.yaml
+++ b/.github/workflows/scripts.yaml
@@ -56,15 +56,12 @@ jobs:
name: Lint shell files
runs-on: ubuntu-latest
timeout-minutes: 5
- container: "alpine:3.16"
steps:
- name: Checkout repo
uses: actions/checkout@v3
- name: Install lint utilities
- run: |
- apk add shellcheck
- apk add --no-cache --upgrade bash
+ run: sudo apt install shellcheck
- name: Lint shell files
run: ./ci/dev/lint-scripts.sh
From 24776df3f6a59415cea1f003236b1babed13f943 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 11:08:36 -0700
Subject: [PATCH 57/58] fixup!: fix yarn key
---
.github/workflows/build.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fa90c7257646..c92fa1987f60 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
uses: actions/cache@v3
with:
path: "**/node_modules"
- key: yarn-build-${{ hashFiles('**yarn.lock') }}
+ key: yarn-build-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
yarn-build-
@@ -110,7 +110,7 @@ jobs:
uses: actions/cache@v3
with:
path: "**/node_modules"
- key: yarn-build-${{ hashFiles('**yarn.lock') }}
+ key: yarn-build-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
yarn-build-
From 5f8beae8b81cb29327021a42ef27b87579863c94 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 22 Sep 2022 11:56:37 -0700
Subject: [PATCH 58/58] fixup!: add fetch-depth 0
---
.github/workflows/build.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c92fa1987f60..2ea4769b334b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -58,6 +58,8 @@ jobs:
steps:
- name: Checkout repo
uses: actions/checkout@v3
+ with:
+ fetch-depth: 2
- name: Get changed files
id: changed-files
@@ -87,6 +89,8 @@ jobs:
steps:
- name: Checkout repo
uses: actions/checkout@v3
+ with:
+ fetch-depth: 2
- name: Get changed files
id: changed-files