feat: copy .d.ts files

Author: kentcdodds

package.json

@@ -59,6 +59,7 @@
     "chalk": "^4.1.0",
     "concurrently": "^6.0.0",
     "cosmiconfig": "^7.0.0",
+    "cpy": "^8.1.2",
     "cross-env": "^7.0.3",
     "cross-spawn": "^7.0.3",
     "doctoc": "^2.0.0",

src/__tests__/utils.js

@@ -8,12 +8,15 @@ jest.mock('cosmiconfig', () => {
   return {...cosmiconfigExports, cosmiconfigSync: jest.fn()}
 })
 
-let whichSyncMock, readPkgUpSyncMock
+jest.mock('cpy')
+
+let whichSyncMock, readPkgUpSyncMock, cpy
 
 beforeEach(() => {
   jest.resetModules()
   whichSyncMock = require('which').sync
   readPkgUpSyncMock = require('read-pkg-up').sync
+  cpy = require('cpy')
 })
 
 test('package is the package.json', () => {
@@ -160,15 +163,21 @@ test('hasLocalConfiguration returns true if a local config found and it is empty
   expect(require('../utils').hasLocalConfig('module')).toBe(true)
 })
 
-test('should generate typescript definitions into provided folder', () => {
+test('should generate typescript definitions into provided folder', async () => {
   whichSyncMock.mockImplementationOnce(() => require.resolve('../'))
   const {sync: crossSpawnSyncMock} = require('cross-spawn')
-  require('../utils').generateTypeDefs('destination folder')
+  await require('../utils').generateTypeDefs('destination folder')
   expect(crossSpawnSyncMock).toHaveBeenCalledTimes(1)
   const args = crossSpawnSyncMock.mock.calls[0][1]
   const outDirIndex = args.findIndex(arg => arg === '--outDir') + 1
 
   expect(args[outDirIndex]).toBe('destination folder')
+
+  expect(cpy).toHaveBeenCalledTimes(1)
+  expect(cpy).toHaveBeenCalledWith('**/*.d.ts', '../dist', {
+    cwd: '/blah/src',
+    parents: true,
+  })
 })
 
 function mockPkg({package: pkg = {}, path = '/blah/package.json'}) {

src/scripts/build/babel.js

@@ -54,7 +54,7 @@ if (noTypeDefinitions) {
   args = args.filter(a => a !== '--no-ts-defs')
 }
 
-function go() {
+async function go() {
   let result = spawn.sync(
     resolveBin('@babel/cli', {executable: 'babel'}),
     [
@@ -73,18 +73,22 @@ function go() {
 
   if (hasTypescript && !noTypeDefinitions) {
     console.log('Generating TypeScript definitions')
-    result = generateTypeDefs(pathToOutDir)
-    console.log('TypeScript definitions generated')
+    result = await generateTypeDefs(pathToOutDir)
     if (result.status !== 0) return result.status
+    console.log('TypeScript definitions generated')
   }
 
   // because babel will copy even ignored files, we need to remove the ignored files
   const ignoredPatterns = (parsedArgs.ignore || builtInIgnore)
     .split(',')
     .map(pattern => path.join(pathToOutDir, pattern))
+
+  // type def files are compiled to an empty file and they're useless
+  // so we'll get rid of those too.
+  const typeDefCompiledFiles = path.join(pathToOutDir, '**/*.d.js')
   const ignoredFiles = ignoredPatterns.reduce(
     (all, pattern) => [...all, ...glob.sync(pattern)],
-    [],
+    [typeDefCompiledFiles],
   )
   ignoredFiles.forEach(ignoredFile => {
     rimraf.sync(ignoredFile)

src/utils.js

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const path = require('path')
+const cpy = require('cpy')
 const spawn = require('cross-spawn')
 const rimraf = require('rimraf')
 const mkdirp = require('mkdirp')
@@ -169,8 +170,8 @@ function hasLocalConfig(moduleName, searchOptions = {}) {
   return result !== null
 }
 
-function generateTypeDefs(outputDir) {
-  return spawn.sync(
+async function generateTypeDefs(outputDir) {
+  const result = spawn.sync(
     resolveBin('typescript', {executable: 'tsc'}),
     // prettier-ignore
     [
@@ -181,6 +182,10 @@ function generateTypeDefs(outputDir) {
     ],
     {stdio: 'inherit'},
   )
+  if (result.status !== 0) return result
+
+  await cpy('**/*.d.ts', '../dist', {cwd: fromRoot('src'), parents: true})
+  return result
 }
 
 function getRollupInputs() {