Skip to content

Commit

Permalink
Merge branch 'main' into add-ribbon-progress-ring
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattseddon
mattseddon committed Nov 30, 2022
2 parents 4efa711 + 6e3c2e7 commit e21e29d
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 51 deletions.
6 changes: 3 additions & 3 deletions extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1594,8 +1594,8 @@
"@types/uuid": "8.3.4",
"@types/vscode": "1.64.0",
"@vscode/test-electron": "2.2.0",
"@wdio/cli": "7.26.0",
"@wdio/local-runner": "7.26.0",
"@wdio/cli": "7.27.0",
"@wdio/local-runner": "7.27.0",
"@wdio/mocha-framework": "7.26.0",
"@wdio/spec-reporter": "7.26.0",
"chai": "4.3.7",
Expand All @@ -1615,7 +1615,7 @@
"vsce": "2.14.0",
"vscode-uri": "3.0.6",
"wdio-vscode-service": "4.2.1",
"webdriverio": "7.26.0",
"webdriverio": "7.27.0",
"webpack": "5.75.0",
"webpack-cli": "5.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"lint-staged": "13.0.3",
"npm-run-all": "4.1.5",
"nyc": "15.1.0",
"prettier": "2.7.1",
"prettier": "2.8.0",
"prettier-config-standard": "5.0.0",
"ts-node": "10.9.1",
"turbo": "1.6.3",
Expand Down
99 changes: 52 additions & 47 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4719,10 +4719,10 @@
"@microsoft/fast-foundation" "^2.38.0"
"@microsoft/fast-react-wrapper" "^0.1.18"

"@wdio/cli@7.26.0":
version "7.26.0"
resolved "https://registry.yarnpkg.com/@wdio/cli/-/cli-7.26.0.tgz#20c690a5ede4a35cb2f84da9041c250a6013bc54"
integrity sha512-xG+ZIzPqzz/Tvhfrogd8oNvTXzzdE+cbkmTHjMGo1hnmnoAQPeAEcV/QqaX5CHFE9DjaguEeadqjcZikB5U2GQ==
"@wdio/cli@7.27.0":
version "7.27.0"
resolved "https://registry.yarnpkg.com/@wdio/cli/-/cli-7.27.0.tgz#794062a570ae3bf302c03716bf43d31f6319bac8"
integrity sha512-Ck+ndAkNG6jDtYkfxsYgTA0XcwP3dQ4+3yG6p0aWgfX+BPRRWcscsEi+X+uxU0kjZZtClGiAwzR/HZmB8B+zxg==
dependencies:
"@types/ejs" "^3.0.5"
"@types/fs-extra" "^9.0.4"
Expand All @@ -4734,7 +4734,7 @@
"@types/recursive-readdir" "^2.2.0"
"@wdio/config" "7.26.0"
"@wdio/logger" "7.26.0"
"@wdio/protocols" "7.22.0"
"@wdio/protocols" "7.27.0"
"@wdio/types" "7.26.0"
"@wdio/utils" "7.26.0"
async-exit-hook "^2.0.1"
Expand All @@ -4749,7 +4749,7 @@
lodash.union "^4.6.0"
mkdirp "^1.0.4"
recursive-readdir "^2.2.2"
webdriverio "7.26.0"
webdriverio "7.27.0"
yargs "^17.0.0"
yarn-install "^1.0.0"

Expand All @@ -4764,15 +4764,15 @@
deepmerge "^4.0.0"
glob "^8.0.3"

"@wdio/local-runner@7.26.0":
version "7.26.0"
resolved "https://registry.yarnpkg.com/@wdio/local-runner/-/local-runner-7.26.0.tgz#a056c6e9d73c7f48e54fe3f07ce573a90dae26ab"
integrity sha512-GdCP7Y8s8qvoctC0WaSGBSmTSbVw74WEJm6Y3n3DpoCI8ABFNkQlhFlqJH+taQDs3sRVEM65bHGcU4C4FOVWXQ==
"@wdio/local-runner@7.27.0":
version "7.27.0"
resolved "https://registry.yarnpkg.com/@wdio/local-runner/-/local-runner-7.27.0.tgz#de5fb67b3651d618221861199d83b0e323773ec0"
integrity sha512-5a0Z2UvSfUVi2osHbRuUUhdLihbYDB66mmUIr7nt2J0unO5ladMHJizTke5I1HZFtr23AG7m9SX9VDf2ZLA6uw==
dependencies:
"@types/stream-buffers" "^3.0.3"
"@wdio/logger" "7.26.0"
"@wdio/repl" "7.26.0"
"@wdio/runner" "7.26.0"
"@wdio/runner" "7.27.0"
"@wdio/types" "7.26.0"
async-exit-hook "^2.0.1"
split2 "^4.0.0"
Expand Down Expand Up @@ -4820,10 +4820,10 @@
expect-webdriverio "^3.0.0"
mocha "^10.0.0"

"@wdio/protocols@7.22.0":
version "7.22.0"
resolved "https://registry.yarnpkg.com/@wdio/protocols/-/protocols-7.22.0.tgz#d89faef687cb08981d734bbc5e5dffc6fb5a064c"
integrity sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==
"@wdio/protocols@7.27.0":
version "7.27.0"
resolved "https://registry.yarnpkg.com/@wdio/protocols/-/protocols-7.27.0.tgz#8e2663ec877dce7a5f76b021209c18dd0132e853"
integrity sha512-hT/U22R5i3HhwPjkaKAG0yd59eaOaZB0eibRj2+esCImkb5Y6rg8FirrlYRxIGFVBl0+xZV0jKHzR5+o097nvg==

"@wdio/[email protected]":
version "7.26.0"
Expand All @@ -4848,19 +4848,19 @@
object-inspect "^1.10.3"
supports-color "8.1.1"

"@wdio/runner@7.26.0":
version "7.26.0"
resolved "https://registry.yarnpkg.com/@wdio/runner/-/runner-7.26.0.tgz#c0b2848dc885b655e8690d3e0381dfb0ad221af5"
integrity sha512-DhQiOs10oPeLlv7/R+997arPg5OY7iEgespGkn6r+kdx2o+awxa6PFegQrjJmRKUmNv3TTuKXHouP34TbR/8sw==
"@wdio/runner@7.27.0":
version "7.27.0"
resolved "https://registry.yarnpkg.com/@wdio/runner/-/runner-7.27.0.tgz#631d678e1229f601f56e247d61a322c18af8db92"
integrity sha512-y1q3WPHsadq29B3uvjbQSqRDGdwqTAvrjysg0LOLxkciyE+QV2KnbbzTODeSELcXE6iPXz0W1M9ev/kV8yivKA==
dependencies:
"@wdio/config" "7.26.0"
"@wdio/logger" "7.26.0"
"@wdio/types" "7.26.0"
"@wdio/utils" "7.26.0"
deepmerge "^4.0.0"
gaze "^1.1.2"
webdriver "7.26.0"
webdriverio "7.26.0"
webdriver "7.27.0"
webdriverio "7.27.0"

"@wdio/[email protected]":
version "7.26.0"
Expand Down Expand Up @@ -8206,21 +8206,21 @@ [email protected]:
resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.981744.tgz#9960da0370284577d46c28979a0b32651022bacf"
integrity sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==

devtools-protocol@^0.0.1069585:
version "0.0.1069585"
resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1069585.tgz#c9a9f330462aabf054d581f254b13774297b84f2"
integrity sha512-sHmkZB6immWQWU4Wx3ogXwxjQUvQc92MmUDL52+q1z2hQmvpOcvDmbsjwX7QZOPTA32dMV7fgT6zUytcpPzy4A==
devtools-protocol@^0.0.1075032:
version "0.0.1075032"
resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1075032.tgz#4bbe8489177bee0af81f99d5f4fd60b91f971b53"
integrity sha512-Np2EaEFlSOev03f5ySurGi3/z8YWOwsfSPPSDTbf7zlBY77SxBWfkFf41IUmkvfkeckX8XVW9hes1jVwALNAaA==

devtools@7.26.0:
version "7.26.0"
resolved "https://registry.yarnpkg.com/devtools/-/devtools-7.26.0.tgz#3d568aea2238d190ad0cd71c00483c07c707124a"
integrity sha512-+8HNbNpzgo4Sn+WcrvXuwsHW9XPJfLo4bs9lgs6DPJHIIDXYJXQGsd7940wMX0Rp0D2vHXA4ibK0oTI5rogM3Q==
devtools@7.27.0:
version "7.27.0"
resolved "https://registry.yarnpkg.com/devtools/-/devtools-7.27.0.tgz#3806416cc158eb45e10669c34978366c64ecc6bb"
integrity sha512-3zKwVXtmKjewqXF1rwkuBaRNKexEpAIvAp2K5sXTuF5YsIo9GqOrEDYNskQ0DMM0bQzxE0mxRle9ZVjlpghr3A==
dependencies:
"@types/node" "^18.0.0"
"@types/ua-parser-js" "^0.7.33"
"@wdio/config" "7.26.0"
"@wdio/logger" "7.26.0"
"@wdio/protocols" "7.22.0"
"@wdio/protocols" "7.27.0"
"@wdio/types" "7.26.0"
"@wdio/utils" "7.26.0"
chrome-launcher "^0.15.0"
Expand Down Expand Up @@ -14938,16 +14938,21 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"

prettier@2.7.1, prettier@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
prettier@2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9"
integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==

"prettier@>=2.2.1 <=2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18"
integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==

prettier@^2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==

pretty-error@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
Expand Down Expand Up @@ -18801,40 +18806,40 @@ web-namespaces@^1.0.0:
resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"
integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==

webdriver@7.26.0:
version "7.26.0"
resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-7.26.0.tgz#cc20640ee9906c0126044449dfe9562b6277d14e"
integrity sha512-T21T31wq29D/rmpFHcAahhdrvfsfXsLs/LBe2su7wL725ptOEoSssuDXjXMkwjf9MSUIXnTcUIz8oJGbKRUMwQ==
webdriver@7.27.0:
version "7.27.0"
resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-7.27.0.tgz#41d23a6c38bd79ea868f0b9fb9c9e3d4b6e4f8bd"
integrity sha512-870uIBnrGJ86g3DdYjM+PHhqdWf6NxysSme1KIs6irWxK+LqcaWKWhN75PldE+04xJB2mVWt1tKn0NBBFTWeMg==
dependencies:
"@types/node" "^18.0.0"
"@wdio/config" "7.26.0"
"@wdio/logger" "7.26.0"
"@wdio/protocols" "7.22.0"
"@wdio/protocols" "7.27.0"
"@wdio/types" "7.26.0"
"@wdio/utils" "7.26.0"
got "^11.0.2"
ky "0.30.0"
lodash.merge "^4.6.1"

webdriverio@7.26.0:
version "7.26.0"
resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-7.26.0.tgz#d6036d950ef96fb6cc29c6c5c9cfc452fcafa59a"
integrity sha512-7m9TeP871aYxZYKBI4GDh5aQZLN9Fd/PASu5K/jEIT65J4OBB6g5ZaycGFOmfNHCfjWKjwPXZuKiN1f2mcrcRg==
webdriverio@7.27.0:
version "7.27.0"
resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-7.27.0.tgz#33adbd8b377aec79eb40a7873da9fc02bdab1b40"
integrity sha512-xEcpWdbDLTFVP57kxEVniXWL6SNq2hxEMwaXbRck9EiFlhNvVca00oMzYjCVm8jmlL6JYnbfv/u7XyhvkktMIg==
dependencies:
"@types/aria-query" "^5.0.0"
"@types/node" "^18.0.0"
"@wdio/config" "7.26.0"
"@wdio/logger" "7.26.0"
"@wdio/protocols" "7.22.0"
"@wdio/protocols" "7.27.0"
"@wdio/repl" "7.26.0"
"@wdio/types" "7.26.0"
"@wdio/utils" "7.26.0"
archiver "^5.0.0"
aria-query "^5.0.0"
css-shorthand-properties "^1.1.1"
css-value "^0.0.1"
devtools "7.26.0"
devtools-protocol "^0.0.1069585"
devtools "7.27.0"
devtools-protocol "^0.0.1075032"
fs-extra "^10.0.0"
grapheme-splitter "^1.0.2"
lodash.clonedeep "^4.5.0"
Expand All @@ -18847,7 +18852,7 @@ [email protected]:
resq "^1.9.1"
rgb2hex "0.2.5"
serialize-error "^8.0.0"
webdriver "7.26.0"
webdriver "7.27.0"

webidl-conversions@^3.0.0:
version "3.0.1"
Expand Down

0 comments on commit e21e29d

Please sign in to comment.