limited dynamic import support

Author: guybedford

compilers/esm.js

@@ -1,6 +1,8 @@
 var traceur = require('traceur');
 var traceurGet = require('../lib/utils').traceurGet;
 
+var syntaxDynamicImport = require('babel-plugin-syntax-dynamic-import');
+
 var ParseTreeTransformer = traceurGet('codegeneration/ParseTreeTransformer.js').ParseTreeTransformer;
 var ModuleSpecifier = traceurGet('syntax/trees/ParseTrees.js').ModuleSpecifier;
 var createStringLiteralToken = traceurGet('codegeneration/ParseTreeFactory.js').createStringLiteralToken;
@@ -63,6 +65,7 @@ exports.attach = function(loader) {
       //sourceFileName: load.path,
       inputSourceMap: load.metadata.sourceMap,
       ast: true,
+      plugins: [syntaxDynamicImport],
       resolveModuleSource: function(dep) {
         if (depsList.indexOf(dep) == -1)
           depsList.push(dep);
@@ -91,7 +94,7 @@ exports.compile = function(load, opts, loader) {
     var babelOptions = {
       babelrc: false,
       compact: false,
-      plugins: [[require('babel-plugin-transform-es2015-modules-systemjs'), { systemGlobal: opts.systemGlobal }]],
+      plugins: [syntaxDynamicImport, [require('babel-plugin-transform-es2015-modules-systemjs'), { systemGlobal: opts.systemGlobal }]],
       filename: load.path,
       //sourceFileName: load.path,
       sourceMaps: !!opts.sourceMaps,

lib/rollup.js

@@ -26,7 +26,7 @@ exports.rollupTree = function(loader, tree, entryPoints, traceOpts, compileOpts,
   var entryMap = {};
 
   function isESM(moduleName) {
-    return tree[moduleName] && tree[moduleName].metadata && tree[moduleName].metadata.format == 'esm' && !tree[moduleName].metadata.originalSource;
+    return tree[moduleName] && tree[moduleName].metadata && tree[moduleName].metadata.format == 'esm' && !tree[moduleName].metadata.originalSource && !tree[moduleName].source.match(/\s+import\s*\(/);
   }
 
   // for each module in the tree, we traverse the whole tree

package.json

@@ -5,6 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "babel-core": "^6.24.1",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-amd-system-wrapper": "^0.3.7",
     "babel-plugin-transform-cjs-system-wrapper": "^0.6.2",
     "babel-plugin-transform-es2015-modules-systemjs": "^6.6.5",