module loader 2 upgrade, babel upgrade

Author: guybedford

example/es-module.js

@@ -1,5 +1,3 @@
-import value from './es-module-dep.js';
-
 export default function() {
-  return value;
-}
+  return import('./es-module-dep.js');
+}

example/example.html

@@ -5,7 +5,10 @@
   <script>
     var loader = new BrowserESModuleLoader();
     loader.import('./es-module.js').then(function(m) {
-      console.log(m.default());
+     return m.default();
+    })
+    .then(function (m) {
+      console.log(m);
     });
   </script>
 
@@ -14,4 +17,4 @@
     console.log(fn);
   </script>
 
-  <script type="module" src="another-module.js"></script>
+  <script type="module" src="another-module.js"></script>

package.json

@@ -1,13 +1,14 @@
 {
   "name": "browser-es-module-loader",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Demonstrates ES module loading in the browser",
   "main": "dist/browser-es-module-loader.js",
   "author": "Guy Bedford",
   "license": "MIT",
   "devDependencies": {
-    "babel-core": "^6.13.2",
-    "babel-plugin-transform-es2015-modules-systemjs": "^6.12.0",
+    "babel-core": "^6.22.1",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-transform-es2015-modules-systemjs": "^6.22.0",
     "browserify": "^13.1.0",
     "es-module-loader": "^2.0.0",
     "rollup": "^0.34.7",

src/babel-browser-build.js

@@ -1,2 +1,3 @@
 window.babel = require('babel-core');
-window.babelPluginTransformES2015ModulesSystemJS = require('babel-plugin-transform-es2015-modules-systemjs');
+window.babelPluginTransformES2015ModulesSystemJS = require('babel-plugin-transform-es2015-modules-systemjs');
+window.babelPluginSyntaxDynamicImport = require('babel-plugin-syntax-dynamic-import');

src/browser-es-module-loader.js

@@ -4,7 +4,7 @@ import { InternalModuleNamespace as ModuleNamespace } from 'es-module-loader/cor
 import { baseURI, global, isBrowser } from 'es-module-loader/core/common.js';
 import { resolveIfNotPlain } from 'es-module-loader/core/resolve.js';
 
-if (!window.babel || !window.babelPluginTransformES2015ModulesSystemJS)
+if (!window.babel || !window.babelPluginTransformES2015ModulesSystemJS || !window.babelPluginSyntaxDynamicImport)
   throw new Error('babel-browser-build.js must be loaded first');
 
 var loader;
@@ -131,7 +131,7 @@ BrowserESModuleLoader.prototype[RegisterLoader.instantiate] = function(key, proc
       sourceFileName: key,
       moduleIds: false,
       sourceMaps: 'inline',
-      plugins: [babelPluginTransformES2015ModulesSystemJS]
+      plugins: [babelPluginSyntaxDynamicImport, babelPluginTransformES2015ModulesSystemJS]
     });
 
     // evaluate without require, exports and module variables