Update skuba managed sections when merging ignore files #58
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset is good to goLatest commit: cb7a8cb We got this. Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
72636c
reviewed
Jun 16, 2020
72636c
reviewed
Jun 16, 2020
72636c
reviewed
Jun 16, 2020
| (line) => !templateSet.has(line), | ||
| const replacedSkubaSection = inputFile?.replace( | ||
| /# managed by skuba[\s\S]*# end managed by skuba/, | ||
| '', |
There was a problem hiding this comment.
Can we do the replacement inline here?
How about inverting this to be more like:
if (typeof inputFile === 'undefined') {
return templateFile;
}
return inputFile.replace('...', templateFile);You could even one-liner it, but we might add some extra hacks in here later to make the migration less jarring.
72636c
reviewed
Jun 16, 2020
Co-authored-by: Ryan Ling <ryan@outlook.com.au>
72636c
approved these changes
Jun 16, 2020
Comment on lines
8
to
15
| if (inputFile.includes('# managed by skuba')) { | ||
| const replacedSkubaSection = inputFile.replace( | ||
| /# managed by skuba[\s\S]*# end managed by skuba/, | ||
| templateFile, | ||
| ); | ||
|
|
||
| const inputLines = splitIntoSanitisedLines(inputFile ?? '').filter( | ||
| (line) => !templateSet.has(line), | ||
| ); | ||
| return `${replacedSkubaSection}`; | ||
| } |
There was a problem hiding this comment.
What do you think about:
const replacedFile = inputFile.replace(/.../, templateFile);
if (replacedFile.includes(templateFile)) {
return replacedFile;
}It's probably overly-paranoid, but it avoids mismatches between the .replace pattern and .includes string
Co-authored-by: Ryan Ling <ryan@outlook.com.au>
72636c
added a commit
that referenced
this pull request
Jun 22, 2020
This should leave repos migrated from `seek-module-toolkit` and pre-#58 ignore files in a better state instead of littering old patterns everywhere.
72636c
added a commit
that referenced
this pull request
Jun 22, 2020
This should leave repos migrated from `seek-module-toolkit` and pre-#58 ignore files in a better state instead of littering old patterns everywhere.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added skuba managed section to ignore files in the base template. So,
skuba configurecan update those sections without overwriting any existing files.