From 72194a45917115f82f83969ff2cdce811fb8bea2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 1 Jun 2022 14:27:29 +0800
Subject: [PATCH] build: use extended tsconfig

---
 api-extractor.tsconfig.json                 | 32 ++----------------
 packages/server-renderer/test/tsconfig.json |  7 ++++
 packages/server-renderer/tsconfig.json      | 37 ---------------------
 test/tsconfig.json                          | 34 ++-----------------
 tsconfig.json                               |  4 +--
 5 files changed, 13 insertions(+), 101 deletions(-)
 create mode 100644 packages/server-renderer/test/tsconfig.json
 delete mode 100644 packages/server-renderer/tsconfig.json

diff --git a/api-extractor.tsconfig.json b/api-extractor.tsconfig.json
index 0f6dfeaac..39af6b8db 100644
--- a/api-extractor.tsconfig.json
+++ b/api-extractor.tsconfig.json
@@ -1,36 +1,8 @@
 {
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "baseUrl": "./temp",
-    "outDir": "dist",
-    "sourceMap": true,
-    "target": "esnext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "strict": true,
-
-    "allowJs": true,
-    "noImplicitAny": false,
-    "noImplicitThis": false,
-
-    "noUnusedLocals": true,
-    "experimentalDecorators": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "removeComments": false,
-    "jsx": "preserve",
-    "lib": ["esnext", "dom"],
-    "paths": {
-      "compiler/*": ["src/compiler/*"],
-      "core/*": ["src/core/*"],
-      "server/*": ["src/server/*"],
-      "sfc/*": ["src/sfc/*"],
-      "shared/*": ["src/shared/*"],
-      "web/*": ["src/platforms/web/*"],
-      "v3": ["src/v3/index"],
-      "v3/*": ["src/v3/*"],
-      "types/*": ["src/types/*"],
-      "vue": ["src/platforms/web/entry-runtime-with-compiler"]
-    }
+    "types": []
   },
   "include": ["src"]
 }
diff --git a/packages/server-renderer/test/tsconfig.json b/packages/server-renderer/test/tsconfig.json
new file mode 100644
index 000000000..96cc3dcb9
--- /dev/null
+++ b/packages/server-renderer/test/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "types": ["node", "vitest/globals"]
+  },
+  "include": [".", "../../../test/test-env.d.ts"]
+}
diff --git a/packages/server-renderer/tsconfig.json b/packages/server-renderer/tsconfig.json
deleted file mode 100644
index a490aeb83..000000000
--- a/packages/server-renderer/tsconfig.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "outDir": "dist",
-    "sourceMap": true,
-    "target": "esnext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "strict": true,
-
-    "allowJs": true,
-    "noImplicitAny": false,
-    "noImplicitThis": false,
-
-    "noUnusedLocals": true,
-    "experimentalDecorators": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "removeComments": false,
-    "jsx": "preserve",
-    "lib": ["esnext", "dom"],
-    "types": ["node", "vitest/globals"],
-    "paths": {
-      "compiler/*": ["../../src/compiler/*"],
-      "core/*": ["../../src/core/*"],
-      "server/*": ["./src/*"],
-      "sfc/*": ["../../src/sfc/*"],
-      "shared/*": ["../../src/shared/*"],
-      "web/*": ["../../src/platforms/web/*"],
-      "v3": ["../../src/v3/index"],
-      "v3/*": ["../../src/v3/*"],
-      "types/*": ["../../src/types/*"],
-      "vue": ["../../src/platforms/web/entry-runtime-with-compiler"]
-    }
-  },
-  "include": ["../../src", "../../test/test-env.d.ts", "."]
-}
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 8324fccbe..594e42068 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,37 +1,7 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
-    "outDir": "dist",
-    "sourceMap": true,
-    "target": "esnext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "strict": true,
-
-    "allowJs": true,
-    "noImplicitAny": false,
-    "noImplicitThis": false,
-
-    "noUnusedLocals": true,
-    "experimentalDecorators": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "removeComments": false,
-    "jsx": "preserve",
-    "lib": ["esnext", "dom"],
-    "types": ["node", "vitest/globals"],
-    "paths": {
-      "compiler/*": ["../src/compiler/*"],
-      "core/*": ["../src/core/*"],
-      "server/*": ["../packages/server-renderer/src/*"],
-      "sfc/*": ["../src/sfc/*"],
-      "shared/*": ["../src/shared/*"],
-      "web/*": ["../src/platforms/web/*"],
-      "v3": ["../src/v3/index"],
-      "v3/*": ["../src/v3/*"],
-      "types/*": ["../src/types/*"],
-      "vue": ["../src/platforms/web/entry-runtime-with-compiler"]
-    }
+    "types": ["node", "vitest/globals"]
   },
   "include": ["../src", "."]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 26361cfe4..299b45f18 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,7 +24,7 @@
       "compiler/*": ["src/compiler/*"],
       "core/*": ["src/core/*"],
       "server/*": ["packages/server-renderer/src/*"],
-      "sfc/*": ["src/sfc/*"],
+      "sfc/*": ["packages/compiler-sfc/src/*"],
       "shared/*": ["src/shared/*"],
       "web/*": ["src/platforms/web/*"],
       "v3": ["src/v3/index"],
@@ -33,5 +33,5 @@
       "vue": ["src/platforms/web/entry-runtime-with-compiler"]
     }
   },
-  "include": ["src", "packages/server-renderer/src"],
+  "include": ["src", "packages/*/src"]
 }