noflo 1.5.0 → 1.5.1

package/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.1] - 2026-06-20
+### Changed
+- NoFlo can now be imported either ES Module or CommonJS
+
+### Added
+- Basic smoketests for running from both ESM and CommonJS
+
 ## [1.5.0] - 2026-06-20
 ### Changed
 - Improved using NoFlo directly as ES Module dependency

package/bin/noflo-cache-preheat

@@ -2,7 +2,7 @@
 // vim: set filetype=javascript:
 import path from 'node:path';
 import fs from 'node:fs';
-import * as noflo from '../lib/NoFlo.js';
+import * as noflo from '../src/lib/NoFlo.js';
 
 // Base setup
 const baseDir = process.cwd();

package/lib/NoFlo.d.ts

@@ -40,6 +40,30 @@ export { default as OutPort } from "./OutPort.js";
 export { internalSocket };
 export { default as IP } from "./IP.js";
 export { asComponent } from "./AsComponent.js";
+declare const _default: {
+    isBrowser: typeof isBrowser;
+    ComponentLoader: typeof ComponentLoader;
+    Component: typeof Component;
+    InPorts: typeof InPorts;
+    OutPorts: typeof OutPorts;
+    InPort: typeof InPort;
+    OutPort: typeof OutPort;
+    internalSocket: typeof internalSocket;
+    IP: typeof IP;
+    createNetwork: typeof createNetwork;
+    loadFile: typeof loadFile;
+    saveFile: typeof saveFile;
+    asCallback: typeof asCallback;
+    asPromise: typeof asPromise;
+    asComponent: typeof asComponent;
+    Graph: typeof graph.Graph;
+    createGraph: typeof graph.createGraph;
+    loadJSON: typeof graph.loadJSON;
+    loadFBP: typeof graph.loadFBP;
+    equivalent: typeof graph.equivalent;
+    mergeResolveTheirs: typeof graph.mergeResolveTheirs;
+};
+export default _default;
 export type NetworkCallback = (err: Error | null, network?: Network | LegacyNetwork) => any;
 export type CreateNetworkOptions = {
     /**
@@ -56,6 +80,17 @@ import { Network } from "./Network.js";
 import { LegacyNetwork } from "./LegacyNetwork.js";
 import { graph } from "fbp-graph";
 import * as internalSocket from "./InternalSocket.js";
+import { isBrowser } from "./Platform.js";
+import { ComponentLoader } from "./ComponentLoader.js";
+import { Component } from "./Component.js";
+import { InPorts } from "./Ports.js";
+import { OutPorts } from "./Ports.js";
+import InPort from "./InPort.js";
+import OutPort from "./OutPort.js";
+import IP from "./IP.js";
+import { asCallback } from "./AsCallback.js";
+import { asPromise } from "./AsCallback.js";
+import { asComponent } from "./AsComponent.js";
 export { graph, Graph, journal, Journal } from "fbp-graph";
 export { InPorts, OutPorts } from "./Ports.js";
 export { asCallback, asPromise } from "./AsCallback.js";

package/lib/NoFlo.js

@@ -85,21 +85,26 @@ Object.defineProperty(exports, "isBrowser", { enumerable: true, get: function ()
 // directory on the file system.
 var ComponentLoader_js_1 = require("./ComponentLoader.js");
 Object.defineProperty(exports, "ComponentLoader", { enumerable: true, get: function () { return ComponentLoader_js_1.ComponentLoader; } });
+const ComponentLoader_js_2 = require("./ComponentLoader.js");
 // ### Component baseclasses
 //
 // These baseclasses can be used for defining NoFlo components.
 var Component_js_1 = require("./Component.js");
 Object.defineProperty(exports, "Component", { enumerable: true, get: function () { return Component_js_1.Component; } });
+const Component_js_2 = require("./Component.js");
 // ### NoFlo ports
 //
 // These classes are used for instantiating ports on NoFlo components.
 var Ports_js_1 = require("./Ports.js");
 Object.defineProperty(exports, "InPorts", { enumerable: true, get: function () { return Ports_js_1.InPorts; } });
 Object.defineProperty(exports, "OutPorts", { enumerable: true, get: function () { return Ports_js_1.OutPorts; } });
+const Ports_js_2 = require("./Ports.js");
 var InPort_js_1 = require("./InPort.js");
 Object.defineProperty(exports, "InPort", { enumerable: true, get: function () { return InPort_js_1.default; } });
+const InPort_js_2 = require("./InPort.js");
 var OutPort_js_1 = require("./OutPort.js");
 Object.defineProperty(exports, "OutPort", { enumerable: true, get: function () { return OutPort_js_1.default; } });
+const OutPort_js_2 = require("./OutPort.js");
 // ### NoFlo sockets
 //
 // The NoFlo [internalSocket](InternalSocket.html) is used for connecting ports of
@@ -111,6 +116,7 @@ exports.internalSocket = internalSocket;
 // NoFlo Information Packets are defined as "IP" objects.
 var IP_js_1 = require("./IP.js");
 Object.defineProperty(exports, "IP", { enumerable: true, get: function () { return IP_js_1.default; } });
+const IP_js_2 = require("./IP.js");
 /**
  * @callback NetworkCallback
  * @param {Error | null} err
@@ -218,6 +224,7 @@ exports.saveFile = saveFile;
 var AsCallback_js_1 = require("./AsCallback.js");
 Object.defineProperty(exports, "asCallback", { enumerable: true, get: function () { return AsCallback_js_1.asCallback; } });
 Object.defineProperty(exports, "asPromise", { enumerable: true, get: function () { return AsCallback_js_1.asPromise; } });
+const AsCallback_js_2 = require("./AsCallback.js");
 // ## Generating components from JavaScript functions
 //
 // The `asComponent` helper makes it easy to expose a JavaScript function as a
@@ -232,3 +239,22 @@ Object.defineProperty(exports, "asPromise", { enumerable: true, get: function ()
 //
 var AsComponent_js_1 = require("./AsComponent.js");
 Object.defineProperty(exports, "asComponent", { enumerable: true, get: function () { return AsComponent_js_1.asComponent; } });
+const AsComponent_js_2 = require("./AsComponent.js");
+exports.default = {
+    ...fbp_graph_1.graph,
+    isBrowser: Platform_js_1.isBrowser,
+    ComponentLoader: ComponentLoader_js_2.ComponentLoader,
+    Component: Component_js_2.Component,
+    InPorts: Ports_js_2.InPorts,
+    OutPorts: Ports_js_2.OutPorts,
+    InPort: InPort_js_2.default,
+    OutPort: OutPort_js_2.default,
+    internalSocket,
+    IP: IP_js_2.default,
+    createNetwork,
+    loadFile,
+    saveFile,
+    asCallback: AsCallback_js_2.asCallback,
+    asPromise: AsCallback_js_2.asPromise,
+    asComponent: AsComponent_js_2.asComponent,
+};

package/lib/loader/NodeJs.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dynamicLoad = exports.register = exports.getLanguages = exports.getSource = exports.setSource = void 0;
 /* eslint-disable
@@ -17,22 +18,23 @@ const writeFile = (0, util_1.promisify)(fs.writeFile);
 const readFile = (0, util_1.promisify)(fs.readFile);
 // Type loading CoffeeScript compiler
 let CoffeeScript;
-try {
-    // eslint-disable-next-line import/no-unresolved,import/no-extraneous-dependencies
-    CoffeeScript = require('coffeescript');
-}
-catch (e) {
+// eslint-disable-next-line import/no-unresolved,import/no-extraneous-dependencies
+Promise.resolve().then(() => require('coffeescript')).then((compiler) => {
+    CoffeeScript = compiler;
+})
+    .catch((e) => {
     // If there is no CoffeeScript compiler installed, we simply don't support compiling
-}
+});
 // Try loading TypeScript compiler
 let typescript;
-try {
-    // eslint-disable-next-line import/no-unresolved,import/no-extraneous-dependencies
-    typescript = require('typescript');
-}
-catch (e) {
+// eslint-disable-next-line import/no-unresolved,import/no-extraneous-dependencies
+Promise.resolve().then(() => require('typescript')).then((compiler) => {
+    // @ts-ignore
+    typescript = compiler.default;
+})
+    .catch((e) => {
     // If there is no TypeScript compiler installed, we simply don't support compiling
-}
+});
 /**
  * @callback ErrorableCallback
  * @param {Error|null} error
@@ -74,7 +76,7 @@ function transpileSource(packageId, name, source, language) {
             try {
                 src = typescript.transpile(source, {
                     module: typescript.ModuleKind.CommonJS,
-                    target: typescript.ScriptTarget.ES2015,
+                    target: typescript.ScriptTarget.ES2020,
                 });
             }
             catch (err) {
@@ -103,26 +105,27 @@ function transpileSource(packageId, name, source, language) {
  * @returns {Promise<Object|Function>}
  */
 function evaluateModule(baseDir, packageId, name, source) {
-    const Module = require('module');
-    let implementation;
-    try {
+    return Promise.resolve().then(() => require('module')).then(({ Module }) => {
+        let implementation;
         // Use the Node.js module API to evaluate in the correct directory context
-        const modulePath = path.resolve(baseDir, `./components/${name}.js`);
-        const moduleImpl = new Module(modulePath, module);
+        let extension = '.js';
+        if (source.indexOf('require(') !== -1) {
+            // CommonJS
+            extension = '.cjs';
+        }
+        const modulePath = path.resolve(baseDir, `./components/${name}${extension}`);
+        const moduleImpl = new Module(modulePath);
         // @ts-ignore
         moduleImpl.paths = Module._nodeModulePaths(path.dirname(modulePath));
         moduleImpl.filename = modulePath;
         // @ts-ignore
         moduleImpl._compile(source, modulePath);
         implementation = moduleImpl.exports;
-    }
-    catch (e) {
-        return Promise.reject(e);
-    }
-    if ((typeof implementation !== 'function') && (typeof implementation.getComponent !== 'function')) {
-        return Promise.reject(new Error(`Provided source for ${packageId}/${name} failed to create a runnable component`));
-    }
-    return Promise.resolve(implementation);
+        if ((typeof implementation !== 'function') && (typeof implementation.getComponent !== 'function')) {
+            return Promise.reject(new Error(`Provided source for ${packageId}/${name} failed to create a runnable component`));
+        }
+        return Promise.resolve(implementation);
+    });
 }
 /**
  * @param {import("../ComponentLoader").ComponentLoader} loader
@@ -362,9 +365,14 @@ exports.getLanguages = getLanguages;
  */
 function registerCustomLoaders(loader, componentLoaders, callback) {
     componentLoaders.reduce((chain, componentLoader) => chain
-        .then(() => new Promise((resolve, reject) => {
-        const customLoader = require(componentLoader);
-        loader.registerLoader(customLoader, (err) => {
+        .then(() => { var _a; return _a = componentLoader, Promise.resolve().then(() => require(_a)); })
+        .then((customLoader) => new Promise((resolve, reject) => {
+        let loaderFunc = customLoader;
+        if (typeof customLoader === 'object' && customLoader.default) {
+            // CommonJS loader
+            loaderFunc = customLoader.default;
+        }
+        loader.registerLoader(loaderFunc, (err) => {
             if (err) {
                 reject(err);
                 return;
@@ -584,40 +592,24 @@ exports.register = register;
  * @param {ModuleLoadingCallback} callback
  */
 function dynamicLoad(name, cPath, metadata, callback) {
-    let implementation;
-    let instance;
-    try {
-        implementation = require(cPath);
-    }
-    catch (err) {
-        callback(err);
-        return;
-    }
-    if (typeof implementation.getComponent === 'function') {
-        try {
+    (_a = cPath, Promise.resolve().then(() => require(_a))).then((implementation) => {
+        let instance;
+        if (typeof implementation.getComponent === 'function') {
             instance = implementation.getComponent(metadata);
         }
-        catch (err) {
-            callback(err);
-            return;
-        }
-    }
-    else if (typeof implementation === 'function') {
-        try {
+        else if (typeof implementation === 'function') {
             instance = implementation(metadata);
         }
-        catch (err) {
-            callback(err);
-            return;
+        else {
+            throw new Error(`Unable to instantiate ${cPath}`);
         }
-    }
-    else {
-        callback(new Error(`Unable to instantiate ${cPath}`));
-        return;
-    }
-    if (typeof name === 'string') {
-        instance.componentName = name;
-    }
-    callback(null, instance);
+        if (typeof name === 'string') {
+            instance.componentName = name;
+        }
+        callback(null, instance);
+    })
+        .catch((e) => {
+        callback(e);
+    });
 }
 exports.dynamicLoad = dynamicLoad;

package/package.json

@@ -8,7 +8,7 @@
     "noflo"
   ],
   "author": "Henri Bergius <henri.bergius@iki.fi>",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "license": "MIT",
   "engines": {
     "node": ">= 6"
@@ -38,17 +38,21 @@
     "karma-mocha-reporter": "^2.2.5",
     "mocha": "^8.1.3",
     "noflo-component-loader": "^0.4.0",
-    "nyc": "^15.1.0",
+    "nyc": "^14.1.1",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
-    "replace": "^1.2.0",
+    "replace": "^0.2.2",
     "typescript": "^4.0.2",
     "util": "^0.12.3",
     "webpack": "^5.0.0",
     "webpack-cli": "^4.0.0"
   },
-  "main": "./lib/NoFlo",
+  "main": "./src/lib/NoFlo",
   "module": "./src/lib/NoFlo.js",
+  "exports": {
+    "import": "./src/lib/NoFlo.js",
+    "require": "./lib/NoFlo.js"
+  },
   "types": "./lib/NoFlo.d.ts",
   "bin": {
     "noflo": "./bin/noflo",
@@ -61,9 +65,9 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "dirname:to": "sed -i -e 's/import\\.meta\\.dirname/__dirname/g' src/lib/loader/NodeJs.js",
-    "build:node": "npm run dirname:to && tsc && npm run dirname:from",
-    "dirname:from": "sed -i -e 's/__dirname/import\\.meta\\.dirname/g' src/lib/loader/NodeJs.js",
+    "prebuild:node": "replace 'import.meta.dirname' '__dirname' src/lib/loader/NodeJs.js && replace 'import getParams from' 'import * as getParams from' src/lib/AsComponent.js",
+    "build:node": "tsc",
+    "postbuild:node": "replace '__dirname' 'import.meta.dirname' src/lib/loader/NodeJs.js && replace 'import \\* as getParams from' 'import getParams from' src/lib/AsComponent.js",
     "build:browser": "webpack --config webpack.config.cjs",
     "build": "npm run build:node && npm run build:browser",
     "postbuild": "replace 'node/events' 'events' lib -r",
@@ -80,9 +84,9 @@
   },
   "nyc": {
     "include": [
-      "components/*.js",
-      "lib/*.js",
-      "lib/**/*.js"
+      "src/components/*.js",
+      "src/lib/*.js",
+      "src/lib/**/*.js"
     ]
   }
 }

package/spec/ComponentLoader.js

@@ -286,7 +286,7 @@ describe('ComponentLoader with no external packages installed', () => {
       if (noflo.isBrowser()) {
         str = 'Dynamic loading of';
       } else {
-        str = 'Cannot find module';
+        str = 'Cannot find package';
       }
       loader.load('InvalidComponent', (err) => {
         chai.expect(err).to.be.an('error');
@@ -379,7 +379,13 @@ describe('ComponentLoader with no external packages installed', () => {
         chai.expect(component).to.be.an('object');
         chai.expect(component.code).to.be.a('string');
         chai.expect(component.code.indexOf('Component')).to.not.equal(-1);
-        chai.expect(component.code.indexOf('exports.getComponent')).to.not.equal(-1);
+
+        if (!noflo.isBrowser()) {
+          chai.expect(component.code.indexOf('export function getComponent')).to.not.equal(-1);
+        } else {
+          chai.expect(component.code.indexOf('exports.getComponent')).to.not.equal(-1);
+        }
+
         chai.expect(component.name).to.equal('Graph');
         chai.expect(component.library).to.equal('');
         chai.expect(component.language).to.equal(shippingLanguage);
@@ -445,7 +451,11 @@ describe('ComponentLoader with no external packages installed', () => {
         chai.expect(component).to.be.an('object');
         chai.expect(component.code).to.be.a('string');
         chai.expect(component.code.indexOf('Component')).to.not.equal(-1);
-        chai.expect(component.code.indexOf('exports.getComponent')).to.not.equal(-1);
+        if (!noflo.isBrowser()) {
+          chai.expect(component.code.indexOf('export function getComponent')).to.not.equal(-1);
+        } else {
+          chai.expect(component.code.indexOf('exports.getComponent')).to.not.equal(-1);
+        }
         chai.expect(component.name).to.equal('Graph');
         chai.expect(component.library).to.equal('');
         chai.expect(component.language).to.equal(shippingLanguage);
@@ -975,9 +985,11 @@ describe('ComponentLoader with a fixture project and caching', () => {
   it('should be possible to pre-heat the cache file', function (done) {
     this.timeout(8000);
     const { exec } = require('child_process');
-    exec(`node ${path.resolve(__dirname, '../bin/noflo-cache-preheat')}`,
+    exec(
+      `node ${path.resolve(__dirname, '../bin/noflo-cache-preheat')}`,
       { cwd: fixtureRoot },
-      done);
+      done,
+    );
   });
   it('should have populated a fbp-manifest file', (done) => {
     const manifestPath = path.resolve(fixtureRoot, 'fbp.json');

package/spec/fixtures/componentloader/package.json

@@ -1,5 +1,6 @@
 {
   "name": "componentloader",
+  "type": "commonjs",
   "noflo": {
     "icon": "cloud",
     "components": {

package/spec/utils/inject.js

@@ -3,7 +3,7 @@ if (typeof global !== 'undefined') {
   // Node.js injections for Mocha tests
   global.chai = require('chai');
   global.path = require('path');
-  global.noflo = require('../../lib/NoFlo');
+  global.noflo = require('../../src/lib/NoFlo');
   global.flowtrace = require('flowtrace');
   global.baseDir = process.cwd();
 } else {

package/src/lib/AsComponent.js

@@ -4,7 +4,7 @@
 /* eslint-disable
     import/prefer-default-export,
 */
-import * as getParams from 'get-function-params';
+import getParams from 'get-function-params';
 import { Component } from './Component.js';
 
 /**

package/src/lib/NoFlo.js

@@ -65,7 +65,7 @@ import { graph } from 'fbp-graph';
 // network.
 import { Network } from './Network.js';
 import { LegacyNetwork } from './LegacyNetwork.js';
-import { deprecated } from './Platform.js';
+import { deprecated, isBrowser } from './Platform.js';
 
 export {
   graph,
@@ -87,19 +87,25 @@ export { isBrowser } from './Platform.js';
 // to find components and graphs by traversing the NPM dependency tree from a given root
 // directory on the file system.
 export { ComponentLoader } from './ComponentLoader.js';
+import { ComponentLoader } from './ComponentLoader.js';
 
 // ### Component baseclasses
 //
 // These baseclasses can be used for defining NoFlo components.
 export { Component } from './Component.js';
+import { Component } from './Component.js';
 
 // ### NoFlo ports
 //
 // These classes are used for instantiating ports on NoFlo components.
 export { InPorts, OutPorts } from './Ports.js';
+import { InPorts, OutPorts } from './Ports.js';
 
 export { default as InPort } from './InPort.js';
+import InPort from './InPort.js';
+
 export { default as OutPort } from './OutPort.js';
+import OutPort from './OutPort.js';
 
 // ### NoFlo sockets
 //
@@ -113,6 +119,7 @@ export { internalSocket };
 //
 // NoFlo Information Packets are defined as "IP" objects.
 export { default as IP } from './IP.js';
+import IP from './IP.js';
 
 /**
  * @callback NetworkCallback
@@ -224,6 +231,7 @@ export function saveFile(graphInstance, file, callback) {
 //     });
 //
 export { asCallback, asPromise } from './AsCallback.js';
+import { asCallback, asPromise } from './AsCallback.js';
 
 // ## Generating components from JavaScript functions
 //
@@ -238,3 +246,23 @@ export { asCallback, asPromise } from './AsCallback.js';
 //     };
 //
 export { asComponent } from './AsComponent.js';
+import { asComponent } from './AsComponent.js';
+
+export default {
+  ...graph,
+  isBrowser,
+  ComponentLoader,
+  Component,
+  InPorts,
+  OutPorts,
+  InPort,
+  OutPort,
+  internalSocket,
+  IP,
+  createNetwork,
+  loadFile,
+  saveFile,
+  asCallback,
+  asPromise,
+  asComponent,
+};

package/src/lib/loader/NodeJs.js

@@ -16,21 +16,26 @@ const readFile = promisify(fs.readFile);
 
 // Type loading CoffeeScript compiler
 let CoffeeScript;
-try {
-  // eslint-disable-next-line import/no-unresolved,import/no-extraneous-dependencies
-  CoffeeScript = require('coffeescript');
-} catch (e) {
-  // If there is no CoffeeScript compiler installed, we simply don't support compiling
-}
+// eslint-disable-next-line import/no-unresolved,import/no-extraneous-dependencies
+import('coffeescript')
+  .then((compiler) => {
+    CoffeeScript = compiler;
+  })
+  .catch((e) => {
+    // If there is no CoffeeScript compiler installed, we simply don't support compiling
+  });
 
 // Try loading TypeScript compiler
 let typescript;
-try {
-  // eslint-disable-next-line import/no-unresolved,import/no-extraneous-dependencies
-  typescript = require('typescript');
-} catch (e) {
-  // If there is no TypeScript compiler installed, we simply don't support compiling
-}
+// eslint-disable-next-line import/no-unresolved,import/no-extraneous-dependencies
+import('typescript')
+  .then((compiler) => {
+    // @ts-ignore
+    typescript = compiler.default;
+    })
+  .catch((e) => {
+    // If there is no TypeScript compiler installed, we simply don't support compiling
+  });
 
 /**
  * @callback ErrorableCallback
@@ -72,7 +77,7 @@ function transpileSource(packageId, name, source, language) {
       try {
         src = typescript.transpile(source, {
           module: typescript.ModuleKind.CommonJS,
-          target: typescript.ScriptTarget.ES2015,
+          target: typescript.ScriptTarget.ES2020,
         });
       } catch (err) {
         return Promise.reject(err);
@@ -101,25 +106,28 @@ function transpileSource(packageId, name, source, language) {
  * @returns {Promise<Object|Function>}
  */
 function evaluateModule(baseDir, packageId, name, source) {
-  const Module = require('module');
-  let implementation;
-  try {
-    // Use the Node.js module API to evaluate in the correct directory context
-    const modulePath = path.resolve(baseDir, `./components/${name}.js`);
-    const moduleImpl = new Module(modulePath, module);
-    // @ts-ignore
-    moduleImpl.paths = Module._nodeModulePaths(path.dirname(modulePath));
-    moduleImpl.filename = modulePath;
-    // @ts-ignore
-    moduleImpl._compile(source, modulePath);
-    implementation = moduleImpl.exports;
-  } catch (e) {
-    return Promise.reject(e);
-  }
-  if ((typeof implementation !== 'function') && (typeof implementation.getComponent !== 'function')) {
-    return Promise.reject(new Error(`Provided source for ${packageId}/${name} failed to create a runnable component`));
-  }
-  return Promise.resolve(implementation);
+  return import('module')
+    .then(({ Module }) => {
+      let implementation;
+      // Use the Node.js module API to evaluate in the correct directory context
+      let extension = '.js';
+      if (source.indexOf('require(') !== -1) {
+        // CommonJS
+        extension = '.cjs';
+      }
+      const modulePath = path.resolve(baseDir, `./components/${name}${extension}`);
+      const moduleImpl = new Module(modulePath);
+      // @ts-ignore
+      moduleImpl.paths = Module._nodeModulePaths(path.dirname(modulePath));
+      moduleImpl.filename = modulePath;
+      // @ts-ignore
+      moduleImpl._compile(source, modulePath);
+      implementation = moduleImpl.exports;
+      if ((typeof implementation !== 'function') && (typeof implementation.getComponent !== 'function')) {
+        return Promise.reject(new Error(`Provided source for ${packageId}/${name} failed to create a runnable component`));
+      }
+      return Promise.resolve(implementation);
+    });
 }
 
 /**
@@ -368,9 +376,14 @@ export function getLanguages() {
  */
 function registerCustomLoaders(loader, componentLoaders, callback) {
   componentLoaders.reduce((chain, componentLoader) => chain
-    .then(() => new Promise((resolve, reject) => {
-      const customLoader = require(componentLoader);
-      loader.registerLoader(customLoader, (err) => {
+    .then(() => import(componentLoader))
+    .then((customLoader) => new Promise((resolve, reject) => {
+      let loaderFunc = customLoader;
+      if (typeof customLoader === 'object' && customLoader.default) {
+        // CommonJS loader
+        loaderFunc = customLoader.default;
+      }
+      loader.registerLoader(loaderFunc, (err) => {
         if (err) {
           reject(err);
           return;
@@ -611,34 +624,22 @@ export function register(loader, callback) {
  * @param {ModuleLoadingCallback} callback
  */
 export function dynamicLoad(name, cPath, metadata, callback) {
-  let implementation; let instance;
-  try {
-    implementation = require(cPath);
-  } catch (err) {
-    callback(err);
-    return;
-  }
-
-  if (typeof implementation.getComponent === 'function') {
-    try {
-      instance = implementation.getComponent(metadata);
-    } catch (err) {
-      callback(err);
-      return;
-    }
-  } else if (typeof implementation === 'function') {
-    try {
-      instance = implementation(metadata);
-    } catch (err) {
-      callback(err);
-      return;
-    }
-  } else {
-    callback(new Error(`Unable to instantiate ${cPath}`));
-    return;
-  }
-  if (typeof name === 'string') {
-    instance.componentName = name;
-  }
-  callback(null, instance);
+  import(cPath)
+    .then((implementation) => {
+      let instance;
+      if (typeof implementation.getComponent === 'function') {
+        instance = implementation.getComponent(metadata);
+      } else if (typeof implementation === 'function') {
+        instance = implementation(metadata);
+      } else {
+        throw new Error(`Unable to instantiate ${cPath}`);
+      }
+      if (typeof name === 'string') {
+        instance.componentName = name;
+      }
+      callback(null, instance);
+    })
+    .catch((e) => {
+      callback(e)
+    });
 }