Skip to content

Commit

Permalink
(fix): declarationMaps (*.d.ts.map) should have correct sources
Browse files Browse the repository at this point in the history
- when declarationDir is set, `sources` gets set correctly, but
  otherwise its relative path will be incorrect
  - so always set declarationDir to paths.appDist
  • Loading branch information
agilgur5 committed Feb 12, 2020
1 parent bf8ba01 commit 846d984
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/createRollupConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ export async function createRollupConfig(
compilerOptions: {
sourceMap: true,
declaration: true,
declarationDir: paths.appDist,
jsx: 'react',
},
},
Expand All @@ -165,9 +166,8 @@ export async function createRollupConfig(
},
},
check: !opts.transpileOnly,
useTsconfigDeclarationDir: Boolean(
tsconfigJSON?.compilerOptions?.declarationDir
),
// declarationDir is used internally above as a default
useTsconfigDeclarationDir: true,
}),
babelPluginTsdx({
exclude: 'node_modules/**',
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/build-default/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"module": "ESNext",
"lib": ["dom", "esnext"],
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"rootDir": "./src",
"strict": true,
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/build-withTsconfig/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"declarationDir": "typings",
"declarationMap": true,
"sourceMap": true,
"rootDir": "./",
"rootDir": "./src",
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
Expand Down
22 changes: 19 additions & 3 deletions test/tests/tsdx-build.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*/

const shell = require('shelljs');
const fs = require('fs-extra');

const util = require('../fixtures/util');

shell.config.silent = false;
Expand Down Expand Up @@ -42,6 +44,17 @@ describe('tsdx build', () => {
expect(lib.foo()).toBe('bar');
});

it('should create declarationMap files (*.d.ts.map) correctly', async () => {
util.setupStageWithFixture(stageName, 'build-default');

shell.exec('node ../dist/index.js build');

expect(shell.test('-f', 'dist/index.d.ts.map')).toBeTruthy();

const dtsmap = await fs.readJSON('dist/index.d.ts.map');
expect(dtsmap.sources[0]).toBe('../src/index.ts');
});

it('should clean the dist directory before rebuilding', () => {
util.setupStageWithFixture(stageName, 'build-default');

Expand Down Expand Up @@ -102,7 +115,7 @@ describe('tsdx build', () => {
expect(code).toBe(0);
});

it('should use the declarationDir when set in tsconfig', () => {
it('should use the declarationDir when set in tsconfig', async () => {
util.setupStageWithFixture(stageName, 'build-withTsconfig');

const output = shell.exec('node ../dist/index.js build --format esm,cjs');
Expand All @@ -117,8 +130,11 @@ describe('tsdx build', () => {
expect(shell.test('-f', 'dist/build-withtsconfig.esm.js')).toBeTruthy();

expect(shell.test('-f', 'dist/index.d.ts')).toBeFalsy();
expect(shell.test('-f', 'typings/src/index.d.ts')).toBeTruthy();
expect(shell.test('-f', 'typings/src/index.d.ts.map')).toBeTruthy();
expect(shell.test('-f', 'typings/index.d.ts')).toBeTruthy();
expect(shell.test('-f', 'typings/index.d.ts.map')).toBeTruthy();

const dtsmap = await fs.readJSON('typings/index.d.ts.map');
expect(dtsmap.sources[0]).toBe('../src/index.ts');

expect(output.code).toBe(0);
});
Expand Down

0 comments on commit 846d984

Please sign in to comment.