build: use api-extractor for type rollup

.gitignore

@@ -2,5 +2,6 @@ dist
 .DS_Store
 node_modules
 coverage
+temp
 explorations
 TODOs.md

api-extractor.json

@@ -0,0 +1,45 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+
+  "apiReport": {
+    "enabled": true,
+    "reportFolder": "<projectFolder>/temp/"
+  },
+
+  "docModel": {
+    "enabled": true
+  },
+
+  "dtsRollup": {
+    "enabled": true
+  },
+
+  "tsdocMetadata": {
+    "enabled": false
+  },
+
+  "messages": {
+    "compilerMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      }
+    },
+
+    "extractorMessageReporting": {
+      "default": {
+        "logLevel": "warning",
+        "addToApiReportFile": true
+      },
+
+      "ae-missing-release-tag": {
+        "logLevel": "none"
+      }
+    },
+
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      }
+    }
+  }
+}

package.json

@@ -25,9 +25,9 @@
     ]
   },
   "devDependencies": {
+    "@microsoft/api-extractor": "^7.3.9",
     "@types/jest": "^24.0.18",
     "chalk": "^2.4.2",
-    "dts-bundle": "^0.7.3",
     "execa": "^2.0.4",
     "fs-extra": "^8.1.0",
     "jest": "^24.9.0",

packages/compiler-core/api-extractor.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../api-extractor.json",
+  "mainEntryPointFilePath": "./dist/packages/<unscopedPackageName>/src/index.d.ts",
+  "dtsRollup": {
+    "untrimmedFilePath": "./dist/<unscopedPackageName>.d.ts"
+  }
+}

packages/compiler-core/package.json

@@ -4,7 +4,11 @@
   "description": "@vue/compiler-core",
   "main": "index.js",
   "module": "dist/compiler-core.esm-bundler.js",
-  "types": "dist/index.d.ts",
+  "files": [
+    "index.js",
+    "dist"
+  ],
+  "types": "dist/compiler-core.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",

packages/reactivity/api-extractor.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../api-extractor.json",
+  "mainEntryPointFilePath": "./dist/packages/<unscopedPackageName>/src/index.d.ts",
+  "dtsRollup": {
+    "untrimmedFilePath": "./dist/<unscopedPackageName>.d.ts"
+  }
+}

packages/reactivity/package.json

@@ -4,7 +4,11 @@
   "description": "@vue/reactivity",
   "main": "index.js",
   "module": "dist/reactivity.esm-bundler.js",
-  "types": "dist/index.d.ts",
+  "files": [
+    "index.js",
+    "dist"
+  ],
+  "types": "dist/reactivity.d.ts",
   "unpkg": "dist/reactivity.global.js",
   "sideEffects": false,
   "repository": {

packages/runtime-core/api-extractor.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../api-extractor.json",
+  "mainEntryPointFilePath": "./dist/packages/<unscopedPackageName>/src/index.d.ts",
+  "dtsRollup": {
+    "untrimmedFilePath": "./dist/<unscopedPackageName>.d.ts"
+  }
+}

packages/runtime-core/package.json

@@ -4,7 +4,12 @@
   "description": "@vue/runtime-core",
   "main": "index.js",
   "module": "dist/runtime-core.esm-bundler.js",
-  "types": "dist/index.d.ts",
+  "files": [
+    "index.js",
+    "dist",
+    "jsx.d.ts"
+  ],
+  "types": "dist/runtime-core.d.ts",
   "sideEffects": false,
   "repository": {
     "type": "git",

packages/runtime-core/src/index.ts

@@ -42,6 +42,7 @@ export { applyDirectives, resolveDirective } from './directives'
 
 // Types -----------------------------------------------------------------------
 
+export { App } from './apiCreateApp'
 export { VNode } from './vnode'
 export { FunctionalComponent, ComponentInstance } from './component'
 export { RendererOptions } from './createRenderer'

packages/runtime-dom/api-extractor.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../api-extractor.json",
+  "mainEntryPointFilePath": "./dist/packages/<unscopedPackageName>/src/index.d.ts",
+  "dtsRollup": {
+    "untrimmedFilePath": "./dist/<unscopedPackageName>.d.ts"
+  }
+}

packages/runtime-dom/package.json

@@ -4,7 +4,11 @@
   "description": "@vue/runtime-dom",
   "main": "index.js",
   "module": "dist/runtime-dom.esm-bundler.js",
-  "types": "dist/index.d.ts",
+  "files": [
+    "index.js",
+    "dist"
+  ],
+  "types": "dist/runtime-dom.d.ts",
   "unpkg": "dist/runtime-dom.global.js",
   "sideEffects": false,
   "buildOptions": {

packages/runtime-test/api-extractor.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../api-extractor.json",
+  "mainEntryPointFilePath": "./dist/packages/<unscopedPackageName>/src/index.d.ts",
+  "dtsRollup": {
+    "untrimmedFilePath": "./dist/<unscopedPackageName>.d.ts"
+  }
+}

packages/runtime-test/package.json

@@ -4,7 +4,11 @@
   "description": "@vue/runtime-test",
   "main": "index.js",
   "module": "dist/runtime-test.esm-bundler.js",
-  "types": "dist/index.d.ts",
+  "files": [
+    "index.js",
+    "dist"
+  ],
+  "types": "dist/runtime-test.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue.git"

packages/server-renderer/api-extractor.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../api-extractor.json",
+  "mainEntryPointFilePath": "./dist/packages/<unscopedPackageName>/src/index.d.ts",
+  "dtsRollup": {
+    "untrimmedFilePath": "./dist/<unscopedPackageName>.d.ts"
+  }
+}

packages/server-renderer/package.json

@@ -3,7 +3,11 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/server-renderer",
   "main": "index.js",
-  "types": "dist/index.d.ts",
+  "files": [
+    "index.js",
+    "dist"
+  ],
+  "types": "dist/server-renderer.d.ts",
   "buildOptions": {
     "formats": ["cjs"]
   },

packages/vue/api-extractor.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../api-extractor.json",
+  "mainEntryPointFilePath": "./dist/packages/<unscopedPackageName>/src/index.d.ts",
+  "dtsRollup": {
+    "untrimmedFilePath": "./dist/<unscopedPackageName>.d.ts"
+  }
+}

packages/vue/package.json

@@ -4,7 +4,11 @@
   "description": "vue",
   "main": "index.js",
   "module": "dist/vue.esm-bundler.js",
-  "types": "dist/index.d.ts",
+  "files": [
+    "index.js",
+    "dist"
+  ],
+  "types": "dist/vue.d.ts",
   "unpkg": "dist/vue.global.js",
   "buildOptions": {
     "name": "Vue",

rollup.config.js

@@ -81,13 +81,19 @@ function createConfig(output, plugins = []) {
     output.name = packageOptions.name
   }
 
+  const shouldEmitDeclarations =
+    process.env.TYPES != null &&
+    process.env.NODE_ENV === 'production' &&
+    !hasTSChecked
+
   const tsPlugin = ts({
     check: process.env.NODE_ENV === 'production' && !hasTSChecked,
     tsconfig: path.resolve(__dirname, 'tsconfig.json'),
     cacheRoot: path.resolve(__dirname, 'node_modules/.rts2_cache'),
     tsconfigOverride: {
       compilerOptions: {
-        declaration: process.env.NODE_ENV === 'production' && !hasTSChecked
+        declaration: shouldEmitDeclarations,
+        declarationMap: shouldEmitDeclarations
       }
     }
   })

scripts/bootstrap.js

@@ -25,7 +25,8 @@ files.forEach(shortName => {
       description: name,
       main: 'index.js',
       module: `dist/${shortName}.esm-bundler.js`,
-      types: 'dist/index.d.ts',
+      files: [`index.js`, `dist`],
+      types: `dist/${shortName}.d.ts`,
       repository: {
         type: 'git',
         url: 'git+https://github.com/vuejs/vue.git'

scripts/build.js

@@ -19,7 +19,6 @@ const path = require('path')
 const zlib = require('zlib')
 const chalk = require('chalk')
 const execa = require('execa')
-const dts = require('dts-bundle')
 const { targets, fuzzyMatchTarget } = require('./utils')
 
 const args = require('minimist')(process.argv.slice(2))
@@ -55,22 +54,41 @@ async function build(target) {
       '--environment',
       `NODE_ENV:production,` +
         `TARGET:${target}` +
-        (formats ? `,FORMATS:${formats}` : ``)
+        (formats ? `,FORMATS:${formats}` : ``) +
+        (args.types ? `,TYPES:true` : ``)
     ],
     { stdio: 'inherit' }
   )
 
-  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)
+  if (args.types && pkg.types) {
     console.log()
     console.log(
-      chalk.blue(chalk.bold(`generated typings at ${dtsOptions.out}`))
+      chalk.bold(chalk.yellow(`Rolling up type definitions for ${target}...`))
+    )
+
+    // build types
+    const { Extractor, ExtractorConfig } = require('@microsoft/api-extractor')
+
+    const extractorConfigPath = path.resolve(pkgDir, `api-extractor.json`)
+    const extractorConfig = ExtractorConfig.loadFileAndPrepare(
+      extractorConfigPath
     )
+    const result = Extractor.invoke(extractorConfig, {
+      localBuild: true,
+      showVerboseMessages: true
+    })
+
+    if (result.succeeded) {
+      console.log(
+        chalk.bold(chalk.green(`API Extractor completed successfully.`))
+      )
+    } else {
+      console.error(
+        `API Extractor completed with ${extractorResult.errorCount} errors` +
+          ` and ${extractorResult.warningCount} warnings`
+      )
+      process.exitCode = 1
+    }
 
     await fs.remove(`${pkgDir}/dist/packages`)
   }