From 60140af5ba029e30d433ebf5afd442f754ee87e5 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Fri, 5 Nov 2021 14:36:48 +0800
Subject: [PATCH] feat!: remove `@vue/compiler-sfc` from peer dependencies
 (#6808)

---
 packages/@vue/babel-preset-app/package.json           | 2 +-
 packages/@vue/cli-plugin-typescript/index.js          | 2 +-
 packages/@vue/cli-plugin-typescript/package.json      | 7 ++-----
 packages/@vue/cli-service/__tests__/generator.spec.js | 1 -
 packages/@vue/cli-service/generator/index.js          | 5 +----
 packages/@vue/cli-service/lib/config/base.js          | 3 +--
 packages/@vue/cli-service/package.json                | 4 ----
 7 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/packages/@vue/babel-preset-app/package.json b/packages/@vue/babel-preset-app/package.json
index b9d51a815b..71863e6058 100644
--- a/packages/@vue/babel-preset-app/package.json
+++ b/packages/@vue/babel-preset-app/package.json
@@ -42,7 +42,7 @@
   "peerDependencies": {
     "@babel/core": "*",
     "core-js": "^3",
-    "vue": "^2 || ^3.0.0-0"
+    "vue": "^2 || ^3.2.13"
   },
   "peerDependenciesMeta": {
     "core-js": {
diff --git a/packages/@vue/cli-plugin-typescript/index.js b/packages/@vue/cli-plugin-typescript/index.js
index ed94d3f7f5..224758008a 100644
--- a/packages/@vue/cli-plugin-typescript/index.js
+++ b/packages/@vue/cli-plugin-typescript/index.js
@@ -85,7 +85,7 @@ module.exports = (api, projectOptions) => {
             extensions: {
               vue: {
                 enabled: true,
-                compiler: isVue3 ? require.resolve('@vue/compiler-sfc') : require.resolve('vue-template-compiler')
+                compiler: isVue3 ? require.resolve('vue/compiler-sfc') : require.resolve('vue-template-compiler')
               }
             },
             diagnosticOptions: {
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index 9db03aa08d..00b9cfe5b7 100644
--- a/packages/@vue/cli-plugin-typescript/package.json
+++ b/packages/@vue/cli-plugin-typescript/package.json
@@ -37,14 +37,11 @@
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0",
-    "@vue/compiler-sfc": "^3.0.0-beta.14",
     "typescript": ">=2",
-    "vue-template-compiler": "^2.0.0"
+    "vue-template-compiler": "^2.0.0",
+    "vue": "^2 || ^3.2.13"
   },
   "peerDependenciesMeta": {
-    "@vue/compiler-sfc": {
-      "optional": true
-    },
     "vue-template-compiler": {
       "optional": true
     }
diff --git a/packages/@vue/cli-service/__tests__/generator.spec.js b/packages/@vue/cli-service/__tests__/generator.spec.js
index 5da85eb2b1..19bfc7f68b 100644
--- a/packages/@vue/cli-service/__tests__/generator.spec.js
+++ b/packages/@vue/cli-service/__tests__/generator.spec.js
@@ -34,7 +34,6 @@ test('Vue 3', async () => {
   })
 
   expect(pkg.dependencies.vue).toMatch('^3')
-  expect(pkg).toHaveProperty(['devDependencies', '@vue/compiler-sfc'])
 
   expect(files['src/main.js']).toMatch(`import { createApp } from 'vue'`)
 
diff --git a/packages/@vue/cli-service/generator/index.js b/packages/@vue/cli-service/generator/index.js
index 4689f5f37b..bb4a3f5d6b 100644
--- a/packages/@vue/cli-service/generator/index.js
+++ b/packages/@vue/cli-service/generator/index.js
@@ -7,10 +7,7 @@ module.exports = (api, options) => {
   if (options.vueVersion === '3') {
     api.extendPackage({
       dependencies: {
-        'vue': '^3.2.6'
-      },
-      devDependencies: {
-        '@vue/compiler-sfc': '^3.2.6'
+        'vue': '^3.2.13'
       }
     })
   } else {
diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js
index f0b6439e03..fc6b68c129 100644
--- a/packages/@vue/cli-service/lib/config/base.js
+++ b/packages/@vue/cli-service/lib/config/base.js
@@ -101,8 +101,7 @@ module.exports = (api, options) => {
     } else if (vueMajor === 3) {
       // for Vue 3 projects
       const vueLoaderCacheConfig = api.genCacheConfig('vue-loader', {
-        'vue-loader': require('vue-loader/package.json').version,
-        '@vue/compiler-sfc': require('@vue/compiler-sfc/package.json').version
+        'vue-loader': require('vue-loader/package.json').version
       })
 
       webpackConfig.resolve
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index 97dbc05dbe..e21ca4e772 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -82,14 +82,10 @@
     "whatwg-fetch": "^3.6.2"
   },
   "peerDependencies": {
-    "@vue/compiler-sfc": "^3.0.0-beta.14",
     "vue-template-compiler": "^2.0.0",
     "webpack-sources": "*"
   },
   "peerDependenciesMeta": {
-    "@vue/compiler-sfc": {
-      "optional": true
-    },
     "less-loader": {
       "optional": true
     },