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.

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

Revert moving index.[ios|android].js. #1201

Merged
merged 3 commits into from
Jun 7, 2017
Merged

Conversation

tmeasday
Copy link
Member

@tmeasday tmeasday commented Jun 6, 2017

Issue: See #1200

What I did

Moved index.js -> index.[ios|android].js. (It didn't seem possible to make the files import index.js, I ran into this problem: facebook/react-native#6282, maybe you aren't allowed to register components from an imported file? IDK).

How to test

Follow the steps in #1200, but using npm link-ed CLI

@tmeasday tmeasday requested a review from shilman June 6, 2017 03:06
@tmeasday tmeasday force-pushed the 1200-fix-RN-getstorybook branch 3 times, most recently from 2a98396 to effa811 Compare June 6, 2017 03:08
@codecov
Copy link

codecov bot commented Jun 6, 2017

Codecov Report

Merging #1201 into master will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1201      +/-   ##
==========================================
+ Coverage   13.71%   13.72%   +0.01%     
==========================================
  Files         207      207              
  Lines        4615     4611       -4     
  Branches      509      621     +112     
==========================================
  Hits          633      633              
+ Misses       3535     3434     -101     
- Partials      447      544      +97
Impacted Files Coverage Δ
app/react-native/src/bin/storybook.js 0% <0%> (ø) ⬆️
app/react-native/src/preview/story_kind.js 0% <0%> (ø) ⬆️
addons/events/src/components/Event.js 0% <0%> (ø) ⬆️
addons/info/src/components/markdown/code.js 0% <0%> (ø) ⬆️
app/react/src/client/preview/error_display.js 0% <0%> (ø) ⬆️
...react-native/src/manager/components/PreviewHelp.js 0% <0%> (ø) ⬆️
lib/ui/src/modules/ui/configs/handle_routing.js 28.94% <0%> (ø) ⬆️
.../src/manager/containers/CommentsPanel/dataStore.js 34.78% <0%> (ø) ⬆️
app/react-native/src/bin/storybook-start.js 0% <0%> (ø) ⬆️
lib/ui/src/modules/ui/containers/left_panel.js 20% <0%> (ø) ⬆️
... and 23 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9e8abd5...e2cd69b. Read the comment docs.

Copy link
Member

@shilman shilman left a comment

Choose a reason for hiding this comment

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

Proposal in the spirit of the original DRY change:

mv index.js storybook.js

Both index.android.js and index.android.js get:

import StorybookUI from './storybook';
export default StorybookUI;

Tested this for ios and it works.

Reverting from 3e2673b -- this broke RN-storybook for `getstorybook` users.

See #1200
@tmeasday tmeasday force-pushed the 1200-fix-RN-getstorybook branch from effa811 to 782a6e3 Compare June 6, 2017 11:35
@tmeasday
Copy link
Member Author

tmeasday commented Jun 6, 2017

Interesting, it didn't have the bug when I did it that way. I think maybe when I tried to make it index.js rather than storybook.js with the same content, the problem was there. Or maybe it was just RN being weird? Hopefully this works every time :/.

@shilman shilman merged commit 013e574 into master Jun 7, 2017
@shilman shilman deleted the 1200-fix-RN-getstorybook branch June 7, 2017 12:57
@ndelangen ndelangen added this to the v3.0.2 milestone Jun 7, 2017
@ndelangen ndelangen added the cleanup Minor cleanup style change that won't show up in release changelog label Jun 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cleanup Minor cleanup style change that won't show up in release changelog cli react-native
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants