fix(typescript): path validation issue in validatePaths function #1800
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
Current code allows paths that are below the 'file' option but not nested directories. For example if file option is set to "C:/examplelib/output" then "C:/examplelib" is fine while "C:/examplelib/output/decl" is not. The order change in this commit fixes this issue introduced in 12.1.1.
shellscape
changed the title
|
Thanks for the PR. Looks like you've got some test failures in Windows. |
shellscape
reviewed
Oct 23, 2024
| } else if(dirProperty === 'outDir') { | ||
| const fromTsDirToRollup = relative(compilerOptions[dirProperty],outputDir); | ||
| if (fromTsDirToRollup.startsWith('..')) { | ||
| context.error(`@rollup/plugin-typescript: Path of Typescript compiler option '${dirProperty}' must be located inside the same directory as the Rollup 'file' option.`); |
There was a problem hiding this comment.
since we've added a new condition here, please add a test where there is an error produced. that will help prevent regressions in the future.
|
@JaCraig are you running tests locally before pushing? |
shellscape
approved these changes
Oct 23, 2024
|
Code can be shortened to } else {
let fromTsDirToRollup;
if (dirProperty === 'outDir') {
fromTsDirToRollup = relative(compilerOptions[dirProperty]!, outputDir);
} else {
fromTsDirToRollup = relative(outputDir, compilerOptions[dirProperty]!);
}
if (fromTsDirToRollup.startsWith('..')) {
context.error(
`@rollup/plugin-typescript: Path of Typescript compiler option '${dirProperty}' must be located inside the same directory as the Rollup 'file' option.`
);
}
} |
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.
Rollup Plugin Name:
@rollup/plugin-typescriptThis PR contains:
Are tests included?
Breaking Changes?
If yes, then include "BREAKING CHANGES:" in the first commit message body, followed by a description of what is breaking.
List any relevant issue numbers:
resolves #1790
Description
In the @rollup/plugin-typescript plugin, current code allows paths that are below the 'file' option but not nested directories. For example if file option is set to "C:/examplelib/output" directory, then "C:/examplelib" is fine while "C:/examplelib/output/decl" is not. The order change in this commit fixes this issue introduced in 12.1.1.