Skip to content

Conversation

nonewcode
Copy link
Contributor

This PR updates various dev dependencies as well as making some small changes to a couple of the various checks inside props and an update to one of the types to not use {}.

The eslint configuration has also had a bit of an update and i fixed the new errors that arose from that change.

Copy link
Member

@WoLewicki WoLewicki left a comment

Choose a reason for hiding this comment

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

Great job! Thanks for your contribution.

@nonewcode nonewcode requested a review from WoLewicki August 3, 2020 11:15
@WoLewicki
Copy link
Member

Could you also rebase to the newest master? I see there is a conflict with one file.

Signed-off-by: Josh Kelly <[email protected]>
Signed-off-by: Josh Kelly <[email protected]>
Signed-off-by: Josh Kelly <[email protected]>
Signed-off-by: Josh Kelly <[email protected]>
Signed-off-by: Josh Kelly <[email protected]>
Signed-off-by: Josh Kelly <[email protected]>

# Conflicts:
#	src/native-stack/views/NativeStackView.tsx
Signed-off-by: Josh Kelly <[email protected]>

# Conflicts:
#	src/createNativeStackNavigator.js
Signed-off-by: Josh Kelly <[email protected]>
@nonewcode
Copy link
Contributor Author

@WoLewicki Those conflicts should be sorted now, had to add this as a second remote and rebase from there instead of the fork (even though they had the same commit history, weird).

@nonewcode nonewcode requested a review from WoLewicki August 4, 2020 07:47
Copy link
Member

@WoLewicki WoLewicki left a comment

Choose a reason for hiding this comment

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

I think it is ready now! Thanks for your contribution!

@WoLewicki WoLewicki merged commit 519f484 into software-mansion:master Aug 5, 2020
@nonewcode nonewcode deleted the housekeeping branch August 5, 2020 08:36
@nonewcode
Copy link
Contributor Author

Thanks @WoLewicki

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