Skip to content
This repository was archived by the owner on Aug 4, 2021. It is now read-only.

Do not resolve .d.ts files #22

Merged
merged 2 commits into from
Jan 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
node_modules
/node_modules
dist
src/*.js
test/sample/**/*.js
10 changes: 9 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { createFilter } from 'rollup-pluginutils';
import { statSync } from 'fs';
import assign from 'object-assign';

import { endsWith } from './string';
import fixExportClass from './fixExportClass';

const jsxOptions = {
Expand All @@ -28,7 +29,10 @@ function goodErrors ( diagnostic: ts.Diagnostic ): boolean {
export default function typescript ( options ) {
options = assign( {}, options || {} );

const filter = createFilter( options.include || [ '*.ts+(|x)', '**/*.ts+(|x)' ], options.exclude );
const filter = createFilter(
options.include || [ '*.ts+(|x)', '**/*.ts+(|x)' ],
options.exclude || [ '*.d.ts', '**/*.d.ts' ] );

delete options.include;
delete options.exclude;

Expand All @@ -52,6 +56,10 @@ export default function typescript ( options ) {
var result = typescript.nodeModuleNameResolver( importee, importer, resolveHost );

if ( result.resolvedModule && result.resolvedModule.resolvedFileName ) {
if ( endsWith( result.resolvedModule.resolvedFileName, '.d.ts' ) ) {
return null;
}

return result.resolvedModule.resolvedFileName;
}

Expand Down
3 changes: 3 additions & 0 deletions src/string.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export function endsWith ( str: string, tail: string ): boolean {
return !tail.length || str.slice( -tail.length ) === tail;
}
3 changes: 3 additions & 0 deletions test/sample/dts/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { foo } from 'an-import';

foo();
1 change: 1 addition & 0 deletions test/sample/dts/node_modules/an-import.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,17 @@ describe( 'rollup-plugin-typescript', function () {
});
});

it( 'should not resolve .d.ts files', function () {
return rollup.rollup({
entry: 'sample/dts/main.ts',
plugins: [
typescript()
]
}).then( function ( bundle ) {
assert.deepEqual( bundle.imports, [ 'an-import' ] );
});
});

it( 'should transpile JSX if enabled', function () {
return rollup.rollup({
entry: 'sample/jsx/main.tsx',
Expand Down