mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-04-08 02:52:39 -05:00
Moved pipeline/sequence to lib/promise
refs #9178 - continue with killing our global utils folder - i haven't found any better naming for lib/promise - so, require single files for now - instead of doing `promiseLib = require('../lib/promise')` - we can optimise the requires later
This commit is contained in:
parent
0d65e7f24f
commit
f83cbf6117
29 changed files with 28 additions and 28 deletions
|
@ -1,7 +1,7 @@
|
|||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
validator = require('validator'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
mail = require('./../mail'),
|
||||
globalUtils = require('../utils'),
|
||||
urlService = require('../services/url'),
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// RESTful API for the Client resource
|
||||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
var Promise = require('bluebird'),
|
||||
path = require('path'),
|
||||
fs = require('fs-extra'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
exporter = require('../data/export'),
|
||||
importer = require('../data/importer'),
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
mail = require('./../mail'),
|
||||
globalUtils = require('../utils'),
|
||||
urlService = require('../services/url'),
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// API for sending Mail
|
||||
|
||||
var Promise = require('bluebird'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
ObjectId = require('bson-objectid'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
permissions = require('../permissions'),
|
||||
canThis = permissions.canThis,
|
||||
localUtils = require('./utils'),
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// RESTful API for the Post resource
|
||||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// # Roles API
|
||||
// RESTful API for the Role resource
|
||||
var Promise = require('bluebird'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
canThis = require('../permissions').canThis,
|
||||
models = require('../models'),
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
moment = require('moment'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
config = require('../config'),
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// # Slug API
|
||||
// RESTful API for the Slug resource
|
||||
var Promise = require('bluebird'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
fs = require('fs-extra'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
globalUtils = require('../utils'),
|
||||
localUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// RESTful API for the Tag resource
|
||||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// RESTful API for the User resource
|
||||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
canThis = require('../permissions').canThis,
|
||||
models = require('../models'),
|
||||
|
|
|
@ -5,7 +5,7 @@ var Promise = require('bluebird'),
|
|||
_ = require('lodash'),
|
||||
https = require('https'),
|
||||
url = require('url'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
|
|
|
@ -6,8 +6,8 @@ var _ = require('lodash'),
|
|||
glob = require('glob'),
|
||||
uuid = require('uuid'),
|
||||
extract = require('extract-zip'),
|
||||
sequence = require('../../utils/sequence'),
|
||||
pipeline = require('../../utils/pipeline'),
|
||||
sequence = require('../../lib/promise/sequence'),
|
||||
pipeline = require('../../lib/promise/pipeline'),
|
||||
common = require('../../lib/common'),
|
||||
ImageHandler = require('./handlers/image'),
|
||||
JSONHandler = require('./handlers/json'),
|
||||
|
|
|
@ -4,7 +4,7 @@ var _ = require('lodash'),
|
|||
Promise = require('bluebird'),
|
||||
models = require('../../../models'),
|
||||
baseUtils = require('../../../models/base/utils'),
|
||||
sequence = require('../../../utils/sequence'),
|
||||
sequence = require('../../../lib/promise/sequence'),
|
||||
moment = require('moment'),
|
||||
|
||||
fixtures = require('./fixtures'),
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// # Filters
|
||||
// Filters are not yet properly used, this system is intended to allow Apps to extend Ghost in various ways.
|
||||
var Promise = require('bluebird'),
|
||||
pipeline = require('./utils/pipeline'),
|
||||
pipeline = require('./lib/promise/pipeline'),
|
||||
_ = require('lodash'),
|
||||
defaults;
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ var moment = require('moment-timezone'),
|
|||
_ = require('lodash'),
|
||||
models = require('../../models'),
|
||||
common = require('../../lib/common'),
|
||||
sequence = require('../../utils/sequence');
|
||||
sequence = require('../../lib/promise/sequence');
|
||||
|
||||
/**
|
||||
* WHEN access token is created we will update last_seen for user.
|
||||
|
|
|
@ -6,7 +6,7 @@ var _ = require('lodash'),
|
|||
moment = require('moment'),
|
||||
Promise = require('bluebird'),
|
||||
ObjectId = require('bson-objectid'),
|
||||
sequence = require('../utils/sequence'),
|
||||
sequence = require('../lib/promise/sequence'),
|
||||
common = require('../lib/common'),
|
||||
htmlToText = require('html-to-text'),
|
||||
ghostBookshelf = require('./base'),
|
||||
|
|
|
@ -9,7 +9,7 @@ var _ = require('lodash'),
|
|||
utils = require('../utils'),
|
||||
gravatar = require('../utils/gravatar'),
|
||||
validation = require('../data/validation'),
|
||||
pipeline = require('../utils/pipeline'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
|
||||
bcryptGenSalt = Promise.promisify(bcrypt.genSalt),
|
||||
bcryptHash = Promise.promisify(bcrypt.hash),
|
||||
|
|
|
@ -135,7 +135,7 @@ utils = {
|
|||
zipFolder: require('./zip-folder'),
|
||||
generateAssetHash: require('./asset-hash'),
|
||||
tokens: require('./tokens'),
|
||||
sequence: require('./sequence'),
|
||||
sequence: require('../lib/promise/sequence'),
|
||||
ghostVersion: require('./ghost-version'),
|
||||
mobiledocConverter: require('./mobiledoc-converter'),
|
||||
markdownConverter: require('./markdown-converter')
|
||||
|
|
|
@ -5,7 +5,7 @@ var should = require('should'),
|
|||
ObjectId = require('bson-objectid'),
|
||||
testUtils = require('../../utils'),
|
||||
config = require('../../../server/config'),
|
||||
sequence = require('../../../server/utils/sequence'),
|
||||
sequence = require('../../../server/lib/promise/sequence'),
|
||||
common = require('../../../server/lib/common'),
|
||||
api = require('../../../server/api'),
|
||||
models = require('../../../server/models'),
|
||||
|
|
|
@ -7,7 +7,7 @@ var should = require('should'), // jshint ignore:line
|
|||
common = require('../../../../server/lib/common'),
|
||||
models = require('../../../../server/models'),
|
||||
testUtils = require('../../../../test/utils'),
|
||||
sequence = require('../../../../server/utils/sequence'),
|
||||
sequence = require('../../../../server/lib/promise/sequence'),
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
||||
describe('Models: listeners', function () {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
var should = require('should'),
|
||||
testUtils = require('../../utils'),
|
||||
sequence = require('../../../server/utils/sequence'),
|
||||
sequence = require('../../../server/lib/promise/sequence'),
|
||||
_ = require('lodash'),
|
||||
|
||||
// Stuff we are testing
|
||||
|
|
|
@ -4,7 +4,7 @@ var should = require('should'),
|
|||
moment = require('moment'),
|
||||
_ = require('lodash'),
|
||||
Promise = require('bluebird'),
|
||||
sequence = require('../../../server/utils/sequence'),
|
||||
sequence = require('../../../server/lib/promise/sequence'),
|
||||
settingsCache = require('../../../server/settings/cache'),
|
||||
ghostBookshelf = require('../../../server/models/base'),
|
||||
PostModel = require('../../../server/models/post').Post,
|
||||
|
|
|
@ -3,7 +3,7 @@ var should = require('should'), // jshint ignore:line
|
|||
Promise = require('bluebird'),
|
||||
|
||||
// Stuff we are testing
|
||||
pipeline = require('../../server/utils/pipeline'),
|
||||
pipeline = require('../../server/lib/promise/pipeline'),
|
||||
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ var Promise = require('bluebird'),
|
|||
SettingsLib = require('../../server/settings'),
|
||||
customRedirectsMiddleware = require('../../server/web/middleware/custom-redirects'),
|
||||
permissions = require('../../server/permissions'),
|
||||
sequence = require('../../server/utils/sequence'),
|
||||
sequence = require('../../server/lib/promise/sequence'),
|
||||
themes = require('../../server/themes'),
|
||||
DataGenerator = require('./fixtures/data-generator'),
|
||||
configUtils = require('./configUtils'),
|
||||
|
|
Loading…
Add table
Reference in a new issue