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

Flat bundles for each possible entry #1362

Merged
merged 10 commits into from
Jan 10, 2018

Conversation

Andarist
Copy link
Contributor

@Andarist Andarist commented Dec 17, 2017

fixes #1359

  • fix tests (dunno why some tests are failing atm)

@mxstbr
Copy link
Member

mxstbr commented Dec 17, 2017

screen shot 2017-12-17 at 15 43 52

Also, I think Danger is failing because it's using the .babelrc?

@mxstbr
Copy link
Member

mxstbr commented Dec 17, 2017

Danger works again 🎉 Tests are still failing though 😢

@Andarist
Copy link
Contributor Author

Yeah, seems like some problem with jest not hooking into require for whatever reason. Need to dig into this later.

rollup.config.js Outdated
if (prod) plugins.push(uglify(), visualizer({ filename: './bundle-stats.html' }))
if (PRODUCTION) {
plugins.push(uglify(), visualizer({ filename: './bundle-stats.html' }))
}

export default {
Copy link
Member

Choose a reason for hiding this comment

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

Just a quick note, you can use an array here to avoid bloating the package scripts 😬

Not sure if you explicitly decided against it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

just went with the approach already used in the repo, can refactor to array later

@Andarist
Copy link
Contributor Author

Ok, I think I'v fixed the tests, let's see what CI has to say about that 😉

@Andarist Andarist changed the title [wip] Flat bundles for each possible entry Flat bundles for each possible entry Dec 17, 2017
@Andarist
Copy link
Contributor Author

@philpl @mxstbr the PR is ready for code review 🎉

rollup.config.js Outdated
plugins,
globals: { react: 'React' },
outro: BABEL_ENV === 'cjs' ? "module.exports = exports['default']" : '',
Copy link
Member

Choose a reason for hiding this comment

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

Isn't this technically a breaking change? Did people using the CJS bundles have to do const styled = require('styled-components').default before but not now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Both flavours are supported now:

  • const styled = require('styled-components').default
  • const styled = require('styled-components')

Adding the support for latter is not a breaking change, but rather an 'enhancement'.

But anyway babel-plugin-add-module-exports was already used on master on cjs target - see here. So it would be a breaking change to remove that.

It is somewhat a breaking change to remove lib directory. People could import things from 'internal' lib directory before this PR, probably not many did this, but that's a question for you if you consider removing this a breaking change. IMHO it shouldnt be treated as such, lib structure is in my eyes an implementation detail and reaching to it should be considered a bad practice.

Copy link
Member

Choose a reason for hiding this comment

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

Ohh I see, that makes sense! Thanks for the explanation.

Yeah definitely a bad practice, I would definitely not call that a breaking change.

@maciej-ka
Copy link
Contributor

maciej-ka commented Dec 17, 2017

yarn dev is failing

package.json Outdated
"build:native": "cross-env BABEL_ENV=cjs NATIVEBUNDLE=true rollup -c",
"build:primitives": "cross-env BABEL_ENV=cjs PRIMITIVESBUNDLE=true rollup -c",
"build:no-parser:es": "cross-env NOPARSERBUNDLE=true rollup -c",
"build:no-parser:cjs": "cross-env BABEL_ENV=cjs NOPARSERBUNDLE=true rollup -c",
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe let's move details to a new scripts/build.js and here provide only one task that we could call:
yarn build to build all
yarn build native to build selected (passed by args)

Copy link
Member

Choose a reason for hiding this comment

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

That's a great idea! it'd enable us to do both a general build, or a granular one 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

are granular builds really that useful and needed here? personally i liked the proposal of stuffing everything into a single rollup config (arrayed etc) - i guess though that with that in place it shouldnt be hard to introduce a possibility of granular builds by using some env variable like BUILD_ONLY=granular_type

Copy link
Contributor

@maciej-ka maciej-ka Dec 17, 2017

Choose a reason for hiding this comment

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

The remark is about moving implementation details out of package.json to keep it readable.

@@ -0,0 +1,7 @@
{
Copy link
Member

Choose a reason for hiding this comment

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

We could replace this with no-parser/index.js similarly to native as it's intended to mirror the same structure

Copy link
Contributor Author

Choose a reason for hiding this comment

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

actually we cannot do this, i've discussed this briefly yesterday with @mxstbr - the problem is that no-parser entry is used in combination with babel plugin, but when used with module aware bundler (webpack2+, rollup) the import rewriting which is done by the babel plugin points to this no-parser which is in commonjs format, so we've traded es modules for cjs even if using module aware bundlers

this way styled-components/no-parser will point correctly to appropriate module format and will be resolved with 'regular rules' based on what type of bundler you use

when I think about it now, styled-components/primitives should get similar package.json instead of proxying file as it is supposed to be runnable in the browser too, right? 🤔

Copy link
Member

Choose a reason for hiding this comment

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

Yep true, that'd be great!

Copy link
Member

Choose a reason for hiding this comment

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

@mxstbr we could also drop the preprocess/no-parser stuff for the next major release as that was just a proof of concept, but we'd add it back eventually 😅but that might give us some time to think about a better way to implement it

Copy link
Member

Choose a reason for hiding this comment

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

Wait, why? This works perfectly fine now, exactly like it did before except even better in that it resolves to the ES Modules build (so it's treeshakeable) if you bundle with webpack.

Why would we remove this?

@mxstbr mxstbr mentioned this pull request Dec 17, 2017
3 tasks
@Andarist
Copy link
Contributor Author

@maciej-ka good catch, gonna fix it when refactoring the scripts

@mxstbr mxstbr mentioned this pull request Dec 18, 2017
@Andarist
Copy link
Contributor Author

Ready for another round of code review. I've decided not to introduce possibility of granular builds because it would complex the code quite a bit for imho questionable gains. Let me know what do you think about it.

mxstbr
mxstbr previously approved these changes Dec 19, 2017
Copy link
Member

@mxstbr mxstbr left a comment

Choose a reason for hiding this comment

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

This looks good to me locally, shall we merge in master and release an alpha with this to try and see if it works?

rollup.config.js Outdated
'process.env.NODE_ENV': JSON.stringify('production'),
}),
inject({
process: processShim,
Copy link
Member

Choose a reason for hiding this comment

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

Why do we not need the process shim for the dev umd bundle?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

have no idea why it is here at all for any bundle type - i just have left this untouched, it was already there before my PR

Copy link
Member

Choose a reason for hiding this comment

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

Let's try creating a bundle with and without it and look at the diff? If there's none we should just get rid of it. 😁

@maciej-ka
Copy link
Contributor

❤️ how you improved readability of packages.json and rollup config. I should find a moment for an indepth review tonight.

@Andarist
Copy link
Contributor Author

@mxstbr I've checked outputs with and without process shimming - there was no difference. I've removed virtual module resolver few lines above, it also doesn't seem to have any impact. process.env should be replaced in umd bundles (like it is) and process generally shouldnt be used for anything else, so it shouldn't appear nowhere in the bundles.

Still unsure why this was configured though in the first place. I see you changed policy of replacing the process.env just few days ago - this PR will change that again, but I believe it will change it to the more correct usage:

  • umd bundles should have it replaced
  • any other bundle, no matter if its es, cjs, targeting react-native or primitives should have it untouched and replacing should be done by the consumer's bundle

@mxstbr
Copy link
Member

mxstbr commented Dec 19, 2017

Yep, that's the way it was with the last change too except now we have more bundles where it should be left untouched! This LGTM, can we rebase on master? Then I'll publish an alpha release so people can try this.

@Andarist
Copy link
Contributor Author

Ah, yeah, forgot that lib covered most of those builds before. Rebase coming in a minute

@Andarist
Copy link
Contributor Author

Done, no conflicts so it was even quicker ;) Feel free to squash my commits or whatever, im unsure what flow do you like here. Going out for a Christmas party, so won't be able to tweak this in any way myself till tomorrow.

@mxstbr
Copy link
Member

mxstbr commented Dec 19, 2017

Enjoy the party!!

kitten
kitten previously approved these changes Dec 19, 2017
Copy link
Member

@kitten kitten left a comment

Choose a reason for hiding this comment

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

Super happy with how this is looking ❤️ 🎉 🌮 Let's ship it (as an alpha) 😬

@mxstbr
Copy link
Member

mxstbr commented Dec 19, 2017

Gotta merge #1371 into master and then rebase this again first though, otherwise the alpha's going to be broken haha 😊

@mxstbr
Copy link
Member

mxstbr commented Dec 19, 2017

Done, I've published a first version of this as styled-components@alpha! (v2.3.3-0) Going to write a quick post in our community about this so folks can start testing and give feedback whether it works.

@mxstbr
Copy link
Member

mxstbr commented Dec 19, 2017

maciej-ka
maciej-ka previously approved these changes Dec 20, 2017
Copy link
Contributor

@maciej-ka maciej-ka left a comment

Choose a reason for hiding this comment

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

Works and looks great 👍

@Andarist
Copy link
Contributor Author

Andarist commented Jan 3, 2018

👋 do you want to test this some more or are we ready to merge this?

@quantizor
Copy link
Contributor

Don't merge this just yet - might have found an SSR bug. Trying to get my debugging environment to work to verify it >_<

@quantizor
Copy link
Contributor

Hmm... not sure why but my server-side build via webpack doesn't seem to be able to process the named exports from styled-components.cjs.js. It errors out and when I inspect the webpack require object, only the default export is visible.

@Andarist
Copy link
Contributor Author

Andarist commented Jan 3, 2018

I think I know what's going on. Need to check what exact output was produced before the PR, but it's past midnight now, so need to investigate this 2morrow.

Thanks for checking this! I've not verified cjs output good enough - I also thought that this repo is having tests against compiled output.

@Andarist
Copy link
Contributor Author

Andarist commented Jan 3, 2018

Ok, lol, made a quick investigation now 😅 Should be fixed now.

Copy link
Contributor

@quantizor quantizor left a comment

Choose a reason for hiding this comment

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

This is working for me now, thanks and great work!

@quantizor
Copy link
Contributor

@mxstbr want to cut another alpha?

@mxstbr
Copy link
Member

mxstbr commented Jan 4, 2018

@probablyup done, published v2.5.0-0 as styled-components@alpha with the latest changes!

I also thought that this repo is having tests against compiled output.

We should probably run our tests this way...

@mxstbr
Copy link
Member

mxstbr commented Jan 4, 2018

Oops, mispublished. Had to undo v2.5.0-0, and republished alpha as v2.5.0-1. Test styled-components@alpha!

@mxstbr mxstbr closed this Jan 4, 2018
@mxstbr mxstbr reopened this Jan 4, 2018
@quantizor
Copy link
Contributor

Going to give this another test drive at work tomorrow on one of our larger projects. If all looks good, will merge it 👍

@quantizor quantizor merged commit 25fedf9 into styled-components:master Jan 10, 2018
@quantizor
Copy link
Contributor

Excellent work @Andarist, thank you!

@Andarist
Copy link
Contributor Author

Not a problem, for some weird reason Im really enjoying tweaking build infra and I've just hated it not so long time ago 😅

@Andarist Andarist deleted the flat-bundle branch January 10, 2018 09:31
schwers-zz pushed a commit to schwers-zz/styled-components that referenced this pull request Mar 5, 2018
commit ee5903b28262680e766a1e9444726e032633bbc4
Author: Phil Plückthun <phil@plckthn.me>
Date:   Fri Jan 26 01:28:55 2018 +0000

    Remove leftover getComponentIds that was readded by a rebase

commit c001fef8c71e53ba7e80a5961e492cda10d46fdf
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Jan 25 21:15:36 2018 +0000

    Remove console.error for insertRule

commit 1e85a513ca97aa15eafe7fc7280a321e463e1b0c
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Jan 25 13:15:00 2018 +0000

    Update CHANGELOG entry

    Because why not at this point :sweat_smile:

commit e0702a6448564e672ffe82d1876153acaafb201e
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Jan 25 13:10:10 2018 +0000

    Fix bundled NODE_ENV=prod SSR edge-case (small revert)

    Turns out this won't work if someone decides to do
    some weird things with their SSR environment

commit 3ce1b9507dc2d202d55a721e5fda9bd6d35df373
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Jan 25 12:59:00 2018 +0000

    Fix SSR tests and remove obsolete ssr+minify test

    See f52e409

commit 86af6bfad23d2fba0878bf61e0d20a87f38b9f9c
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Jan 25 12:49:28 2018 +0000

    Remove SSR/testing APIs in production

    - Remove toHTML / toReactElement in SpeedyBrowserTag
    - Remove toHTML / toReactElement in StyleSheet

commit 0aee1cfbf9e7c1c036eb0ded63a68bd5f6e077a2
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Jan 25 00:21:31 2018 +0000

    Revert #1224

    It was causing a regression in SSR which easily goes unnoticed and
    doesn't only affect this PR but broke master too.

    In general minification is not necessary because the SSR'd CSS code
    has already run though stylis. Together with gzip this means that the
    actual gains in size are negligible.

    Since I'm not sure how well it plays with extractCompsFromCSS.js in
    *all* scenarios I'll revert it (for now)

commit 8e51a9bace81eb9d6c764b4763952877254c3f50
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 23:56:01 2018 +0000

    Fix rule concatenation in ServerStyleSheet

commit 1341591e76ee38d2062fb5c2e05cc6a52d704fe6
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 23:01:49 2018 +0000

    Switch between BrowserTag variants to bring bundlesize down

commit aa82836f7b8b6dc3c5d858dda82b9d1e75c5df5e
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 22:38:17 2018 +0000

    Match replaceElement implementations

commit 54a559149ca3a6732b095ca23c88f150c80279d8
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 21:56:16 2018 +0000

    Implement alternate BrowserTag for insertRule respecting component order

commit c76655cd344d01c1720eb4020b99322fe8a58652
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 19:40:24 2018 +0000

    Set Jest-indicating __DEV__ flag to false in all bundles

commit f72779c8b1d838433fb63ff169d858d9e2254900
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 14:38:14 2018 +0000

    Refactor: Move nonce to BrowserStyleSheet head

commit 5876c0b3aae941558c592971e2bc8006566e6415
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 12:45:46 2018 +0000

    Add sheetForTag and try-catch around insertRule

    - Fix known Firefox quirk
    - Add try-catch around error-prone insertRule

commit b52168144f85c8a720b01271fa4c3d61955f6030
Author: Phil Plückthun <phil@plckthn.me>
Date:   Tue Jan 23 19:49:43 2018 +0000

    Fix up linting and NODE_ENV detection

commit e8df977155aec9aa2de7c91133507acb49772878
Author: Phil Plückthun <phil@plckthn.me>
Date:   Tue Jan 23 19:26:11 2018 +0000

    Remove import at-rule exception which was fixed in v0.0.7

commit 52c409385255ebc5758d78a8b91ca4b6c31a3a18
Author: Phil Plückthun <phil@plckthn.me>
Date:   Tue Jan 23 19:23:42 2018 +0000

    Set __DEV__ to false in rollup.config

commit 422c1660202d422381ce5ccc3487b16677d5ee08
Author: Phil Plückthun <phil@plckthn.me>
Date:   Tue Jan 23 18:01:08 2018 +0000

    Bump bundlesize (temporarily hopefully)

commit 962460f15ce3f04c2a149d9744371142a37067ac
Author: Phil Plückthun <phil@plckthn.me>
Date:   Tue Jan 23 18:00:41 2018 +0000

    Upgrade to stylis-rule-sheet@^0.0.7

commit a27b610c007d5fb798a4ec49591b5fd296c37dbd
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Thu Dec 21 13:46:46 2017 +0100

    Add CHANGELOG entry

commit c5e54c53017d50452690518e3d82dc6941d93666
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Thu Dec 21 13:45:34 2017 +0100

    Clean up merge conflict

commit 3de780949702866b40990f1fb8875c51c09c42f7
Author: Ryan Schwers <schwers.r@gmail.com>
Date:   Mon Oct 23 19:01:31 2017 -0700

    Use insertRule in the browser

commit 5436fb127ab1d87e156e34e294925c3ed7dd1293
Author: Ryan Schwers <schwers.r@gmail.com>
Date:   Mon Oct 23 18:33:47 2017 -0700

    Fix test for stylis sheet

commit bf072d9c1039aa7aa263e69a4616d2a23da91afb
Author: Ryan Schwers <schwers.r@gmail.com>
Date:   Mon Oct 23 18:23:57 2017 -0700

    Add stylis-rule-sheet parsing. Does not use insertRule yet

commit 41eb37dfbec246acaa378612e24e896f064274de
Author: Ryan Schwers <schwers.r@gmail.com>
Date:   Mon Oct 23 18:20:58 2017 -0700

    Setup array based structure for `insertRule` upgrade.

    * Updates Jest Snapshots
    * Adjusts whitespace

commit 5f011704c4d0d07bf7eb508a7ddfd068f44726d7
Merge: 371e009 ce2ad57
Author: Evan Scott <probablyup@gmail.com>
Date:   Thu Jan 25 14:21:20 2018 -0500

    Merge pull request #1430 from probablyup/streaming

    streaming support

commit ce2ad57769d4fe813ebd3578ca05109895ba8069
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Jan 24 22:47:09 2018 -0500

    ignore -> replace for removing internals

    for some reason the custom ignore() plugin doesn't work for that
    use case... but replace works like a charm.

commit 6ca043f49eb1502796315c4bf495b91c14651e9a
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Jan 24 01:24:42 2018 -0500

    try relative paths

commit 429d845058ce8a4f37234f36ec9c050e9a72cf0d
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Jan 24 01:19:37 2018 -0500

    compile out the error added in this PR

commit bd84cd5d59fc6ae42cc7a911c9e5d9aef8603420
Author: Evan Scott <probablyup@gmail.com>
Date:   Tue Jan 23 00:00:00 2018 -0500

    bump rollup-plugin-uglify

    saves some bytes

commit 64baaaae9fee81c1f4a28fb8fc813682d0a0690f
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Jan 22 23:11:31 2018 -0500

    migrateStreamingStyles -> consolidateStreamedStyles

commit 6e37ea8c61215c9b0b0e4f0a13d1878d3df6b1b0
Author: Evan Scott <probablyup@gmail.com>
Date:   Fri Jan 19 12:26:00 2018 -0500

    move no-parser browser field to root package.json

commit 16d6005b594ae8e0e3946eb52c5f4abc0d116aef
Author: Evan Scott <probablyup@gmail.com>
Date:   Fri Jan 19 12:16:42 2018 -0500

    adjust error message copy

commit 1f7611ad7a129d592abfef2b38cab0c73418dc00
Author: Evan Scott <probablyup@gmail.com>
Date:   Fri Jan 19 00:50:26 2018 -0500

    add browser builds without stream module

commit f22472e55bdf72a2fbaf493fbd1b0a098a36fc01
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Thu Jan 18 03:18:24 2018 -0500

    ignore test files from flow

commit c4e5062708d0983f4c9c67261b96e01682097fe7
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Thu Jan 18 03:07:51 2018 -0500

    add changelog entry

commit 057432e37bf519202dcc516609550a490085d9f3
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Thu Jan 18 03:01:30 2018 -0500

    close our stream properly

commit 05eb11afd06308f270e838f402be291e5a0dfd68
Author: Evan Scott <probablyup@gmail.com>
Date:   Tue Jan 16 03:07:07 2018 -0500

    implement migrateStreamingStyles utility

    When using streaming rendering, style blocks are emitted in chunks directly
    next to the HTML they reference. In order to prevent errors during rehydration
    (since React doesn't know about the style blocks we are interleaving) this
    method relocates all styled-component blocks to the end of `<head>`.

    Although the naming of this could be made generic, I thought
    it would be a good idea to be specific so people strongly associate
    the functionality with the streaming process.

commit edcc2e7cbbb5ebb28db5bb305e99e58ec0798732
Author: Evan Scott <probablyup@gmail.com>
Date:   Sat Jan 13 16:33:25 2018 -0500

    implement streaming support for SSR

commit 371e0090d4f95126b8e591bee6badbf9ab9806df
Merge: 75e3e4c 345cd65
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 20:27:46 2018 +0000

    Merge pull request #1448 from styled-components/fix/windows-internals-build

    Replace rollup-plugin-hypothetical with custom ignore plugin

commit 345cd654ce9e13847b1923f027cd8392e6494016
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 17:36:54 2018 +0000

    Replace rollup-plugin-hypothetical with custom ignore plugin

commit 75e3e4c28fbfaf0af79e04c9daf9703df88aee18
Merge: e2ffaca 725b9a8
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 24 08:55:11 2018 +0000

    Merge pull request #1445 from probablyup/compile-out-errors

    compile out development error messages for production

commit 725b9a8271084f71d06e8d9403e321a77bdfce39
Author: Evan Scott <probablyup@gmail.com>
Date:   Tue Jan 23 00:12:30 2018 -0500

    compile out development error messages for production

commit e2ffaca7d6d03a66a721c8984b16b40c63ba8d9f
Merge: c7a21ee 2b58c8c
Author: Evan Scott <probablyup@gmail.com>
Date:   Tue Jan 23 14:32:03 2018 -0500

    Merge pull request #1224 from bbohen/minify-getStyleElement-output

    Minify the output CSS when using SSR in production

commit 2b58c8c46625605afcc6301312839599739d3c9e
Author: Evan Scott <probablyup@gmail.com>
Date:   Tue Jan 23 13:25:04 2018 -0500

    bump threshold for now

commit c0d3251246d87232300fafa0c99cd41e55159c6d
Merge: e0faa88 c7a21ee
Author: Evan Scott <probablyup@gmail.com>
Date:   Tue Jan 23 10:45:57 2018 -0500

    Merge branch 'master' into minify-getStyleElement-output

commit e0faa8840751d53e6f9397a9d4e585a38d593aff
Author: Brad Bohen <bbohen@gmail.com>
Date:   Tue Jan 23 08:40:08 2018 -0500

    Add entry to CHANGELOG

commit eb1581507e0d4fe36b937874d06037a95984c26e
Author: Brad Bohen <bbohen@gmail.com>
Date:   Tue Jan 23 08:11:00 2018 -0500

    Removed CHANGELOG formatting

commit c7a21ee10d81545c24cfccea3a6f59d7a5b4a50f
Merge: a43caef 4ca60dd
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 21:45:01 2018 +0000

    Merge pull request #1439 from styled-components/v3.0.2

    v3.0.2

commit 4ca60dd2474b44427c25e6ff18d75174e9bf7718
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 19:19:45 2018 +0000

    v3.0.2

commit 3057689fce4c241186d2b7df584a9c7b08532f84
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 19:19:00 2018 +0000

    Update CHANGELOG

commit a43caefff2b20e98df0464546af80a5267bda9dd
Merge: 4240d61 6ecd7e7
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 19:17:53 2018 +0000

    Merge pull request #1438 from styled-components/fix/add-secret-internals

    Export secret internals for jest-styled-components 👻

commit 6ecd7e7f999f9e349dfdd974e7ecc5617e8a4641
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 19:05:21 2018 +0000

    Add entry to CHANGELOG

commit 728d961fdae0bff3c515a3026f4960facc7efb82
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 19:03:52 2018 +0000

    Remove secret internals from React Native (unneeded)

commit 357bd55c49a92e2352066db00f7f968bd67a2b13
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 18:55:08 2018 +0000

    Remove secret internals from production UMD bundle

commit d5fc5f9e776d47fc6e46e44e303a5a8736168807
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 18:28:22 2018 +0000

    Export secret internals for jest-styled-components

commit 4240d61abab5bf1618e3cde8d4a6d52b9d245fad
Merge: fcdf8d4 1e54dd7
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 16:31:58 2018 +0000

    Merge pull request #1436 from styled-components/v3.0.0

    v3.0.0 & v.3.0.1

commit 1e54dd710f0d3a13ac9251939a9b9f0f5a53f657
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 16:17:43 2018 +0000

    Fix CHANGELOG to point to 3.0.1

commit cac67baf84c3d766b1d0a53e54be96d7329e5a6f
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 16:17:09 2018 +0000

    v3.0.1

commit 8cf3cb191a51223a173c95f94d653448af5b7196
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 16:12:49 2018 +0000

    Enable "/native"-less import for React Native

commit ea8c55be8b88f1cbb57d3ef50a3f22430c87e590
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 16:01:24 2018 +0000

    Upgrade @types/react-native

commit b611155a9f5c73f87833058fc4629a3d11f3fa2f
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 15:47:40 2018 +0000

    Remove _remove_rn_globals.js script

commit 878b005a02ad31e0683179fcbbd135f3f8549ea8
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 14:28:15 2018 +0000

    v3.0.0

commit 239ad9b567c56c9e739c609a10cffcd1e65604e5
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 14:09:30 2018 +0000

    Add notes on pre-commit to husky migration to CONTRIBUTING.md

commit 3d8120bc64ad9ab46abfa698ea8deefb887d6301
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 14:06:14 2018 +0000

    Update CHANGELOG

commit fcdf8d40437acf004be2e1dcf3af66796254adcc
Merge: d811350 e646c31
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 15:57:22 2018 +0000

    Merge pull request #1339 from jpdriver/master

    Update support for React Native

commit e646c31519cdefec83b96b94ca0b24b45087813c
Merge: 792f3fb d811350
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 15:52:53 2018 +0000

    Merge branch 'master' into master

commit 792f3fbde248316a0a2daa64b71b6a69f386abb2
Merge: 77cc6c4 d811350
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Jan 22 15:49:53 2018 +0000

    Merge branch 'master' into master

commit d8113504536880055776b46733d759cea9d09292
Merge: e4f59b0 b463a8c
Author: Evan Scott <probablyup@gmail.com>
Date:   Sun Jan 21 17:53:04 2018 -0500

    Merge pull request #1427 from pelotom/allow-component-type

    Allow ComponentType to be passed to styled

commit b34bbf638a0f357d19890e85ec6ea0da2456818b
Merge: a601e4a e4f59b0
Author: Evan Scott <probablyup@gmail.com>
Date:   Fri Jan 19 23:41:43 2018 -0500

    Merge branch 'master' into minify-getStyleElement-output

commit b463a8c86b84099ef3ef766ccad12055cda0b831
Author: Tom Crockett <pelotom@gmail.com>
Date:   Sat Jan 13 20:04:49 2018 -0800

    Use React.ComponentType type in test

commit 06b5ec4b3168a200e6b1d8f44b8a3dcd6ee6638f
Author: Tom Crockett <pelotom@gmail.com>
Date:   Sat Jan 13 19:59:28 2018 -0800

    Disallow styling component with wrong typed theme

commit e4f59b047cb92c693ed2218dca934eef703fa2e7
Merge: 761fb10 ab2e25c
Author: Phil Plückthun <phil@plckthn.me>
Date:   Sun Jan 14 03:04:03 2018 +0000

    Merge pull request #1426 from probablyup/react-16

    upgrade tests to react 16

commit ab2e25c5cbe64f846b1ff9d19a918f8eceda0c9b
Author: Evan Scott <probablyup@gmail.com>
Date:   Sat Jan 13 20:48:45 2018 -0500

    upgrade tests to react 16

commit cd9dac9f854da13c50885713b94aadaaab4502c0
Author: Tom Crockett <pelotom@gmail.com>
Date:   Sat Jan 13 18:37:52 2018 -0800

    Add link to the TypeScript bug report

commit 3f3929b564b4276a3d0f069745884eaa158f494b
Author: Tom Crockett <pelotom@gmail.com>
Date:   Sat Jan 13 18:34:51 2018 -0800

    Add issue trail in comments

commit c6bf52cfa41499ab05b55fde20d0b33375dc61fe
Author: Tom Crockett <pelotom@gmail.com>
Date:   Sat Jan 13 18:24:55 2018 -0800

    Allow passing a React.ComponentType to styled()

commit 0ab1abbcb5c85603fc3d3b1502cba1db8813651c
Author: Tom Crockett <pelotom@gmail.com>
Date:   Sat Jan 13 18:03:44 2018 -0800

    Add failing test

commit 761fb104ac3d4a8aedd4dc1b3759cdce456ffada
Merge: 10aa07c 8c36719
Author: Phil Plückthun <phil@plckthn.me>
Date:   Sun Jan 14 00:25:08 2018 +0000

    Merge pull request #1425 from probablyup/es-sourcemaps

    generate and ship source maps with the flat builds

commit 10aa07c5014c1c88da9bd2fc71b09cba99950437
Merge: 0d0753b b4044b1
Author: Phil Plückthun <phil@plckthn.me>
Date:   Sun Jan 14 00:23:42 2018 +0000

    Merge pull request #1242 from theshortcut/enzyme-3

    Upgrade to enzyme v3

commit b4044b15e35b4431c1d6aed8d10e9fbbb45903f3
Author: Clayton Ferris <cferris@gmail.com>
Date:   Sun Oct 15 12:14:16 2017 -0700

    hack around react-native global typescript definitions clashing with node's

commit c6b79334a0cc2e160b0a08201912f5f38d00088c
Author: Clayton Ferris <cferris@gmail.com>
Date:   Sun Oct 15 10:09:59 2017 -0700

    Upgrade to enzyme v3

commit 8c36719ad4c2f4f72067351081c4a935c743f551
Author: Evan Scott <probablyup@gmail.com>
Date:   Sat Jan 13 14:52:26 2018 -0500

    generate and ship source maps with the flat builds

commit 0d0753b70a4ae8d8e8820dff81e0f14c04a7e47a
Merge: 58b4f01 7559eff
Author: Max Stoiber <contact@mxstbr.com>
Date:   Thu Jan 11 18:02:21 2018 +0100

    Merge pull request #1423 from JamieDixon/rollup-object-assign

    Remove object spread from rollup.config.js

commit 7559eff01e1046e68ba99441df6149d93575fa5b
Author: Jamie Dixon <jamie@jamie-dixon.co.uk>
Date:   Thu Jan 11 15:58:17 2018 +0000

    Remove object spread from rollup.config.js and replace with Object.assign

commit 58b4f012548cccfe6730bd2a8b649d59b7e739f8
Merge: beed1b8 e8469c8
Author: Max Stoiber <contact@mxstbr.com>
Date:   Wed Jan 10 10:32:05 2018 +0100

    Merge pull request #1405 from maciej-ka/fix-unknown-prop-console-error-in-test

    fix: console error in attrs test

commit e8469c83879fc15d6c75a322a1752381fd72432a
Author: Maciej Kasprzyk <kapustka.maciek@gmail.com>
Date:   Wed Jan 10 09:56:33 2018 +0100

    Update attrs.test.js

commit a601e4a673a115b4e2558e29f7898fd986e17eb8
Merge: fb314ed beed1b8
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Jan 10 03:01:57 2018 -0500

    Merge remote-tracking branch 'upstream/master' into HEAD

commit beed1b813a1bbe11a94f73d7aa3669392bd891eb
Merge: 25fedf9 5742428
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Jan 10 02:54:16 2018 -0500

    Merge pull request #1392 from probablyup/es-remove-trailing-comma

    remove trailing commas for functions

commit 25fedf9f996a6d6ec8b95c99b0ef0fa1428edf1c
Merge: c240fd1 bb3726e
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Jan 10 01:01:48 2018 -0500

    Merge pull request #1362 from Andarist/flat-bundle

    Flat bundles for each possible entry

commit c240fd14f5aeda59fc0aac3f479911a2af6d63c0
Merge: 5aa6ca9 9b8e50d
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Jan 10 05:25:40 2018 +0000

    Merge pull request #1418 from probablyup/es-expose-util

    expose isStyledComponent utility

commit 9b8e50dc5cee949f461bf4d1c9b5b08d49abbc06
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Jan 10 00:05:52 2018 -0500

    also add the util to the other indexes

commit 347447eb7897fbb9cac801a0130a2fc978c6a7e2
Author: Evan Scott <probablyup@gmail.com>
Date:   Tue Jan 9 23:51:17 2018 -0500

    expose isStyledComponent utility

commit 5aa6ca9a3eb28b17a3722df2ffec227bf4b416f1
Merge: 9df28d7 7b8745f
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Jan 10 00:00:47 2018 -0500

    Merge pull request #1414 from BenLorantfy/inner-ref-fix

    Inner ref fix

commit 7b8745f4bc7f674cc2bb416c6d855a086e821058
Author: Ben <benlorantfy@gmail.com>
Date:   Mon Jan 8 18:18:42 2018 -0500

    Removed flow suppresion

commit 20bb4d98c0f93f5d8854c0af97906d7afb481d98
Author: Ben <benlorantfy@gmail.com>
Date:   Mon Jan 8 15:43:42 2018 -0500

    Added to changelog

commit b1329243fe6a0a7e0e173660ab63f160afb32201
Author: Ben <benlorantfy@gmail.com>
Date:   Mon Jan 8 15:31:54 2018 -0500

    remove console.log

commit e962b5fa6d37369bcfface581995c848404fc837
Author: Ben <benlorantfy@gmail.com>
Date:   Mon Jan 8 15:26:54 2018 -0500

    fix

commit 77e627124f13ab43ab55473a05c360f63358ed38
Author: Ben <benlorantfy@gmail.com>
Date:   Mon Jan 8 15:24:10 2018 -0500

    fixed tests x3

commit 735d9af598fcfac81455995148b95ef774ff639a
Author: Ben <benlorantfy@gmail.com>
Date:   Mon Jan 8 14:47:21 2018 -0500

    fixed testsx2

commit c52830f6b962b59a101ccd72b88ffeec9343cd6c
Author: Ben <benlorantfy@gmail.com>
Date:   Mon Jan 8 14:37:39 2018 -0500

    fixed test

commit 0a2dee5eccb22a38177d11efb70344f0e599c2d4
Author: Ben <benlorantfy@gmail.com>
Date:   Mon Jan 8 14:21:39 2018 -0500

    Removed innerRef when it shouldn't be set

commit 9df28d74717e47504b5dfe262f81f1247229167d
Merge: e4caa40 265102c
Author: Evan Scott <probablyup@gmail.com>
Date:   Fri Jan 5 02:07:18 2018 -0500

    Merge pull request #1398 from danielbayerlein/update-license-year

    Update license year

commit 265102c7d45b8c3b2fe269d2dab6d01ab6d74052
Author: Daniel Bayerlein <daniel.bayerlein@googlemail.com>
Date:   Mon Jan 1 11:00:26 2018 +0100

    Update license year

commit e4caa40558eb663212b3a3d5dc0de9784da8e91c
Merge: 75502fb 722e8f2
Author: Phil Plückthun <phil@plckthn.me>
Date:   Fri Jan 5 03:30:13 2018 +0000

    Merge pull request #1404 from styled-components/welcome-evan

    Add @probablyup to the core team

commit e451d49191649e2e9becee92ba79db6805e77b97
Author: maciej-ka <maciej.kasprzyk.it@gmail.com>
Date:   Thu Jan 4 22:18:31 2018 +0100

    fix: console error in attrs test

commit 722e8f26f06384e0d414000c798df57ecdd84013
Author: Max Stoiber <contact@mxstbr.com>
Date:   Thu Jan 4 22:11:22 2018 +0100

    Add @probablyup to the core team

    Due to his amazing contributions over the past months and clear understand of the styled-components vision we decided to invite Evan to the core team. To our joy, he's accepted the invitation, so please welcome the newest member of our core circle: [@probablyup](https://twitter.com/probablyup)! 🎉🎊

commit bb3726e864f547489543d523e45a193af8ee5627
Author: Mateusz Burzyński <mateuszburzynski@gmail.com>
Date:   Thu Jan 4 00:54:37 2018 +0100

    Fixed issue with cjs outputs

commit 86a66d7a894104eb29a93d0fafaaa9c575239a0c
Merge: 873c5b7 75502fb
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Jan 3 17:18:00 2018 -0500

    Merge branch 'master' into flat-bundle

commit 75502fbf1f1fb413eeafd3f9f4cadfe06f646df6
Merge: 0ef2736 3317290
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 29 12:36:29 2017 +0100

    Merge pull request #1380 from gribnoysup/feature/refactor-sandbox-server

    Refactor sandbox setup

commit 33172901efddc193c0ddee6760fe558685267515
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Thu Dec 28 19:28:54 2017 +0100

    Handle server errors properly

commit b35c750fcdc73fd0e7193dc74fc5df040e392628
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Thu Dec 28 19:28:09 2017 +0100

    Add source maps to the client build

commit f1650e04dda77a92a90596c717e23f1ddc7f0e22
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Thu Dec 28 19:27:45 2017 +0100

    Disable webpackDevServer logging

commit c057c6cec70b0f8f70402d6c74f20758f1ae076c
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Wed Dec 20 23:50:37 2017 +0100

    Add EnvPlugin

commit d0fb77412e8b5c0fcc4e7bc76110d2fb65754573
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Wed Dec 20 23:34:15 2017 +0100

    Mark s-c as a core module; Remove unused eslint-plugin

commit 6abdba25ffa6d256fbde3ed76be6880198b9936a
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Wed Dec 20 23:14:40 2017 +0100

    Add custom babel config

commit 78404ba39b1b221c76bee955c00c2b8def00653a
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Wed Dec 20 22:41:52 2017 +0100

    Add raw-loader, move example to separate file; Add waitMiddleware; Add ssr and hot-reload

commit fd9faac38522d9c61cfd2aed5bd11fbeb4a523f5
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Wed Dec 20 21:44:14 2017 +0100

    Disable flowtype rule for sandbox

commit 050390673c89ed1d6dbc5283da6dc35310f9977a
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Wed Dec 20 21:43:39 2017 +0100

    Initial setup; Remove old server, replace with micro(-dev); Remove custom livereload, add webpack hmr

commit 0ef2736311f47003c64dda90d5e05de75c8b08c3
Merge: 7721e6f fd9848a
Author: Phil Plückthun <phil@plckthn.me>
Date:   Fri Dec 29 03:39:50 2017 +0100

    Merge pull request #1394 from gribnoysup/bug/server-side-navigator

    Change navigator check to prevent crashing in node env

commit fd9848aeae14b445260d0430e469b48e41ce893e
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Thu Dec 28 23:14:10 2017 +0100

    Update CHANGELOG.md

commit db64f033eead9170b8302d01bca41afc42844236
Author: Sergey <gribnoysup@users.noreply.github.com>
Date:   Thu Dec 28 21:53:38 2017 +0100

    Change typeof check

commit b10984c07effd622b8e26a4d8a76938731991ce3
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Thu Dec 28 18:32:04 2017 +0100

    Change navigator check to prevent crashing in node env

commit 7721e6f7b7709af8af11e0ece55c64ac3329fd24
Author: Luke Belliveau <luke.belliveau@gmail.com>
Date:   Thu Dec 28 11:08:08 2017 -0500

    Add ESLint precommit hook to CHANGELOG.md (#1393)

commit cfd5c62c833760dcc2224b9317981b504548bc9a
Merge: 4ed8b69 ee238c2
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Dec 28 15:11:01 2017 +0100

    Merge pull request #1376 from styled-components/prettier-eslint-precommit-hook

    Add pre-commit hook for prettier and eslint --fix

commit 5742428ad9389bcb3217ccb03d4fea001827f908
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Dec 27 17:06:51 2017 -0500

    remove trailing commas for functions

    They're not supported in ES5, which is tested against in the node
    versions included by the styled-components CI. Also disabled an
    eslint rule that was conflicting with what prettier was doing.

commit fb314ed8ff35d5810b24596f4653d2d45c6fb919
Merge: 3b0666d 4ed8b69
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Dec 27 12:21:12 2017 -0500

    Merge remote-tracking branch 'upstream/master' into HEAD

commit 4ed8b69a5a1ce0fb22b27110ea00f87cd0f9248f
Merge: f588fde fa02e00
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Dec 27 16:32:17 2017 +0100

    Merge pull request #1391 from stratiformltd/warn_on_react_native

    Add warning if importing Web Styled Components on React Native

commit fa02e0001526a279907437238f5e7c1aeb374983
Author: Taz Singh <taz@tazsingh.com>
Date:   Wed Dec 27 10:47:54 2017 +0000

    Add warning if importing Web Styled Components on React Native

commit f588fde46ba30d0c3504c42eab9675f51037fd78
Merge: 83900bc ea4ab8a
Author: Max Stoiber <contact@mxstbr.com>
Date:   Sat Dec 23 11:51:56 2017 +0100

    Merge pull request #1388 from tbroadley/fix-typos

    Fix typos

commit ea4ab8a475d24647f6fdc2d82b666c0a45f5ab62
Author: Thomas Broadley <buriedunderbooks@hotmail.com>
Date:   Fri Dec 22 21:23:26 2017 -0500

    Change "components" to "component"

commit 14829947e084dd8cd80135d6bd51442bc27fbfd1
Author: Thomas Broadley <buriedunderbooks@hotmail.com>
Date:   Fri Dec 22 21:22:44 2017 -0500

    docs: fix typos

commit 83900bc1a4a3fae904525e292f28948e1bd69f38
Merge: c9329e1 6c0b213
Author: Phil Plückthun <phil@plckthn.me>
Date:   Fri Dec 22 21:26:13 2017 +0000

    Merge pull request #1382 from Andarist/fix/nested-theme-providers

    Fixed nested themes not being republished on outer theme changes

commit c9329e1137a35b48f170c50f0394793a98577ada
Merge: a81042f 6adbb71
Author: Phil Plückthun <phil@plckthn.me>
Date:   Fri Dec 22 18:30:23 2017 +0000

    Merge pull request #1387 from styled-components/2.4.0

    v2.4.0

commit 6adbb7180bd212daa908454a7cdf0bbb9572c0df
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Fri Dec 22 10:53:15 2017 +0100

    v2.4.0

commit 4045187ce09923ae601772e9b33b33c8ebcabed4
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Fri Dec 22 10:51:15 2017 +0100

    Update CHANGELOG

commit a81042f3c12bbe77a15c8927742c689d3d8f2ea7
Merge: 2dc4d4c ff804ee
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 22 10:49:06 2017 +0100

    Merge pull request #1381 from probablyup/es-remove-numbering

    use a simpler hashing strategy when possible

commit ff804eed84c5481e8b202b4fcb84dedce3c99197
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Dec 20 18:27:29 2017 -0500

    add changelog entry

commit b2483b09f48f4a3a33fe414a3ebdaf785a81f8bc
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Dec 20 18:16:21 2017 -0500

    use a simpler hashing strategy when possible

    the execution order of files can differ between build environments
    and lead to mismatching hashes. if the babel plugin is being used, we
    will usually have a displayName, which will be unique enough for hashing
    purposes and we can fall back to the numerical way of doing things as
    a fallback

commit 6c0b213ba1459ea88c755fce38cd258f71da3639
Author: Mateusz Burzyński <mateuszburzynski@gmail.com>
Date:   Thu Dec 21 01:19:20 2017 +0100

    Fixed nested themes not being republished on outer theme changes

commit ee238c23922df0d5c4b462893bf07499322b90c8
Author: lukebelliveau <luke.belliveau@gmail.com>
Date:   Wed Dec 20 07:40:43 2017 -0500

    Some tweaks to format script and lint-staged config

commit 2dc4d4cb054b5453d3c3cab2c73d9a6b9ae8968e
Merge: aee7847 d2d6be5
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Dec 20 11:49:47 2017 +0000

    Merge pull request #1378 from styled-components/2.3.3

    v2.3.3

commit d2d6be5feafdc116a3429e6b6f71f7718c51a8ba
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Wed Dec 20 12:35:50 2017 +0100

    v2.3.3

commit 910a051f2f4111bb7c5c2a2f9d0a6d3aac351971
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Wed Dec 20 12:31:20 2017 +0100

    Update CHANGELOG

commit aee7847e378626fc4922dc021bc2e5a5307f44ee
Merge: f3d39ed 51b95f5
Author: Max Stoiber <contact@mxstbr.com>
Date:   Wed Dec 20 10:27:59 2017 +0100

    Merge pull request #1377 from probablyup/es-slimming-2

    add back the validAttr regex (corrected)

commit 51b95f5e354c840fdcdc2a26db4bf6ed5f7974b3
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Dec 20 00:39:57 2017 -0500

    fix the regex and add a note on how to regenerate it

commit 7b2a8f61e5cd6fcbd574ced17bb5d9bd39dfcb85
Author: Evan Scott <probablyup@gmail.com>
Date:   Wed Dec 20 00:21:51 2017 -0500

    revert "Revert "replace valid attrs with an optimized regex""

    This reverts commit 35b989b73fdd08a43ff4a441506caed518859894.

commit 2501f73be7e13d718fa1e2548032a3ea62162f74
Author: lukebelliveau <lbellive@thoughtworks.com>
Date:   Tue Dec 19 21:33:00 2017 -0500

    Remove pre-commit from dependencies and keys in package.json, as it was replaced with husky

commit e68f6f105a9345b7bf348b5cbce4563d97f5f5c4
Author: lukebelliveau <lbellive@thoughtworks.com>
Date:   Tue Dec 19 21:14:08 2017 -0500

    Re-add eslint-plugin-prettier and configure pre-commit hook such that it runs prettier as part of the eslint plugin. Add eslint-plugin-flowtype to ensure flow compatibility.

commit 41e12075859c531091ce679b1deae16c8bea02e4
Author: lukebelliveau <lbellive@thoughtworks.com>
Date:   Tue Dec 19 20:14:11 2017 -0500

    Add eslint-config-prettier and remove eslint-plugin-prettier from package.json and .eslintrc. Fix type inconsistency in eslintrc's "env" object.

commit 8640163f2ac482dfa366909be78056fb82ee3187
Author: lukebelliveau <lbellive@thoughtworks.com>
Date:   Tue Dec 19 18:52:56 2017 -0500

    Add 'format' script and attach to pre-commit hook. This script runs 'prettier' and 'eslint --fix' on the src/ folder.

commit f3d39edd28bbd3017a3c4803876f3127a4eb20bd
Merge: 3a409ad 609da3c
Author: Max Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 21:51:56 2017 +0100

    Merge pull request #1374 from Caryyon/syntax-readme

    Removed syntax-highlighting from REAMD.md

commit 609da3c03d0ca572ab42771c92cd4c8d9bf47f4d
Author: Cary <cary.wolff@swarmingtech.com>
Date:   Tue Dec 19 14:29:36 2017 -0600

    removed Code Completions and alternative installation

commit ea8b755fe741fad85e7edd0fa20b463cfd60ea50
Author: Cary <cary.wolff@swarmingtech.com>
Date:   Tue Dec 19 12:56:07 2017 -0600

    removed syntax-highlighting from REAMD.md

commit 873c5b7d001465d43b4b550cf45faa6e33271db9
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 18:56:39 2017 +0100

    v2.3.3-0

commit bc53492efa3b687dc82b3d452932783443ecb431
Author: Mateusz Burzyński <mateuszburzynski@gmail.com>
Date:   Tue Dec 19 17:59:24 2017 +0100

    Removed process shimming/injecting from the rollup config

commit 87089ba3bba92acae101a1bd0076574df9e3e52f
Author: Mateusz Burzyński <mateuszburzynski@gmail.com>
Date:   Tue Dec 19 16:59:57 2017 +0100

    Refactored constructing babel config in rollup config

commit 42c0314c72d2568c29c92fcfe857e5e32cf28911
Author: Mateusz Burzyński <mateuszburzynski@gmail.com>
Date:   Tue Dec 19 16:48:58 2017 +0100

    Refactored rollup.config.js

commit a4ee00aaad33f75d937d4c8f7fab2aa465b7a31b
Author: Mateusz Burzyński <mateuszburzynski@gmail.com>
Date:   Sun Dec 17 18:00:40 2017 +0100

    using loose mode for transform-class-properties

commit 4f3c0131f03455163bb90acab95abef3707aeb59
Author: Mateusz Burzyński <mateuszburzynski@gmail.com>
Date:   Sun Dec 17 17:44:38 2017 +0100

    fixed tests

commit 7b7540d04ffa1eaa5dcddd70532449dfe07a2145
Author: Mateusz Burzyński <mateuszburzynski@gmail.com>
Date:   Sun Dec 17 16:05:48 2017 +0100

    Fixed danger

commit 4b2045061ec95dd6a954c0a758e31fa634cbecef
Author: Mateusz Burzyński <mateuszburzynski@gmail.com>
Date:   Sun Dec 17 15:34:54 2017 +0100

    Flat bundles for each possible entry

commit 3a409ad09079550137b236624eece94d1b27846e
Merge: 9807f62 d53d599
Author: Phil Plückthun <phil@plckthn.me>
Date:   Tue Dec 19 17:44:54 2017 +0000

    Merge pull request #1371 from styled-components/fix-attr-filtering

    [HOTFIX] Revert validAttr.js change

commit d53d599b5f8e49cb386c35e9ce81db5560224883
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 18:31:13 2017 +0100

    Update changelog

commit 8d8e6b9f0e4898706b0f5abc649a4676957904af
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 12:02:44 2017 +0100

    v2.3.2

commit 9b5938df0acfd416168e567a4115ef91f159a6b0
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 12:01:14 2017 +0100

    Bump bundlesize back up

commit 35b989b73fdd08a43ff4a441506caed518859894
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 11:56:08 2017 +0100

    Revert "replace valid attrs with an optimized regex"

    This reverts commit 5905e70c4ca47faf3666eef39ac6086f74f36c66.

commit d9f26c5df6897f5c632fa2b1490021572ea72382
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 11:35:16 2017 +0100

    Add failing test to attribute filtering

    @probablyup some of your changes in validAttrs.js broke the filtering
    for invalid props. Mind taking a look at fixing this?

commit 9807f62bbf4e1b256cdf32c4224eee29ae722553
Merge: a6b0f64 61d11e6
Author: Phil Plückthun <phil@plckthn.me>
Date:   Tue Dec 19 10:43:02 2017 +0000

    Merge pull request #1370 from styled-components/2.3.1

    v2.3.1 🎉

commit 61d11e6cac04b3e7e06b91f1827f46bb8b6ed260
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 10:15:51 2017 +0100

    v2.3.1

commit 3035d38478d676f13a559434b710b103d709b8ef
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 10:08:50 2017 +0100

    Update CHANGELOG

commit a6b0f645e399f13e43b3c3c38a4ccb480ce49d30
Merge: b7b7ebd a2a52a5
Author: Max Stoiber <contact@mxstbr.com>
Date:   Tue Dec 19 10:05:20 2017 +0100

    Merge pull request #1365 from probablyup/es-slimming

    reduce library size

commit b7b7ebd6542001c52b8fa8775c75e5b16497ddd2
Merge: c8621e5 26f0dc0
Author: Max Stoiber <contact@mxstbr.com>
Date:   Mon Dec 18 20:12:24 2017 +0100

    Merge pull request #1369 from BasThomas/typo-and-styling-fixes

    Fix some typos and improve styling in docs

commit 26f0dc0ef48cdb1240dd6ec212c7b67283482130
Author: Bas Broek <bas@basbroek.nl>
Date:   Mon Dec 18 19:33:45 2017 +0100

    Fix some typos and improve styling in docs

commit c8621e55d216f1ebe790c25b8ff5245756e54e05
Merge: de2667a 3a80095
Author: Max Stoiber <contact@mxstbr.com>
Date:   Mon Dec 18 19:19:28 2017 +0100

    Merge pull request #1363 from iRoachie/patch-1

    Provide GitHub Badge in readme

commit a2a52a55f696740dde0345b23518a4065f82f09a
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 01:47:03 2017 -0500

    one more dev error

commit 42a81dd1041d339adea44db70274660cd893952e
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 01:40:12 2017 -0500

    add a changelog entry

commit ca8c6343b8130d6338d80ccf183ab9ad6015e1a3
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 01:32:10 2017 -0500

    lower bundle size threshold

commit 32eb121f99851d50ee62b1f1c9835f5453f6fe7b
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 01:28:23 2017 -0500

    remove dev errors from production build

    reduces bundle size by 0.08kB gzipped

commit 132bc003f7f1f4120fc685cc24e313a80fda6247
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 01:26:32 2017 -0500

    remove a dev warning from production build

    reduces bundle size by 0.09kB gzipped

commit 5905e70c4ca47faf3666eef39ac6086f74f36c66
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 01:24:24 2017 -0500

    replace valid attrs with an optimized regex

    saves ~0.27kB gzipped

commit e5c2c6a4e3b995a82e5215d916fdbaba851a0d34
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 01:02:14 2017 -0500

    omit some development errors from production build

    saves ~0.05kB gzipped

commit 6343f8802f2337431a1ded9468624f548374d66f
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 00:54:31 2017 -0500

    use a simpler isFunction check

    drops bundle size by 0.05 kB gzipped

commit f69eff3f8b44a1288f243e5a6b3a36bf956a1477
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 00:52:13 2017 -0500

    omit warnTooManyClasses in production

    drops bundle size by 0.2kB gzipped

commit de2667ab41c6c0ee45cc481f3bd4e09a66e79456
Merge: bbb3bc5 38b28df
Author: Max Stoiber <contact@mxstbr.com>
Date:   Mon Dec 18 16:15:26 2017 +0100

    Merge pull request #1366 from styled-components/more-updates-to-community-guidelines

    Make some more updates to the community guidelines

commit 38b28df27462c5a63f9679cac5d457d0f24056f1
Merge: 6c81214 bbb3bc5
Author: Max Stoiber <contact@mxstbr.com>
Date:   Mon Dec 18 15:53:45 2017 +0100

    Merge branch 'master' into more-updates-to-community-guidelines

commit bbb3bc532ea63d4c9a55cdc4ff54e4488b6f1c44
Merge: 95f6683 6483106
Author: Phil Plückthun <phil@plckthn.me>
Date:   Mon Dec 18 14:47:51 2017 +0000

    Merge pull request #1367 from styled-components/readme-updates

    Clean up the README

commit 3a8009584b5d9d46ec033bd848fd47518e39d036
Author: Kyle Roach <kroach.work@gmail.com>
Date:   Mon Dec 18 07:19:32 2017 -0400

    Change svg image for GitHub badge

commit 6483106d8c0c8b54d3785f4fa0379a9cd481bde5
Author: Max Stoiber <contact@mxstbr.com>
Date:   Mon Dec 18 12:02:45 2017 +0100

    Update alt text

commit ed73e442595ed0b8e586807f02b161c10b8fa031
Author: Max Stoiber <contact@mxstbr.com>
Date:   Mon Dec 18 11:57:52 2017 +0100

    Use the proxied badges from styled-components.com

    This should make them load much faster, `img.shields.io` is having some struggles today for some reason.

commit b7601ec4c2ef5ca1c69c33df9dc5d036623d3b52
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Mon Dec 18 10:55:58 2017 +0100

    Clean up the readme

    - Center align logo, badges and tagline
    - Remove installation instructions from above-the-fold
    - Remove core team mentions, just say supported by Front End Center
    - Add example with screenshot back in from before we got the new docs
    - Improve overall look

    We should also move the alternative installation instructions and syntax
    highlighting setups to the docs instead of them being in this README,
    refernence if somebody wants to pick those up:
    https://github.com/styled-components/styled-components-website/issues/185
    and https://github.com/styled-components/styled-components-website/issues/186

commit 6c812141c4267f80672a49529a6e1b6cd95b35c5
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Mon Dec 18 10:20:47 2017 +0100

    Make some more updates to the community guidelines

    - Rephrases some things
    - Adds more information
    - Documents release process on `npm`
    - Notes CoC in Community guidelines

commit 95f66835457bfd2b43678b3244f72ff8dea6494d
Merge: 470be50 4a9271d
Author: Max Stoiber <contact@mxstbr.com>
Date:   Mon Dec 18 09:22:14 2017 +0100

    Merge pull request #1364 from styled-components/community-guidelines

    Update community guidelines and add core team file

commit a7c352a164075e7fd4299e50eea8e7d6517312f5
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 00:37:48 2017 -0500

    ignore dist files from editor linting

commit 7513f003a7a0e85a3d8403c50d942d1357bd1e33
Author: Evan Scott <probablyup@gmail.com>
Date:   Mon Dec 18 00:36:05 2017 -0500

    update lockfile

commit 4a9271d9c715cda88e3fbb71b9006407eaa18d34
Merge: 74acd68 470be50
Author: Max Stoiber <contact@mxstbr.com>
Date:   Sun Dec 17 23:44:42 2017 +0100

    Merge branch 'master' into community-guidelines

commit 74acd68b9c8de3bd0072c37c10425865b09cbe7e
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Sun Dec 17 23:33:17 2017 +0100

    Small updates

commit 94a6b071589ed97502b22e8c5ed671b650873f5d
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Sun Dec 17 22:47:26 2017 +0100

    Update community guidelines and add core team file

    Based on the [Moya community
    guidelines](https://github.com/Moya/contributors) I've updated out
    `CONTRIBUTING.md` to explicitly explain our "Invite any contributor who
    has at least one PR merged" philosophy, and added a `CORE_TEAM.md` file
    which contains a list of core team members. (@geelen, @mxstbr, @philpl,
    @schwers; in order of addition)

    I've also already set up an instance of
    [Aeryn](https://github.com/Moya/Aeryn), which will automatically invite
    any collaborator that has a PR merged into the main `styled-components`
    repo to the organisation.

    I hope that (as with Moya) this makes the `styled-components` longer
    lasting and removes the core team members as bottlenecks from the
    evolution of the library.

commit 0c186bd7d9817fc457231d4e72a26c0d6acd9b35
Author: Kyle Roach <kroach.work@gmail.com>
Date:   Sun Dec 17 12:44:11 2017 -0400

    Provide GitHub Badge in readme

    Example code that maintainers can add to their readme to show off styled-components

commit 470be50c1ac0138c1ff60a27aa1021db6c5ca56b
Merge: 1be908f 9b96080
Author: Max Stoiber <contact@mxstbr.com>
Date:   Sun Dec 17 14:58:16 2017 +0100

    Merge pull request #1361 from styled-components/remove-test-results

    Remove test-results.json from git

commit 9b960801da0a0f4fd32ee81c97a0c2b66cb74d98
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Sun Dec 17 13:53:06 2017 +0100

    Change order on Travis

commit fb27eb012696969304235983a4e3fbfe6a1eabc3
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Sun Dec 17 12:55:48 2017 +0100

    Use jests outputFile option instead of jest-json-reporter

commit b7ed95d96be76f1606a54796298223480cb91be5
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Sun Dec 17 12:28:52 2017 +0100

    Remove test-results.json from git

    This file is necessary for danger-plugin-jest to work correctly, but
    there's really no need to check it into git and get conflicts on every
    single PR.

commit 1be908fdb4b8d5f714f2f7c2402373cf8cac2d8d
Merge: b41ed55 70b2acf
Author: Phil Plückthun <phil@plckthn.me>
Date:   Sat Dec 16 21:41:46 2017 +0000

    Merge pull request #1357 from maciej-ka/screenshot-test

    test: add screenshot test

commit 70b2acf5016534dbdaa56c2578ae5b832296583a
Author: maciej-ka <maciej.kasprzyk.it@gmail.com>
Date:   Fri Dec 15 20:33:02 2017 +0100

    feat: screenshot test

commit b41ed55599e7adb5a082dd72fa3bd29a8f437ae4
Merge: 1dfc7a6 0d35874
Author: Max Stoiber <contact@mxstbr.com>
Date:   Sat Dec 16 00:33:57 2017 +0100

    Merge pull request #1356 from maciej-ka/fix-remove-process-env-from-dev-bundle

    fix: allow process.env only in es bundle

commit 0d35874eab2be7761cb11a1d9f11c07a39f9518a
Author: maciej-ka <maciej.kasprzyk.it@gmail.com>
Date:   Fri Dec 15 21:58:42 2017 +0100

    fix: allow process.env only in es bundle

commit 1dfc7a64ff8ff3706424d68bbe021b8f973ff9db
Merge: 77f3eef 9dd46b9
Author: Wout Mertens <Wout.Mertens@gmail.com>
Date:   Fri Dec 15 23:31:23 2017 +0100

    Merge pull request #593 from existentialism/prettier

    Add Prettier

commit 3b0666db5eff0712023edea34f132e9661d34900
Author: Brad Bohen <bbohen@gmail.com>
Date:   Fri Dec 15 13:45:56 2017 -0500

    Removed prettier formatting from CHANGELOG & package.json

commit 9dd46b93ad343b4737444e245d96dbf0e91935d4
Author: Brian Ng <bng412@gmail.com>
Date:   Fri Dec 15 09:26:09 2017 -0600

    Run prettier

commit f09419c9e18db03bbf9803f6988b4221c02a7b5d
Author: Brian Ng <bng412@gmail.com>
Date:   Fri Mar 17 11:10:17 2017 -0500

    Add prettier commands and tweak eslint rules

commit 18d6f1080e790e15d1459e552ecb21f734261fe6
Author: Brad Bohen <bbohen@gmail.com>
Date:   Fri Oct 20 10:29:35 2017 -0400

    Updated minify to leave comments

commit c36b01df6da60bc52a81016079840239d60a9a03
Author: Brad Bohen <bbohen@gmail.com>
Date:   Fri Oct 20 00:45:25 2017 -0400

    Updated jest snapshots

commit 262557b62ac959e6563ac59692d64a249e1e77d1
Author: Brad Bohen <bbohen@gmail.com>
Date:   Mon Oct 9 10:35:56 2017 -0400

    Update CHANGELOG

commit 93ce2d760d111306e52f0472a468b17c92f89b8b
Author: Brad Bohen <bbohen@gmail.com>
Date:   Mon Oct 9 10:01:21 2017 -0400

    Increased maximum bundle size

commit f92ee3b7f378adb36a9a9967074f9d90f92ec722
Author: Brad Bohen <bbohen@gmail.com>
Date:   Mon Oct 9 10:00:56 2017 -0400

    Added test for minify util

commit ea7388668f9eb83080ee6938bcfc5fc11bfc1a36
Author: Brad Bohen <bbohen@gmail.com>
Date:   Mon Oct 9 10:00:23 2017 -0400

    Fixed and updated ssr test

commit 1cf860920a99009bd455ee6e167abedbf3dc64c7
Author: Brad Bohen <bbohen@gmail.com>
Date:   Mon Oct 9 09:10:24 2017 -0400

    Added production environment check for minified SSR CSS

commit 7620e941d5513197c7f6717c09bf3432944f9c5f
Author: Brad Bohen <bbohen@gmail.com>
Date:   Mon Oct 9 01:37:14 2017 -0400

    Updated ServerStyleSheet to use newly added minify util

commit 77f3eef9397f25a3655a19474f224cd30da340da
Merge: 90fd3fb 8526f7a
Author: Phil Plückthun <phil@plckthn.me>
Date:   Fri Dec 15 13:42:22 2017 +0000

    Merge pull request #1352 from styled-components/2.3.0

    2.3.0

commit 8526f7a7c620decd67b86fa055a1ef877a3c6b27
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 12:44:19 2017 +0100

    v2.3.0

commit 8719686e6bc037f68bbfb8efb39552c11e924e13
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 12:34:44 2017 +0100

    Update CHANGELOG

commit 90fd3fb2b3d9b444af4df934f7d685abf45537a1
Merge: 35047d0 9b5b5ad
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 12:26:25 2017 +0100

    Merge pull request #1313 from evan-scott-zocdoc/es-fix-escaping

    Es fix escaping

commit 9b5b5adf08fbc6fd44656bb22b346231f1d624bf
Merge: 661854d 35047d0
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 12:12:07 2017 +0100

    Merge branch 'master' into es-fix-escaping

commit 661854d9637d3b33bf5c9cda185a37d0a3a1e187
Merge: 567e456 35047d0
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 12:11:21 2017 +0100

    Merge branch 'master' into es-fix-escaping

commit 35047d00f52664cf5534e247cd7a7e59d85229d9
Merge: 607f7f1 d5a0ad4
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 11:52:56 2017 +0100

    Merge pull request #1205 from MatthieuLemoine/withtheme-fix

    Fix ref warning when using withTheme HOC and stateless function components

commit d5a0ad444804fa2b96ff1572783e2035cfebfa7b
Author: Maximilian Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 11:44:40 2017 +0100

    Adjust bundlesize

commit e6036eac7702e4c857b59b61c2f746c6cc2b6672
Merge: 672282b 607f7f1
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 11:31:17 2017 +0100

    Merge branch 'master' into withtheme-fix

commit 672282bca687c2cd2edcd4f93f937875635dafd2
Merge: 7849b85 607f7f1
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 11:30:44 2017 +0100

    Merge branch 'master' into withtheme-fix

commit 607f7f15f4bd9331360e43ad7511d852eb722c0f
Merge: 702d3a0 bb922e9
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 11:29:59 2017 +0100

    Merge pull request #1123 from nbostrom/style-objects-typescript

    Support style objects in ts definitions

commit bb922e95ec6ae5a36b30747ccb367dee4271cbb6
Merge: bf94c93 702d3a0
Author: Max Stoiber <contact@mxstbr.com>
Date:   Fri Dec 15 11:08:11 2017 +0100

    Merge branch 'master' into style-objects-typescript

commit 702d3a0774b659f8bc3b59ee11ccca74bad25da7
Merge: beea2b4 8a5dc07
Author: Phil Plückthun <phil@plckthn.me>
Date:   Tue Dec 12 19:45:49 2017 +0000

    Merge pull request #1257 from gribnoysup/issues/1238

    Add dev sandbox to the repo

commit 8a5dc07f0db101f3769673739357cb351a72926c
Merge: 242a81e beea2b4
Author: Sergey Petushkov <sergey.petushkov@home24.de>
Date:   Tue Dec 12 14:53:20 2017 +0100

    Merge remote-tracking branch 'upstream/master' into issues/1238

    Conflicts:
    	yarn.lock

commit beea2b4ed450a9c06ce6b23ede0a6797c332fcef
Merge: 3fe59c5 159ba4b
Author: Max Stoiber <contact@mxstbr.com>
Date:   Mon Dec 4 12:28:19 2017 +0100

    Merge pull request #1342 from styled-components/philpl-patch-1

    Update issue template and add attention grabbers

commit 159ba4b571448f7aab2a4d9c98bcf4df6213cb6b
Author: Phil Plückthun <phil@plckthn.me>
Date:   Sun Dec 3 22:44:03 2017 +0000

    Update ISSUE_TEMPLATE.md

commit af28319b8b966c7d1614f1aefdc7f0ea0b99e753
Author: Phil Plückthun <phil@plckthn.me>
Date:   Sun Dec 3 22:43:01 2017 +0000

    Update issue template and add attention grabbers

    - Add some updates notes
    - Add concise lists instead of long texts
    - Add emojis to highlight sections
    - Add ALL CAPS text where appropriate

    This might help to avoid more issues that are already answered (?)

commit 77cc6c4eceae9d06cb969980cd46a389b1567485
Author: JP Driver <jp.driver@formidable.com>
Date:   Fri Dec 1 16:55:57 2017 +0000

    remove support for Navigator in React Native

commit 1315ad9be71564756f4ce27db96b037125eb41ab
Author: JP Driver <jp.driver@formidable.com>
Date:   Fri Dec 1 16:30:16 2017 +0000

    update CHANGELOG.md

commit fa852a68132098992b4bb54406342b4145b26c73
Author: JP Driver <jp.driver@formidable.com>
Date:   Fri Dec 1 16:29:48 2017 +0000

    update @types/react-native dependency

commit 194054236c905da7745fc7eb28a0386e466f5438
Author: JP Driver <jp.driver@formidable.com>
Date:   Fri Dec 1 15:45:09 2017 +0000

    update CHANGELOG.md

commit 583aff856ad4fa401e5c1e81dd08cb036c2132c1
Author: JP Driver <jp.driver@formidable.com>
Date:   Fri Dec 1 15:40:45 2017 +0000

    add SafeAreaView to React Native interface

commit 3fe59c5ced3d857216d734a126537af9348ae4a3
Merge: 80488e1 74971bb
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Nov 29 13:11:54 2017 +0000

    Merge pull request #1332 from styled-components/2.2.4

    v2.2.4

commit 74971bb1732b7a962a32b38cc0d0bed8444aff08
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Nov 29 12:23:08 2017 +0000

    v2.2.4

commit c74a7bbb684fa324b7ad89f4593c552d2e0a01b1
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Nov 29 12:20:52 2017 +0000

    Update test-results.json

commit a73343e60c4792dd886755a597780503c0e7886f
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Nov 29 12:19:30 2017 +0000

    Update CHANGELOG.md

commit 567e456ffc8d362c81a3e5aaa106debcc14d72a0
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Fri Nov 17 15:33:32 2017 -0500

    add TODO comment for implementing CSS.escape eventually

commit ec1b61fc3bfe532b86137d55010a1109929428d6
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Thu Nov 16 20:02:29 2017 -0500

    updated test-results.json

commit 024de45ba5713ed8265439c823230d15e6cecce4
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Thu Nov 16 17:08:28 2017 -0500

    escape componentId creation consistently

    addressing PR comments re: escape util

    reduce escaping to only spots where we're using a displayName

commit 43fe39fde6159873c91cc1b38f5df4f530427ff2
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Thu Nov 16 18:36:19 2017 -0500

    reduce bundle size by omitting some warnings in production

commit e5edbe13e69984e8d17228230c47365912d96969
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Thu Nov 16 17:07:41 2017 -0500

    add tests for getComponentName

commit 75ad91d9bf049fc83fcafea2a180c8768567bdc7
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Thu Nov 16 17:07:20 2017 -0500

    add escape utility

commit 80488e11a31c6c284e6af7bb1ceb61a737ef4f0e
Merge: 549c3c9 40a9458
Author: Phil Plückthun <phil@plckthn.me>
Date:   Wed Nov 15 22:18:45 2017 +0000

    Merge pull request #1296 from evan-scott-zocdoc/es-adjust-stylis-v

    deps: upgrade stylis

commit 40a94589b6d813b4c28f56087bcbfd44484d005b
Merge: 7df8937 549c3c9
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Wed Nov 15 15:28:04 2017 -0500

    Merge branch 'master' into es-adjust-stylis-v

commit 549c3c902dfb4d82894ce245e1cae8282d7adcb7
Merge: f9d036d f5a915b
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Nov 9 18:00:55 2017 +0000

    Merge pull request #1280 from theKashey/master

    Disable static styled in case of HMR

commit f5a915b7e5808c43711f2b3b3de511cc77988fb1
Merge: 2536a4f f9d036d
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Nov 9 17:43:06 2017 +0000

    Merge branch 'master' into master

commit 7df8937c5729131be26f03717e657c0572d42cd3
Author: Evan Scott <evan.scott@zocdoc.com>
Date:   Mon Nov 6 16:35:46 2017 -0500

    deps: upgrade stylis

    I think there was something about the "3.x" syntax that was causing
    this subdependency from being automatically updated externally.

    In my own projects, when running `npm update` I have not been getting
    automatic stylis updates as they are released.

commit f9d036d47aafff83d43e70cae970fee39ab75dd9
Merge: 8f9e627 49b79c7
Author: Max Stoiber <contact@mxstbr.com>
Date:   Sat Nov 4 22:41:31 2017 +0100

    Merge pull request #1292 from orta/danger-js

    Update to Danger 2.0

commit 49b79c77acba5e04eec20c68b1548d404f8a6a3b
Author: Orta Therox <orta.therox@gmail.com>
Date:   Sat Nov 4 13:59:32 2017 -0400

    Update to Danger 2.0

commit 2536a4f0280f37b670294aacf69ce106f2684cb2
Author: Anton Korzunov <akorzunov@atlassian.com>
Date:   Wed Nov 1 23:11:07 2017 +1100

    Disable static styled in case of HMR

commit 8f9e6271099d3728841c336ee9af70fa2051ffd6
Merge: 8efc21a f9f41b6
Author: Max Stoiber <contact@mxstbr.com>
Date:   Tue Oct 31 15:52:23 2017 +0100

    Merge pull request #1279 from orta/danger-js

    Updates Danger to 2.0b2

commit 242a81e7816b5dfb10f55fcd1e99e03575168165
Merge: f40a4bd 8efc21a
Author: Sergey <gribnoysup@users.noreply.github.com>
Date:   Mon Oct 30 10:20:26 2017 +0100

    Merge branch 'master' into issues/1238

commit f40a4bde40d38787b9d0aa8e32635a1b10350df0
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Sat Oct 28 16:47:59 2017 +0200

    Revert styling fixes

commit 2cf3e0c76590b2f3d73c33625e8450fcbe6b0ce8
Merge: 800dfb4 8a6dada
Author: Sergey <gribnoysup@users.noreply.github.com>
Date:   Fri Oct 27 12:58:59 2017 +0200

    Merge branch 'master' into issues/1238

commit 800dfb4cae01095931200b7a320db19311265bbb
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Fri Oct 27 09:40:20 2017 +0200

    Remove excessive newlines; Fix CONTRIBUTING.md; Fix some linting errors

commit 2925a102a3d7af13afade7920e2473e25271a287
Author: Sergey <gribnoysup@users.noreply.github.com>
Date:   Wed Oct 25 12:42:29 2017 +0200

    Fix typo

commit 702b6124fa171208dea372fb1a1520ea3d3072e4
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Sun Oct 22 19:35:34 2017 +0200

    Move all sandbox related stuff to a /sandbox; Ad SSR support; Add livereload

commit 8fb26d3060d5ee38b65fa0879462deb6284ceaa4
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Fri Oct 20 15:30:22 2017 +0300

    Add description for how to use sandbox

commit ae36ee37e089a39ab1db4bfa3100950524fd4ffc
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Fri Oct 20 14:33:44 2017 +0300

    Fix title style

commit 003a6746b941bd05f3f26dfcca8ef4609f076d2c
Author: Sergey Petushkov <petushkov.sergey@gmail.com>
Date:   Fri Oct 20 14:25:23 2017 +0300

    Add webpack, webpack-dev-server; Add sandbox

commit bf94c93c272d606b7b464bf9fca64bf41c694b37
Author: Niklas Boström <Niklas Boström>
Date:   Thu Oct 19 19:56:52 2017 +0200

    Update changelog

commit ee6b70da6c24705d6c38ea631cd2bfc4b16843a2
Merge: 4e7ebdd 43daf3b
Author: Phil Plückthun <phil@plckthn.me>
Date:   Thu Oct 19 15:17:38 2017 +0100

    Merge branch 'master' into style-objects-typescript

commit 4e7ebdd2466308ded5fa12292e58c3913725c28a
Author: Niklas Boström <Niklas Boström>
Date:   Tue Aug 29 08:30:02 2017 +0200

    Support style objects in ts definitions

commit 7849b859bf49a1fb652c67aea16640fc5eb40e77
Author: Matthieu Lemoine <mlemoine@yumii.fr>
Date:   Tue Oct 3 15:03:27 2017 +0200

    Fix ref warning when using  withTheme
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ship flat bundles instead of a lib folder
5 participants