Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RNmobile] Upgrade to RN 0.61.5 #19369

Merged
merged 24 commits into from
Jan 24, 2020
Merged

[RNmobile] Upgrade to RN 0.61.5 #19369

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
273a24e
`focusable` replaced `clickable
hypest Nov 22, 2019
a082b33
Merge branch 'master' into rnmobile/upgrade-to-rn-0.61
hypest Dec 16, 2019
b05f1e4
Provide a native colors.native.scss
hypest Dec 16, 2019
865f005
Upgrade React Native version in Gutenberg web repo
hypest Dec 16, 2019
1c31695
Jest doesn't have hasteImplModulePath anymore
hypest Dec 16, 2019
951cd38
Work around other regressions. Will revert when those fixed
hypest Dec 17, 2019
2c507e6
Merge commit '619b80d' into HEAD
hypest Dec 20, 2019
3d55012
Merge commit '296f94c' into rnmobile/upgrade-to-rn-0.61-extra-hermes
hypest Dec 30, 2019
57b233d
Bump react-native version to 0.61.5
hypest Dec 30, 2019
68ec09d
Update babel-jest to try fixing babel-plugin-jest-hoist jest.mock issue
hypest Dec 31, 2019
106dd45
Update jest to try fixing babel-plugin-jest-hoist jest.mock issue
hypest Dec 31, 2019
7e3c2b5
Pin xmldom to older version to bypass license file ambiguity
hypest Dec 31, 2019
ef2ae71
Revert "Provide a native colors.native.scss"
hypest Dec 31, 2019
921ff4d
Merge commit 'ee6cc56' into rnmobile/upgrade-to-rn-0.61-extra-hermes
hypest Jan 22, 2020
79dbd06
Revert "Pin xmldom to older version to bypass license file ambiguity"
hypest Jan 22, 2020
1f82623
Cater for lowercase OR in licenses types
hypest Jan 22, 2020
8f1f65a
Merge branch 'master' into rnmobile/upgrade-to-rn-0.61-extra-hermes
hypest Jan 22, 2020
63b5806
Update package-lock.json via npm v6.13.6
hypest Jan 22, 2020
b3625b9
Check for the same "or" format as we're splitting
hypest Jan 22, 2020
3264117
Merge branch 'master' into rnmobile/upgrade-to-rn-0.61-extra-hermes
hypest Jan 23, 2020
a6a7f9c
Update package-lock.json after running run check-local-changes
hypest Jan 23, 2020
99c6bd7
Merge branch 'master' into rnmobile/upgrade-to-rn-0.61-extra-hermes
hypest Jan 24, 2020
fcb5fef
Fix package-lock.json conflicts by keeping Jest to 24.9.0, Babel to
hypest Jan 24, 2020
29705d8
Update package-lock by running npm install
hypest Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into rnmobile/upgrade-to-rn-0.61-extra-hermes 
Leaving the merge conflicts inside package-lock.json to resolve in
separate commit for greater visibility.
  • Loading branch information
@hypest
hypest committed Jan 24, 2020
commit 99c6bd7424442cce80f942806aad6e36b8fee8ac
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.