Fix TypeScript emit target (#629)

* Fix TypeScript including build artefacts

* Fix declaration files emitted into wrong directory

Author: marvinhagemeister

src/index.js

@@ -562,10 +562,14 @@ function createConfig(options, entry, format, writeMeta) {
 						typescript({
 							typescript: require('typescript'),
 							cacheRoot: `./node_modules/.cache/.rts2_cache_${format}`,
+							useTsconfigDeclarationDir: true,
 							tsconfigDefaults: {
 								compilerOptions: {
 									sourceMap: options.sourcemap,
 									declaration: true,
+									declarationDir: dirname(
+										pkg.types || pkg.typings || options.output,
+									),
 									jsx: 'react',
 									jsxFactory:
 										// TypeScript fails to resolve Fragments when jsxFactory
@@ -574,6 +578,7 @@ function createConfig(options, entry, format, writeMeta) {
 											? undefined
 											: options.jsx || 'h',
 								},
+								files: options.entries,
 							},
 							tsconfig: options.tsconfig,
 							tsconfigOverride: {

test/__snapshots__/index.test.js.snap

@@ -2332,6 +2332,64 @@ exports[`fixtures build shebang with microbundle 5`] = `
 "
 `;
 
+exports[`fixtures build ts-declaration with microbundle 1`] = `
+"Used script: microbundle
+
+Directory tree:
+
+ts-declaration
+  dist
+    index.esm.js
+    index.esm.js.map
+    index.js
+    index.js.map
+    index.umd.js
+    index.umd.js.map
+  node_modules
+  package.json
+  src
+    index.tsx
+  tsconfig.json
+  types
+    index.d.ts
+
+
+Build \\"tsDeclarations\\" to dist:
+55 B: index.js.gz
+33 B: index.js.br
+61 B: index.esm.js.gz
+45 B: index.esm.js.br
+172 B: index.umd.js.gz
+126 B: index.umd.js.br"
+`;
+
+exports[`fixtures build ts-declaration with microbundle 2`] = `6`;
+
+exports[`fixtures build ts-declaration with microbundle 3`] = `
+"function n(){return 42}export{n as foo};
+//# sourceMappingURL=index.esm.js.map
+"
+`;
+
+exports[`fixtures build ts-declaration with microbundle 4`] = `
+"exports.foo=function(){return 42};
+//# sourceMappingURL=index.js.map
+"
+`;
+
+exports[`fixtures build ts-declaration with microbundle 5`] = `
+"!function(e,n){\\"object\\"==typeof exports&&\\"undefined\\"!=typeof module?n(exports):\\"function\\"==typeof define&&define.amd?define([\\"exports\\"],n):n((e=e||self).tsDeclarations={})}(this,function(e){e.foo=function(){return 42}});
+//# sourceMappingURL=index.umd.js.map
+"
+`;
+
+exports[`fixtures build ts-declaration with microbundle 6`] = `1`;
+
+exports[`fixtures build ts-declaration with microbundle 7`] = `
+"export declare function foo(): number;
+"
+`;
+
 exports[`fixtures build ts-jsx with microbundle 1`] = `
 "Used script: microbundle build --jsx 'React.createElement'
 

test/fixtures/ts-declaration/package.json

@@ -0,0 +1,6 @@
+{
+	"name": "ts-declarations",
+	"main": "dist/index.js",
+	"types": "types/index.d.ts",
+	"source": "src/index.tsx"
+}

test/fixtures/ts-declaration/src/index.tsx

@@ -0,0 +1,3 @@
+export function foo() {
+	return 42;
+}

test/fixtures/ts-declaration/tsconfig.json

@@ -0,0 +1,6 @@
+{
+	"compilerOptions": {
+		"noEmit": true,
+		"allowJs": true
+	}
+}

test/fixtures/ts-declaration/types/index.d.ts

@@ -0,0 +1 @@
+export declare function foo(): number;

test/index.test.js

@@ -63,13 +63,29 @@ describe('fixtures', () => {
 			expect(files.length).toMatchSnapshot();
 			// we don't realy care about the content of a sourcemap
 			files
-				.filter(file => !/\.map$/.test(file))
+				.filter(
+					file =>
+						!/\.map$/.test(file) &&
+						!fs.lstatSync(resolve(dist, file)).isDirectory(),
+				)
 				.sort(file => (/modern/.test(file) ? 1 : 0))
 				.forEach(file => {
 					expect(
 						fs.readFileSync(resolve(dist, file)).toString('utf8'),
 					).toMatchSnapshot();
 				});
+
+			// TypeScript declaration files
+			const types = resolve(`${fixturePath}/types`);
+			if (fs.existsSync(types)) {
+				const declarations = fs.readdirSync(types);
+				expect(declarations.length).toMatchSnapshot();
+				declarations.forEach(file => {
+					expect(
+						fs.readFileSync(resolve(types, file)).toString('utf8'),
+					).toMatchSnapshot();
+				});
+			}
 		},
 		TEST_TIMEOUT,
 	);