@toptal/davinci-monorepo 8.3.8-alpha-fx-5435-monorepo-commands-0774222d.6 → 8.5.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @toptal/davinci-monorepo
 
+## 8.5.0
+
+### Minor Changes
+
+- [#2416](https://github.com/toptal/davinci/pull/2416) [`9518893e`](https://github.com/toptal/davinci/commit/9518893ec55a03736bbaa4ec49b8dea2e6d1f46f) Thanks [@dmaklygin](https://github.com/dmaklygin)!
+- add hosts command to davinci-monorepo package. Try it out with `yarn davinci-monorepo hosts`
+
+## 8.4.0
+
+### Minor Changes
+
+- [#2412](https://github.com/toptal/davinci/pull/2412) [`e0df16d2`](https://github.com/toptal/davinci/commit/e0df16d2e60c2ccd302059ff28f6311af488719f) Thanks [@sashuk](https://github.com/sashuk)!
+- check if nx build system exists
+
 ## 8.3.7
 
 ### Patch Changes

package/docs/hosts.md

@@ -2,18 +2,18 @@
 
 The `host` functions are used to get information about hosts in the monorepo.
 
-## Specified Hosts Command
+## Filter Valid Hosts Command
 
-This command is used to identify and validate specified hosts from the input.
+This command is used to identify and validate hosts from the input.
 
 ### Description
 
-The `davinci-monorepo specified` command processes an input string to determine existing hosts. It checks the input for valid host names, filters the corresponding packages, and outputs the result either to the console or GitHub.
+The `davinci-monorepo hosts filter-valid-hosts` command processes an input string to determine existing hosts. It checks the input for valid host names, filters the corresponding packages, and outputs the result either to the console or GitHub.
 
 ### Usage
 
 ```shell
-davinci-monorepo hosts specified --hosts="@toptal/test-1-host @toptal/test-2-host"
+davinci-monorepo hosts filter-valid-hosts --hosts="@toptal/test-1-host @toptal/test-2-host"
 ```
 
 ### Options
@@ -43,7 +43,7 @@ davinci-monorepo hosts specified --hosts="@toptal/test-1-host @toptal/test-2-hos
 #### Example 1: Specifying Hosts and Output to Console
 
 ```bash
-davinci-monorepo hosts specified --hosts "@toptal/test-1-host @toptal/test-2-host" --output console
+davinci-monorepo hosts filter-valid-hosts --hosts "@toptal/test-1-host @toptal/test-2-host" --output console
 ```
 
 #### Example 2: Using Environment Variables and Output to GitHub
@@ -52,7 +52,7 @@ davinci-monorepo hosts specified --hosts "@toptal/test-1-host @toptal/test-2-hos
 export HOSTS_SEQUENCE="@toptal/test-1-host @toptal/test-2-host"
 export NX_HEAD="abc1234"
 export NX_BASE="def5678"
-davinci-monorepo hosts specified --output github
+davinci-monorepo hosts filter-valid-hosts --output github
 ```
 
 ### Environment Variables

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-monorepo",
-  "version": "8.3.8-alpha-fx-5435-monorepo-commands-0774222d.6+0774222d",
+  "version": "8.5.0",
   "keywords": [
     "lint"
   ],
@@ -27,7 +27,7 @@
   "dependencies": {
     "@nodelib/fs.walk": "^1.2.6",
     "@oclif/core": "^1.16.1",
-    "@toptal/davinci-cli-shared": "2.5.1-alpha-fx-5435-monorepo-commands-0774222d.9+0774222d",
+    "@toptal/davinci-cli-shared": "^2.5.0",
     "chalk": "^4.1.2",
     "codeowners": "5.1.1",
     "dependency-cruiser": "^12.5.0",
@@ -49,6 +49,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "0774222ddf02b514f6737a7ce94b67ac4498b3ac"
+  }
 }

package/src/commands/hosts/{specified-hosts.js → filter-valid-hosts.js}

@@ -3,7 +3,7 @@ import { print } from '@toptal/davinci-cli-shared'
 import { getPackages } from '../../utils/get-packages.js'
 import { validateHost, writeToGithubOutput } from '../../utils/index.js'
 
-const specifiedHostsCommand = async ({
+const filterValidHostsCommand = async ({
   hosts,
   output,
   head,
@@ -61,11 +61,11 @@ const specifiedHostsCommand = async ({
   process.exit(0)
 }
 
-export const createSpecifiedHostsCommand = program => {
+export const createFilterValidHostsCommand = program => {
   return program
-    .createCommand('specified')
+    .createCommand('filter-valid-hosts')
     .description('Gets the input and determines existing hosts in the input')
-    .action(specifiedHostsCommand)
+    .action(filterValidHostsCommand)
     .option(
       '-h, --hosts [hosts]',
       'Input string to search for hosts in. By default, it is taken from the environment variable HOSTS_SEQUENCE'

package/src/commands/hosts/host-attributes.js

@@ -28,8 +28,14 @@ const hostAttributesCommand = ({ host, output, logLevel }) => {
 
   const hostName = getHostNameFromPackageName(packageName)
   const jenkinsTemployJobName = `${hostName}-temploy-helm-run`
-  const jenkinsStagingJobName = `${hostName}-portal-staging-deployment`
-  const deploybotName = `${hostName}-portal`
+  const jenkinsStagingJobName =
+    hostName === 'client-portal'
+      ? 'portal-staging-deployment'
+      : `${hostName}-portal-staging-deployment`
+  // In order to deploy to the portal, we need to replace the "host" with "portal"
+  // e.g. hire-global-client-host -> hire-global-client-portal
+  const deploybotName =
+    hostName === 'client-portal' ? 'portal' : `${hostName}-portal`
 
   const result = JSON.stringify({
     packageName,
@@ -37,6 +43,7 @@ const hostAttributesCommand = ({ host, output, logLevel }) => {
     jenkinsTemployJobName,
     jenkinsStagingJobName,
     deploybotName,
+    sentryProject: hostName,
   })
 
   switch (output) {

package/src/commands/hosts/index.js

@@ -1,10 +1,10 @@
-import { createSpecifiedHostsCommand } from './specified-hosts.js'
+import { createFilterValidHostsCommand } from './filter-valid-hosts.js'
 import { createHostAttributesCommand } from './host-attributes.js'
 
 export const hostsCommandFactory = program => {
   return program
     .createCommand('hosts')
-    .addCommand(createSpecifiedHostsCommand(program))
+    .addCommand(createFilterValidHostsCommand(program))
     .addCommand(createHostAttributesCommand(program))
 }
 

package/src/utils/check-if-monorepo.js

@@ -27,15 +27,18 @@ const isPNPMWorkspace = () => {
  */
 const checkIfMonorepo = () => {
   const lernaIsAvailable = yarnCommandExists('lerna --version')
+  const nxIsAvailable = yarnCommandExists('nx --version')
   const pnpmWorkspaceExists = isPNPMWorkspace()
   const yarnWorkspaceExists = yarnCommandExists('workspaces info')
   const workspacesExist = yarnWorkspaceExists || pnpmWorkspaceExists
   const isMonorepo =
-    (lernaIsAvailable && yarnWorkspaceExists) || pnpmWorkspaceExists
+    ((lernaIsAvailable || nxIsAvailable) && yarnWorkspaceExists) ||
+    pnpmWorkspaceExists
 
   return {
     isMonorepo,
     lernaIsAvailable,
+    nxIsAvailable,
     workspacesExist,
     pnpmWorkspaceExists,
   }

package/src/utils/check-if-monorepo.test.js

@@ -20,6 +20,20 @@ describe('checkIfMonorepo', () => {
     })
   })
 
+  describe('when project does not have `nx` installed', () => {
+    it('returns false for `nxIsAvailable`', () => {
+      execa.sync
+        .mockImplementation(() => true)
+        .mockImplementation(() => {
+          throw new Error('Cannot execute nx')
+        })
+      const { nxIsAvailable, isMonorepo } = checkIfMonorepo()
+
+      expect(nxIsAvailable).toBe(false)
+      expect(isMonorepo).toBe(false)
+    })
+  })
+
   describe('when project does not have workspaces configured', () => {
     afterEach(() => execa.sync.mockClear())
 
@@ -36,7 +50,16 @@ describe('checkIfMonorepo', () => {
 
   describe('when project has `lerna` installed and workspaces are configured', () => {
     it('returns true for `isMonorepo`', () => {
-      execa.sync.mockImplementation(() => true)
+      execa.sync.mockImplementation(() => true).mockImplementation(() => false)
+      const { isMonorepo } = checkIfMonorepo()
+
+      expect(isMonorepo).toBe(true)
+    })
+  })
+
+  describe('when project has `nx` installed and workspaces are configured', () => {
+    it('returns true for `isMonorepo`', () => {
+      execa.sync.mockImplementation(() => false).mockImplementation(() => true)
       const { isMonorepo } = checkIfMonorepo()
 
       expect(isMonorepo).toBe(true)