docs: remove remaining bluebird references (#12167)

CONTRIBUTING.md

@@ -23,7 +23,7 @@ We're glad to get pull request if any functionality is missing or something is b
 * Make sure that all existing tests pass
 * Make sure that all existing tests pass
 * Make sure you followed [coding guidelines](https://github.com/sequelize/sequelize/blob/master/CONTRIBUTING.md#coding-guidelines)
 * Make sure you followed [coding guidelines](https://github.com/sequelize/sequelize/blob/master/CONTRIBUTING.md#coding-guidelines)
 * Add some tests for your new functionality or a test exhibiting the bug you are solving. Ideally all new tests should not pass _without_ your changes.
 * Add some tests for your new functionality or a test exhibiting the bug you are solving. Ideally all new tests should not pass _without_ your changes.
-  - Use [promise style](http://bluebirdjs.com/docs/why-promises.html) in all new tests. Specifically this means:
+  - Use [async/await](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/async_function) in all new tests. Specifically this means:
     - don't use `EventEmitter`, `QueryChainer` or the `success`, `done` and `error` events
     - don't use `EventEmitter`, `QueryChainer` or the `success`, `done` and `error` events
     - don't use a done callback in your test, just return the promise chain.
     - don't use a done callback in your test, just return the promise chain.
   - Small bugfixes and direct backports to the 4.x branch are accepted without tests.
   - Small bugfixes and direct backports to the 4.x branch are accepted without tests.

docs/manual/core-concepts/getting-started.md

@@ -104,8 +104,8 @@ const sequelize = new Sequelize('sqlite::memory:', {
 });
 });
 ```
 ```
 
 
-## Bluebird Promises and async/await
+## Promises and async/await
 
 
-Most of the methods provided by Sequelize are asynchronous and therefore return Promises. They are all [Bluebird](http://bluebirdjs.com) Promises, so you can use the rich Bluebird API (for example, using `finally`, `tap`, `tapCatch`, `map`, `mapSeries`, etc) out of the box. You can access the Bluebird constructor used internally by Sequelize with `Sequelize.Promise`, if you want to set any Bluebird specific options.
+Most of the methods provided by Sequelize are asynchronous and therefore return Promises. They are all [Promises](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) , so you can use the Promise API (for example, using `then`, `catch`, `finally`) out of the box.
 
 
-Of course, using `async` and `await` works normally as well.
+Of course, using `async` and `await` works normally as well.
\ No newline at end of file

docs/manual/other-topics/typescript.md

@@ -8,9 +8,8 @@ As Sequelize heavily relies on runtime property assignments, TypeScript won't be
 
 
 In order to avoid installation bloat for non TS users, you must install the following typing packages manually:
 In order to avoid installation bloat for non TS users, you must install the following typing packages manually:
 
 
-- `@types/node` (this is universally required)
+- `@types/node` (this is universally required in node projects)
 - `@types/validator`
 - `@types/validator`
-- `@types/bluebird`
 
 
 ## Usage
 ## Usage
 
 
@@ -129,8 +128,6 @@ Address.belongsTo(User, {targetKey: 'id'});
 User.hasOne(Address,{sourceKey: 'id'});
 User.hasOne(Address,{sourceKey: 'id'});
 
 
 async function stuff() {
 async function stuff() {
-  // Please note that when using async/await you lose the `bluebird` promise context
-  // and you fall back to native
   const newUser = await User.create({
   const newUser = await User.create({
     name: 'Johnny',
     name: 'Johnny',
     preferredName: 'John',
     preferredName: 'John',

package-lock.json

@@ -1146,12 +1146,6 @@
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true
       "dev": true
     },
     },
-    "@types/bluebird": {
-      "version": "3.5.30",
-      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.30.tgz",
-      "integrity": "sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==",
-      "dev": true
-    },
     "@types/color-name": {
     "@types/color-name": {
       "version": "1.1.1",
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",

package.json

@@ -47,7 +47,6 @@
   "devDependencies": {
   "devDependencies": {
     "@commitlint/cli": "^8.3.5",
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-angular": "^8.3.4",
     "@commitlint/config-angular": "^8.3.4",
-    "@types/bluebird": "^3.5.26",
     "@types/node": "^12.12.37",
     "@types/node": "^12.12.37",
     "@types/validator": "^10.11.0",
     "@types/validator": "^10.11.0",
     "acorn": "^7.1.1",
     "acorn": "^7.1.1",

types/index.d.ts

@@ -15,6 +15,5 @@ export * from './lib/associations/index';
 export * from './lib/errors';
 export * from './lib/errors';
 export { BaseError as Error } from './lib/errors';
 export { BaseError as Error } from './lib/errors';
 export { useInflection } from './lib/utils';
 export { useInflection } from './lib/utils';
-export { Promise } from './lib/promise';
 export { Utils, QueryTypes, Op, TableHints, IndexHints, DataTypes, Deferrable };
 export { Utils, QueryTypes, Op, TableHints, IndexHints, DataTypes, Deferrable };
 export { Validator as validator } from './lib/utils/validator-extras';
 export { Validator as validator } from './lib/utils/validator-extras';

types/lib/associations/belongs-to-many.d.ts

@@ -11,8 +11,6 @@ import {
   Transactionable,
   Transactionable,
   WhereOptions,
   WhereOptions,
 } from '../model';
 } from '../model';
-import { Promise } from '../promise';
-import { Transaction } from '../transaction';
 import { Association, AssociationScope, ForeignKeyOptions, ManyToManyOptions, MultiAssociationAccessors } from './base';
 import { Association, AssociationScope, ForeignKeyOptions, ManyToManyOptions, MultiAssociationAccessors } from './base';
 
 
 /**
 /**
@@ -21,7 +19,7 @@ import { Association, AssociationScope, ForeignKeyOptions, ManyToManyOptions, Mu
 export interface ThroughOptions {
 export interface ThroughOptions {
   /**
   /**
    * The model used to join both sides of the N:M association.
    * The model used to join both sides of the N:M association.
-   * Can be a string if you want the model to be generated by sequelize. 
+   * Can be a string if you want the model to be generated by sequelize.
    */
    */
   model: typeof Model | string;
   model: typeof Model | string;
 
 

types/lib/associations/belongs-to.d.ts

 import { DataType } from '../data-types';
 import { DataType } from '../data-types';
 import { CreateOptions, FindOptions, Model, ModelCtor, SaveOptions } from '../model';
 import { CreateOptions, FindOptions, Model, ModelCtor, SaveOptions } from '../model';
-import { Promise } from '../promise';
 import { Association, AssociationOptions, SingleAssociationAccessors } from './base';
 import { Association, AssociationOptions, SingleAssociationAccessors } from './base';
 
 
 // type ModelCtor<M extends Model> = InstanceType<typeof M>;
 // type ModelCtor<M extends Model> = InstanceType<typeof M>;

types/lib/associations/has-many.d.ts

@@ -8,7 +8,6 @@ import {
   ModelCtor,
   ModelCtor,
   Transactionable,
   Transactionable,
 } from '../model';
 } from '../model';
-import { Promise } from '../promise';
 import { Association, ManyToManyOptions, MultiAssociationAccessors } from './base';
 import { Association, ManyToManyOptions, MultiAssociationAccessors } from './base';
 
 
 /**
 /**

types/lib/associations/has-one.d.ts

 import { DataType } from '../data-types';
 import { DataType } from '../data-types';
 import { CreateOptions, FindOptions, Model, ModelCtor, SaveOptions } from '../model';
 import { CreateOptions, FindOptions, Model, ModelCtor, SaveOptions } from '../model';
-import { Promise } from '../promise';
 import { Association, AssociationOptions, SingleAssociationAccessors } from './base';
 import { Association, AssociationOptions, SingleAssociationAccessors } from './base';
 
 
 /**
 /**

types/lib/connection-manager.d.ts

-import { Promise } from './promise';
-
 export interface GetConnectionOptions {
 export interface GetConnectionOptions {
   /**
   /**
    * Set which replica to use. Available options are `read` and `write`
    * Set which replica to use. Available options are `read` and `write`

types/lib/model.d.ts

@@ -4,9 +4,8 @@ import { DataType } from './data-types';
 import { Deferrable } from './deferrable';
 import { Deferrable } from './deferrable';
 import { HookReturn, Hooks, ModelHooks } from './hooks';
 import { HookReturn, Hooks, ModelHooks } from './hooks';
 import { ValidationOptions } from './instance-validator';
 import { ValidationOptions } from './instance-validator';
-import { Promise } from './promise';
 import { QueryOptions, IndexesOptions } from './query-interface';
 import { QueryOptions, IndexesOptions } from './query-interface';
-import { Config, Options, Sequelize, SyncOptions } from './sequelize';
+import { Sequelize, SyncOptions } from './sequelize';
 import { Transaction, LOCK } from './transaction';
 import { Transaction, LOCK } from './transaction';
 import { Col, Fn, Literal, Where } from './utils';
 import { Col, Fn, Literal, Where } from './utils';
 import Op = require('./operators');
 import Op = require('./operators');

types/lib/promise.d.ts

-// tslint:disable-next-line:no-implicit-dependencies
-import * as Bluebird from 'bluebird';
-
-export const Promise: typeof Bluebird;
-export type Promise<T> = Bluebird<T>;
-export default Promise;

types/lib/query-interface.d.ts

 import { DataType } from './data-types';
 import { DataType } from './data-types';
 import { Logging, Model, ModelAttributeColumnOptions, ModelAttributes, Transactionable, WhereOptions, Filterable, Poolable } from './model';
 import { Logging, Model, ModelAttributeColumnOptions, ModelAttributes, Transactionable, WhereOptions, Filterable, Poolable } from './model';
-import { Promise } from './promise';
 import QueryTypes = require('./query-types');
 import QueryTypes = require('./query-types');
 import { Sequelize, RetryOptions } from './sequelize';
 import { Sequelize, RetryOptions } from './sequelize';
 import { Transaction } from './transaction';
 import { Transaction } from './transaction';

types/lib/sequelize.d.ts

 import * as DataTypes from './data-types';
 import * as DataTypes from './data-types';
-import * as Deferrable from './deferrable';
 import { HookReturn, Hooks, SequelizeHooks } from './hooks';
 import { HookReturn, Hooks, SequelizeHooks } from './hooks';
 import { ValidationOptions } from './instance-validator';
 import { ValidationOptions } from './instance-validator';
 import {
 import {
@@ -23,15 +22,10 @@ import {
   Hookable,
   Hookable,
 } from './model';
 } from './model';
 import { ModelManager } from './model-manager';
 import { ModelManager } from './model-manager';
-import * as Op from './operators';
-import { Promise } from './promise';
 import { QueryInterface, QueryOptions, QueryOptionsWithModel, QueryOptionsWithType } from './query-interface';
 import { QueryInterface, QueryOptions, QueryOptionsWithModel, QueryOptionsWithType } from './query-interface';
 import QueryTypes = require('./query-types');
 import QueryTypes = require('./query-types');
 import { Transaction, TransactionOptions } from './transaction';
 import { Transaction, TransactionOptions } from './transaction';
 import { Cast, Col, Fn, Json, Literal, Where } from './utils';
 import { Cast, Col, Fn, Json, Literal, Where } from './utils';
-// tslint:disable-next-line:no-duplicate-imports
-import * as Utils from './utils';
-import { validator } from './utils/validator-extras';
 import { ConnectionManager } from './connection-manager';
 import { ConnectionManager } from './connection-manager';
 
 
 /**
 /**
@@ -777,7 +771,7 @@ export class Sequelize extends Hooks {
   /**
   /**
    * Use CLS with Sequelize.
    * Use CLS with Sequelize.
    * CLS namespace provided is stored as `Sequelize._cls`
    * CLS namespace provided is stored as `Sequelize._cls`
-   * and bluebird Promise is patched to use the namespace, using `cls-bluebird` module.
+   * and Promise is patched to use the namespace, using `cls-hooked` module.
    *
    *
    * @param namespace
    * @param namespace
    */
    */

types/lib/transaction.d.ts

 import { Deferrable } from './deferrable';
 import { Deferrable } from './deferrable';
 import { Logging } from './model';
 import { Logging } from './model';
-import { Promise } from './promise';
 import { Sequelize } from './sequelize';
 import { Sequelize } from './sequelize';
 
 
 /**
 /**

types/lib/utils.d.ts

@@ -115,5 +115,3 @@ export class Where extends SequelizeMethod {
   constructor(attr: object, comparator: string, logic: string | object);
   constructor(attr: object, comparator: string, logic: string | object);
   constructor(attr: object, logic: string | object);
   constructor(attr: object, logic: string | object);
 }
 }
-
-export { Promise } from './promise';

types/test/count.ts

-import { Model, Promise, Op } from 'sequelize';
+import { Model, Op } from 'sequelize';
 
 
 class MyModel extends Model {}
 class MyModel extends Model {}
 
 

types/test/e2e/docs-example.ts

@@ -120,8 +120,6 @@ Address.belongsTo(User, {targetKey: 'id'});
 User.hasOne(Address,{sourceKey: 'id'});
 User.hasOne(Address,{sourceKey: 'id'});
 
 
 async function stuff() {
 async function stuff() {
-  // Please note that when using async/await you lose the `bluebird` promise context
-  // and you fall back to native
   const newUser = await User.create({
   const newUser = await User.create({
     name: 'Johnny',
     name: 'Johnny',
     preferredName: 'John',
     preferredName: 'John',

types/test/promise.ts

-import { Promise } from 'sequelize';
-
-let promise: Promise<number> = Promise.resolve(1);
-promise.then((arg: number) => ({})).then((a: {}) => void 0);
-
-promise = new Promise<number>(resolve => resolve());