Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Jest #3724

Merged
merged 16 commits into from
Jan 9, 2020
Merged

Jest #3724

merged 16 commits into from
Jan 9, 2020

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Dec 13, 2019 •
edited
Loading

Fixes element-hq/element-web#11291

Blocked on Babel 7

@turt2live
Copy link
Member

This can't be blocked on babel 7 because babel 7 is already blocked on this...

@t3chguy
Copy link
Member Author

t3chguy commented Dec 17, 2019 •
edited
Loading

This is staged against a branch on js-sdk which still holds babel 6, so in theory this would work if babel 7 was brought into react-sdk but until that time it'll fail against js-sdk develop.

DO NOT MERGE until babel 7

@t3chguy t3chguy marked this pull request as ready for review December 19, 2019 11:21
@t3chguy t3chguy requested a review from turt2live January 6, 2020 17:12
@turt2live turt2live changed the base branch from develop to travis/sourcemaps January 9, 2020 22:53
turt2live
turt2live approved these changes Jan 9, 2020
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

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

looks plausible. I'll handle the merge conflicts and get it into the sourcemaps branch.

@turt2live turt2live merged commit 4fe0150 into travis/sourcemaps Jan 9, 2020
@t3chguy t3chguy deleted the t3chguy/jest branch May 25, 2020 18:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@turt2live turt2live turt2live approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@t3chguy @turt2live