From 7a22ae9e2152e71ac1d3d7a2306deffd6edb54b7 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 31 Dec 2021 20:13:06 +0800
Subject: [PATCH] fix: remove sass-loader version check

---
 packages/vue-cli-plugin-uni/lib/options.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/lib/options.js b/packages/vue-cli-plugin-uni/lib/options.js
index 77a79d2c6..74939e04c 100644
--- a/packages/vue-cli-plugin-uni/lib/options.js
+++ b/packages/vue-cli-plugin-uni/lib/options.js
@@ -1,10 +1,6 @@
 const fs = require('fs')
 const path = require('path')
 
-const {
-  sassLoaderVersion
-} = require('@dcloudio/uni-cli-shared/lib/scss')
-
 const isWin = /^win/.test(process.platform)
 
 function genTranspileDepRegex (depPath) {
@@ -27,9 +23,9 @@ module.exports = function initOptions (options) {
   options.transpileDependencies.push(genTranspileDepRegex(path.resolve(process.env.UNI_INPUT_DIR, 'node_modules')))
   options.transpileDependencies.push('@dcloudio/uni-' + process.env.UNI_PLATFORM)
   options.transpileDependencies.push('@dcloudio/uni-i18n')
-  options.transpileDependencies.push('@dcloudio/uni-stat')
+  options.transpileDependencies.push('@dcloudio/uni-stat')
   options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-app')
-  options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-cloud')
+  options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-cloud')
   options.transpileDependencies.push('@dcloudio/vue-cli-plugin-uni/packages/uni-stat')
 
   if (process.env.UNI_PLATFORM !== 'mp-weixin') { // mp runtime
@@ -85,18 +81,11 @@ module.exports = function initOptions (options) {
   if (!outputStyle || outputStyle === 'compressed') {
     options.css.loaderOptions.sass.sassOptions.outputStyle = 'expanded'
   }
-
-  if (sassLoaderVersion < 8) {
-    options.css.loaderOptions.sass.data = sassData
-  } else {
-    const name = sassLoaderVersion >= 9 ? 'additionalData' : 'prependData'
-    options.css.loaderOptions.sass[name] = sassData
-  }
-
+  options.css.loaderOptions.sass.prependData = sassData
   const userPostcssConfigPath = path.resolve(process.env.UNI_INPUT_DIR, 'postcss.config.js')
   if (fs.existsSync(userPostcssConfigPath)) {
     options.css.loaderOptions.postcss.config.path = userPostcssConfigPath
   } else {
     options.css.loaderOptions.postcss.config.path = path.resolve(process.env.UNI_CLI_CONTEXT, 'postcss.config.js')
   }
-}
+}
-- 
GitLab