Skip to content

Commit

Permalink
Sync React with Haste-style imports rewritten to use path-based impor…
Browse files Browse the repository at this point in the history
…ts instead

This commit uses the same base commit of React that's currently in RN (React ec6691a68716bc59291746fc62f374a56fb435c9) plus a commit in the React repo that removes Haste-style imports from the renderer and a commit to make the shims import from `implementations` (facebook/react#15786).

I built React in the React repo with `yarn build` and copied over the `oss` directory into one called `implementations` and removed the `*.fb.js` files.

Test plan: run unit tests, RNTester, CI. Also verified that we can make Metro pick up `.fb.js` files with:

```js
resolver: {
  sourceExts: ['fb.js', 'js', 'json', ...],
}
```
  • Loading branch information
ide committed May 31, 2019
1 parent 2aca234 commit b0d0c20
Show file tree
Hide file tree
Showing 10 changed files with 641 additions and 489 deletions.
2 changes: 1 addition & 1 deletion Libraries/Renderer/REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ec6691a68716bc59291746fc62f374a56fb435c9
87d375afd0d9394646a4bcddcebb7b15ffaa7e9e
Loading

0 comments on commit b0d0c20

Please sign in to comment.