Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump electron from 22.3.14 to 22.3.21 #24299

Merged
merged 6 commits into from
Sep 7, 2023
Merged

Bump electron from 22.3.14 to 22.3.21 #24299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d11e0fb
Bump electron from 22.3.14 to 22.3.21
dependabot[bot] Sep 6, 2023
13b3c25
Update distro hash
lewis-sanchez Sep 7, 2023
e1733ea
Bump distro hash
lewis-sanchez Sep 7, 2023
90633ae
Update distro hash
lewis-sanchez Sep 7, 2023
9c41bf0
Update distro hash
lewis-sanchez Sep 7, 2023
e7dca19
Update hash
lewis-sanchez Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "azuredatastudio",
"version": "1.46.0",
"distro": "ddc1ad96839c9128a60123f438335d3c8b2d3480",
"distro": "7f4613d9a9266732a1d3a616e3d4112495083a71",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updating the distro hash to resolve distro merge conflicts is the only change I made to this PR.

"author": {
"name": "Microsoft Corporation"
},
Expand Down Expand Up @@ -178,7 +178,7 @@
"cssnano": "^4.1.11",
"debounce": "^1.0.0",
"deemon": "^1.8.0",
"electron": "22.3.14",
"electron": "22.3.21",
"eslint": "8.36.0",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-jsdoc": "^39.3.2",
Expand Down
20 changes: 5 additions & 15 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,21 +1129,11 @@
"@types/node" "*"
form-data "^3.0.0"

"@types/node@*":
version "4.2.22"
resolved "https://registry.yarnpkg.com/@types/node/-/node-4.2.22.tgz#cf488a0f6b4a9c245d09927f4f757ca278b9c8ce"
integrity sha512-LXRap3bb4AjtLZ5NOFc4ssVZrQPTgdPcNm++0SEJuJZaOA+xHkojJNYqy33A5q/94BmG5tA6yaMeD4VdCv5aSA==

"@types/[email protected]":
"@types/node@*", "@types/[email protected]", "@types/node@^16.11.26":
version "16.18.25"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.25.tgz#8863940fefa1234d3fcac7a4b7a48a6c992d67af"
integrity sha512-rUDO6s9Q/El1R1I21HG4qw/LstTHCPO/oQNAwI/4b2f9EWvMnqt4d3HJwPMawfZ3UvodB8516Yg+VAq54YM+eA==

"@types/node@^16.11.26":
version "16.11.31"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.31.tgz#1dad8138efee6808809bb80f9e66bbe3e46c9277"
integrity sha512-wh/d0pcu/Ie2mqTIqh4tjd0mLAB4JWxOjHQtLN20HS7sjMHiV4Afr+90hITTyZcxowwha5wjv32jGEn1zkEFMg==

"@types/plotly.js@^1.44.9":
version "1.54.22"
resolved "https://registry.yarnpkg.com/@types/plotly.js/-/plotly.js-1.54.22.tgz#001b9cfafc5e0bdf133bc6ab6e30ff0af39e584d"
Expand Down Expand Up @@ -3668,10 +3658,10 @@ electron-to-chromium@^1.4.284:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz#953bc9a4767f5ce8ec125f9a1ad8e00e8f67e479"
integrity sha512-RoDlZufvrtr2Nx3Yx5MB8jX3aHIxm8nRWPJm3yVvyHmyKaRvn90RjzB6hNnt0AkhS3IInJdyRfQb4mWhPvUjVw==

[email protected].14:
version "22.3.14"
resolved "https://registry.yarnpkg.com/electron/-/electron-22.3.14.tgz#539fc7d7b6df37483aaa351856a28e43092d550e"
integrity sha512-WxVcLnC4DrkBLN1/BwpxNkGvVq8iq1hM7lae5nvjnSYg/bwVbuo1Cwc80Keft4MIWKlYCXNiKKqs3qCXV4Aiaw==
[email protected].21:
version "22.3.21"
resolved "https://registry.yarnpkg.com/electron/-/electron-22.3.21.tgz#a817446cc1e62e9650522fa7eae389f9fc5b5e19"
integrity sha512-9JzWgvehRrqA30M7RvWCwwbyq2EgPUSbCFaqyZGnG0B52m4ayB8H+uFNIKXyWuyFwAEPDpQW5cGwCzXir1HuLA==
dependencies:
"@electron/get" "^2.0.0"
"@types/node" "^16.11.26"
Expand Down