Skip to content

Make native-keymap and keytar optional dependencies #4192

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.

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

Merged
merged 1 commit into from
Sep 17, 2021
Merged

Conversation

GirlBossRush
Copy link
Contributor

@GirlBossRush GirlBossRush commented Sep 16, 2021

This PR addresses a regression introduced in our VS code fork. Previously, we removed two dependencies which required additional native packages, however they were included in the latest release. Rather than remove these and break the desktop build, we now mark them as optional: coder/vscode@07bcbc3

Fixes #4179

@GirlBossRush GirlBossRush added the bug Something isn't working label Sep 16, 2021
@GirlBossRush GirlBossRush added this to the 3.12.1 milestone Sep 16, 2021
@GirlBossRush GirlBossRush self-assigned this Sep 16, 2021
@GirlBossRush GirlBossRush changed the title Bump vscode. Make native-keymap and keytar optional dependencies Sep 16, 2021
@codecov
Copy link

codecov bot commented Sep 16, 2021

Codecov Report

Merging #4192 (b448a66) into main (7925f88) will not change coverage.
The diff coverage is n/a.

❗ Current head b448a66 differs from pull request most recent head 76a2116. Consider uploading reports for the commit 76a2116 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##             main    #4192   +/-   ##
=======================================
  Coverage   64.22%   64.22%           
=======================================
  Files          36       36           
  Lines        1873     1873           
  Branches      379      379           
=======================================
  Hits         1203     1203           
  Misses        569      569           
  Partials      101      101           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7925f88...76a2116. Read the comment docs.

@GirlBossRush GirlBossRush marked this pull request as ready for review September 16, 2021 21:57
@GirlBossRush GirlBossRush requested a review from a team as a code owner September 16, 2021 21:57
@github-actions
Copy link

github-actions bot commented Sep 16, 2021

✨ Coder.com for PR #4192 deployed! It will be updated on every commit.

- Fix issue where yarn lock cannot be updated in development.
Copy link
Contributor

@jsjoeio jsjoeio left a comment

Choose a reason for hiding this comment

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

This looks good to me! Curious about @edvincent's comment here coder/vscode@07bcbc3#commitcomment-56613657

@@ -20,6 +20,7 @@
Current maintainers:

- @code-asher
- @TeffenEllis
Copy link
Contributor

Choose a reason for hiding this comment

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

🎉

@edvincent
Copy link
Contributor

This looks good to me! Curious about @edvincent's comment here coder/vscode@07bcbc3#commitcomment-56613657

@jsjoeio I'm keeping an eye on the above build, to test with the NPM artifact and report back on that comment - I'm myself curious of exactly what does (or doesn't) happen on installs.

@jsjoeio
Copy link
Contributor

jsjoeio commented Sep 16, 2021

I'm keeping an eye on the above build, to test with the NPM artifact and report back on that comment

Dang, you rock! We really appreciate the help!

@edvincent
Copy link
Contributor

Yup it all seems to work as expected when pulling them as optional dependencies! 🎉

The errors are still there, but are now warnings. All the other installs still go through (instead of the install exiting because of the error). code-server seems usable and doesn't seem to be having any issue from what I can see / clicking around so far.

@GirlBossRush GirlBossRush merged commit 3c61d96 into main Sep 17, 2021
@GirlBossRush GirlBossRush deleted the 4179-keytar branch September 17, 2021 00:55
@jsjoeio
Copy link
Contributor

jsjoeio commented Sep 17, 2021

Yup it all seems to work as expected when pulling them as optional dependencies! 🎉

Hooray! Thanks so much for reporting and helping us test the fix @edvincent! We really appreciate it 🙌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot install the NPM package without X11 anymore (aka missing modifications on vendored vscode?)
3 participants