Merge existing release to master #2
Merged
Conversation
This file contains hidden or 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
* Nihaux/immutable2: immutable compatibility close FormidableLabs#77
…nvert it back when placing it in props
Though react-redux's [5.0.0 release is backwards compatible with 4.0.0])(https://github.com/reactjs/react-redux/releases/tag/v5.0.0), in the spirit of supporting multiple versions as with the react and react-dom dependency, this change allows either version to be used. This will silence the peer dependency warning.
…he immutable flag is set
Note that this reveals the unintended side-effect that the `patternOptions` are included in the matching `route`
* immutable2: Also handle plain old Javascript objects being passed in, even when the immutable flag is set Make the router an immutable object through a deep conversion, and convert it back when placing it in props Resolve duplicate merged methods of finding currentLocation immutable compatibility close FormidableLabs#77
* allow-url-pattern-options: eslint fixes if `patternOptions` is defined on the route, omit it from the result Add `lodash.omit` so that we can remove `patternOptions` from route matches Add test for `patternOptions` Add a note and example for how `url-pattern` options can be set Allow routes to specify `patternOptions` to pass through to `url-pattern`
|
@matthewhampton says we should look at removing the build stuff from here... (and just get webpack to build this for us) |
|
@davidfraser You mean the committed files in dist? I'm happy to wait until you've done that, if you're going to do it now. Otherwise we can always do it later. |
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.
Merge changes from our earlier release, off a branch called j5-12.1.2-j5-1. This contains: