From 55a6197ce16b423779051ce7a8e4a403158b1d87 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 3 Jul 2020 11:08:28 +0800
Subject: [PATCH] feat(cli): Compatible with sass-loader@9 #1861

---
 packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js | 7 ++++---
 packages/vue-cli-plugin-uni/lib/options.js                 | 5 +++--
 2 files changed, 7 insertions(+), 5 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 ac354fa36..2323500e6 100644
--- a/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
+++ b/packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
@@ -25,7 +25,7 @@ const postcssLoader = {
   options: {
     sourceMap: false,
     parser: require('postcss-comment'),
-    plugins: [
+    plugins: [
       require('postcss-import')({
         resolve (id, basedir, importOptions) {
           if (id.startsWith('~@/')) {
@@ -77,12 +77,13 @@ if (sassLoaderVersion < 8) {
   sassLoader.options.outputStyle = 'expanded'
   sassLoader.options.indentedSyntax = true
 } else {
-  scssLoader.options.prependData = sassData
+  const name = sassLoaderVersion >= 9 ? 'additionalData' : 'prependData'
+  scssLoader.options[name] = sassData
   scssLoader.options.sassOptions = {
     outputStyle: 'expanded'
   }
 
-  sassLoader.options.prependData = sassData
+  sassLoader.options[name] = sassData
   sassLoader.options.sassOptions = {
     outputStyle: 'expanded',
     indentedSyntax: true
diff --git a/packages/vue-cli-plugin-uni/lib/options.js b/packages/vue-cli-plugin-uni/lib/options.js
index 1ae94efed..67ad1e654 100644
--- a/packages/vue-cli-plugin-uni/lib/options.js
+++ b/packages/vue-cli-plugin-uni/lib/options.js
@@ -85,8 +85,9 @@ module.exports = function initOptions (options) {
 
   if (sassLoaderVersion < 8) {
     options.css.loaderOptions.sass.data = sassData
-  } else {
-    options.css.loaderOptions.sass.prependData = sassData
+  } else {
+    const name = sassLoaderVersion >= 9 ? 'additionalData' : 'prependData'
+    options.css.loaderOptions.sass[name] = sassData
   }
 
   const userPostcssConfigPath = path.resolve(process.env.UNI_INPUT_DIR, 'postcss.config.js')
-- 
GitLab