Merge branch 'master' into fix/ctb-no-model-api

This commit is contained in:
Aurélien GEORGET 2018-01-10 13:58:20 +01:00 committed by GitHub
commit 79b2635019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -78,14 +78,14 @@ module.exports = {
const aggregate = files.filter( const aggregate = files.filter(
p => p =>
intersection(p.split('/').map(p => p.replace('.json', '')), ['environments', 'database', 'security', 'request', 'response', 'server']).length === 2 || intersection(p.split('/').map(p => p.replace('.json', '')), ['environments', 'database', 'security', 'request', 'response', 'server']).length === 2 ||
p.indexOf('functions') !== -1 || ((p.indexOf('functions') !== -1 ||
p.indexOf('policies') !== -1 || p.indexOf('policies') !== -1 ||
p.indexOf('locales') !== -1 || p.indexOf('locales') !== -1 ||
p.indexOf('hook') !== -1 || p.indexOf('hook') !== -1 ||
p.indexOf('middleware') !== -1 || p.indexOf('middleware') !== -1 ||
p.indexOf('language') !== -1 || p.indexOf('language') !== -1 ||
p.indexOf('queries') !== -1 || p.indexOf('queries') !== -1 ||
p.indexOf('layout') !== -1 p.indexOf('layout') !== -1) && p.indexOf('api') === -1)
); );
const optional = difference(files, aggregate); const optional = difference(files, aggregate);