Merge branch 'main' into chrisbarber/get-project-team-bug

.changeset/fluffy-eggs-learn.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/yellow-eels-stare.md

@@ -0,0 +1,2 @@
+---
+---

examples/nextjs/package.json

@@ -9,9 +9,9 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "eslint": "8.41.0",
-    "eslint-config-next": "13.4.4",
-    "next": "13.4.4",
+    "eslint": "8.42.0",
+    "eslint-config-next": "13.4.5",
+    "next": "13.4.5",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   }

package.json

@@ -32,7 +32,7 @@
     "source-map-support": "0.5.12",
     "ts-eager": "2.0.2",
     "ts-jest": "29.1.0",
-    "turbo": "1.10.1",
+    "turbo": "1.10.3",
     "typescript": "4.9.5"
   },
   "scripts": {

packages/cli/src/util/link/repo.ts

@@ -275,7 +275,7 @@ export function findProjectsFromPath(
   path: string
 ): RepoProjectConfig[] {
   const normalizedPath = normalizePath(path);
-  return projects
+  const matches = projects
     .slice()
     .sort(sortByDirectory)
     .filter(project => {
@@ -288,14 +288,9 @@ export function findProjectsFromPath(
         normalizedPath.startsWith(`${project.directory}/`)
       );
     });
-}
-
-/**
- * TODO: remove
- */
-export function findProjectFromPath(
-  projects: RepoProjectConfig[],
-  path: string
-): RepoProjectConfig | undefined {
-  return findProjectsFromPath(projects, path)[0];
+  // If there are multiple matches, we only want the most relevant
+  // selections (with the deepest directory depth), so pick the first
+  // one and filter on those matches.
+  const firstMatch = matches[0];
+  return matches.filter(match => match.directory === firstMatch.directory);
 }

packages/cli/test/unit/util/link/repo.test.ts

@@ -1,7 +1,7 @@
 import { tmpdir } from 'node:os';
 import { join, sep } from 'node:path';
 import {
-  findProjectFromPath,
+  findProjectsFromPath,
   findRepoRoot,
   RepoProjectConfig,
   traverseUpDirectories,
@@ -57,35 +57,36 @@ describe('traverseUpDirectories()', () => {
   });
 });
 
-describe('findProjectFromPath()', () => {
+describe('findProjectsFromPath()', () => {
   const projects: RepoProjectConfig[] = [
     { id: 'root', name: 'r', directory: '.' },
     { id: 'site', name: 'a', directory: 'apps/site' },
     { id: 'site2', name: 'a', directory: 'apps/site2' },
     { id: 'other', name: 'b', directory: 'apps/other' },
+    { id: 'duplicate', name: 'd', directory: 'apps/other' },
     { id: 'nested', name: 'n', directory: 'apps/other/nested' },
   ];
 
   it.each([
-    { id: 'root', path: '.' },
-    { id: 'root', path: 'lib' },
-    { id: 'root', path: 'lib' },
-    { id: 'site', path: `apps${sep}site` },
-    { id: 'site', path: `apps${sep}site` },
-    { id: 'site', path: `apps${sep}site${sep}components` },
-    { id: 'site2', path: `apps${sep}site2` },
-    { id: 'site2', path: `apps${sep}site2${sep}inner` },
-    { id: 'other', path: `apps${sep}other` },
-    { id: 'other', path: `apps${sep}other${sep}lib` },
-    { id: 'nested', path: `apps${sep}other${sep}nested` },
-    { id: 'nested', path: `apps${sep}other${sep}nested${sep}foo` },
-  ])('should find Project "$id" for path "$path"', ({ path, id }) => {
-    const actual = findProjectFromPath(projects, path);
-    expect(actual?.id).toEqual(id);
+    { ids: ['root'], path: '.' },
+    { ids: ['root'], path: 'lib' },
+    { ids: ['root'], path: 'lib' },
+    { ids: ['site'], path: `apps${sep}site` },
+    { ids: ['site'], path: `apps${sep}site` },
+    { ids: ['site'], path: `apps${sep}site${sep}components` },
+    { ids: ['site2'], path: `apps${sep}site2` },
+    { ids: ['site2'], path: `apps${sep}site2${sep}inner` },
+    { ids: ['other', 'duplicate'], path: `apps${sep}other` },
+    { ids: ['other', 'duplicate'], path: `apps${sep}other${sep}lib` },
+    { ids: ['nested'], path: `apps${sep}other${sep}nested` },
+    { ids: ['nested'], path: `apps${sep}other${sep}nested${sep}foo` },
+  ])('should find Project "$id" for path "$path"', ({ path, ids }) => {
+    const actual = findProjectsFromPath(projects, path);
+    expect(actual.map(a => a.id)).toEqual(ids);
   });
 
-  it('should return `undefined` when there are no matching Projects', () => {
-    const actual = findProjectFromPath([projects[1]], '.');
-    expect(actual).toBeUndefined();
+  it('should return empty array when there are no matching Projects', () => {
+    const actual = findProjectsFromPath([projects[1]], '.');
+    expect(actual).toHaveLength(0);
   });
 });