Skip to content

fix: relative path pattern in workspace globs #5763

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
merged 2 commits into from
Jul 11, 2024
Merged

fix: relative path pattern in workspace globs #5763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e4c617
fix: relative path pattern in workspace globs
Jul 11, 2024
343174e
Merge branch 'main' into fix/relative-path-pattern-in-workspace-defin…
Jul 11, 2024
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
18 changes: 18 additions & 0 deletions packages/build-info/src/workspaces/get-workspace-packages.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,21 @@ test('should map the project paths correctly', async ({ fs }) => {
{ path: join('apps/deep/deeper/f'), name: undefined },
])
})

test('should match deep packages with a globstar expression and a leading ./', async ({ fs }) => {
const cwd = mockFileSystem(
{
'package.json': '{}',
'apps/other/hello.txt': '',
'apps/deep/a/package.json': '{}',
'apps/deep/b/package.json': JSON.stringify({ name: 'b' }),
'apps/deep/c/package.json': JSON.stringify({ name: 'c' }),
'apps/deep/d/no-package': '{}',
},
'test',
)
expect(await getWorkspacePackages(new Project(fs, cwd), ['./apps/deep/**', '!./apps/deep/a'])).toMatchObject([
{ path: join('apps/deep/b'), name: 'b' },
{ path: join('apps/deep/c'), name: 'c' },
])
})
6 changes: 4 additions & 2 deletions packages/build-info/src/workspaces/get-workspace-packages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ export async function getWorkspacePackages(project: Project, patterns: string[]
const results = (
await Promise.all(
patterns.map((pattern) => {
const matcher = new Minimatch(pattern)
const cleanedPattern = pattern.replace(/^!?(\.\/)/, (match, p1) => match.replace(p1, ''))
Copy link
Member

@serhalp serhalp Jul 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe leave a comment here explaining why this is needed?

Copy link
Member

@serhalp serhalp Jul 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if anyone would ever want to use a path starting with ../? 🤔

Copy link
Contributor Author

@lukasholzer lukasholzer Jul 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As it's the root of the workspace I don't think it make any sense

const matcher = new Minimatch(cleanedPattern)
if (matcher.negate) {
return
}
Expand All @@ -118,7 +119,8 @@ export async function getWorkspacePackages(project: Project, patterns: string[]

for (const result of results) {
for (const pattern of patterns) {
const matcher = new Minimatch(pattern)
const cleanedPattern = pattern.replace(/^!?(\.\/)/, (match, p1) => match.replace(p1, ''))
const matcher = new Minimatch(cleanedPattern)
if (minimatch(result.path, matcher.pattern)) {
filtered.set(project.fs.join(result.path), result)
if (matcher.negate) {
Expand Down