build: adjust types build script

diff --git a/packages/compiler/package.json b/packages/compiler/package.json
index 4f04b367e76234fd377f5f60ae80dc462f3ce13a..0e3866a3e4a4e1245508e1609d0b53c8286ab3ae 100644 (file)
--- a/packages/compiler/package.json
+++ b/packages/compiler/package.json
@@ -4,7 +4,7 @@
   "description": "@vue/compiler",
   "main": "index.js",
   "module": "dist/compiler.esm-bundler.js",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",

diff --git a/packages/core/package.json b/packages/core/package.json
index 17d243c29a4f472aeeb5519e08a5c59baecc7643..3cfd3367f0b07538fb7eb8b85ac2ddf2aca3bbaa 100644 (file)
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -4,7 +4,7 @@
   "description": "@vue/core",
   "main": "index.js",
   "module": "dist/core.esm-bundler.js",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",

diff --git a/packages/observer/package.json b/packages/observer/package.json
index d12346c8b9708910c3bb55c19cdccd30bb729bec..da6feeac8c5efd2f43501f3db45d467836a7d18d 100644 (file)
--- a/packages/observer/package.json
+++ b/packages/observer/package.json
@@ -4,7 +4,7 @@
   "description": "@vue/observer",
   "main": "index.js",
   "module": "dist/observer.esm-bundler.js",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "unpkg": "dist/observer.global.js",
   "sideEffects": false,
   "repository": {

diff --git a/packages/renderer-dom/package.json b/packages/renderer-dom/package.json
index b5a33ed94ac964442404276e740e5f4ae5167d32..5626e486344702204600d36da87aae3a336ca2f2 100644 (file)
--- a/packages/renderer-dom/package.json
+++ b/packages/renderer-dom/package.json
@@ -4,7 +4,7 @@
   "description": "@vue/renderer-dom",
   "main": "index.js",
   "module": "dist/renderer-dom.esm-bundler.js",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "unpkg": "dist/renderer-dom.global.js",
   "sideEffects": false,
   "buildOptions": {

diff --git a/packages/renderer-server/package.json b/packages/renderer-server/package.json
index 2c1ee2565a2095e3f2c934b80e860db2728b997e..6340c6fa7e988e6b104b050736b79dcf97281e7f 100644 (file)
--- a/packages/renderer-server/package.json
+++ b/packages/renderer-server/package.json
@@ -3,7 +3,7 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/renderer-server",
   "main": "index.js",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "buildOptions": {
     "formats": ["cjs"]
   },

diff --git a/packages/renderer-test/package.json b/packages/renderer-test/package.json
index 8984a70f593e45b09d1255592b83540732410aab..0427f6e95c220312627eae55dd6c43001a8043b9 100644 (file)
--- a/packages/renderer-test/package.json
+++ b/packages/renderer-test/package.json
@@ -4,7 +4,7 @@
   "description": "@vue/renderer-test",
   "main": "index.js",
   "module": "dist/renderer-test.esm-bundler.js",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue.git"

diff --git a/packages/scheduler/package.json b/packages/scheduler/package.json
index 60b35db18b1cd7eba9eb5baf4d918422f19992fc..397fdc2acf09bac4c846d6a99b9da3ea9a5c32f5 100644 (file)
--- a/packages/scheduler/package.json
+++ b/packages/scheduler/package.json
@@ -4,7 +4,7 @@
   "description": "@vue/scheduler",
   "main": "index.js",
   "module": "dist/scheduler.esm-bundler.js",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",

diff --git a/packages/vue/package.json b/packages/vue/package.json
index 45b9e3061ccbd8c88bd96643ff6d442a037ca30c..6b748c03af928dfa55e438f1115ab95e777e2964 100644 (file)
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -4,7 +4,6 @@
   "description": "vue",
   "main": "index.js",
   "module": "dist/vue.esm-bundler.js",
-  "typings": "dist/index.d.ts",
   "unpkg": "dist/vue.global.js",
   "sideEffects": false,
   "buildOptions": {

diff --git a/packages/vue/src/index.ts b/packages/vue/src/index.ts
index 6ae92e1ee11d3b7b2314f7c80687ad3fd1042814..72fa6708ec6ae6833dee6601f70e88c3d89eacb6 100644 (file)
--- a/packages/vue/src/index.ts
+++ b/packages/vue/src/index.ts
@@ -6,12 +6,13 @@ import {
   createComponentClassFromOptions
 } from '@vue/renderer-dom'
 
+// Note: typing for this is intentionally loose, as it will be using 2.x types.
+
 class Vue {
-  static h = h
-  static render = render
-  static nextTick = nextTick
+  static h: any = h
+  static render: any = render
+  static nextTick: any = nextTick
 
-  // Note: typing for this is intentionally loose, as it will be using 2.x types.
   constructor(options: any) {
     // convert it to a class
     const Component = createComponentClassFromOptions(options || {})

diff --git a/scripts/build.js b/scripts/build.js
index 47d7e44642ad0716e5d6e5bc8401b4863be59ff4..e65ea810c74e03adc340cf1c0c4e58a9121f5a94 100644 (file)
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -43,6 +43,7 @@ async function buildAll(targets) {
 
 async function build(target) {
   const pkgDir = path.resolve(`packages/${target}`)
+  const pkg = require(`${pkgDir}/package.json`)
 
   await fs.remove(`${pkgDir}/dist`)
 
@@ -58,16 +59,20 @@ async function build(target) {
     { stdio: 'inherit' }
   )
 
-  const dtsOptions = {
-    name: target === 'vue' ? target : `@vue/${target}`,
-    main: `${pkgDir}/dist/packages/${target}/src/index.d.ts`,
-    out: `${pkgDir}/dist/index.d.ts`
-  }
-  dts.bundle(dtsOptions)
-  console.log()
-  console.log(chalk.blue(chalk.bold(`generated typings at ${dtsOptions.out}`)))
+  if (pkg.types) {
+    const dtsOptions = {
+      name: target === 'vue' ? target : `@vue/${target}`,
+      main: `${pkgDir}/dist/packages/${target}/src/index.d.ts`,
+      out: `${pkgDir}/${pkg.types}`
+    }
+    dts.bundle(dtsOptions)
+    console.log()
+    console.log(
+      chalk.blue(chalk.bold(`generated typings at ${dtsOptions.out}`))
+    )
 
-  await fs.remove(`${pkgDir}/dist/packages`)
+    await fs.remove(`${pkgDir}/dist/packages`)
+  }
 }
 
 function checkAllSizes(targets) {

diff --git a/scripts/utils.js b/scripts/utils.js
index 627ed740978cea306237a4a003048d3cdfb29a43..8aca7cab7619463ab38796a6aadf95e005d87822 100644 (file)
--- a/scripts/utils.js
+++ b/scripts/utils.js
@@ -1,7 +1,14 @@
 const fs = require('fs')
 
 const targets = (exports.targets = fs.readdirSync('packages').filter(f => {
-  return f !== 'shared' && fs.statSync(`packages/${f}`).isDirectory()
+  if (!fs.statSync(`packages/${f}`).isDirectory()) {
+    return false
+  }
+  const pkg = require(`../packages/${f}/package.json`)
+  if (pkg.private) {
+    return false
+  }
+  return true
 }))
 
 exports.fuzzyMatchTarget = partialTarget => {