Allow includeFolders on CHILDREN

This commit is contained in:
Aaron Carlino 2019-12-19 14:33:08 +13:00
parent 8ffc3eeb5b
commit d1d75d08bb
3 changed files with 410 additions and 436 deletions

View File

@ -41,13 +41,18 @@ module.exports = {
} }
} }
}, },
`gatsby-remark-copy-linked-files`,
{ {
resolve: `gatsby-remark-images`, resolve: `gatsby-remark-images`,
options: { options: {
maxWidth: 850, maxWidth: 850,
}, },
}, },
{
resolve: `gatsby-remark-copy-linked-files`,
options: {
ignoreFileExtensions: [`md`],
},
},
] ]
} }
}, },

View File

@ -1,447 +1,416 @@
module.exports = [ module.exports = [
/******* main content *********/ /******* main content *********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4`,
remote: `https://github.com/silverstripe/silverstripe-userhelp-content.git`,
branch: `4`,
patterns: `docs/en/**`
}
},
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3`,
remote: `https://github.com/silverstripe/silverstripe-userhelp-content.git`,
branch: `3`,
patterns: `docs/en/**`
}
},
/******* [FORK] versionedfiles ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/versionedfiles`,
//remote: `https://github.com/silverstripe-australia/silverstripe-versionedfiles`,
remote: `https://github.com/silverstripe/silverstripe-versionedfiles`,
// branch: `master`,
branch: `pulls/master/new-docs`,
patterns: `docs/en/userguide/**`
}
},
/******* [FORK] advancedworkflow ********/
// v3
{
// Running a fork. Switch remote back once merged.
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/setting_up_advancedworkflow`,
//remote: `https://github.com/symbiote/silverstripe-advancedworkflow`,
//branch: `4`,
remote: `https://github.com/silverstripe/silverstripe-advancedworkflow`,
branch: `pulls/4/new-docs`,
patterns: `docs/en/userguide/**`
}
},
// v4 // v4
{ {
resolve: `gatsby-source-git`, resolve: `gatsby-source-git`,
options: { options: {
name: `user--4`, name: `user--4--optional_features/setting_up_advancedworkflow`,
remote: `https://github.com/silverstripe/silverstripe-userhelp-content.git`, // remote: `https://github.com/symbiote/silverstripe-advancedworkflow`,
//branch: `4`, // branch: `master`,
branch: `pulls/4/new-docs`, remote: `https://github.com/silverstripe/silverstripe-advancedworkflow`,
patterns: `docs/en/**` branch: `pulls/master/new-docs`,
} patterns: `docs/en/userguide/**`
}
}, },
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3`,
remote: `https://github.com/silverstripe/silverstripe-userhelp-content.git`,
//branch: `3`,
branch: `pulls/3/new-docs`,
patterns: `docs/en/**`
}
},
/******* versionedfiles ********/ /******* registry ********/
// v3 // v3
{ {
// Running a fork. Switch remote back once merged. resolve: `gatsby-source-git`,
resolve: `gatsby-source-git`, options: {
options: { name: `user--3--optional_features/online_databases_and_registries`,
name: `user--3--optional_features/versionedfiles`, remote: `https://github.com/silverstripe/silverstripe-registry`,
//remote: `https://github.com/silverstripe-australia/silverstripe-versionedfiles`, branch: `1.0`,
remote: `https://github.com/silverstripe/silverstripe-versionedfiles`, patterns: `docs/en/userguide/**`
// branch: `master`, }
branch: `pulls/master/new-docs`, },
patterns: `docs/en/userguide/**`
} // v4
}, {
resolve: `gatsby-source-git`,
/******* advancedworkflow ********/ options: {
name: `user--4--optional_features/online_databases_and_registries`,
remote: `https://github.com/silverstripe/silverstripe-registry`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* [FORK] forum ********/
// v3 // v3
{ {
// Running a fork. Switch remote back once merged. // Fork. Remove once PR is merged.
resolve: `gatsby-source-git`, resolve: `gatsby-source-git`,
options: { options: {
name: `user--3--optional_features/setting_up_advancedworkflow`, name: `user--3--optional_features/forums`,
//remote: `https://github.com/symbiote/silverstripe-advancedworkflow`, remote: `https://github.com/unclecheese/silverstripe-forum`,
//branch: `4`, //branch: `0.8`,
remote: `https://github.com/silverstripe/silverstripe-advancedworkflow`, branch: `pulls/0.8/new-docs`,
branch: `pulls/4/new-docs`, patterns: `docs/en/userguide/**`
patterns: `docs/en/userguide/**` }
} },
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/setting_up_advancedworkflow`,
// remote: `https://github.com/symbiote/silverstripe-advancedworkflow`,
// branch: `master`,
remote: `https://github.com/silverstripe/silverstripe-advancedworkflow`,
branch: `pulls/master/new-docs`,
patterns: `docs/en/userguide/**`
}
},
/******* registry ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/online_databases_and_registries`,
remote: `https://github.com/silverstripe/silverstripe-registry`,
//branch: `1.0`,
branch: `pulls/1.0/new-docs`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/online_databases_and_registries`,
remote: `https://github.com/silverstripe/silverstripe-registry`,
// branch: `master`,
branch: `pulls/master/new-docs`,
patterns: `docs/en/userguide/**`
}
},
/******* forum ********/
// v3
{
// Fork. Remove once PR is merged.
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/forums`,
remote: `https://github.com/unclecheese/silverstripe-forum`,
//branch: `0.8`,
branch: `pulls/0.8/new-docs`,
patterns: `docs/en/userguide/**`
}
},
/******* contentreview ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/content_review`,
remote: `https://github.com/silverstripe/silverstripe-contentreview`,
// branch: `master`,
branch: `pulls/master/new-docs`,
patterns: `docs/en/userguide/**`
}
},
/******* blog ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/blogs`,
remote: `https://github.com/silverstripe/silverstripe-blog`,
//branch: `2`,
branch: `pulls/2/new-docs`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/blogs`,
remote: `https://github.com/silverstripe/silverstripe-blog`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* userforms ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/forms`,
remote: `https://github.com/silverstripe/silverstripe-userforms`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* translatable ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/working_with_translations`,
remote: `https://github.com/silverstripe/silverstripe-translatable`,
//branch: `2.1`,
branch: `pulls/2.1/new-docs`,
patterns: `docs/en/userguide/**`
}
},
/******* subsites ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/working_with_multiple_websites`,
remote: `https://github.com/silverstripe/silverstripe-subsites`,
//branch: `1.1`,
branch: `pulls/1.1/new-docs`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/working_with_multiple_websites`,
remote: `https://github.com/silverstripe/silverstripe-subsites`,
//branch: `1.1`,
branch: `pulls/1.1/new-docs`,
patterns: `docs/en/userguide/**`
}
},
/******* secureassets ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/securing_files`,
remote: `https://github.com/silverstripe/silverstripe-secureassets`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* taxonomy ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/taxonomies`,
remote: `https://github.com/silverstripe/silverstripe-taxonomy`,
branch: `pulls/1/new-docs`,
// branch: `1`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/taxonomies`,
remote: `https://github.com/silverstripe/silverstripe-taxonomy`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* iframe ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/iframe`,
remote: `https://github.com/silverstripe/silverstripe-iframe`,
//branch: `1.0`,
branch: `pulls/1.0/new-docs`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/iframe`,
remote: `https://github.com/silverstripe/silverstripe-iframe`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* versionfeed ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/site_wide_rss_feeds`,
remote: `https://github.com/silverstripe/silverstripe-versionfeed`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/site_wide_rss_feeds`,
remote: `https://github.com/silverstripe/silverstripe-versionfeed`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* dms ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/document_management_system`,
remote: `https://github.com/silverstripe/silverstripe-dms`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* elemental ********/
// v4
{
// Fork. Replace when PR is merged.
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/content_blocks`,
remote: `https://github.com/dnadesign/silverstripe-elemental`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* maintenance ********/
// v4
{
// Fork. Replace when PR is merged.
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/modules_report`,
//remote: `https://github.com/bringyourownideas/silverstripe-maintenance`,
remote: `https://github.com/silverstripe/silverstripe-maintenance`,
branch: `pulls/1/new-docs`,
// branch: `1`,
patterns: `docs/en/userguide/**`
}
},
/******* sharedraftcontent ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/share_draft_content`,
remote: `https://github.com/silverstripe/silverstripe-sharedraftcontent`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* documentconverter ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/document_converter`,
remote: `https://github.com/silverstripe/silverstripe-documentconverter`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* ckan-registry ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/ckan_registry`,
remote: `https://github.com/silverstripe/silverstripe-ckan-registry`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* mfa ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/multi-factor_authentication`,
remote: `https://github.com/silverstripe/silverstripe-mfa`,
branch: `pulls/master/new-docs`,
// branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******** securityreport ********/ /******* contentreview ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--managing_your_website/reports/security_report`,
remote: `https://github.com/silverstripe/silverstripe-securityreport`,
branch: `pulls/master/new-docs`,
//branch: `master`,
patterns: `docs/en/userguide/**`,
}
},
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--managing_your_website/reports/security_report`,
remote: `https://github.com/silverstripe/silverstripe-securityreport`,
branch: `pulls/master/new-docs`,
//branch: `master`,
patterns: `docs/en/userguide/**`,
}
},
/******** sitewide-content-report ********/
// v4 // v4
{ {
resolve: `gatsby-source-git`, resolve: `gatsby-source-git`,
options: { options: {
name: `user--4--managing_your_website/reports/sitewide_content_report`, name: `user--4--optional_features/content_review`,
remote: `https://github.com/silverstripe/silverstripe-sitewidecontent-report`, remote: `https://github.com/silverstripe/silverstripe-contentreview`,
branch: `pulls/master/new-docs`, branch: `master`,
//branch: `master`, patterns: `docs/en/userguide/**`
patterns: `docs/en/userguide/**`, }
} },
},
// v3 /******* blog ********/
{
resolve: `gatsby-source-git`, // v3
options: { {
name: `user--3--managing_your_website/reports/sitewide_content_report`, resolve: `gatsby-source-git`,
remote: `https://github.com/silverstripe/silverstripe-sitewidecontent-report`, options: {
branch: `pulls/2.0/new-docs`, name: `user--3--optional_features/blogs`,
//branch: `2.0`, remote: `https://github.com/silverstripe/silverstripe-blog`,
patterns: `docs/en/userguide/**`, branch: `2`,
} patterns: `docs/en/userguide/**`
}, }
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/blogs`,
remote: `https://github.com/silverstripe/silverstripe-blog`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* userforms ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/forms`,
remote: `https://github.com/silverstripe/silverstripe-userforms`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* translatable ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/working_with_translations`,
remote: `https://github.com/silverstripe/silverstripe-translatable`,
branch: `2.1`,
patterns: `docs/en/userguide/**`
}
},
/******* subsites ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/working_with_multiple_websites`,
remote: `https://github.com/silverstripe/silverstripe-subsites`,
branch: `1.1`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/working_with_multiple_websites`,
remote: `https://github.com/silverstripe/silverstripe-subsites`,
branch: `1.1`,
patterns: `docs/en/userguide/**`
}
},
/******* secureassets ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/securing_files`,
remote: `https://github.com/silverstripe/silverstripe-secureassets`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* taxonomy ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/taxonomies`,
remote: `https://github.com/silverstripe/silverstripe-taxonomy`,
branch: `1`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/taxonomies`,
remote: `https://github.com/silverstripe/silverstripe-taxonomy`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* iframe ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/iframe`,
remote: `https://github.com/silverstripe/silverstripe-iframe`,
branch: `1.0`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/iframe`,
remote: `https://github.com/silverstripe/silverstripe-iframe`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* versionfeed ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/site_wide_rss_feeds`,
remote: `https://github.com/silverstripe/silverstripe-versionfeed`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/site_wide_rss_feeds`,
remote: `https://github.com/silverstripe/silverstripe-versionfeed`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* dms ********/
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--optional_features/document_management_system`,
remote: `https://github.com/silverstripe/silverstripe-dms`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* elemental ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/content_blocks`,
remote: `https://github.com/dnadesign/silverstripe-elemental`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* [FORK] maintenance ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/modules_report`,
//remote: `https://github.com/bringyourownideas/silverstripe-maintenance`,
remote: `https://github.com/silverstripe/silverstripe-maintenance`,
branch: `pulls/1/new-docs`,
// branch: `1`,
patterns: `docs/en/userguide/**`
}
},
/******* sharedraftcontent ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/share_draft_content`,
remote: `https://github.com/silverstripe/silverstripe-sharedraftcontent`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* documentconverter ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/document_converter`,
remote: `https://github.com/silverstripe/silverstripe-documentconverter`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* ckan-registry ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/ckan_registry`,
remote: `https://github.com/silverstripe/silverstripe-ckan-registry`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******* mfa ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--optional_features/multi-factor_authentication`,
remote: `https://github.com/silverstripe/silverstripe-mfa`,
branch: `master`,
patterns: `docs/en/userguide/**`
}
},
/******** securityreport ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--managing_your_website/reports/security_report`,
remote: `https://github.com/silverstripe/silverstripe-securityreport`,
branch: `master`,
patterns: `docs/en/userguide/**`,
}
},
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--managing_your_website/reports/security_report`,
remote: `https://github.com/silverstripe/silverstripe-securityreport`,
branch: `master`,
patterns: `docs/en/userguide/**`,
}
},
/******** sitewide-content-report ********/
// v4
{
resolve: `gatsby-source-git`,
options: {
name: `user--4--managing_your_website/reports/sitewide_content_report`,
remote: `https://github.com/silverstripe/silverstripe-sitewidecontent-report`,
branch: `master`,
patterns: `docs/en/userguide/**`,
}
},
// v3
{
resolve: `gatsby-source-git`,
options: {
name: `user--3--managing_your_website/reports/sitewide_content_report`,
remote: `https://github.com/silverstripe/silverstripe-sitewidecontent-report`,
branch: `2.0`,
patterns: `docs/en/userguide/**`,
}
},
]; ];

View File

@ -46,7 +46,7 @@ const ChildrenOf: StatelessComponent<ChildrenOfProps> = ({ folderName, exclude,
var nodes: SilverstripeDocument[] = []; var nodes: SilverstripeDocument[] = [];
if (!folderName && !exclude && !only) { if (!folderName && !exclude && !only) {
nodes = currentNode.isIndex ? getChildren(currentNode, false) : getSiblings(currentNode) nodes = currentNode.isIndex ? getChildren(currentNode, includeFolders) : getSiblings(currentNode)
} else if (folderName) { } else if (folderName) {
const targetFolder = getChildren(currentNode, true).find( const targetFolder = getChildren(currentNode, true).find(