Merge master into shilman/refactor-core
#2628
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Questionable changes: - ability to pass a story decorator function - pass clearDecorators to ConfigAPI React/Vue/Angular working (apparently). RN still broken.
- resolve conflicts - fix RN story_store (make it an EventEmitter)
- move keyboard handling to the UI library, rather than introducing new deps - keep QS handling in each framework (for now)
…factor Use store revisions to ensure that stories re-render on HMR.
…factor-core-rebase
|
We could also just merge this directly into |
|
Oh, man 🤕 ... |
|
I'm not sure how best to show the diff between this branch and @shilman's? Perhaps I should just change the base of this to |
This didn't apply at all cleanly as it involved adding code to each framework's `init.js`, which was removed in the refactor. Here we do better; we simply abstract the job of URL<->redux store syncing to the core library.
tmeasday
force-pushed
the
tmeasday/shilman-refactor-core-rebase
branch
from
a4530fe to
ad97f32
Compare
Codecov Report
@@ Coverage Diff @@
## master #2628 +/- ##
==========================================
+ Coverage 32.65% 34.33% +1.68%
==========================================
Files 398 388 -10
Lines 8868 8681 -187
Branches 968 913 -55
==========================================
+ Hits 2896 2981 +85
+ Misses 5298 5074 -224
+ Partials 674 626 -48
Continue to review full report at Codecov.
|
|
I think better merge it to #2241 and we will review it again there |
|
|
oops, sorry fixed this but forgot to push last night. |
|
I think everyone is sufficiently weirded out by this PR, I will change the base to |
|
Hopefully a little easier to understand now. |
|
This is passing now. |
ndelangen
approved these changes
Jan 3, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue: #2241 was out of date
What I did
Merged
master. Also re-applied #2349 in ad97f32How to test
Please test all 3 web-based frameworks, especially around HMR and the issues explored in #2349