@toptal/davinci-monorepo 8.5.2-alpha-fx-5804-prohibit-customization-of-davinci-graphql-codegen-tool-b6fc3f7c.33 → 8.5.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @toptal/davinci-monorepo
 
+## 8.5.2
+
+### Patch Changes
+
+- [#2475](https://github.com/toptal/davinci/pull/2475) [`7d8e3041`](https://github.com/toptal/davinci/commit/7d8e3041dc38fdaf2ab3996375d301472535c878) Thanks [@dmaklygin](https://github.com/dmaklygin)!
+- fix monorepo metrics command
+
 ## 8.5.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-monorepo",
-  "version": "8.5.2-alpha-fx-5804-prohibit-customization-of-davinci-graphql-codegen-tool-b6fc3f7c.33+b6fc3f7c",
+  "version": "8.5.2",
   "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-5804-prohibit-customization-of-davinci-graphql-codegen-tool-b6fc3f7c.61+b6fc3f7c",
+    "@toptal/davinci-cli-shared": "^2.5.0",
     "chalk": "^4.1.2",
     "codeowners": "5.1.1",
     "dependency-cruiser": "^16.3.0",
@@ -49,6 +49,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "b6fc3f7ce0ed642d1004ea9a5daa8a0a2d411564"
+  }
 }

package/src/commands/metrics.js

@@ -150,6 +150,7 @@ const metricsCommand = options => {
     }
   } else {
     console.log(output)
+    process.exit(0)
   }
 }
 

package/src/utils/get-lerna-graph.js

@@ -1,19 +1,23 @@
 import childProcessLib from 'child_process'
+import fs from 'fs'
 
 const lernaGraphCommand =
-  'yarn --silent --cwd=../.. lerna list --all --toposort --graph --loglevel silent'
+  'yarn --silent --cwd=../.. lerna list --all --toposort --graph --loglevel silent > lerna-output.json'
 
 /**
  * Generates and returns a graph of monorepo packages
  */
 export const createGetLernaGraph =
-  childProcess =>
+  () =>
   (options = {}) => {
     const { onlyLocalDependencies = false, excludedPackages = new Set() } =
       options
 
-    const lernaGraphCommandOutput = childProcess.execSync(lernaGraphCommand)
-    const packagesGraph = JSON.parse(lernaGraphCommandOutput.toString())
+    childProcessLib.execSync(lernaGraphCommand)
+    const lernaOutput = fs.readFileSync('lerna-output.json', 'utf8')
+
+    fs.unlinkSync('lerna-output.json')
+    const packagesGraph = JSON.parse(lernaOutput)
 
     excludedPackages.forEach(packageName => delete packagesGraph[packageName])
 

package/src/utils/get-lerna-graph.test.js

@@ -1,5 +1,6 @@
 import { jest } from '@jest/globals'
 import childProcess from 'child_process'
+import fs from 'fs'
 
 import { createGetLernaGraph } from './get-lerna-graph.js'
 
@@ -11,29 +12,38 @@ const graph = {
 }
 
 describe('getLernaGraph', () => {
-  let execSyncMock
+  let execSyncMock, readFileSyncMock, unlinkSync
 
   beforeEach(() => {
     execSyncMock = jest.spyOn(childProcess, 'execSync')
+    readFileSyncMock = jest.spyOn(fs, 'readFileSync')
+    unlinkSync = jest.spyOn(fs, 'unlinkSync')
   })
 
   afterEach(() => {
     execSyncMock.mockReset()
+    readFileSyncMock.mockReset()
+    unlinkSync.mockReset()
   })
 
   it('executes the command', () => {
-    execSyncMock.mockReturnValue(JSON.stringify(graph))
+    readFileSyncMock.mockReturnValue(JSON.stringify(graph))
 
     getLernaGraph()
 
     expect(execSyncMock).toHaveBeenCalledTimes(1)
     expect(execSyncMock).toHaveBeenCalledWith(
-      'yarn --silent --cwd=../.. lerna list --all --toposort --graph --loglevel silent'
+      'yarn --silent --cwd=../.. lerna list --all --toposort --graph --loglevel silent > lerna-output.json'
     )
+    expect(readFileSyncMock).toHaveBeenCalledTimes(1)
+    expect(readFileSyncMock).toHaveBeenCalledWith('lerna-output.json', 'utf8')
+
+    expect(unlinkSync).toHaveBeenCalledTimes(1)
+    expect(unlinkSync).toHaveBeenCalledWith('lerna-output.json')
   })
 
   it('returns a graph', () => {
-    execSyncMock.mockReturnValue(JSON.stringify(graph))
+    readFileSyncMock.mockReturnValue(JSON.stringify(graph))
 
     const result = getLernaGraph()
 
@@ -42,7 +52,7 @@ describe('getLernaGraph', () => {
 
   describe('when onlyLocalDependencies option is true', () => {
     it('returns graph with only internal dependencies', () => {
-      execSyncMock.mockReturnValue(JSON.stringify(graph))
+      readFileSyncMock.mockReturnValue(JSON.stringify(graph))
 
       const result = getLernaGraph({ onlyLocalDependencies: true })
 
@@ -52,7 +62,7 @@ describe('getLernaGraph', () => {
 
   describe('when there are some excluded packages', () => {
     it('returns graph without excluded packages', () => {
-      execSyncMock.mockReturnValue(
+      readFileSyncMock.mockReturnValue(
         JSON.stringify({
           package1: ['externalDependency1', 'package2'],
           package2: [