Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add support for the Styled Components Babel plugin #4722

Merged
merged 2 commits into from
Mar 26, 2018
Merged

Add support for the Styled Components Babel plugin #4722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dda4f5c
Add support for the Styled Components Babel plugin
KyleAMathews Mar 26, 2018
4affc6f
Update using-styled-components
KyleAMathews Mar 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions examples/using-styled-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@
"version": "1.0.0",
"author": "Kyle Mathews <mathews.kyle@gmail.com>",
"dependencies": {
"gatsby": "latest",
"gatsby-link": "latest",
"gatsby-plugin-google-analytics": "latest",
"gatsby-plugin-offline": "latest",
"gatsby-plugin-styled-components": "latest",
"lodash": "^4.16.4",
"react-typography": "^0.15.0",
"slash": "^1.0.0",
"styled-components": "^2.2.3",
"typography": "^0.15.8",
"typography-breakpoint-constants": "^0.14.0"
"babel-plugin-styled-components": "^1.5.1",
"gatsby": "1.9.242",
"gatsby-link": "1.6.39",
"gatsby-plugin-google-analytics": "1.0.25",
"gatsby-plugin-offline": "1.0.15",
"gatsby-plugin-styled-components": "2.0.10",
"lodash": "^4.17.5",
"react-typography": "^0.16.13",
"slash": "^2.0.0",
"styled-components": "^3.2.3",
"typography": "^0.16.6",
"typography-breakpoint-constants": "^0.15.10"
},
"keywords": [
"gatsby"
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-styled-components/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ built-in server-side rendering support.

## Install

`npm install --save gatsby-plugin-styled-components styled-components`
`npm install --save gatsby-plugin-styled-components styled-components babel-plugin-styled-components`

## How to use

Expand Down
3 changes: 2 additions & 1 deletion packages/gatsby-plugin-styled-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"main": "index.js",
"peerDependencies": {
"gatsby": "^1.0.0",
"styled-components": ">= 2.0.0"
"styled-components": ">= 2.0.0",
"babel-plugin-styled-components": ">1.5.0"
},
"repository": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-styled-components",
"scripts": {
Expand Down
33 changes: 33 additions & 0 deletions packages/gatsby-plugin-styled-components/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Add Babel plugin
let babelPluginExists = false
try {
require.resolve(`babel-plugin-styled-components`)
babelPluginExists = true
} catch (e) {
// Ignore
}

exports.modifyBabelrc = ({ babelrc, stage }) => {
if (babelPluginExists) {
if (stage === `build-html`) {
return {
...babelrc,
plugins: babelrc.plugins.concat([
[
`babel-plugin-styled-components`,
{
ssr: true,
},
],
]),
}
}

return {
...babelrc,
plugins: babelrc.plugins.concat([`babel-plugin-styled-components`]),
}
}

return babelrc
}
1 change: 1 addition & 0 deletions packages/gatsby/src/utils/babel-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ module.exports = async function babelConfig(program, stage) {

const normalizedConfig = normalizeConfig(babelrc, directory)
let modifiedConfig = await apiRunnerNode(`modifyBabelrc`, {
stage,
babelrc: normalizedConfig,
})
if (modifiedConfig.length > 0) {
Expand Down