Skip to content

Commit

Permalink
chore: Move sass imports to a single file
Browse files Browse the repository at this point in the history
  • Loading branch information
kevee committed Jun 12, 2020
1 parent 56df1fc commit 8e3788e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
8 changes: 2 additions & 6 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const path = require('path')
const srcPath = path.resolve(__dirname, '../src')
const sassImports = require('../src/utilities/sass-imports')

module.exports = ({ config }) => {
// Transpile Gatsby module because Gatsby includes un-transpiled ES6 code.
Expand Down Expand Up @@ -37,11 +37,7 @@ module.exports = ({ config }) => {
loader: require.resolve('sass-loader'),

options: {
data: `@import '~scss/type.module.scss';
@import '~scss/helpers.module.scss';
@import '~scss/colors.module.scss';
@import '~scss/links.module.scss';
@import '~scss/breakpoints.module.scss';`,
data: sassImports,
},
},
],
Expand Down
8 changes: 3 additions & 5 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ require(`@babel/register`)({
plugins: ['@babel/plugin-transform-runtime'],
})
require('dotenv').config()

const algoliaQueries = require('./src/utilities/algolia').queries
const sassImports = require('./src/utilities/sass-imports.js')

const gatsbyConfig = {
siteMetadata: {
Expand All @@ -30,11 +32,7 @@ const gatsbyConfig = {
{
resolve: 'gatsby-plugin-sass',
options: {
data: `@import '~scss/type.module.scss';
@import '~scss/helpers.module.scss';
@import '~scss/colors.module.scss';
@import '~scss/links.module.scss';
@import '~scss/breakpoints.module.scss';`,
data: sassImports,
},
},
{
Expand Down
9 changes: 9 additions & 0 deletions src/utilities/sass-imports.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = [
'type.module.scss',
'helpers.module.scss',
'colors.module.scss',
'links.module.scss',
'breakpoints.module.scss',
]
.map(file => `@import '~scss/${file}';`)
.join('\n')

0 comments on commit 8e3788e

Please sign in to comment.