Merge pull request #280 from klarkc/master

Add support for es6 modules in boot scripts
strongloop · Oct 11, 2018 · 0ace54c · 0ace54c
2 parents b7a14e3 + bfa874d
commit 0ace54c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/lib/plugins/boot-script.js b/lib/plugins/boot-script.js
@@ -66,6 +66,7 @@ function runScripts(app, list, callback) {
     debug('Requiring script %s', filepath);
     try {
       var exports = require(filepath);
+      if (exports.__esModule) exports = exports.default;
       if (typeof exports === 'function') {
         debug('Exported function detected %s', filepath);
         functions.push({

diff --git a/test/bootstrapper.test.js b/test/bootstrapper.test.js
@@ -81,6 +81,7 @@ describe('Bootstrapper', function() {
         'promiseFinished',
         'thenableStarted',
         'thenableFinished',
+        'umdLoaded',
       ]);
       done();
     });

diff --git a/test/executor.test.js b/test/executor.test.js
@@ -315,6 +315,7 @@ describe('executor', function() {
         'promiseFinished',
         'thenableStarted',
         'thenableFinished',
+        'umdLoaded',
       ]);
     });
   });
@@ -337,6 +338,7 @@ describe('executor', function() {
             'promiseFinished',
             'thenableStarted',
             'thenableFinished',
+            'umdLoaded',
           ]);
           done();
         });

diff --git a/test/fixtures/simple-app/boot/umd-script.js b/test/fixtures/simple-app/boot/umd-script.js
@@ -0,0 +1,13 @@
+// Copyright IBM Corp. 2017. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+'use strict';
+
+module.exports = {
+  default: function() {
+    process.bootFlags.push('umdLoaded');
+  },
+};
+Object.defineProperty(module.exports, '__esModule', {value: true});