knex-migrator 5.1.4 → 5.1.6

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2022 Ghost Foundation
+Copyright (c) 2013-2023 Ghost Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -126,7 +126,6 @@ module.exports.config = {
 
 ### Examples
 ```
-const Promise = require('bluebird');
 
 module.exports.up = function(options) {
   const connection = options.connection;
@@ -146,7 +145,6 @@ module.exports.down = function(options) {
 ```
 
 ```
-const Promise = require('bluebird');
 
 module.exports.config = {
   transaction: true
@@ -338,7 +336,7 @@ knexMigrator.isDatabaseOK()
 
 # Copyright & License
 
-Copyright (c) 2013-2022 Ghost Foundation - Released under the [MIT license](LICENSE).
+Copyright (c) 2013-2023 Ghost Foundation - Released under the [MIT license](LICENSE).
 
 
 

package/lib/database.js

@@ -1,9 +1,9 @@
 const knex = require('knex'),
-    Promise = require('bluebird'),
     omit = require('lodash/omit'),
     debug = require('debug')('knex-migrator:database'),
     errors = require('./errors');
 const DatabaseInfo = require('@tryghost/database-info');
+const {sequence} = require('@tryghost/promise');
 
 /**
  * @NOTE: Knex-migrator only supports knex query builder.
@@ -41,7 +41,7 @@ exports.connect = function connect(options) {
  * This helper functions is used to test the connection. It's basically a "test query".
  *
  * @param connection
- * @returns {Bluebird<R> | Bluebird<any> | Promise<T>}
+ * @returns {Promise<R> | Promise<any> | Promise<T>}
  */
 exports.ensureConnectionWorks = (connection) => {
     return connection.raw('SELECT 1+1 as RESULT;')
@@ -76,7 +76,7 @@ module.exports.createTransaction = function (connection, callback) {
  *
  * @TODO: https://github.com/TryGhost/knex-migrator/issues/118
  * @TODO: https://github.com/TryGhost/knex-migrator/issues/91
- * @returns {Bluebird<R> | Bluebird<any> | * | Promise<T>}
+ * @returns {Promise<R> | Promise<any> | * | Promise<T>}
  */
 exports.createMigrationsTable = async function createMigrationsTable(connection) {
     const hasTable = await connection.schema.hasTable('migrations');
@@ -182,7 +182,7 @@ exports.drop = function drop(options) {
         // @NOTE: We cannot just remove the sqlite3 file, because any database connection will get invalid.
         return connection.raw('SELECT name FROM sqlite_master WHERE type="table";')
             .then(function (tables) {
-                return Promise.each(tables, function (table) {
+                return sequence(tables.map(table => () => {
                     if (table.name === 'sqlite_sequence') {
                         debug('Skip drop table: ' + table.name);
                         return Promise.resolve();
@@ -190,7 +190,7 @@ exports.drop = function drop(options) {
 
                     debug('Drop table: ' + table.name);
                     return connection.schema.dropTableIfExists(table.name);
-                });
+                }));
             })
             .catch(function (err) {
                 // CASE: database file was never initialised

package/lib/index.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const path = require('path');
-const Promise = require('bluebird');
+const {sequence} = require('@tryghost/promise');
 const debug = require('debug')('knex-migrator:index');
 const database = require('./database');
 const utils = require('./utils');
@@ -60,7 +60,7 @@ function KnexMigrator(options = {}) {
  * otherwise we would overjump migration files to execute.
  *
  * @param {Object} options - Custom options you can pass in (disableHooks, noScripts, skipInitCompletion, only, skip)
- * @returns {Bluebird<R>}
+ * @returns {Promise<R>}
  */
 KnexMigrator.prototype.init = function init(options) {
     options = options || {};
@@ -264,9 +264,9 @@ KnexMigrator.prototype.init = function init(options) {
                     });
             });
 
-            return Promise.each(ops, function (op) {
+            return sequence(ops.map(op => () => {
                 return op.bind(self)();
-            });
+            }));
         });
 };
 
@@ -287,7 +287,7 @@ KnexMigrator.prototype.init = function init(options) {
  * 8. Disconnect from database otherwise the CLI won't close properly.
  *
  * @param {Object} options - Custom options you can pass in (version, force, init, only, skip)
- * @returns {Bluebird<any>}
+ * @returns {Promise<any>}
  */
 KnexMigrator.prototype.migrate = async function migrate(options) {
     options = options || {};
@@ -559,7 +559,7 @@ KnexMigrator.prototype.reset = function reset(options) {
  * 6. Returns result.
  * 7. Destroy connection.
  *
- * @returns {Bluebird<any>}
+ * @returns {Promise<any>}
  */
 KnexMigrator.prototype.isDatabaseOK = function isDatabaseOK() {
     let self = this;
@@ -642,7 +642,7 @@ KnexMigrator.prototype.isDatabaseOK = function isDatabaseOK() {
  * 7. Destroy connection.
  *
  * @param {Object} options - Custom options the user can pass in (force, version, v, disableHooks)
- * @returns {Bluebird<any>}
+ * @returns {Promise<any>}
  */
 KnexMigrator.prototype.rollback = function rollback(options) {
     options = options || {};
@@ -715,12 +715,12 @@ KnexMigrator.prototype.rollback = function rollback(options) {
                     });
 
                     values.reverse();
-                    return Promise.each(values, function (value) {
+                    return sequence(values.map(value => () => {
                         return self._rollback({
                             version: value.version,
                             onlyTasks: [value.name]
                         });
-                    });
+                    }));
                 });
         }).then(function () {
             if (hooks.shutdown) {
@@ -788,7 +788,7 @@ KnexMigrator.prototype.rollback = function rollback(options) {
  * 3. Delete migration entry from database.
  *
  * @param {Object} options - Custom options the user can pass in (version, skippedTasks, onlyTasks, task)
- * @returns {Bluebird<IterableOrNever<R>>}
+ * @returns {Promise<IterableOrNever<R>>}
  * @private
  */
 KnexMigrator.prototype._rollback = function _rollback(options) {
@@ -858,7 +858,7 @@ KnexMigrator.prototype._rollback = function _rollback(options) {
 
     tasks.reverse();
 
-    return Promise.each(tasks, function (task) {
+    return sequence(tasks.map(task => () => {
         if (skippedTasks[version] && skippedTasks[version].indexOf(task.name) !== -1) {
             return Promise.resolve();
         }
@@ -905,7 +905,7 @@ KnexMigrator.prototype._rollback = function _rollback(options) {
                 })
                 .delete();
         });
-    });
+    }));
 };
 
 /**
@@ -924,7 +924,7 @@ KnexMigrator.prototype._rollback = function _rollback(options) {
  * 5. Returns any skipped task. Skipped tasks are tasks which failed. Only one task is returned, the last one which failed.
  *
  * @param {Object} options - Custom options the user can pass in (version, hooks, only, skip)
- * @returns {Bluebird<{skippedTasks: Array}>}
+ * @returns {Promise<{skippedTasks: Array}>}
  * @private
  */
 KnexMigrator.prototype._migrateTo = function _migrateTo(options) {
@@ -964,7 +964,7 @@ KnexMigrator.prototype._migrateTo = function _migrateTo(options) {
     debug('Migrate: ' + version + ' with ' + tasks.length + ' tasks.');
     debug('Tasks: ' + JSON.stringify(tasks));
 
-    return Promise.each(tasks, function executeTask(task) {
+    return sequence(tasks.map(task => () => {
         return self._beforeEach({
             task: task.name,
             version: version
@@ -1036,7 +1036,7 @@ KnexMigrator.prototype._migrateTo = function _migrateTo(options) {
                 err: err
             });
         });
-    }).then(function () {
+    })).then(function () {
         return {
             skippedTasks: skippedTasks
         };
@@ -1099,7 +1099,7 @@ KnexMigrator.prototype._afterEach = function _afterEach(options) {
  * database. It returns expected and actual database state.
  *
  * @param {Object} options - Custom user options (force)
- * @returns {Bluebird<any>}
+ * @returns {Promise<any>}
  * @private
  */
 KnexMigrator.prototype._integrityCheck = async function _integrityCheck(options) {

package/lib/locking.js

@@ -50,7 +50,7 @@ module.exports.lock = function (connection) {
 
 /**
  * @description Private helper to determine whether the database is locked or not.
- * @returns {Bluebird<boolean>}
+ * @returns {boolean}
  */
 module.exports.isLocked = function (connection) {
     return connection('migrations_lock')

package/lib/utils.js

@@ -2,8 +2,7 @@ const path = require('path'),
     _ = require('lodash'),
     fs = require('fs'),
     compareVer = require('compare-ver'),
-    Promise = require('bluebird'),
-    resolve = Promise.promisify(require('resolve')),
+    resolve = require('util').promisify(require('resolve')),
     debug = require('debug')('knex-migrator:utils'),
     errors = require('./errors');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex-migrator",
-  "version": "5.1.4",
+  "version": "5.1.6",
   "description": "Database migrations with knex.",
   "keywords": [
     "ghost",
@@ -47,10 +47,10 @@
     "node": "^14.18.0 || ^16.13.0 || ^18.12.1"
   },
   "dependencies": {
-    "@tryghost/database-info": "0.3.17",
-    "@tryghost/errors": "1.2.24",
-    "@tryghost/logging": "2.4.4",
-    "bluebird": "3.7.2",
+    "@tryghost/database-info": "0.3.21",
+    "@tryghost/errors": "1.2.27",
+    "@tryghost/logging": "2.4.9",
+    "@tryghost/promise": "0.3.4",
     "commander": "5.1.0",
     "compare-ver": "2.0.2",
     "debug": "4.3.4",
@@ -58,8 +58,8 @@
     "lodash": "4.17.21",
     "moment": "2.24.0",
     "mysql2": "3.2.0",
-    "nconf": "0.12.0",
-    "resolve": "1.22.3"
+    "nconf": "0.12.1",
+    "resolve": "1.22.8"
   },
   "files": [
     "bin",