Unverified Commit 157a7a7b authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Upgrade with-carbon-components to built-in SCSS (#10321)

Co-authored-by: 's avatarJoe Haddad <timer150@gmail.com>
parent 81fd7046
const withSass = require('@zeit/next-sass') module.exports = {
const withImages = require('next-images') experimental: {
scss: true,
module.exports = withImages( },
withSass({ }
webpack(config) {
config.module.rules.push({
test: /\.(png|svg|eot|otf|ttf|woff|woff2)$/,
use: {
loader: 'url-loader',
options: {
limit: 100000,
publicPath: './',
outputPath: 'static/',
name: '[name].[ext]',
},
},
})
return config
},
})
)
...@@ -10,12 +10,10 @@ ...@@ -10,12 +10,10 @@
}, },
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@zeit/next-sass": "^1.0.1",
"carbon-components": "^9.6.4", "carbon-components": "^9.6.4",
"carbon-components-react": "^6.19.1", "carbon-components-react": "^6.19.1",
"carbon-icons": "^7.0.7", "carbon-icons": "^7.0.7",
"next": "latest", "next": "latest",
"next-images": "^0.10.6",
"react": "^16.7.0", "react": "^16.7.0",
"react-dom": "^16.7.0" "react-dom": "^16.7.0"
} }
......
import '../styles/custom-theme.scss'
function MyApp({ Component, pageProps }) {
return <Component {...pageProps} />
}
export default MyApp
import Document, { Head, Main, NextScript } from 'next/document'
export default class MyDocument extends Document {
render() {
return (
<html>
<Head>
<link rel="stylesheet" href="/_next/static/style.css" />
</Head>
<body>
<Main />
<NextScript />
</body>
</html>
)
}
}
import React, { Component, Fragment } from 'react' import React, { Component, Fragment } from 'react'
import { Button } from 'carbon-components-react' import { Button } from 'carbon-components-react'
import '../static/myCustomTheme.scss'
export default class DemoApp extends Component { export default class DemoApp extends Component {
render() { render() {
return ( return (
......
@import './export.scss';
@import '../node_modules/carbon-components/scss/globals/scss/styles.scss';
@import './export.scss';
@import '~carbon-components/scss/globals/scss/styles.scss';
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