From 157a7a7b8ccc10419a534656a0db775a37575e03 Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Thu, 30 Jan 2020 13:26:26 +0100 Subject: [PATCH] Upgrade with-carbon-components to built-in SCSS (#10321) Co-authored-by: Joe Haddad --- .../with-carbon-components/next.config.js | 28 ++++--------------- examples/with-carbon-components/package.json | 2 -- examples/with-carbon-components/pages/_app.js | 7 +++++ .../with-carbon-components/pages/_document.js | 17 ----------- .../with-carbon-components/pages/index.js | 2 -- .../static/myCustomTheme.scss | 3 -- .../styles/custom-theme.scss | 2 ++ .../{static => styles}/export.scss | 0 8 files changed, 14 insertions(+), 47 deletions(-) create mode 100644 examples/with-carbon-components/pages/_app.js delete mode 100644 examples/with-carbon-components/pages/_document.js delete mode 100644 examples/with-carbon-components/static/myCustomTheme.scss create mode 100644 examples/with-carbon-components/styles/custom-theme.scss rename examples/with-carbon-components/{static => styles}/export.scss (100%) diff --git a/examples/with-carbon-components/next.config.js b/examples/with-carbon-components/next.config.js index 215b0c0510badd1..67c6b64ff2bfc54 100644 --- a/examples/with-carbon-components/next.config.js +++ b/examples/with-carbon-components/next.config.js @@ -1,23 +1,5 @@ -const withSass = require('@zeit/next-sass') -const withImages = require('next-images') - -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 - }, - }) -) +module.exports = { + experimental: { + scss: true, + }, +} diff --git a/examples/with-carbon-components/package.json b/examples/with-carbon-components/package.json index c99333fb49dfcfd..3c93e60c6f24c95 100644 --- a/examples/with-carbon-components/package.json +++ b/examples/with-carbon-components/package.json @@ -10,12 +10,10 @@ }, "license": "ISC", "dependencies": { - "@zeit/next-sass": "^1.0.1", "carbon-components": "^9.6.4", "carbon-components-react": "^6.19.1", "carbon-icons": "^7.0.7", "next": "latest", - "next-images": "^0.10.6", "react": "^16.7.0", "react-dom": "^16.7.0" } diff --git a/examples/with-carbon-components/pages/_app.js b/examples/with-carbon-components/pages/_app.js new file mode 100644 index 000000000000000..790cab606bc67a2 --- /dev/null +++ b/examples/with-carbon-components/pages/_app.js @@ -0,0 +1,7 @@ +import '../styles/custom-theme.scss' + +function MyApp({ Component, pageProps }) { + return +} + +export default MyApp diff --git a/examples/with-carbon-components/pages/_document.js b/examples/with-carbon-components/pages/_document.js deleted file mode 100644 index 534bd1d59505a31..000000000000000 --- a/examples/with-carbon-components/pages/_document.js +++ /dev/null @@ -1,17 +0,0 @@ -import Document, { Head, Main, NextScript } from 'next/document' - -export default class MyDocument extends Document { - render() { - return ( - - - - - -
- - - - ) - } -} diff --git a/examples/with-carbon-components/pages/index.js b/examples/with-carbon-components/pages/index.js index 2dd762884df58e8..dd78a0423e512f7 100644 --- a/examples/with-carbon-components/pages/index.js +++ b/examples/with-carbon-components/pages/index.js @@ -1,8 +1,6 @@ import React, { Component, Fragment } from 'react' import { Button } from 'carbon-components-react' -import '../static/myCustomTheme.scss' - export default class DemoApp extends Component { render() { return ( diff --git a/examples/with-carbon-components/static/myCustomTheme.scss b/examples/with-carbon-components/static/myCustomTheme.scss deleted file mode 100644 index 4272fb81346aec6..000000000000000 --- a/examples/with-carbon-components/static/myCustomTheme.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import './export.scss'; - -@import '../node_modules/carbon-components/scss/globals/scss/styles.scss'; diff --git a/examples/with-carbon-components/styles/custom-theme.scss b/examples/with-carbon-components/styles/custom-theme.scss new file mode 100644 index 000000000000000..9b908bed73d6227 --- /dev/null +++ b/examples/with-carbon-components/styles/custom-theme.scss @@ -0,0 +1,2 @@ +@import './export.scss'; +@import '~carbon-components/scss/globals/scss/styles.scss'; diff --git a/examples/with-carbon-components/static/export.scss b/examples/with-carbon-components/styles/export.scss similarity index 100% rename from examples/with-carbon-components/static/export.scss rename to examples/with-carbon-components/styles/export.scss