Skip to content

Commit 8ee85c2

Browse files
authored
Merge pull request #51 from jasonrundell/issue/45-fix-parcel-build-for-emotion
Change emotion import
2 parents 074ea16 + 3881166 commit 8ee85c2

16 files changed

Lines changed: 30 additions & 17 deletions

File tree

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,19 @@
6363
"webpack-cli": "^5.0.1"
6464
},
6565
"dependencies": {
66+
"@emotion/css": "^11.10.6",
6667
"@emotion/react": "^11.10.6",
6768
"@emotion/styled": "^11.10.6",
6869
"prop-types": "^15.8.1",
6970
"react": "^18.2.0",
7071
"react-dom": "^18.2.0"
7172
},
7273
"peerDependencies": {
73-
"react": "^18.2.0",
74-
"react-dom": "^18.2.0",
74+
"@emotion/css": "^11.10.6",
7575
"@emotion/react": "^11.10.6",
76-
"@emotion/styled": "^11.10.6"
76+
"@emotion/styled": "^11.10.6",
77+
"react": "^18.2.0",
78+
"react-dom": "^18.2.0"
7779
},
7880
"bugs": {
7981
"url": "https://github.com/jasonrundell/dropship/issues"

src/stories/atoms/Article/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { css } from '@emotion/react'
3+
import { css } from '@emotion/css'
44

55
export const Article = ({ id, classNames, children }) => {
66
const style = css`

src/stories/atoms/Avatar/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { css } from '@emotion/react'
3+
import { css } from '@emotion/css'
44

55
import { Icon } from '../Icon'
66
import { sizes, sizeKeys } from '../../../shared/sizes'

src/stories/atoms/Box/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { css } from '@emotion/react'
3+
import { css } from '@emotion/css'
44

55
export const Box = ({ isTight, isRoomy, classNames, children }) => {
66
const style = css`

src/stories/atoms/Button/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { css } from '@emotion/react'
3+
import { css } from '@emotion/css'
44

55
export const Button = ({ size, label, onClick, classNames }) => {
66
const style = css`

src/stories/atoms/Container/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { css } from '@emotion/react'
3+
import { css } from '@emotion/css'
44

55
export const Container = ({ id, classNames, children }) => {
66
const style = css`

src/stories/atoms/Heading/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { css } from '@emotion/react'
3+
import { css } from '@emotion/css'
44

55
import { sizes } from '../../../shared/sizes'
66

src/stories/atoms/Icon/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { css } from '@emotion/react'
3+
import { css } from '@emotion/css'
44
import { icons } from '../../../shared/icons'
55

66
/**

src/stories/atoms/Link/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { css } from '@emotion/react'
3+
import { css } from '@emotion/css'
44

55
export const Link = ({ href, label, onClick, target, rel, classNames }) => {
66
const style = css`

src/stories/atoms/Paragraph/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import { css } from '@emotion/react'
3+
import { css } from '@emotion/css'
44

55
export const Paragraph = ({ classNames, children }) => {
66
const style = css`

0 commit comments

Comments
 (0)