cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

call resolveModuleSource on dynamic imports - fixes #1085

Browse Source
This commit is contained in:
Sebastian McKenzie 2015-03-26 00:50:58 +11:00
parent bc5f2b9be6
commit 238f9c2e7e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/babel/transformation/file/index.js
View File

@ -263,11 +263,18 @@ export default class File {
}
}
resolveModuleSource(source: string): string {
var resolveModuleSource = this.opts.resolveModuleSource;
if (resolveModuleSource) source = resolveModuleSource(source, this.opts.filename);
return source;
}
addImport(source: string, name?: string, noDefault?: boolean): Object {
name ||= source;
var id = this.dynamicImportIds[name];
if (!id) {
source = this.resolveModuleSource(source);
id = this.dynamicImportIds[name] = this.scope.generateUidIdentifier(name);
var specifiers = [t.importDefaultSpecifier(id)];

5
src/babel/transformation/transformers/internal/modules.js
View File

@ -11,9 +11,8 @@ export function check(node) {
}
export function ImportDeclaration(node, parent, scope, file) {
var resolveModuleSource = file.opts.resolveModuleSource;
if (node.source && resolveModuleSource) {
node.source.value = resolveModuleSource(node.source.value, file.opts.filename);
if (node.source) {
node.source.value = file.resolveModuleSource(node.source.value);
}
}