yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove trailing commas

Browse Source
This commit is contained in:
Aurélien Georget 2017-06-15 18:09:51 +02:00
parent 8b1e6474b0
commit 969826a089
3 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi/lib/configuration/hooks/core/responses/policy.js
View File

@ -18,7 +18,7 @@ const createResponses = ctx => {
responses,
_.mapValues(_.omit(Boom, ['create']), fn => (...rest) => {
ctx.body = fn(...rest);
}),
})
);
};

94
packages/strapi/lib/configuration/hooks/core/router/index.js
View File

@ -9,7 +9,7 @@ const _ = require('lodash');
const Boom = require('boom');
// Local utilities.
const responsesPolicy = require('../../core/responses/policy');
const responsesPolicy = require('../responses/policy');
const handler404 = require('./404.js');
// Strapi utilities.
@ -68,7 +68,7 @@ module.exports = strapi => {
return strapi.log.warn(
'Ignored attempt to bind route `' +
endpoint +
'` to unknown controller/action.',
'` to unknown controller/action.'
);
}
@ -79,12 +79,12 @@ module.exports = strapi => {
path: value.path,
handler: _.remove(
[strapi.middlewares.compose(policies), action],
o => _.isFunction(o),
o => _.isFunction(o)
),
validate,
validate
},
_.isEmpty,
),
_.isEmpty
)
);
} catch (err) {
cb(err);
@ -112,7 +112,7 @@ module.exports = strapi => {
return strapi.log.warn(
'Ignored attempt to bind route `' +
endpoint +
'` to unknown controller/action.',
'` to unknown controller/action.'
);
}
@ -123,12 +123,12 @@ module.exports = strapi => {
path: value.path,
handler: _.remove(
[strapi.middlewares.compose(policies), action],
o => _.isFunction(o),
o => _.isFunction(o)
),
validate,
validate
},
_.isEmpty,
),
_.isEmpty
)
);
} catch (err) {
cb(err);
@ -136,7 +136,7 @@ module.exports = strapi => {
});
routerAdmin.prefix(
strapi.config.admin || `/${strapi.config.paths.admin}`,
strapi.config.admin || `/${strapi.config.paths.admin}`
);
// TODO:
@ -154,7 +154,7 @@ module.exports = strapi => {
// Exclude routes with prefix.
const excludedRoutes = _.omitBy(
value,
o => !o.hasOwnProperty('prefix'),
o => !o.hasOwnProperty('prefix')
);
// Add others routes to the plugin's router.
@ -172,14 +172,14 @@ module.exports = strapi => {
const { policies, action, validate } = routerChecker(
value,
endpoint,
plugin,
plugin
);
if (_.isUndefined(action) || !_.isFunction(action)) {
return strapi.log.warn(
'Ignored attempt to bind route `' +
endpoint +
'` to unknown controller/action.',
'` to unknown controller/action.'
);
}
@ -190,12 +190,12 @@ module.exports = strapi => {
path: value.path,
handler: _.remove(
[strapi.middlewares.compose(policies), action],
o => _.isFunction(o),
o => _.isFunction(o)
),
validate,
validate
},
_.isEmpty,
),
_.isEmpty
)
);
} catch (err) {
cb(err);
@ -220,14 +220,14 @@ module.exports = strapi => {
const { policies, action, validate } = routerChecker(
value,
endpoint,
plugin,
plugin
);
if (_.isUndefined(action) || !_.isFunction(action)) {
return strapi.log.warn(
'Ignored attempt to bind route `' +
endpoint +
'` to unknown controller/action.',
'` to unknown controller/action.'
);
}
@ -238,12 +238,12 @@ module.exports = strapi => {
path: value.path,
handler: _.remove(
[strapi.middlewares.compose(policies), action],
o => _.isFunction(o),
o => _.isFunction(o)
),
validate,
validate
},
_.isEmpty,
),
_.isEmpty
)
);
} catch (err) {
cb(err);
@ -262,7 +262,7 @@ module.exports = strapi => {
strapi.router.route({
method: ['GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'PATCH'],
path: '*',
handler: handler404,
handler: handler404
});
strapi.app.use(responsesPolicy);
@ -273,8 +273,8 @@ module.exports = strapi => {
strapi.router.router.allowedMethods({
throw: false,
notImplemented: () => Boom.notImplemented(),
methodNotAllowed: () => Boom.methodNotAllowed(),
}),
methodNotAllowed: () => Boom.methodNotAllowed()
})
);
cb();
@ -288,7 +288,7 @@ module.exports = strapi => {
controller: _.trim(value.controller),
action: _.trim(value.action),
splittedEndpoint: _.trim(route.endpoint),
verb: route.verb && _.trim(route.verb.toLowerCase()),
verb: route.verb && _.trim(route.verb.toLowerCase())
};
await next();
@ -351,14 +351,14 @@ module.exports = strapi => {
_.startsWith(policy, globalPolicyPrefix, 0) &&
!_.isEmpty(
strapi.config.policies,
policy.replace(globalPolicyPrefix, ''),
policy.replace(globalPolicyPrefix, '')
)
) {
// Global policy.
return policies.push(
strapi.config.policies[
policy.replace(globalPolicyPrefix, '').toLowerCase()
],
]
);
} else if (
_.startsWith(policy, pluginPolicyPrefix, 0) &&
@ -368,8 +368,8 @@ module.exports = strapi => {
strapi.plugins,
policySplited[1] +
'.config.policies.' +
policySplited[2].toLowerCase(),
),
policySplited[2].toLowerCase()
)
)
) {
// Plugin's policies can be used from app APIs with a specific syntax (`plugins.pluginName.policyName`).
@ -378,8 +378,8 @@ module.exports = strapi => {
strapi.plugins,
policySplited[1] +
'.config.policies.' +
policySplited[2].toLowerCase(),
),
policySplited[2].toLowerCase()
)
);
} else if (
!_.startsWith(policy, globalPolicyPrefix, 0) &&
@ -387,32 +387,32 @@ module.exports = strapi => {
!_.isEmpty(
_.get(
strapi.plugins,
plugin + '.config.policies.' + policy.toLowerCase(),
),
plugin + '.config.policies.' + policy.toLowerCase()
)
)
) {
// Plugin policy used in the plugin itself.
return policies.push(
_.get(
strapi.plugins,
plugin + '.config.policies.' + policy.toLowerCase(),
),
plugin + '.config.policies.' + policy.toLowerCase()
)
);
} else if (
!_.startsWith(policy, globalPolicyPrefix, 0) &&
!_.isEmpty(
_.get(
strapi.api,
currentApiName + '.config.policies.' + policy.toLowerCase(),
),
currentApiName + '.config.policies.' + policy.toLowerCase()
)
)
) {
// API policy used in the API itself.
return policies.push(
_.get(
strapi.api,
currentApiName + '.config.policies.' + policy.toLowerCase(),
),
currentApiName + '.config.policies.' + policy.toLowerCase()
)
);
}
@ -421,7 +421,7 @@ module.exports = strapi => {
endpoint +
'` with unknown policy `' +
policy +
'`.',
'`.'
);
});
}
@ -435,14 +435,14 @@ module.exports = strapi => {
) {
const validator = _.get(
strapi.api,
currentApiName + '.validators.' + value.config.validate,
currentApiName + '.validators.' + value.config.validate
);
_.merge(
validate,
_.mapValues(validator, value => {
return builder.build(value);
}),
})
);
}
@ -450,7 +450,7 @@ module.exports = strapi => {
route,
policies,
action,
validate,
validate
};
}
},

6
packages/strapi/lib/private/bootstrap.js vendored
View File

@ -22,7 +22,7 @@ module.exports = function runBootstrap(cb) {
this.log.warn(
'Bootstrap is taking unusually long to execute its callback (' +
timeoutMs +
' miliseconds).',
' miliseconds).'
);
this.log.warn('Perhaps you forgot to call it?');
}, timeoutMs);
@ -33,7 +33,7 @@ module.exports = function runBootstrap(cb) {
return this.config.bootstrap(err => {
if (ranBootstrapFn) {
this.log.error(
'You called the callback in `strapi.config.boostrap` more than once!',
'You called the callback in `strapi.config.boostrap` more than once!'
);
return;
}
@ -44,7 +44,7 @@ module.exports = function runBootstrap(cb) {
} catch (e) {
if (ranBootstrapFn) {
this.log.error(
'The bootstrap function threw an error after its callback was called.',
'The bootstrap function threw an error after its callback was called.'
);
this.log.error(e);
return;