Skip to content

Removed Bluebird dependency #17831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daniellockyer merged 5 commits into from
Aug 29, 2023
Merged

Removed Bluebird dependency #17831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5ba8d3
Removed bluebird from `Bookshelf.raw-knex` plugin
chairulakmal Aug 26, 2023
e625a9f
fixed missing semicolon warning by linter
chairulakmal Aug 26, 2023
a8f8ec8
Removed bluebird from Bookshelf.raw-knex plugin with minimal changes
chairulakmal Aug 28, 2023
e65d1dd
Modified array returned by Promise.all to reattach the original keys …
chairulakmal Aug 29, 2023
7aa561c
Merge branch 'main' into 14882-remove-bluebird-from-bookshelf-raw-knex
chairulakmal Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ghost/core/core/server/models/base/plugins/raw-knex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const _ = require('lodash');
const debug = require('@tryghost/debug')('models:base:raw-knex');
const plugins = require('@tryghost/bookshelf-plugins');
const Promise = require('bluebird');

const schema = require('../../../data/schema');

Expand Down Expand Up @@ -166,10 +165,12 @@ module.exports = function (Bookshelf) {
})();
});

return Promise.props(props)
.then((relationsToAttach) => {
return Promise.all(Object.values(props))
Comment thread
chairulakmal marked this conversation as resolved.
.then((relationsToAttachArray) => {
debug('attach relations', modelName);

const relationsToAttach = _.zipObject(_.keys(props), relationsToAttachArray);

objects = _.map(objects, (object) => {
_.each(Object.keys(relationsToAttach), (relation) => {
if (!relationsToAttach[relation][object.id]) {
Expand Down
1 change: 0 additions & 1 deletion ghost/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@
"@tryghost/zip": "1.1.37",
"amperize": "0.6.1",
"analytics-node": "6.2.0",
"bluebird": "3.7.2",
"body-parser": "1.20.2",
"bookshelf": "1.2.0",
"bookshelf-relations": "2.6.0",
Expand Down