Skip to content

Handle proper fallbacks in config #5658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobinMalfait merged 11 commits into from
Oct 1, 2021
Merged

Handle proper fallbacks in config #5658

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
619c481
immediately take the `safelist` values into account
RobinMalfait Sep 30, 2021
4a69480
drop the dot from the extension
RobinMalfait Sep 30, 2021
32164ba
normalize the configuration
RobinMalfait Sep 30, 2021
33bd557
make shared cache local per extractor
RobinMalfait Sep 30, 2021
c457a71
ensure we always have an `extension`
RobinMalfait Sep 30, 2021
577fb12
splitup custom-extractors test
RobinMalfait Sep 30, 2021
e651dc3
update old config structure to new structure
RobinMalfait Oct 1, 2021
4680dcc
ensure we validate the "old" structure, and warn if invalid
RobinMalfait Oct 1, 2021
bbd55f4
add tests with "old" config, to ensure it keeps working
RobinMalfait Oct 1, 2021
3cae4f9
add missing `content` object
RobinMalfait Oct 1, 2021
e22e46a
inline unnecessary function abstraction
RobinMalfait Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
inline unnecessary function abstraction
  • Loading branch information
@RobinMalfait
RobinMalfait committed Oct 1, 2021
commit e22e46a1594e3059699a202e6f3d3bb467c1c4ac
8 changes: 2 additions & 6 deletions src/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,12 +436,8 @@ async function build() {
return resolvedConfig
}

function extractContent(config) {
return config.content.files
}

function extractFileGlobs(config) {
return extractContent(config)
return config.content.files
.filter((file) => {
// Strings in this case are files / globs. If it is something else,
// like an object it's probably a raw content object. But this object
Expand All @@ -452,7 +448,7 @@ async function build() {
}

function extractRawContent(config) {
return extractContent(config).filter((file) => {
return config.content.files.filter((file) => {
return typeof file === 'object' && file !== null
})
}
Expand Down