From e7434d82912fe1cf34384c4116bbf7a2c0b47eb5 Mon Sep 17 00:00:00 2001
From: andrei <12499409+andreiTn@users.noreply.github.com>
Date: Fri, 27 Nov 2020 12:04:39 +0000
Subject: [PATCH] chore: remove deprecated node-sass

---
 packages/@vue/cli-service/__tests__/generator.spec.js    | 9 ---------
 packages/@vue/cli-service/generator/index.js             | 4 ----
 packages/@vue/cli/lib/options.js                         | 2 +-
 .../lib/promptModules/__tests__/cssPreprocessors.spec.js | 2 +-
 packages/@vue/cli/lib/promptModules/cssPreprocessors.js  | 8 --------
 packages/@vue/cli/lib/util/ProjectPackageManager.js      | 2 +-
 packages/@vue/cli/lib/util/inferRootOptions.js           | 2 --
 packages/@vue/cli/types/cli-test.ts                      | 4 ----
 packages/@vue/cli/types/index.d.ts                       | 2 +-
 9 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/packages/@vue/cli-service/__tests__/generator.spec.js b/packages/@vue/cli-service/__tests__/generator.spec.js
index 3565cba1c1..760137ec62 100644
--- a/packages/@vue/cli-service/__tests__/generator.spec.js
+++ b/packages/@vue/cli-service/__tests__/generator.spec.js
@@ -19,15 +19,6 @@ test('sass (default)', async () => {
   expect(pkg).toHaveProperty(['devDependencies', 'sass'])
 })
 
-test('node sass', async () => {
-  const { pkg, files } = await generateWithOptions({
-    cssPreprocessor: 'node-sass'
-  })
-
-  expect(files['src/App.vue']).toMatch('<style lang="scss">')
-  expect(pkg).toHaveProperty(['devDependencies', 'node-sass'])
-})
-
 test('dart sass', async () => {
   const { pkg, files } = await generateWithOptions({
     cssPreprocessor: 'dart-sass'
diff --git a/packages/@vue/cli-service/generator/index.js b/packages/@vue/cli-service/generator/index.js
index d96a829928..76c9601d64 100644
--- a/packages/@vue/cli-service/generator/index.js
+++ b/packages/@vue/cli-service/generator/index.js
@@ -41,10 +41,6 @@ module.exports = (api, options) => {
         sass: '^1.26.5',
         'sass-loader': '^8.0.2'
       },
-      'node-sass': {
-        'node-sass': '^4.12.0',
-        'sass-loader': '^8.0.2'
-      },
       'dart-sass': {
         sass: '^1.26.5',
         'sass-loader': '^8.0.2'
diff --git a/packages/@vue/cli/lib/options.js b/packages/@vue/cli/lib/options.js
index bfb6cd35e8..22865e1ea4 100644
--- a/packages/@vue/cli/lib/options.js
+++ b/packages/@vue/cli/lib/options.js
@@ -43,7 +43,7 @@ const presetSchema = createSchema((joi) =>
         }),
       cssPreprocessor: joi
         .string()
-        .valid('sass', 'dart-sass', 'node-sass', 'less', 'stylus'),
+        .valid('sass', 'dart-sass', 'less', 'stylus'),
       plugins: joi.object().required(),
       configs: joi.object()
     })
diff --git a/packages/@vue/cli/lib/promptModules/__tests__/cssPreprocessors.spec.js b/packages/@vue/cli/lib/promptModules/__tests__/cssPreprocessors.spec.js
index d138eb7c37..b2d52f20f2 100644
--- a/packages/@vue/cli/lib/promptModules/__tests__/cssPreprocessors.spec.js
+++ b/packages/@vue/cli/lib/promptModules/__tests__/cssPreprocessors.spec.js
@@ -14,7 +14,7 @@ test('CSS pre-processor ', async () => {
     },
     {
       message: 'Pick a CSS pre-processor',
-      choices: ['Sass/SCSS (with dart-sass)', 'Sass/SCSS (with node-sass)', 'Less', 'Stylus'],
+      choices: ['Sass/SCSS (with dart-sass)', 'Less', 'Stylus'],
       choose: 0
     }
   ]
diff --git a/packages/@vue/cli/lib/promptModules/cssPreprocessors.js b/packages/@vue/cli/lib/promptModules/cssPreprocessors.js
index 992eebeecc..da6287de5b 100644
--- a/packages/@vue/cli/lib/promptModules/cssPreprocessors.js
+++ b/packages/@vue/cli/lib/promptModules/cssPreprocessors.js
@@ -15,18 +15,10 @@ module.exports = cli => {
     message: `Pick a CSS pre-processor${process.env.VUE_CLI_API_MODE ? '' : ` (${notice})`}:`,
     description: `${notice}.`,
     choices: [
-      // In Vue CLI <= 3.3, the value of Sass option in 'sass' an means 'node-sass'.
-      // Considering the 'sass' package on NPM is actually for Dart Sass, we renamed it to 'node-sass'.
-      // In @vue/cli-service there're still codes that accepts 'sass' as an option value, for compatibility reasons,
-      // and they're meant to be removed in v4.
       {
         name: 'Sass/SCSS (with dart-sass)',
         value: 'dart-sass'
       },
-      {
-        name: 'Sass/SCSS (with node-sass)',
-        value: 'node-sass'
-      },
       {
         name: 'Less',
         value: 'less'
diff --git a/packages/@vue/cli/lib/util/ProjectPackageManager.js b/packages/@vue/cli/lib/util/ProjectPackageManager.js
index 1629156eb6..e76ab1de67 100644
--- a/packages/@vue/cli/lib/util/ProjectPackageManager.js
+++ b/packages/@vue/cli/lib/util/ProjectPackageManager.js
@@ -247,7 +247,7 @@ class PackageManager {
     }
 
     try {
-      // node-sass, chromedriver, etc.
+      // chromedriver, etc.
       const binaryMirrorConfigMetadata = await this.getMetadata('binary-mirror-config', { full: true })
       const latest = binaryMirrorConfigMetadata['dist-tags'] && binaryMirrorConfigMetadata['dist-tags'].latest
       const mirrors = binaryMirrorConfigMetadata.versions[latest].mirrors.china
diff --git a/packages/@vue/cli/lib/util/inferRootOptions.js b/packages/@vue/cli/lib/util/inferRootOptions.js
index af021255a8..2382b1cdbf 100644
--- a/packages/@vue/cli/lib/util/inferRootOptions.js
+++ b/packages/@vue/cli/lib/util/inferRootOptions.js
@@ -34,8 +34,6 @@ module.exports = function inferRootOptions (pkg) {
   // cssPreprocessors
   if ('sass' in deps) {
     rootOptions.cssPreprocessor = 'sass'
-  } else if ('node-sass' in deps) {
-    rootOptions.cssPreprocessor = 'node-sass'
   } else if ('less-loader' in deps) {
     rootOptions.cssPreprocessor = 'less'
   } else if ('stylus-loader' in deps) {
diff --git a/packages/@vue/cli/types/cli-test.ts b/packages/@vue/cli/types/cli-test.ts
index c9294c23b6..c78c62ecad 100644
--- a/packages/@vue/cli/types/cli-test.ts
+++ b/packages/@vue/cli/types/cli-test.ts
@@ -44,10 +44,6 @@ const testPromptAPI = (cli: PromptModuleAPI) => {
         name: 'Sass/SCSS (with dart-sass)',
         value: 'dart-sass'
       },
-      {
-        name: 'Sass/SCSS (with node-sass)',
-        value: 'node-sass'
-      },
       {
         name: 'Less',
         value: 'less'
diff --git a/packages/@vue/cli/types/index.d.ts b/packages/@vue/cli/types/index.d.ts
index 80f5c4b031..7a25c20b3c 100644
--- a/packages/@vue/cli/types/index.d.ts
+++ b/packages/@vue/cli/types/index.d.ts
@@ -48,7 +48,7 @@ type Preset = Partial<{
   useConfigFiles: boolean
   plugins: Record<string, any>
   configs: Record<string, any>
-  cssPreprocessor: 'sass' | 'dart-sass' | 'node-sass' | 'less' | 'stylus'
+  cssPreprocessor: 'sass' | 'dart-sass' | 'less' | 'stylus'
 }>
 
 declare class PromptModuleAPI {