@toptal/davinci-engine 13.0.0 → 14.0.1-alpha-ff-79-27a22fcb.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Change Log
 
+## 14.0.0
+
+### Major Changes
+
+- [#2643](https://github.com/toptal/davinci/pull/2643) [`ab9666f`](https://github.com/toptal/davinci/commit/ab9666f999e7a610f6068e0145200257d8511b46) Thanks [@rocodesign](https://github.com/rocodesign)!
+  Migrate package manager from Yarn to pnpm
+  **WHAT (breaking change):**
+  - switch package manager from Yarn to pnpm across the entire Davinci monorepo
+  - add `pnpm-workspace.yaml`, `.npmrc`, and `packageManager` field for corepack support
+  - convert Yarn `resolutions` to `pnpm.overrides` in root `package.json`
+  - update lerna `npmClient` from `yarn` to `pnpm`
+  - replace `yarn` with `pnpm` in root scripts (postinstall, test, test:unit:update)
+  **HOW to update:**
+  - install pnpm (`corepack enable` or `npm install -g pnpm@10.6.1`)
+  - replace `yarn install` with `pnpm install` in local workflows
+  - replace `yarn <script>` with `pnpm <script>` when running commands
+
+### Patch Changes
+
+- Updated dependencies [[`ab9666f`](https://github.com/toptal/davinci/commit/ab9666f999e7a610f6068e0145200257d8511b46)]:
+  - @toptal/davinci-cli-shared@3.0.0
+  - @toptal/davinci-cloudflare-requests-handler@1.0.0
+  - @toptal/davinci-monorepo@13.0.0
+  - @toptal/davinci-workspace-root@2.0.0
+
 ## 13.0.0
 
 ### Major Changes

package/README.md

@@ -4,7 +4,7 @@ Starts and builds your project. Under the hood, it covers webpack with the defau
 
 ### Usage
 
-Use it by installing `yarn add @toptal/davinci-engine` in your project.
+Use it by installing `pnpm add @toptal/davinci-engine` in your project.
 
 #### Commands
 

package/docs/size.md

@@ -52,7 +52,7 @@ After running the size command, you will see one of the following outputs:
    ```json
    "scripts": {
        "build": "davinci-engine build",
-       "size": "yarn build && davinci-engine size --limit 500kb"
+       "size": "pnpm build && davinci-engine size --limit 500kb"
    }
    ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-engine",
-  "version": "13.0.0",
+  "version": "14.0.1-alpha-ff-79-27a22fcb.1+27a22fcb",
   "description": "Build tool for frontend projects",
   "author": "Toptal",
   "license": "SEE LICENSE IN LICENSE.MD",
@@ -19,7 +19,7 @@
     "CHANGELOG.md"
   ],
   "scripts": {
-    "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' yarn jest"
+    "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' pnpm jest"
   },
   "dependencies": {
     "@babel/cli": "^7.20.7",
@@ -43,10 +43,10 @@
     "@svgr/webpack": "^8.1.0",
     "@swc/core": "^1.13.5",
     "@swc/plugin-styled-components": "^9.1.0",
-    "@toptal/davinci-cli-shared": "^2.6.1",
-    "@toptal/davinci-cloudflare-requests-handler": "0.1.2",
-    "@toptal/davinci-monorepo": "^12.1.2",
-    "@toptal/davinci-workspace-root": "^1.0.1",
+    "@toptal/davinci-cli-shared": "^3.0.1-alpha-ff-79-27a22fcb.1+27a22fcb",
+    "@toptal/davinci-cloudflare-requests-handler": "^1.0.1-alpha-ff-79-27a22fcb.1+27a22fcb",
+    "@toptal/davinci-monorepo": "^13.0.1-alpha-ff-79-27a22fcb.1+27a22fcb",
+    "@toptal/davinci-workspace-root": "^2.0.1-alpha-ff-79-27a22fcb.1+27a22fcb",
     "autoprefixer": "^10.4.15",
     "babel-loader": "^8.2.3",
     "babel-plugin-graphql-tag": "^3.3.0",
@@ -69,6 +69,7 @@
     "graphql": "^16.8.1",
     "graphql-tag": "^2.12.4",
     "html-webpack-plugin": "^5.3.1",
+    "lerna": "^9.0.0",
     "lodash.throttle": "^4.1.1",
     "mini-css-extract-plugin": "^2.6.1",
     "open": "^8.3.0",
@@ -110,5 +111,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "27a22fcb012002a99ab87a4a996721e3ba8a92c4"
 }

package/src/commands/compile-package.js

@@ -1,4 +1,4 @@
-import { print, runSync, files } from '@toptal/davinci-cli-shared'
+import { print, runSync, files, resolveBin } from '@toptal/davinci-cli-shared'
 import path from 'path'
 import { replaceTscAliasPaths } from 'tsc-alias'
 import dotProp from 'dot-prop'
@@ -8,6 +8,9 @@ import { getEnvVariables } from '../utils/index.js'
 import { copyPackageJson } from '../utils/copy-package-json.js'
 import { copyFileIfExists } from '../utils/copy-file.js'
 import { DOTENV_NONE, DIST_PACKAGE_PATH } from '../constants.cjs'
+
+const babelBin = resolveBin('@babel/cli', import.meta.url, 'babel')
+
 const SOURCE_FOLDER_NAME = 'src'
 const PACKAGE_ENTRY_FILE = `./${SOURCE_FOLDER_NAME}/index.package.js`
 const DEFAULT_TSCONFIG_PATH = './tsconfig.json'
@@ -58,7 +61,7 @@ const emitTypeDeclarations = ({ tsConfigPath, outputDir }) => {
     SOURCE_FOLDER_NAME,
   ]
 
-  runSync('yarn', tscArgs)
+  runSync('pnpm', tscArgs)
   replaceTscAliasPaths({
     configFile: tsConfigPath,
   })
@@ -78,9 +81,8 @@ const transpileSourceCode = ({ outputDir, envVariables, babelConfigPath }) => {
   const pathsToIgnore = getPathsToIgnoreDuringTranspilation()
 
   runSync(
-    'yarn',
+    babelBin,
     [
-      'babel',
       path.resolve(SOURCE_FOLDER_NAME),
       '--config-file',
       babelConfigAbsolutePath,

package/src/commands/release-package.js

@@ -37,7 +37,7 @@ export const releasePackageCommand = async ({
   try {
     print.header('Building package')
     cliShared.runSync(
-      'yarn',
+      'pnpm',
       getCompilePackageCommand({
         babelConfig,
         entry,
@@ -46,7 +46,7 @@ export const releasePackageCommand = async ({
     )
     print.green('Releasing package...\n')
     cliShared.runSync(
-      'yarn',
+      'pnpm',
       getPublishPackageCommand({
         outputVersionFile,
         nonMonorepo,

package/src/commands/release-package.test.js

@@ -31,14 +31,14 @@ describe('createReleasePackageCommand', () => {
   it('compiles and releases a package with default options', () => {
     action({})
 
-    expect(runSync).toHaveBeenCalledWith('yarn', [
+    expect(runSync).toHaveBeenCalledWith('pnpm', [
       'davinci-engine',
       'compile-package',
       '--dotenv',
       'auto',
     ])
 
-    expect(runSync).toHaveBeenCalledWith('yarn', [
+    expect(runSync).toHaveBeenCalledWith('pnpm', [
       'davinci-engine',
       'publish-package',
     ])
@@ -55,7 +55,7 @@ describe('createReleasePackageCommand', () => {
       tsConfig,
     })
 
-    expect(runSync).toHaveBeenCalledWith('yarn', [
+    expect(runSync).toHaveBeenCalledWith('pnpm', [
       'davinci-engine',
       'compile-package',
       '--dotenv',
@@ -68,7 +68,7 @@ describe('createReleasePackageCommand', () => {
       tsConfig,
     ])
 
-    expect(runSync).toHaveBeenCalledWith('yarn', [
+    expect(runSync).toHaveBeenCalledWith('pnpm', [
       'davinci-engine',
       'publish-package',
     ])
@@ -77,7 +77,7 @@ describe('createReleasePackageCommand', () => {
   it('passes down --outputVersion to publish-package command', () => {
     action({ outputVersion: './.version' })
 
-    expect(runSync).toHaveBeenCalledWith('yarn', [
+    expect(runSync).toHaveBeenCalledWith('pnpm', [
       'davinci-engine',
       'publish-package',
       '--outputVersion',

package/src/commands/sentry-upload-sourcemaps.js

@@ -1,16 +1,14 @@
-import { print, runSync } from '@toptal/davinci-cli-shared'
+import { print, runSync, resolveBin } from '@toptal/davinci-cli-shared'
 
 import { paths } from '../configs/paths.js'
 import { resolveApp } from '../utils/paths-resolution.js'
 
+const sentryCliBin = resolveBin('@sentry/cli', import.meta.url, 'sentry-cli')
+
 const getReleaseName = () => {
-  const { stdout } = runSync(
-    'yarn',
-    ['--silent', 'sentry-cli', 'releases', 'propose-version'],
-    {
-      stdio: undefined,
-    }
-  )
+  const { stdout } = runSync(sentryCliBin, ['releases', 'propose-version'], {
+    stdio: undefined,
+  })
 
   return stdout
 }
@@ -20,22 +18,16 @@ const uploadSourceMaps = parameters => {
   const releaseName = parameters.releaseName || getReleaseName()
 
   print.yellow('Release name:', releaseName, '\n')
-  runSync('yarn', ['sentry-cli', 'releases', 'new', releaseName])
-  const args = [
-    'sentry-cli',
-    'releases',
-    'files',
-    releaseName,
-    'upload-sourcemaps',
-  ]
+  runSync(sentryCliBin, ['releases', 'new', releaseName])
+  const args = ['releases', 'files', releaseName, 'upload-sourcemaps']
 
   args.push(appBuildDirectory ? resolveApp(appBuildDirectory) : paths.appBuild)
 
   if (urlPrefix) {
     args.push('--url-prefix', urlPrefix)
   }
-  runSync('yarn', args)
-  runSync('yarn', ['sentry-cli', 'releases', 'finalize', releaseName])
+  runSync(sentryCliBin, args)
+  runSync(sentryCliBin, ['releases', 'finalize', releaseName])
 }
 const failureExitIfNoEnvVariable = variableName => {
   if (!process.env[variableName]) {

package/src/configs/paths.js

@@ -7,11 +7,12 @@ import { resolveApp, resolveExtension } from '../utils/paths-resolution.js'
 
 const getWorkspacePaths = () => {
   const workspaceRoot = workspace.getWorkspaceRoot()
+
   const paths = globby.sync(
     [
       'hosts/*',
-      'namespaces/**/apps/*',
-      'namespaces/**/libs/*',
+      'namespaces/*/apps/*',
+      'namespaces/*/libs/*',
       'apps/*',
       'libs/*',
       'packages/*',
@@ -19,6 +20,10 @@ const getWorkspacePaths = () => {
     {
       onlyDirectories: true,
       cwd: workspaceRoot,
+      expandDirectories: false,
+      followSymbolicLinks: false,
+      ignore: ['**/node_modules/**'],
+      gitignore: false,
     }
   )
 

package/src/configs/webpack-config/aliases.js

@@ -3,7 +3,7 @@ import { createRequire } from 'module'
 import path from 'path'
 import { resolveTsAliases } from 'resolve-ts-aliases'
 
-const appDirectory = fs.realpathSync(process.cwd())
+const appDirectory = process.cwd()
 const resolveApp = relativePath => path.resolve(appDirectory, relativePath)
 
 const prepareAliases = ({ isEnvDevelopment, enableReactRefresh }) => {
@@ -29,7 +29,7 @@ const prepareAliases = ({ isEnvDevelopment, enableReactRefresh }) => {
     const localRequire = createRequire(import.meta.url)
 
     Object.assign(aliases, {
-      // needed if you use yarn link
+      // needed if you use pnpm link
       'react-hot-loader/root': path.join(
         localRequire.resolve('react-hot-loader'),
         '../root'

package/src/configs/webpack-config/plugins/index.js

@@ -29,6 +29,7 @@ const getExcludedFolders = () => {
     '**/*.spec.*',
     '**/*.pact.*',
     '**/*.stories.*',
+    '**/*.cy.*',
     '**/src/setupProxy.*',
     '**/src/setupTests.*',
     '**/dist',

package/src/utils/paths-resolution.js

@@ -3,8 +3,8 @@ import path from 'path'
 
 import { MODULE_FILE_EXTENSIONS } from '../constants.cjs'
 
-export const resolveApp = (relativePath, fs = osFs) =>
-  path.resolve(fs.realpathSync(process.cwd()), relativePath)
+export const resolveApp = relativePath =>
+  path.resolve(process.cwd(), relativePath)
 
 const findExtension = (filePath, fs) => {
   const extension = MODULE_FILE_EXTENSIONS.find(ext =>

package/src/utils/paths-resolution.test.js

@@ -1,16 +1,14 @@
 import { jest } from '@jest/globals'
 import fs from 'fs'
+import path from 'path'
 
 import { resolveApp, resolveExtension } from './paths-resolution.js'
 
-const projectPath = '/project-folder'
-
 const existsSyncMock = jest.fn()
 
 const mockedFs = {
   ...fs,
   existsSync: existsSyncMock,
-  realpathSync: () => projectPath,
 }
 
 describe('paths resolution utils', () => {
@@ -18,9 +16,9 @@ describe('paths resolution utils', () => {
     it('should return absolute file path', () => {
       const filePath = './some-file'
 
-      const result = resolveApp(filePath, mockedFs)
+      const result = resolveApp(filePath)
 
-      expect(result).toBe('/project-folder/some-file')
+      expect(result).toBe(path.resolve(process.cwd(), filePath))
     })
   })
 

package/src/utils/publish-packages/publish-monorepo-packages.js

@@ -1,4 +1,4 @@
-import cliShared from '@toptal/davinci-cli-shared'
+import cliShared, { resolveBin } from '@toptal/davinci-cli-shared'
 
 import { paths } from '../../configs/paths.js'
 import {
@@ -94,8 +94,10 @@ const getMonorepoPublishLernaAlphaCommand = ({ branch, publishRootFolder }) => {
     publishRootFolder ??
     paths.appPackageBuild.slice(paths.appPackageBuild.lastIndexOf('/') + 1)
 
+  const lernaBin = resolveBin('lerna', import.meta.url)
+
   const options = [
-    'lerna',
+    lernaBin,
     'publish',
     '--canary',
     `--preid alpha-${normalizedBranchName}-${shortRef}`,

package/src/utils/publish-packages/publish-monorepo-packages.test.js

@@ -60,7 +60,7 @@ describe('publishMonorepoPackages', () => {
         // run a command
         expect(runSync).toHaveBeenCalledTimes(1)
         expect(runSync).toHaveBeenCalledWith(
-          `lerna publish --canary --preid alpha-${NORMALIZED_BRANCH_NAME}-${GIT_REF} --no-git-tag-version --exact --yes --contents ${publishRootFolder} --force-publish`,
+          expect.stringContaining(`publish --canary --preid alpha-${NORMALIZED_BRANCH_NAME}-${GIT_REF} --no-git-tag-version --exact --yes --contents ${publishRootFolder} --force-publish`),
           [],
           {
             shell: true,
@@ -86,7 +86,7 @@ describe('publishMonorepoPackages', () => {
         // run a command
         expect(runSync).toHaveBeenCalledTimes(1)
         expect(runSync).toHaveBeenCalledWith(
-          `lerna publish --canary --preid alpha-${NORMALIZED_BRANCH_NAME}-${GIT_REF} --no-git-tag-version --exact --yes --contents ${DIST_PACKAGE_PATH} --force-publish`,
+          expect.stringContaining(`publish --canary --preid alpha-${NORMALIZED_BRANCH_NAME}-${GIT_REF} --no-git-tag-version --exact --yes --contents ${DIST_PACKAGE_PATH} --force-publish`),
           [],
           {
             shell: true,
@@ -150,7 +150,7 @@ describe('publishMonorepoPackages', () => {
         // run a command
         expect(runSync).toHaveBeenCalledTimes(1)
         expect(runSync).toHaveBeenCalledWith(
-          `lerna publish --canary --preid alpha-${NORMALIZED_BRANCH_NAME}-${GIT_REF} --no-git-tag-version --exact --yes --contents ${DIST_PACKAGE_PATH} --force-publish`,
+          expect.stringContaining(`publish --canary --preid alpha-${NORMALIZED_BRANCH_NAME}-${GIT_REF} --no-git-tag-version --exact --yes --contents ${DIST_PACKAGE_PATH} --force-publish`),
           [],
           {
             shell: true,
@@ -184,7 +184,7 @@ describe('publishMonorepoPackages', () => {
         // run a command
         expect(runSync).toHaveBeenCalledTimes(1)
         expect(runSync).toHaveBeenCalledWith(
-          `lerna publish --canary --preid alpha-${NORMALIZED_BRANCH_NAME}-${GIT_REF} --no-git-tag-version --exact --yes --contents ${DIST_PACKAGE_PATH} --force-publish`,
+          expect.stringContaining(`publish --canary --preid alpha-${NORMALIZED_BRANCH_NAME}-${GIT_REF} --no-git-tag-version --exact --yes --contents ${DIST_PACKAGE_PATH} --force-publish`),
           [],
           {
             shell: true,