Updated regex to match attribute change of v4 #181
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
MicheleBertoli
requested changes
Sep 6, 2018
There was a problem hiding this comment.
This is awesome, thanks @fbring.
Well done with the tests, and I'm glad you made a backwards-compatible change.
Unfortunately, I tried upgrading to v4 locally and I noticed there are various broken tests, so I need to do a bit more work - but this is covered for now.
I left one comment, and then we can merge.
| @@ -18,7 +18,7 @@ if (isStyledComponent) { | |||
| StyleSheet = secretInternals.StyleSheet | |||
| } | |||
| } else { | |||
| StyleSheet = require('styled-components/lib/models/StyleSheet').default | |||
| StyleSheet = require('styled-components/lib/models/StyleSheet').default // eslint-disable-line | |||
There was a problem hiding this comment.
This gives you an error only when you have v4 installed, right?
I couldn't repro with v3.
If that's the case, this is safe to remove, as this PR is not adding v4 yet.
|
Thank you very much, @fbring. |
MicheleBertoli
approved these changes
Sep 8, 2018
|
Thank you, @MicheleBertoli . Sorry, yesterday I had no time to look over it again. |
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.
As already mentioned in #169 there is an attribute update in v4 of styled-components.