Use bluebird in utils.js

3.0-RELEASE-NOTES.md

@@ -5,3 +5,9 @@ always describe the impact on users and instructions for upgrading
 applications from 2.x to 3.0.
 
 See also https://github.com/strongloop/loopback/blob/master/3.0-DEVELOPING.md
+
+## Always use bluebird as promise library
+
+In version 3.0, we always use bluebird as promise library instead of the default promise library in javascript.
+
+[Related code change](https://github.com/strongloop/loopback-datasource-juggler/pull/790)

lib/scope.js

@@ -407,7 +407,7 @@ function defineScope(cls, targetClass, name, params, methods, options) {
         }
       }
     }
-    
+
     options = options || {};
     filter = filter || {};
     var targetModel = definition.targetModel(this._receiver);

lib/utils.js

@@ -19,6 +19,7 @@ exports.findIndexOf = findIndexOf;
 
 var traverse = require('traverse');
 var assert = require('assert');
+var Promise = require('bluebird');
 
 function safeRequire(module) {
   try {
@@ -478,15 +479,6 @@ function sortObjectsByIds(idName, ids, objects, strict) {
 
 function createPromiseCallback() {
   var cb;
-
-  if (!global.Promise) {
-    cb = function(){};
-    cb.promise = {};
-    Object.defineProperty(cb.promise, 'then', { get: throwPromiseNotDefined });
-    Object.defineProperty(cb.promise, 'catch', { get: throwPromiseNotDefined });
-    return cb;
-  }
-
   var promise = new Promise(function (resolve, reject) {
     cb = function (err, data) {
       if (err) return reject(err);
@@ -497,12 +489,6 @@ function createPromiseCallback() {
   return cb;
 }
 
-function throwPromiseNotDefined() {
-  throw new Error(
-    'Your Node runtime does support ES6 Promises. ' +
-    'Set "global.Promise" to your preferred implementation of promises.');
-}
-
 /**
  * Dedupe an array
  * @param {Array} an array

package.json

@@ -32,12 +32,12 @@
     "node >= 0.6"
   ],
   "devDependencies": {
-    "bluebird": "^2.9.9",
     "mocha": "^2.1.0",
     "should": "^8.0.2"
   },
   "dependencies": {
     "async": "~1.0.0",
+    "bluebird": "^3.1.1",
     "debug": "^2.1.1",
     "depd": "^1.0.0",
     "inflection": "^1.6.0",

test/async-observer.test.js

@@ -1,5 +1,6 @@
 var ModelBuilder = require('../').ModelBuilder;
 var should = require('./init');
+var Promise = require('bluebird');
 
 describe('async observer', function() {
   var TestModel;

test/init.js

@@ -27,6 +27,3 @@ if (!('getModelBuilder' in global)) {
   };
 }
 
-if (!('Promise' in global)) {
-  global.Promise = require('bluebird');
-}