0.3.0

Author: guybedford

README.md

@@ -31,11 +31,11 @@ import {fn} from './local-es-module.js';
 
 Note that only the default import form for CommonJS modules is supported.
 
-Also supports dynamic loading via a `loader` global (note that this will change in future when the dynamic loader spec is available);
+Also supports dynamic loading via the dynamic import syntax:
 
 ```javascript
 export function lazyLoad(path) {
-  return loader.import(path);
+  return import(path);
 }
 ```
 

package.json

@@ -1,14 +1,15 @@
 {
   "name": "node-es-module-loader",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Loads ES modules with CJS interop in Node",
   "main": "dist/node-es-module-loader.js",
   "bin": {
     "node-esml": "bin/node-esml.js"
   },
   "dependencies": {
     "babel-core": "^6.17.0",
-    "babel-plugin-transform-es2015-modules-systemjs": "^6.14.0"
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-transform-es2015-modules-systemjs": "^6.19.0"
   },
   "author": "Guy Bedford",
   "license": "MIT",

src/node-es-module-loader.js

@@ -1,10 +1,12 @@
 import RegisterLoader from 'es-module-loader/core/register-loader.js';
-import { InternalModuleNamespace as ModuleNamespace } from 'es-module-loader/core/loader-polyfill.js';
+import { ModuleNamespace } from 'es-module-loader/core/loader-polyfill.js';
 
 import { isNode, baseURI, pathToFileUrl, fileUrlToPath } from 'es-module-loader/core/common.js';
-import { resolveUrlToParentIfNotPlain } from 'es-module-loader/core/resolve.js';
+import { resolveIfNotPlain } from 'es-module-loader/core/resolve.js';
 
 var babel = require('babel-core');
+var modulesRegister = require('babel-plugin-transform-es2015-modules-systemjs');
+var importSyntax = require('babel-plugin-syntax-dynamic-import');
 var path = require('path');
 var Module = require('module');
 var fs = require('fs');
@@ -28,7 +30,7 @@ function NodeESModuleLoader(baseKey, rcPath) {
     throw new Error('Node module loader can only be used in Node');
 
   if (baseKey)
-    baseKey = resolveUrlToParentIfNotPlain(baseKey, baseURI) || resolveUrlToParentIfNotPlain('./' + baseKey, baseURI);
+    baseKey = resolveIfNotPlain(baseKey, baseURI) || resolveIfNotPlain('./' + baseKey, baseURI);
 
   if (rcPath) {
     if (typeof rcPath !== 'string')
@@ -49,8 +51,9 @@ function NodeESModuleLoader(baseKey, rcPath) {
 NodeESModuleLoader.prototype = Object.create(RegisterLoader.prototype);
 
 // normalize is never given a relative name like "./x", that part is already handled
-NodeESModuleLoader.prototype[RegisterLoader.resolve] = function(key, parent, metadata) {
-  key = RegisterLoader.prototype[RegisterLoader.resolve].call(this, key, parent, metadata) || key;
+NodeESModuleLoader.prototype[RegisterLoader.resolve] = function(key, parent) {
+  parent = parent || baseURI;
+  key = RegisterLoader.prototype[RegisterLoader.resolve].call(this, key, parent) || key;
 
   return Promise.resolve()
   .then(function() {
@@ -66,7 +69,7 @@ NodeESModuleLoader.prototype[RegisterLoader.resolve] = function(key, parent, met
 
 // instantiate just needs to run System.register
 // so we fetch the source, convert into the Babel System module format, then evaluate it
-NodeESModuleLoader.prototype[RegisterLoader.instantiate] = function(key, metadata, processAnonRegister) {
+NodeESModuleLoader.prototype[RegisterLoader.instantiate] = function(key, processAnonRegister) {
   var loader = this;
 
   // first, try to load the module as CommonJS
@@ -90,7 +93,7 @@ NodeESModuleLoader.prototype[RegisterLoader.instantiate] = function(key, metadat
         sourceFileName: key,
         moduleIds: false,
         sourceMaps: 'both',
-        plugins: [require('babel-plugin-transform-es2015-modules-systemjs')],
+        plugins: [importSyntax, modulesRegister],
         extends: loader.rcPath
       });