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

t-kelly · web-flow · commit 414e2010a267 · 2018-10-16T09:20:52.000-04:00
Fix cssVarLoader running on development build
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,
