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

handle bare imports (#23) #25

Merged
merged 3 commits into from
Dec 28, 2015
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
15 changes: 12 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,18 @@ export default function commonjs ( options = {} ) {

if ( !existing ) {
name = `require$$${uid++}`;
required[ source ] = { source, name };
required[ source ] = { source, name, importsDefault: false };
} else {
name = required[ source ].name;
}

magicString.overwrite( node.start, node.end, name );
if ( parent.type !== 'ExpressionStatement' ) {
required[ source ].importsDefault = true;
magicString.overwrite( node.start, node.end, name );
} else {
// is a bare import, e.g. `require('foo');`
magicString.remove( parent.start, parent.end );
}
},

leave ( node ) {
Expand All @@ -170,7 +176,10 @@ export default function commonjs ( options = {} ) {
const name = getName( id );

const importBlock = sources.length ?
sources.map( source => `import ${required[ source ].name} from '${source}';` ).join( '\n' ) :
sources.map( source => {
const { name, importsDefault } = required[ source ];
return `import ${importsDefault ? `${name} from ` : ``}'${source}';`;
}).join( '\n' ) :
'';

const args = `module${uses.exports || uses.global ? ', exports' : ''}${uses.global ? ', global' : ''}`;
Expand Down
1 change: 1 addition & 0 deletions test/samples/bare-import/bar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Math.bar = 42;
1 change: 1 addition & 0 deletions test/samples/bare-import/foo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require( './bar.js' );
3 changes: 3 additions & 0 deletions test/samples/bare-import/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import './foo.js';

assert.equal( Math.bar, 42 );
7 changes: 7 additions & 0 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@ describe( 'rollup-plugin-commonjs', () => {
});
});

it( 'handles bare imports', () => {
return rollup({
entry: 'samples/bare-import/main.js',
plugins: [ commonjs() ]
}).then( executeBundle );
});

it( 'does not export __esModule', () => {
return rollup({
entry: 'samples/__esModule/main.js',
Expand Down