From ff6a0c47bfcf283c80403f81f38b371cb812f91c Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Wed, 10 Aug 2022 10:59:19 +0800
Subject: [PATCH] fix: remove sass-loader version check

---
 .../build/css-loader.conf.js                  | 30 +++++--------------
 .../vue-cli-plugin-uni/lib/chain-webpack.js   | 28 +++++++----------
 2 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js b/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
index f0f8d26a5..e0ce80eee 100644
--- a/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
+++ b/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
@@ -8,10 +8,6 @@ const {
   nvueCssPreprocessOptions
 } = require('@dcloudio/uni-cli-shared')
 
-const {
-  sassLoaderVersion
-} = require('@dcloudio/uni-cli-shared/lib/scss')
-
 const nvueStyleLoader = {
   loader: '@dcloudio/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/style'
 }
@@ -78,25 +74,15 @@ const sassLoader = {
   }
 }
 
-if (sassLoaderVersion < 8) {
-  scssLoader.options.data = sassData
-  scssLoader.options.outputStyle = 'expanded'
-
-  sassLoader.options.data = sassData
-  sassLoader.options.outputStyle = 'expanded'
-  sassLoader.options.indentedSyntax = true
-} else {
-  const name = sassLoaderVersion >= 9 ? 'additionalData' : 'prependData'
-  scssLoader.options[name] = sassData
-  scssLoader.options.sassOptions = {
-    outputStyle: 'expanded'
-  }
+scssLoader.options.prependData = sassData
+scssLoader.options.sassOptions = {
+  outputStyle: 'expanded'
+}
 
-  sassLoader.options[name] = sassData
-  sassLoader.options.sassOptions = {
-    outputStyle: 'expanded',
-    indentedSyntax: true
-  }
+sassLoader.options.prependData = sassData
+sassLoader.options.sassOptions = {
+  outputStyle: 'expanded',
+  indentedSyntax: true
 }
 
 const lessLoader = {
diff --git a/packages/vue-cli-plugin-uni/lib/chain-webpack.js b/packages/vue-cli-plugin-uni/lib/chain-webpack.js
index ecdb30d16..b263aca74 100644
--- a/packages/vue-cli-plugin-uni/lib/chain-webpack.js
+++ b/packages/vue-cli-plugin-uni/lib/chain-webpack.js
@@ -1,10 +1,6 @@
 const path = require('path')
 const webpack = require('webpack')
 
-const {
-  sassLoaderVersion
-} = require('@dcloudio/uni-cli-shared/lib/scss')
-
 const {
   getPartialIdentifier
 } = require('./util')
@@ -112,21 +108,19 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       })
     })
 
-    if (sassLoaderVersion >= 8) { // check indentedSyntax
-      // vue cli 3 and sass-loader 8
-      cssTypes.forEach(type => {
-        webpackConfig.module.rule('sass').oneOf(type).use('sass-loader').tap(options => {
-          if (options.indentedSyntax) {
-            if (!options.sassOptions) {
-              options.sassOptions = {}
-            }
-            options.sassOptions.indentedSyntax = true
-            delete options.indentedSyntax
+    // vue cli 3 and sass-loader 8
+    cssTypes.forEach(type => {
+      webpackConfig.module.rule('sass').oneOf(type).use('sass-loader').tap(options => {
+        if (options.indentedSyntax) {
+          if (!options.sassOptions) {
+            options.sassOptions = {}
           }
-          return options
-        })
+          options.sassOptions.indentedSyntax = true
+          delete options.indentedSyntax
+        }
+        return options
       })
-    }
+    })
 
     platformOptions.chainWebpack(webpackConfig, vueOptions, api)
     // define
-- 
GitLab