Skip to content
This repository was archived by the owner on May 14, 2021. It is now read-only.

Merge 1.0 branch into master #111

Merged
merged 33 commits into from
Aug 28, 2017
Merged

Merge 1.0 branch into master #111

merged 33 commits into from
Aug 28, 2017

Conversation

mxstbr
Copy link
Member

@mxstbr mxstbr commented Aug 28, 2017

THIS DOES NOT RELEASE v1.0

Since I don't think we'll do anymore pre-v1 releases we can now merge the 1.0 branch into master to avoid them going out of date all the time. WDYT?

ismay and others added 28 commits August 17, 2017 11:48
Update package.lock
d6582ad
Add stylelint-config-styled-components-processor as peer dependency
cf988ad
Remove ignoring of stylelint rules
15093e0
Update typescript to supress warnings during testing
9f85932
Remove todo comment
09f9578
Don't mutate stylelintResult
24d6a1f
Update readme
e152b93
Update readme
1331c92
Fix readme wording
6b71c0f
@emilgoldsmith
Revert Typescript to 2.3.2 for updating in different PR
2d655a9
@emilgoldsmith
Merge pull request #49 from styled-components/move-to-shared-config
d7d0122 
Move to shared config
@emilgoldsmith
Initial implementation efforts for interpolation tags
9e79304
@emilgoldsmith
Initial tests for interpolation tags
23dacc7
@emilgoldsmith
Implemented extrapolateShortenedCommand
1d96a49
@emilgoldsmith
Added tests for extrapolateShortenedCommand
5ae6913
@emilgoldsmith
Implemented and tested extractScpTagInformation
c91bbc3
@emilgoldsmith
Implemented basic current interpolation tag API spec and basic tests
61c8f4c
@emilgoldsmith
Renamed Scp to Sc
e813aad
@emilgoldsmith
Add error throwing to invalid sc- tags
d42f3a1
@emilgoldsmith
Implemented and added tests for quotes for custom placeholder
46743cb
@emilgoldsmith
Edited a few comments
18c89f1
@emilgoldsmith
Completed tests
4732a2a
@emilgoldsmith
Rewording of turning off rules in README
65aae8e
@emilgoldsmith
first draft of interpolation tagging README section
de0da57
@mxstbr @emilgoldsmith
README overhaul
f013644
@emilgoldsmith
Removed ref from the interpolation tagging API
86b660f
@emilgoldsmith
Merge pull request #70 from styled-components/feature/label-interpola…
c971fde 
…tions-by-comment

Add interpolation tags
@mxstbr
Merge branch 'master' into 1.0
da1c593
@mxstbr mxstbr requested review from a user and emilgoldsmith August 28, 2017 13:01
@mxstbr
Copy link
Member Author

mxstbr commented Aug 28, 2017

Ugh linting... One sec.

@mxstbr mxstbr mentioned this pull request Aug 28, 2017
Merged
@mxstbr
Copy link
Member Author

mxstbr commented Aug 28, 2017

Now prettier fails, even though it doesn't locally. That's fun!

@ghost
Copy link

ghost commented Aug 28, 2017

Now prettier fails, even though it doesn't locally. That's fun!

Maybe version difference between your local version and the remote one?

@mxstbr
Copy link
Member Author

mxstbr commented Aug 28, 2017

I thought of that, but I'm running the latest version 😕

It's still failing and now I'm out of ideas why that could be. Ugh.

@ghost
Copy link

ghost commented Aug 28, 2017

@mxstbr This should fix it. Running lint:prettier showed the same error as on travis for me locally. Should be a version mismatch or just a file that wasn't fixed by prettier previously. Anyway, hopefully it passes now.

@emilgoldsmith
Copy link
Member

I think it could be related to node versions possibly?

@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling add5e35 on 1.0 into f67b192 on master.

emilgoldsmith
emilgoldsmith approved these changes Aug 28, 2017
View reviewed changes
Copy link
Member

@emilgoldsmith emilgoldsmith left a comment

Choose a reason for hiding this comment

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

I'm good with merging this in as well :).

@mxstbr mxstbr merged commit 0bc8560 into master Aug 28, 2017
@mxstbr
Copy link
Member Author

mxstbr commented Aug 28, 2017

Thanks @ismay!!

@emilgoldsmith emilgoldsmith deleted the 1.0 branch August 31, 2017 16:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@emilgoldsmith emilgoldsmith emilgoldsmith approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mxstbr @emilgoldsmith @coveralls