Commit Graph

7 Commits

Author SHA1 Message Date
Joe Previte f214235e2d
fix: resolve conflicts in build/lib/node.ts
It looks like they added a few more variables and cleaned this file up.

I removed the yarn and yarnRc stuff. Hope that doesn't break anything.
2021-02-25 12:08:12 -07:00
Joe Previte ce1a8c89dd
fix: postinstall.js conflicts
Again, hope this was correct.

It looks like they moved around a few lines here.

If there are issues with dependencies not installing, check here.
2021-02-25 11:57:35 -07:00
Joe Previte eae5d8c807
chore(vscode): update to 1.53.2
These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.
2021-02-25 11:27:27 -07:00
Asher 9221efc104
Restore Node check
Since we're following the VS Code allowed version range now to prevent
bugs use the new range instead of commenting it out.
2021-02-09 10:09:45 -06:00
Asher 859de79d97 Update to VS Code 1.52.1 2021-02-09 16:08:37 +00:00
Joe Previte 51a2a2ad2d
feat: apply patch after setting up subtree 2020-12-15 15:53:52 -07:00
Joe Previte 41bee49d07 Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00