From 7999b1387224e1f089655d7df8b4d4b7c9b8c82a Mon Sep 17 00:00:00 2001
From: wkj <278599135@qq.com>
Date: Tue, 5 Jul 2022 15:38:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81less=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/web/webpack.config.js | 39 +++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/config/web/webpack.config.js b/config/web/webpack.config.js
index 9d0ebf4..68bd8bb 100644
--- a/config/web/webpack.config.js
+++ b/config/web/webpack.config.js
@@ -111,7 +111,7 @@ module.exports = function (webpackEnv) {
 
 
     // common function to get style loaders
-    const getStyleLoaders = (cssOptions, preProcessor) => {
+    const getStyleLoaders = (cssOptions, preProcessor, preProcessOptions) => {
         const loaders = [
             isEnvDevelopment && require.resolve('style-loader'),
             isEnvProduction && {
@@ -187,9 +187,9 @@ module.exports = function (webpackEnv) {
                 },
                 {
                     loader: require.resolve(preProcessor),
-                    options: {
+                    options: Object.assign({
                         sourceMap: true,
-                    },
+                    }, preProcessOptions),
                 }
             );
         }
@@ -610,6 +610,25 @@ module.exports = function (webpackEnv) {
                                 'sass-loader'
                             ),
                         },
+                        // {
+                        //     test: lessRegex,
+                        //     use: [
+                        //         {
+                        //             loader: 'style-loader',
+                        //         },
+                        //         {
+                        //             loader: 'css-loader', // translates CSS into CommonJS
+                        //         },
+                        //         {
+                        //             loader: 'less-loader', // compiles Less to CSS
+                        //             options: {
+                        //                 lessOptions: {
+                        //                     javascriptEnabled: true,
+                        //                 },
+                        //             },
+                        //         },
+                        //     ],
+                        // },
                         {
                             test: lessRegex,
                             exclude: lessModuleRegex,
@@ -623,7 +642,12 @@ module.exports = function (webpackEnv) {
                                         mode: 'icss',
                                     },
                                 },
-                                'less-loader'
+                                'less-loader',
+                                {
+                                    lessOptions: {
+                                        javascriptEnabled: true,
+                                    },
+                                }
                             ),
                             sideEffects: true,
                         },
@@ -640,7 +664,12 @@ module.exports = function (webpackEnv) {
                                         getLocalIdent: getCSSModuleLocalIdent,
                                     },
                                 },
-                                'less-loader'
+                                'less-loader',
+                                {
+                                    lessOptions: {
+                                        javascriptEnabled: true,
+                                    },
+                                }
                             ),
                         },
                         // "file" loader makes sure those assets get served by WebpackDevServer.