From acb50efb72227a759663eef15be48afc4b26e132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20=C3=87AKI?= Date: Tue, 3 Aug 2021 14:51:40 +0300 Subject: [PATCH] voltranConfig.sassResources undefined bug fixed. --- webpack.client.config.js | 18 +++++++++++------- webpack.server.config.js | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/webpack.client.config.js b/webpack.client.config.js index f7a812f..c15dbd5 100644 --- a/webpack.client.config.js +++ b/webpack.client.config.js @@ -190,13 +190,17 @@ const clientConfig = webpackMerge(commonConfig, voltranClientConfig, { { loader: 'sass-loader' }, - { - loader: 'sass-resources-loader', - options: { - sourceMap: true, - resources: [...voltranConfig.sassResources] - } - } + ...(voltranConfig.sassResources + ? [ + { + loader: 'sass-resources-loader', + options: { + sourceMap: false, + resources: voltranConfig.sassResources + } + } + ] + : []) ] } ] diff --git a/webpack.server.config.js b/webpack.server.config.js index 2351a3b..1b9b79b 100644 --- a/webpack.server.config.js +++ b/webpack.server.config.js @@ -26,8 +26,6 @@ const voltranServerConfig = voltranServerConfigPath ? require(voltranConfig.webpackConfiguration.server) : ''; - - const serverConfig = webpackMerge(commonConfig, voltranServerConfig, { name: 'server', @@ -85,13 +83,17 @@ const serverConfig = webpackMerge(commonConfig, voltranServerConfig, { { loader: 'sass-loader' }, - { - loader: 'sass-resources-loader', - options: { - sourceMap: true, - resources: [...voltranConfig.sassResources] - } - } + ...(voltranConfig.sassResources + ? [ + { + loader: 'sass-resources-loader', + options: { + sourceMap: false, + resources: voltranConfig.sassResources + } + } + ] + : []) ] } ]