-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Handle Global
with Babel
#1639
Merged
Merged
Handle Global
with Babel
#1639
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
'babel-plugin-emotion': minor | ||
'@emotion/core': minor | ||
--- | ||
|
||
`Global` gets handled by the Babel plugin now - this gives inline css-less expressions source maps. The same transforms are being applied for `Global` imported from macro entry (`@emotion/core/macro`).` | ||
20 changes: 20 additions & 0 deletions
20
packages/babel-plugin-emotion/__tests__/__snapshots__/global-requires-options.js.snap
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
// Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
||
exports[`Global inline source maps can be disabled 1`] = ` | ||
" | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core' | ||
|
||
export default () => <Global styles={{ color: 'hotpink' }} /> | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
import * as React from 'react'; | ||
import { Global } from '@emotion/core'; | ||
var _ref = { | ||
name: \\"1lrxbo5\\", | ||
styles: \\"color:hotpink;\\" | ||
}; | ||
export default (() => <Global styles={_ref} />);" | ||
`; |
206 changes: 206 additions & 0 deletions
206
packages/babel-plugin-emotion/__tests__/__snapshots__/global.js.snap
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,206 @@ | ||
// Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
||
exports[`emotion-babel-plugin Global basic-array 1`] = ` | ||
"import * as React from 'react' | ||
import { Global } from '@emotion/core' | ||
|
||
export default () => ( | ||
<Global styles={[{ color: 'hotpink' }, { backgroundColor: '#fff' }]} /> | ||
) | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
import { css as _css } from \\"@emotion/core\\"; | ||
import * as React from 'react'; | ||
import { Global } from '@emotion/core'; | ||
export default (() => <Global styles={ | ||
/*#__PURE__*/ | ||
_css([{ | ||
color: 'hotpink' | ||
}, { | ||
backgroundColor: '#fff' | ||
}], process.env.NODE_ENV === \\"production\\" ? \\"\\" : \\"/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJhc2ljLWFycmF5LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlVIiwiZmlsZSI6ImJhc2ljLWFycmF5LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgUmVhY3QgZnJvbSAncmVhY3QnXG5pbXBvcnQgeyBHbG9iYWwgfSBmcm9tICdAZW1vdGlvbi9jb3JlJ1xuXG5leHBvcnQgZGVmYXVsdCAoKSA9PiAoXG4gIDxHbG9iYWwgc3R5bGVzPXtbeyBjb2xvcjogJ2hvdHBpbmsnIH0sIHsgYmFja2dyb3VuZENvbG9yOiAnI2ZmZicgfV19IC8+XG4pXG4iXX0= */\\")} />);" | ||
`; | ||
|
||
exports[`emotion-babel-plugin Global basic-obj 1`] = ` | ||
"import * as React from 'react' | ||
import { Global } from '@emotion/core' | ||
|
||
export default () => <Global styles={{ color: 'hotpink' }} /> | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
function _EMOTION_STRINGIFIED_CSS_ERROR__() { return \\"You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop).\\"; } | ||
|
||
import * as React from 'react'; | ||
import { Global } from '@emotion/core'; | ||
|
||
var _ref = process.env.NODE_ENV === \\"production\\" ? { | ||
name: \\"1lrxbo5\\", | ||
styles: \\"color:hotpink;\\" | ||
} : { | ||
name: \\"1lrxbo5\\", | ||
styles: \\"color:hotpink;\\", | ||
map: \\"/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJhc2ljLW9iai5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHNkIiLCJmaWxlIjoiYmFzaWMtb2JqLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgUmVhY3QgZnJvbSAncmVhY3QnXG5pbXBvcnQgeyBHbG9iYWwgfSBmcm9tICdAZW1vdGlvbi9jb3JlJ1xuXG5leHBvcnQgZGVmYXVsdCAoKSA9PiA8R2xvYmFsIHN0eWxlcz17eyBjb2xvcjogJ2hvdHBpbmsnIH19IC8+XG4iXX0= */\\", | ||
toString: _EMOTION_STRINGIFIED_CSS_ERROR__ | ||
}; | ||
|
||
export default (() => <Global styles={_ref} />);" | ||
`; | ||
|
||
exports[`emotion-babel-plugin Global complex-array 1`] = ` | ||
"import * as React from 'react' | ||
import { Global } from '@emotion/core' | ||
|
||
const getBgColor = () => ({ backgroundColor: '#fff' }) | ||
|
||
export default () => <Global styles={[{ color: 'hotpink' }, getBgColor()]} /> | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
import { css as _css } from \\"@emotion/core\\"; | ||
import * as React from 'react'; | ||
import { Global } from '@emotion/core'; | ||
|
||
const getBgColor = () => ({ | ||
backgroundColor: '#fff' | ||
}); | ||
|
||
export default (() => <Global styles={ | ||
/*#__PURE__*/ | ||
_css([{ | ||
color: 'hotpink' | ||
}, getBgColor()], process.env.NODE_ENV === \\"production\\" ? \\"\\" : \\"/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNvbXBsZXgtYXJyYXkuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSzZCIiwiZmlsZSI6ImNvbXBsZXgtYXJyYXkuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBSZWFjdCBmcm9tICdyZWFjdCdcbmltcG9ydCB7IEdsb2JhbCB9IGZyb20gJ0BlbW90aW9uL2NvcmUnXG5cbmNvbnN0IGdldEJnQ29sb3IgPSAoKSA9PiAoeyBiYWNrZ3JvdW5kQ29sb3I6ICcjZmZmJyB9KVxuXG5leHBvcnQgZGVmYXVsdCAoKSA9PiA8R2xvYmFsIHN0eWxlcz17W3sgY29sb3I6ICdob3RwaW5rJyB9LCBnZXRCZ0NvbG9yKCldfSAvPlxuIl19 */\\")} />);" | ||
`; | ||
|
||
exports[`emotion-babel-plugin Global complex-obj 1`] = ` | ||
"import * as React from 'react' | ||
import { Global } from '@emotion/core' | ||
|
||
const getBgColor = () => ({ backgroundColor: '#fff' }) | ||
|
||
export default () => <Global styles={{ color: 'hotpink', ...getBgColor() }} /> | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
import { css as _css } from \\"@emotion/core\\"; | ||
import * as React from 'react'; | ||
import { Global } from '@emotion/core'; | ||
|
||
const getBgColor = () => ({ | ||
backgroundColor: '#fff' | ||
}); | ||
|
||
export default (() => <Global styles={ | ||
/*#__PURE__*/ | ||
_css({ | ||
color: 'hotpink', | ||
...getBgColor() | ||
}, process.env.NODE_ENV === \\"production\\" ? \\"\\" : \\"/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNvbXBsZXgtb2JqLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUs2QiIsImZpbGUiOiJjb21wbGV4LW9iai5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIFJlYWN0IGZyb20gJ3JlYWN0J1xuaW1wb3J0IHsgR2xvYmFsIH0gZnJvbSAnQGVtb3Rpb24vY29yZSdcblxuY29uc3QgZ2V0QmdDb2xvciA9ICgpID0+ICh7IGJhY2tncm91bmRDb2xvcjogJyNmZmYnIH0pXG5cbmV4cG9ydCBkZWZhdWx0ICgpID0+IDxHbG9iYWwgc3R5bGVzPXt7IGNvbG9yOiAnaG90cGluaycsIC4uLmdldEJnQ29sb3IoKSB9fSAvPlxuIl19 */\\")} />);" | ||
`; | ||
|
||
exports[`emotion-babel-plugin Global css-used-as-value 1`] = ` | ||
"import * as React from 'react' | ||
import { Global, css } from '@emotion/core' | ||
|
||
// this gets ignored by Global macro, but it tests that this combination doesn't crash or something | ||
export default () => <Global styles={css({ color: 'hotpink' })} /> | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
function _EMOTION_STRINGIFIED_CSS_ERROR__() { return \\"You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop).\\"; } | ||
|
||
import * as React from 'react'; | ||
import { Global, css } from '@emotion/core'; // this gets ignored by Global macro, but it tests that this combination doesn't crash or something | ||
|
||
var _ref = process.env.NODE_ENV === \\"production\\" ? { | ||
name: \\"1lrxbo5\\", | ||
styles: \\"color:hotpink;\\" | ||
} : { | ||
name: \\"1lrxbo5\\", | ||
styles: \\"color:hotpink;\\", | ||
map: \\"/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNzcy11c2VkLWFzLXZhbHVlLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlxQyIsImZpbGUiOiJjc3MtdXNlZC1hcy12YWx1ZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIFJlYWN0IGZyb20gJ3JlYWN0J1xuaW1wb3J0IHsgR2xvYmFsLCBjc3MgfSBmcm9tICdAZW1vdGlvbi9jb3JlJ1xuXG4vLyB0aGlzIGdldHMgaWdub3JlZCBieSBHbG9iYWwgbWFjcm8sIGJ1dCBpdCB0ZXN0cyB0aGF0IHRoaXMgY29tYmluYXRpb24gZG9lc24ndCBjcmFzaCBvciBzb21ldGhpbmdcbmV4cG9ydCBkZWZhdWx0ICgpID0+IDxHbG9iYWwgc3R5bGVzPXtjc3MoeyBjb2xvcjogJ2hvdHBpbmsnIH0pfSAvPlxuIl19 */\\", | ||
toString: _EMOTION_STRINGIFIED_CSS_ERROR__ | ||
}; | ||
|
||
export default (() => <Global styles={_ref} />);" | ||
`; | ||
|
||
exports[`emotion-babel-plugin Global no-jsx 1`] = ` | ||
"import * as React from 'react' | ||
import { Global } from '@emotion/core' | ||
|
||
const foo = Global | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
import * as React from 'react'; | ||
import { Global } from '@emotion/core'; | ||
const foo = Global;" | ||
`; | ||
|
||
exports[`emotion-babel-plugin Global no-styles-prop 1`] = ` | ||
"import * as React from 'react' | ||
import { Global } from '@emotion/core' | ||
|
||
export default () => <Global /> | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
import * as React from 'react'; | ||
import { Global } from '@emotion/core'; | ||
export default (() => <Global />);" | ||
`; | ||
|
||
exports[`emotion-babel-plugin Global spread-styles 1`] = ` | ||
"/* eslint-disable */ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core' | ||
|
||
export default () => <Global {...styles} /> | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
/* eslint-disable */ | ||
import * as React from 'react'; | ||
import { Global } from '@emotion/core'; | ||
export default (() => <Global {...styles} />);" | ||
`; | ||
|
||
exports[`emotion-babel-plugin Global with-closing-element 1`] = ` | ||
"/* eslint-disable */ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core' | ||
|
||
// prettier-ignore | ||
export default () => <Global styles={{ color: 'hotpink' }}></Global> | ||
|
||
|
||
↓ ↓ ↓ ↓ ↓ ↓ | ||
|
||
function _EMOTION_STRINGIFIED_CSS_ERROR__() { return \\"You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop).\\"; } | ||
|
||
/* eslint-disable */ | ||
import * as React from 'react'; | ||
import { Global } from '@emotion/core'; // prettier-ignore | ||
|
||
var _ref = process.env.NODE_ENV === \\"production\\" ? { | ||
name: \\"1lrxbo5\\", | ||
styles: \\"color:hotpink;\\" | ||
} : { | ||
name: \\"1lrxbo5\\", | ||
styles: \\"color:hotpink;\\", | ||
map: \\"/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndpdGgtY2xvc2luZy1lbGVtZW50LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUs2QiIsImZpbGUiOiJ3aXRoLWNsb3NpbmctZWxlbWVudC5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlICovXG5pbXBvcnQgKiBhcyBSZWFjdCBmcm9tICdyZWFjdCdcbmltcG9ydCB7IEdsb2JhbCB9IGZyb20gJ0BlbW90aW9uL2NvcmUnXG5cbi8vIHByZXR0aWVyLWlnbm9yZVxuZXhwb3J0IGRlZmF1bHQgKCkgPT4gPEdsb2JhbCBzdHlsZXM9e3sgY29sb3I6ICdob3RwaW5rJyB9fT48L0dsb2JhbD5cbiJdfQ== */\\", | ||
toString: _EMOTION_STRINGIFIED_CSS_ERROR__ | ||
}; | ||
|
||
export default (() => <Global styles={_ref}></Global>);" | ||
`; |
6 changes: 6 additions & 0 deletions
6
packages/babel-plugin-emotion/__tests__/global-macro/__fixtures__/basic-array.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core/macro' | ||
|
||
export default () => ( | ||
<Global styles={[{ color: 'hotpink' }, { backgroundColor: '#fff' }]} /> | ||
) |
4 changes: 4 additions & 0 deletions
4
packages/babel-plugin-emotion/__tests__/global-macro/__fixtures__/basic-obj.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core/macro' | ||
|
||
export default () => <Global styles={{ color: 'hotpink' }} /> |
6 changes: 6 additions & 0 deletions
6
packages/babel-plugin-emotion/__tests__/global-macro/__fixtures__/complex-array.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core/macro' | ||
|
||
const getBgColor = () => ({ backgroundColor: '#fff' }) | ||
|
||
export default () => <Global styles={[{ color: 'hotpink' }, getBgColor()]} /> |
6 changes: 6 additions & 0 deletions
6
packages/babel-plugin-emotion/__tests__/global-macro/__fixtures__/complex-obj.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core/macro' | ||
|
||
const getBgColor = () => ({ backgroundColor: '#fff' }) | ||
|
||
export default () => <Global styles={{ color: 'hotpink', ...getBgColor() }} /> |
5 changes: 5 additions & 0 deletions
5
packages/babel-plugin-emotion/__tests__/global-macro/__fixtures__/css-used-as-value.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
import * as React from 'react' | ||
import { Global, css } from '@emotion/core/macro' | ||
|
||
// this gets ignored by Global macro, but it tests that this combination doesn't crash or something | ||
export default () => <Global styles={css({ color: 'hotpink' })} /> |
4 changes: 4 additions & 0 deletions
4
packages/babel-plugin-emotion/__tests__/global-macro/__fixtures__/no-jsx.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core/macro' | ||
|
||
const foo = Global |
4 changes: 4 additions & 0 deletions
4
packages/babel-plugin-emotion/__tests__/global-macro/__fixtures__/no-styles-prop.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core/macro' | ||
|
||
export default () => <Global /> |
5 changes: 5 additions & 0 deletions
5
packages/babel-plugin-emotion/__tests__/global-macro/__fixtures__/spread-styles.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
/* eslint-disable */ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core/macro' | ||
|
||
export default () => <Global {...styles} /> |
6 changes: 6 additions & 0 deletions
6
packages/babel-plugin-emotion/__tests__/global-macro/__fixtures__/with-closing-element.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
/* eslint-disable */ | ||
import * as React from 'react' | ||
import { Global } from '@emotion/core/macro' | ||
|
||
// prettier-ignore | ||
export default () => <Global styles={{ color: 'hotpink' }}></Global> |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you split this changeset into two, one for the babel plugin and one for core?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done