Unverified Commit e058fa49 authored by Jip Sterk's avatar Jip Sterk Committed by GitHub

remove unneeded deps & updated example (#17651)

Closes #17626
parent e20dba2c
{
"presets": ["next/babel", "@emotion/babel-preset-css-prop"]
}
...@@ -11,11 +11,12 @@ ...@@ -11,11 +11,12 @@
"keywords": [], "keywords": [],
"author": "Thomas Greco", "author": "Thomas Greco",
"license": "MIT", "license": "MIT",
"devDependencies": {
"@emotion/babel-preset-css-prop": "10.0.27"
},
"dependencies": { "dependencies": {
"@emotion/core": "10.0.27", "@emotion/core": "10.0.35",
"@emotion/styled": "10.0.27", "@emotion/styled": "10.0.27",
"emotion": "10.0.27",
"emotion-server": "10.0.27",
"next": "latest", "next": "latest",
"react": "^16.7.0", "react": "^16.7.0",
"react-dom": "^16.7.0" "react-dom": "^16.7.0"
......
import NextApp from 'next/app'
import { CacheProvider } from '@emotion/core'
// Use only { cache } from 'emotion'. Don't use { css }.
import { cache } from 'emotion'
import { globalStyles } from '../shared/styles' import { globalStyles } from '../shared/styles'
export default class App extends NextApp { const App = ({ Component, pageProps }) => (
render() { <>
const { Component, pageProps } = this.props {globalStyles}
return ( <Component {...pageProps} />
<CacheProvider value={cache}> </>
{globalStyles} )
<Component {...pageProps} />
</CacheProvider> export default App
)
}
}
import Document, { Html, Head, Main, NextScript } from 'next/document'
import { extractCritical } from 'emotion-server'
export default class MyDocument extends Document {
static async getInitialProps(ctx) {
const initialProps = await Document.getInitialProps(ctx)
const styles = extractCritical(initialProps.html)
return {
...initialProps,
styles: (
<>
{initialProps.styles}
<style
data-emotion-css={styles.ids.join(' ')}
dangerouslySetInnerHTML={{ __html: styles.css }}
/>
</>
),
}
}
render() {
return (
<Html>
<Head />
<body>
<Main />
<NextScript />
</body>
</Html>
)
}
}
import { Basic, Combined, Animated, bounce } from '../shared/styles' import { Animated, Basic, bounce, Combined } from '../shared/styles'
const Home = () => ( const Home = () => (
<div> <div>
<Basic>Cool Styles</Basic> <Basic>Cool Styles</Basic>
......
import { keyframes, css, Global } from '@emotion/core' import { css, Global, keyframes } from '@emotion/core'
import styled from '@emotion/styled' import styled from '@emotion/styled'
export const globalStyles = ( export const globalStyles = (
...@@ -46,22 +46,22 @@ export const bounce = keyframes` ...@@ -46,22 +46,22 @@ export const bounce = keyframes`
} }
` `
export const Basic = styled('div')` export const Basic = styled.div`
${basicStyles}; ${basicStyles};
` `
export const Combined = styled('div')` export const Combined = styled.div`
${basicStyles}; ${basicStyles};
${hoverStyles}; ${hoverStyles};
& code { & code {
background-color: linen; background-color: linen;
} }
` `
export const Animated = styled('div')` export const Animated = styled.div`
${basicStyles}; ${basicStyles};
${hoverStyles}; ${hoverStyles};
& code { & code {
background-color: linen; background-color: linen;
} }
animation: ${(props) => props.animation} 0.2s infinite ease-in-out alternate; animation: ${({ animation }) => animation} 0.2s infinite ease-in-out alternate;
` `
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment