Merge pull request #835 from Shopify/fix-cssvar-build

Fix cssVarLoader running on development build
Shopify · Oct 16, 2018 · 414e201 · 414e201
2 parents e375c1c + 55d206b
commit 414e201
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/slate-tools/tools/webpack/config/parts/css.js b/packages/slate-tools/tools/webpack/config/parts/css.js
@@ -43,8 +43,7 @@ const postcssLoader = {
 const cssVarLoader = {loader: '@shopify/slate-cssvar-loader'};
 
 cssRule.use = [
-  isDev ? styleLoader : MiniCssExtractPlugin.loader,
-  cssVarLoader,
+  ...(isDev ? [styleLoader] : [MiniCssExtractPlugin.loader, cssVarLoader]),
   cssLoader,
   postcssLoader,
 ];

diff --git a/packages/slate-tools/tools/webpack/config/parts/sass.js b/packages/slate-tools/tools/webpack/config/parts/sass.js
@@ -47,8 +47,7 @@ const sassLoader = {
 };
 
 sassRule.use = [
-  isDev ? styleLoader : MiniCssExtractPlugin.loader,
-  cssVarLoader,
+  ...(isDev ? [styleLoader] : [MiniCssExtractPlugin.loader, cssVarLoader]),
   cssLoader,
   postcssLoader,
   sassLoader,