From 8e3788e0ce280a71de263abe7a42bc9ed3b66b71 Mon Sep 17 00:00:00 2001 From: Kevin Miller Date: Fri, 12 Jun 2020 13:42:50 -0600 Subject: [PATCH] chore: Move sass imports to a single file --- .storybook/webpack.config.js | 8 ++------ gatsby-config.js | 8 +++----- src/utilities/sass-imports.js | 9 +++++++++ 3 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 src/utilities/sass-imports.js diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js index 5d058a5ef..0055fb1ee 100644 --- a/.storybook/webpack.config.js +++ b/.storybook/webpack.config.js @@ -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. @@ -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, }, }, ], diff --git a/gatsby-config.js b/gatsby-config.js index a8e151fb0..47ce9731f 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -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: { @@ -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, }, }, { diff --git a/src/utilities/sass-imports.js b/src/utilities/sass-imports.js new file mode 100644 index 000000000..7027a4398 --- /dev/null +++ b/src/utilities/sass-imports.js @@ -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')