From 8d49b97cc306e1c34a25a6d2afcfb6267a6c724f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 4 Oct 2019 17:36:26 -0400
Subject: [PATCH] build: include main vue package in aliases and tsconfig paths

---
 rollup.config.js | 8 +++-----
 tsconfig.json    | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rollup.config.js b/rollup.config.js
index 7ee58378d..9988a4a64 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -19,11 +19,9 @@ const packageOptions = pkg.buildOptions || {}
 // build aliases dynamically
 const aliasOptions = { resolve: ['.ts'] }
 fs.readdirSync(packagesDir).forEach(dir => {
-  if (
-    !dir.startsWith('vue') &&
-    fs.statSync(path.resolve(packagesDir, dir)).isDirectory()
-  ) {
-    aliasOptions[`@vue/${dir}`] = path.resolve(packagesDir, `${dir}/src/index`)
+  if (fs.statSync(path.resolve(packagesDir, dir)).isDirectory()) {
+    const name = dir === `vue` ? dir : `@vue/${dir}`
+    aliasOptions[name] = path.resolve(packagesDir, `${dir}/src/index`)
   }
 })
 const aliasPlugin = alias(aliasOptions)
diff --git a/tsconfig.json b/tsconfig.json
index 3784a8e29..b4b9e4bf8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,6 +20,7 @@
     "types": ["jest", "node"],
     "rootDir": ".",
     "paths": {
+      "vue": ["packages/vue/src"],
       "@vue/shared": ["packages/shared/src"],
       "@vue/runtime-core": ["packages/runtime-core/src"],
       "@vue/runtime-dom": ["packages/runtime-dom/src"],