Skip to content

gi.ts rework & merge - #144

Merged
ewlsh merged 89 commits into
mainfrom
gi-ts-rework
Apr 5, 2024
Merged

gi.ts rework & merge#144
ewlsh merged 89 commits into
mainfrom
gi-ts-rework

Conversation

@ewlsh

@ewlsh ewlsh commented Feb 10, 2024

Copy link
Copy Markdown
Collaborator

This is the second attempt at merging the two codebases, it is still a draft but it is generating types with only a few failures to debug 🥳

@ewlsh

ewlsh commented Feb 10, 2024

Copy link
Copy Markdown
Collaborator Author

I'm working on merging the newlib/ folder into the rest of the source.

I used newlib/ for the gi.ts sources so it was easier to merge the codebases side-by-side.

@JumpLink

Copy link
Copy Markdown
Collaborator

Yay I'll have a look when I find the time. Shall we delete branch 4.x for this and create a new one?

@ewlsh

ewlsh commented Feb 13, 2024

Copy link
Copy Markdown
Collaborator Author

Yay I'll have a look when I find the time. Shall we delete branch 4.x for this and create a new one?

@JumpLink I think it'd be best to create a new branch off of 3.x called 4.x or next and we can target that branch with this MR.

@JumpLink

JumpLink commented Feb 17, 2024

Copy link
Copy Markdown
Collaborator

@ewlsh I have now recreated the main branch for this because I have already referred to it in the documentation. I could start helping by removing the code for node-gtk, CommonJS and other exports as NPM package and also adjust the examples accordingly. How do we want to do this? Should I create a PR for gi-ts-rework or should I push directly to it, which do you prefer?

I start by fixing the current merge conflicts

@JumpLink

JumpLink commented Feb 18, 2024

Copy link
Copy Markdown
Collaborator

#148 solves the current merge conflicts and continued the general work. Can be merged at any time into this PR if you want to continue working on it, I would then create another PR to help further, but don't wait for me as my available time is currently limited.

Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1.
- [Commits](indutny/node-ip@v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@JumpLink
JumpLink changed the base branch from 3.x to main February 26, 2024 16:10
@ewlsh
ewlsh force-pushed the gi-ts-rework branch 2 times, most recently from 2158fee to 5c5475c Compare March 11, 2024 05:02
@JumpLink JumpLink mentioned this pull request Mar 13, 2024
@ewlsh
ewlsh force-pushed the gi-ts-rework branch 4 times, most recently from d92f509 to db33289 Compare April 4, 2024 11:28
@ewlsh
ewlsh merged commit 2214e8b into main Apr 5, 2024
@ewlsh
ewlsh deleted the gi-ts-rework branch April 5, 2024 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants