@toptal/davinci-monorepo 12.0.2-alpha-top-support-npm-7e29d4f4.5 → 12.0.2-alpha-top-support-npm-62a0d26c.7

package/bin/davinci-monorepo.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import cliEngine from '@toptal/davinci-cli-shared'
+
 import { commands } from '../src/index.js'
 
 cliEngine.loadCommands(commands, 'davinci-monorepo')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-monorepo",
-  "version": "12.0.2-alpha-top-support-npm-7e29d4f4.5+7e29d4f4",
+  "version": "12.0.2-alpha-top-support-npm-62a0d26c.7+62a0d26c",
   "keywords": [
     "lint"
   ],
@@ -25,9 +25,10 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' yarn jest"
   },
   "dependencies": {
+    "@manypkg/find-root": "^3.0.0",
     "@nodelib/fs.walk": "^1.2.6",
     "@oclif/core": "^1.16.1",
-    "@toptal/davinci-cli-shared": "2.5.2-alpha-top-support-npm-7e29d4f4.53+7e29d4f4",
+    "@toptal/davinci-cli-shared": "2.5.2-alpha-top-support-npm-62a0d26c.55+62a0d26c",
     "chalk": "^4.1.2",
     "codeowners": "5.1.1",
     "dependency-cruiser": "^16.3.0",
@@ -51,5 +52,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7e29d4f4d372103ff0ca43382fc4a137b0a9df91"
+  "gitHead": "62a0d26c9f0d3e74903894448f28902f7d476686"
 }

package/src/commands/codeowners/services/async-codeowners-import/async-codeowners-import.js

@@ -1,4 +1,4 @@
-import getWorkspaceRoot from 'find-yarn-workspace-root'
+import { findWorkspaceRoot as getWorkspaceRoot } from '../../../../utils/find-workspace-root.js'
 
 /**
  * @param {string} cwd

package/src/commands/coverage-command/create-group-coverage-by-codeowners-command.js

@@ -1,9 +1,9 @@
 import path from 'path'
 import { print } from '@toptal/davinci-cli-shared'
-import getWorkspaceRoot from 'find-yarn-workspace-root'
 import { readFile, writeFile } from 'fs/promises'
 import { existsSync } from 'fs'
 
+import { findWorkspaceRoot as getWorkspaceRoot } from '../../utils/find-workspace-root.js'
 import { CYPRESS_COVERAGE_PATH, JEST_COVERAGE_PATH } from './config.js'
 import { sanitizeTeamName } from './services/sanitize-team-name/sanitize-team-name.js'
 import { getUniqueTeams } from './services/get-unique-teams/get-unique-teams.js'

package/src/index.js

@@ -7,11 +7,17 @@ import { hostsCommandFactory } from './commands/hosts/index.js'
 import { createUpdatePicassoCommand } from './commands/update-picasso.js'
 import checkIfMonorepo from './utils/check-if-monorepo.js'
 import { getPackages, getPackagesLocations } from './utils/get-packages.js'
+import {
+  findWorkspaceRoot,
+  getWorkspaceRoot,
+} from './utils/find-workspace-root.js'
 
 export const utils = {
   checkIfMonorepo,
   getPackages,
   getPackagesLocations,
+  findWorkspaceRoot,
+  getWorkspaceRoot,
 }
 
 export const commands = [

package/src/utils/find-workspace-root.js

@@ -0,0 +1,26 @@
+import { findRootSync } from '@manypkg/find-root'
+
+/**
+ * Find the root directory of a workspace/monorepo.
+ * Works with any package manager: yarn, npm, pnpm, lerna, rush.
+ *
+ * @param {string} [cwd=process.cwd()] - The directory to start searching from
+ * @returns {string|null} - The absolute path to workspace root or null if not in a workspace
+ */
+export const findWorkspaceRoot = (cwd = process.cwd()) => {
+  try {
+    const result = findRootSync(cwd)
+
+    return result.rootDir
+  } catch {
+    // If not in a workspace, return null (same behavior as find-yarn-workspace-root)
+    return null
+  }
+}
+
+/**
+ * @deprecated Use findWorkspaceRoot instead
+ */
+export const getWorkspaceRoot = findWorkspaceRoot
+
+export default findWorkspaceRoot

package/src/utils/find-workspace-root.test.js

@@ -0,0 +1,34 @@
+import { describe, it, expect } from '@jest/globals'
+import path from 'path'
+import { fileURLToPath } from 'url'
+
+import { findWorkspaceRoot, getWorkspaceRoot } from './find-workspace-root.js'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
+describe('findWorkspaceRoot', () => {
+  it('should find workspace root', () => {
+    const root = findWorkspaceRoot()
+
+    // Should return a path (not null) since we're running from a workspace
+    expect(root).toBeTruthy()
+    expect(typeof root).toBe('string')
+
+    // Should be absolute path
+    expect(root.startsWith('/')).toBe(true)
+  })
+
+  it('should work with getWorkspaceRoot alias', () => {
+    const root1 = findWorkspaceRoot()
+    const root2 = getWorkspaceRoot()
+
+    expect(root1).toBe(root2)
+  })
+
+  it('should return same result for different starting directories', () => {
+    const rootFromCwd = findWorkspaceRoot()
+    const rootFromPackage = findWorkspaceRoot(__dirname)
+
+    expect(rootFromCwd).toBe(rootFromPackage)
+  })
+})

package/src/utils/get-changed-files.js

@@ -1,9 +1,9 @@
-import getWorkspaceRoot from 'find-yarn-workspace-root'
 import { execSync } from 'child_process'
 
+import { findWorkspaceRoot } from './find-workspace-root.js'
 import logger from './logger.js'
 
-const workspaceRoot = getWorkspaceRoot()
+const workspaceRoot = findWorkspaceRoot()
 
 const hasStashedChanges = () => {
   try {