yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-08 14:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only use keys from settings.json to create documentation files, fix array concat only for routes in extensions

Browse Source
This commit is contained in:
Alexandre Bodin 2019-06-14 23:07:04 +02:00
parent 8bc172d535
commit c5dc672cc7
2 changed files with 394 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

544
packages/strapi-plugin-documentation/services/Documentation.js
View File

File diff suppressed because it is too large Load Diff

5
packages/strapi/lib/Strapi.js
View File

@ -266,8 +266,9 @@ class Strapi extends EventEmitter {
* Handle plugin extensions * Handle plugin extensions
*/ */
// merge extensions config folders // merge extensions config folders
_.mergeWith(this.plugins, extensions.merges, (objValue, srcValue) => { _.mergeWith(this.plugins, extensions.merges, (objValue, srcValue, key) => {
if (_.isArray(srcValue) && _.isArray(objValue)) { // concat routes
if (_.isArray(srcValue) && _.isArray(objValue) && key === 'routes') {
return srcValue.concat(objValue); return srcValue.concat(objValue);
} }
}); });