From 238f9c2e7ef95db78013275c2d2ed734b0ee6e57 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Thu, 26 Mar 2015 00:50:58 +1100 Subject: [PATCH] call `resolveModuleSource` on dynamic imports - fixes #1085 --- src/babel/transformation/file/index.js | 7 +++++++ src/babel/transformation/transformers/internal/modules.js | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/babel/transformation/file/index.js b/src/babel/transformation/file/index.js index accbe5f09a..b180a96296 100644 --- a/src/babel/transformation/file/index.js +++ b/src/babel/transformation/file/index.js @@ -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)]; diff --git a/src/babel/transformation/transformers/internal/modules.js b/src/babel/transformation/transformers/internal/modules.js index 1fd67d8c4f..cc4d456870 100644 --- a/src/babel/transformation/transformers/internal/modules.js +++ b/src/babel/transformation/transformers/internal/modules.js @@ -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); } }