search

endojs / endo

Endo is a distributed secure JavaScript sandbox, based on SES
Apache License 2.0
804 stars 71 forks source link

Endo: sync with master branch #1783

Closed kriskowal closed 12 months ago

kriskowal commented 1 year ago

Brings the latest release into the endo pet daemon branch.

kriskowal commented 1 year ago

@kumavis To make this, I did a git merge origin/master in the endo branch and resolved the conflicts. Since this is a merge and not a rebase, it’ll go cleanly into origin/endo. To resolve conflicts, I just merged the before and after sections of the dependencies and let ./scripts/sync-versions.sh . pick the most recent ones. I also reset yarn.lock to its prior state and ran yarn to create a separate chore: Sync yarn.lock commit.