@teambit/dependencies 1.0.140 → 1.0.141

package/artifacts/__bit_junit.xml

@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-  <testsuite name="teambit.dependencies/dependencies@1.0.140" timestamp="2024-01-19T03:40:54.506Z" tests="37" failures="0" errors="0" skipped="0">
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/testing-library__jest-dom" time="0.353"/>
+  <testsuite name="teambit.dependencies/dependencies@1.0.141" timestamp="2024-01-20T03:38:40.885Z" tests="37" failures="0" errors="0" skipped="0">
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/testing-library__jest-dom" time="0.324"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/chai" time="0.001"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/mocha"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/classnames"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/cors" time="0.001"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/cross-spawn"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/dagre"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/didyoumean" time="0.001"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/eslint"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/dagre" time="0.001"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/didyoumean"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/eslint" time="0.001"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/express"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/find-cache-dir"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/find-root" time="0.001"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/history"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/http-proxy-agent" time="0.001"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/lodash"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/http-proxy-agent"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/lodash" time="0.001"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/lodash.compact"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/lodash.flatten" time="0.001"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/lodash.head"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/lodash.pick"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/lodash.flatten"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/lodash.head" time="0.041"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/lodash.pick" time="0.001"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/mdx-js__react"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/memoizee"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/mime" time="0.001"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/mousetrap"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/node" time="0.001"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/mime"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/mousetrap" time="0.001"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/node"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/puppeteer"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/react"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/react-dom" time="0.001"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/react-dom"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/react-router-dom"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/react-tabs"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/react-tooltip"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/socket.io-client"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/ua-parser-js"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/url-join"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/url-join" time="0.001"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/url-parse"/>
-    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/webpack" time="0.001"/>
+    <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/webpack"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/webpack-dev-server"/>
     <testcase classname="package-to-definetly-typed.spec.js" name="should map to @types/webpack-merge"/>
   </testsuite>

package/dependencies-loader/apply-overrides.ts

@@ -1,7 +1,6 @@
-import R from 'ramda';
 import path from 'path';
 import { ComponentID, ComponentIdList } from '@teambit/component-id';
-import { cloneDeep, uniq } from 'lodash';
+import { cloneDeep, difference, forEach, isEmpty, pick, pickBy, uniq } from 'lodash';
 import { IssuesList, IssuesClasses, MissingPackagesData } from '@teambit/component-issues';
 import { DEPENDENCIES_FIELDS, MANUALLY_REMOVE_DEPENDENCY } from '@teambit/legacy/dist/constants';
 import Component from '@teambit/legacy/dist/consumer/component/consumer-component';
@@ -135,7 +134,7 @@ export class ApplyOverrides {
     // the custom react uses the "teambit.envs/env" env, which will add react ^17.0.0 to every component that uses it
     // we want to make sure that the custom react is using 16.4.0 not 17.
     await this.applyAutoDetectedPeersFromEnvOnEnvItSelf();
-    this.coreAspects = R.uniq(this.coreAspects);
+    this.coreAspects = uniq(this.coreAspects);
   }
 
   private removeIgnoredComponentsByOverrides() {
@@ -178,13 +177,13 @@ export class ApplyOverrides {
     const shouldBeIncludedDev = (pkgVersion, pkgName) =>
       !this.overridesDependencies.shouldIgnorePackageByType(pkgName, 'devDependencies');
 
-    this.allPackagesDependencies.packageDependencies = R.pickBy(
-      shouldBeIncluded,
-      this.allPackagesDependencies.packageDependencies
+    this.allPackagesDependencies.packageDependencies = pickBy(
+      this.allPackagesDependencies.packageDependencies,
+      shouldBeIncluded
     );
-    this.allPackagesDependencies.devPackageDependencies = R.pickBy(
-      shouldBeIncludedDev,
-      this.allPackagesDependencies.devPackageDependencies
+    this.allPackagesDependencies.devPackageDependencies = pickBy(
+      this.allPackagesDependencies.devPackageDependencies,
+      shouldBeIncludedDev
     );
   }
 
@@ -263,7 +262,7 @@ export class ApplyOverrides {
           this.allDependencies[depField].push(new Dependency(depData.componentId, [], depData.packageName))
         );
       }
-      if (packages[depField] && !R.isEmpty(packages[depField])) {
+      if (packages[depField] && !isEmpty(packages[depField])) {
         Object.assign(this.allPackagesDependencies[this._pkgFieldMapping(depField)], packages[depField]);
       }
     });
@@ -289,10 +288,10 @@ export class ApplyOverrides {
   private removeDevAndEnvDepsIfTheyAlsoRegulars() {
     // remove dev and env packages that are also regular packages
     const getNotRegularPackages = (packages) =>
-      R.difference(R.keys(packages), R.keys(this.allPackagesDependencies.packageDependencies));
-    this.allPackagesDependencies.devPackageDependencies = R.pick(
-      getNotRegularPackages(this.allPackagesDependencies.devPackageDependencies),
-      this.allPackagesDependencies.devPackageDependencies
+      difference(Object.keys(packages), Object.keys(this.allPackagesDependencies.packageDependencies));
+    this.allPackagesDependencies.devPackageDependencies = pick(
+      this.allPackagesDependencies.devPackageDependencies,
+      getNotRegularPackages(this.allPackagesDependencies.devPackageDependencies)
     );
     // remove dev dependencies that are also regular dependencies
     // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
@@ -310,7 +309,7 @@ export class ApplyOverrides {
     };
     const projectPeerDependencies = getPeerDependencies();
     const peerPackages = {};
-    if (R.isEmpty(projectPeerDependencies)) return;
+    if (isEmpty(projectPeerDependencies)) return;
 
     // check whether the peer-dependencies was actually require in the code. if so, remove it from
     // the packages/dev-packages and add it as a peer-package.
@@ -334,7 +333,7 @@ export class ApplyOverrides {
     const pkgJsonRegularDeps = packageJson.dependencies || {};
     const peerDeps = this.allPackagesDependencies.peerPackageDependencies || {};
     ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'].forEach((field) => {
-      R.forEachObjIndexed((_pkgVal, pkgName) => {
+      forEach(this.allPackagesDependencies[field], (_pkgVal, pkgName) => {
         const peerVersionFromPkgJson = pkgJsonPeer[pkgName];
         const regularVersionFromPkgJson = pkgJsonRegularDeps[pkgName];
         if (peerVersionFromPkgJson) {
@@ -344,7 +343,7 @@ export class ApplyOverrides {
           delete this.allPackagesDependencies.peerPackageDependencies?.[pkgName];
           this.allPackagesDependencies[field][pkgName] = regularVersionFromPkgJson;
         }
-      }, this.allPackagesDependencies[field]);
+      });
     });
     this.allPackagesDependencies.peerPackageDependencies = peerDeps;
   }
@@ -358,7 +357,7 @@ export class ApplyOverrides {
     // we are not iterate component deps since they are resolved from what actually installed
     // the policy used for installation only in that case
     ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'].forEach((field) => {
-      R.forEachObjIndexed((_pkgVal, pkgName) => {
+      forEach(this.allPackagesDependencies[field], (_pkgVal, pkgName) => {
         const peerVersionFromWsPolicy = wsPeer[pkgName];
         const regularVersionFromWsPolicy = wsRegular[pkgName];
         if (peerVersionFromWsPolicy) {
@@ -368,7 +367,7 @@ export class ApplyOverrides {
           delete this.allPackagesDependencies.peerPackageDependencies?.[pkgName];
           this.allPackagesDependencies[field][pkgName] = regularVersionFromWsPolicy;
         }
-      }, this.allPackagesDependencies[field]);
+      });
     });
     this.allPackagesDependencies.peerPackageDependencies = peerDeps;
   }
@@ -409,7 +408,7 @@ export class ApplyOverrides {
       missingPackages = uniq(missingData.map((d) => d.missingPackages).flat());
     }
     ['dependencies', 'devDependencies', 'peerDependencies'].forEach((field) => {
-      R.forEachObjIndexed((pkgVal, pkgName) => {
+      forEach(autoDetectOverrides[field], (pkgVal, pkgName) => {
         if (this.overridesDependencies.shouldIgnorePeerPackage(pkgName)) return;
         // Validate it was auto detected, we only affect stuff that were detected
         const existsInCompsDeps = this.allDependencies.dependencies.find((dep) => {
@@ -482,7 +481,7 @@ export class ApplyOverrides {
         ) {
           this.allPackagesDependencies[key][pkgName] = pkgVal;
         }
-      }, autoDetectOverrides[field]);
+      });
     });
   }
 
@@ -498,12 +497,12 @@ export class ApplyOverrides {
     // we are not iterate component deps since they are resolved from what actually installed
     // the policy used for installation only in that case
     ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'].forEach((field) => {
-      R.forEachObjIndexed((_pkgVal, pkgName) => {
+      forEach(this.allPackagesDependencies[field], (_pkgVal, pkgName) => {
         const peerVersionFromEnvPolicy = envPolicyManifest[pkgName];
         if (peerVersionFromEnvPolicy) {
           delete this.allPackagesDependencies[field][pkgName];
         }
-      }, this.allPackagesDependencies[field]);
+      });
     });
     Object.assign(deps, envPolicyManifest);
     // TODO: handle component deps once we support peers between components

package/dependencies-loader/auto-detect-deps.ts

@@ -1,10 +1,9 @@
 import * as path from 'path';
 import fs from 'fs-extra';
-import R from 'ramda';
 import semver from 'semver';
 import { isSnap } from '@teambit/component-version';
 import { ComponentID } from '@teambit/component-id';
-import { uniq, isEmpty } from 'lodash';
+import { uniq, isEmpty, forEach, differenceWith } from 'lodash';
 import { IssuesList, IssuesClasses } from '@teambit/component-issues';
 import { Dependency } from '@teambit/legacy/dist/consumer/component/dependencies';
 import { DEFAULT_DIST_DIRNAME, DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';
@@ -242,7 +241,7 @@ export class AutoDetectDeps {
       return;
     }
     const allDepsFiles = this.tree[originFile].files;
-    if (!allDepsFiles || R.isEmpty(allDepsFiles)) return;
+    if (!allDepsFiles || isEmpty(allDepsFiles)) return;
     allDepsFiles.forEach((depFile: FileObject) => {
       const isDepFileUntracked = this.processOneDepFile(
         originFile,
@@ -358,7 +357,7 @@ export class AutoDetectDeps {
    */
   private processComponents(originFile: PathLinuxRelative, fileType: FileType) {
     const components = this.tree[originFile].components;
-    if (!components || R.isEmpty(components)) return;
+    if (!components || isEmpty(components)) return;
     components.forEach((compDep) => {
       let componentId = this.getComponentIdByResolvedPackageData(compDep);
       if (componentId.isEqual(this.componentId)) {
@@ -451,7 +450,7 @@ export class AutoDetectDeps {
     }
     const packageNames = Object.keys(packages).concat(this.tree[originFile].missing?.packages ?? []);
     this._addTypesPackagesForTypeScript(packageNames, originFile);
-    if (!packages || R.isEmpty(packages)) return;
+    if (!packages || isEmpty(packages)) return;
     if (fileType.isTestFile) {
       Object.assign(this.allPackagesDependencies.devPackageDependencies, packages);
     } else {
@@ -477,13 +476,13 @@ export class AutoDetectDeps {
         const existWithDifferentExt = compFilesWithoutExt.some((f) => f === relativeToCompDirWithoutExt);
         return !existWithDifferentExt;
       });
-      if (R.isEmpty(missingFiles)) return;
+      if (isEmpty(missingFiles)) return;
       this._pushToMissingDependenciesOnFs(originFile, missingFiles);
     };
     const processMissingPackages = () => {
       if (isEmpty(missing.packages)) return;
       const missingPackages = missing.packages;
-      if (!R.isEmpty(missingPackages)) {
+      if (!isEmpty(missingPackages)) {
         this._pushToMissingPackagesDependenciesIssues(originFile, missingPackages, fileType);
       }
     };
@@ -561,7 +560,7 @@ export class AutoDetectDeps {
 
     this.tree[originFile].unidentifiedPackages = unidentifiedPackagesFiltered;
     this.tree[originFile].components = bitsFiltered;
-    this.coreAspects.push(...R.uniq(usedCoreAspects));
+    this.coreAspects.push(...uniq(usedCoreAspects));
   }
 
   /**
@@ -623,7 +622,7 @@ export class AutoDetectDeps {
   }
 
   private getExistingDepRelativePaths(dependency: Dependency, relativePath: RelativePath) {
-    if (!dependency.relativePaths || R.isEmpty(dependency.relativePaths)) return null;
+    if (!dependency.relativePaths || isEmpty(dependency.relativePaths)) return null;
     return dependency.relativePaths.find(
       (paths) =>
         paths.sourceRelativePath === relativePath.sourceRelativePath &&
@@ -633,7 +632,7 @@ export class AutoDetectDeps {
 
   private getDiffSpecifiers(originSpecifiers: ImportSpecifier[], targetSpecifiers: ImportSpecifier[]) {
     const cmp = (specifier1, specifier2) => specifier1.mainFile.name === specifier2.mainFile.name;
-    return R.differenceWith(cmp, targetSpecifiers, originSpecifiers);
+    return differenceWith(targetSpecifiers, originSpecifiers, cmp);
   }
 
   /**
@@ -682,14 +681,14 @@ export class AutoDetectDeps {
   private _pushToUntrackDependenciesIssues(originFile: PathLinuxRelative, depFileRelative, nested = false) {
     const findExisting = () => {
       let result;
-      R.forEachObjIndexed((currentUntracked) => {
+      forEach(this.issues.getIssue(IssuesClasses.UntrackedDependencies)?.data || {}, (currentUntracked) => {
         const found = currentUntracked.untrackedFiles.find((file) => {
           return file.relativePath === depFileRelative;
         });
         if (found) {
           result = found;
         }
-      }, this.issues.getIssue(IssuesClasses.UntrackedDependencies)?.data || {});
+      });
       return result;
     };
     const existing = findExisting();

package/dependencies-loader/dependencies-loader.ts

@@ -1,4 +1,3 @@
-import R from 'ramda';
 import path from 'path';
 import { uniq } from 'lodash';
 import { IssuesClasses } from '@teambit/component-issues';
@@ -143,7 +142,7 @@ export class DependenciesLoader {
     this.component.devPackageDependencies = dependenciesData.allPackagesDependencies.devPackageDependencies ?? {};
     this.component.peerPackageDependencies = dependenciesData.allPackagesDependencies.peerPackageDependencies ?? {};
     const missingFromOverrides = overridesDependencies.missingPackageDependencies;
-    if (!R.isEmpty(missingFromOverrides)) {
+    if (missingFromOverrides.length) {
       dependenciesData.issues.getOrCreate(IssuesClasses.MissingManuallyConfiguredPackages).data =
         uniq(missingFromOverrides);
     }

package/dependencies-loader/dependencies-versions-resolver.ts

@@ -1,8 +1,8 @@
-import R from 'ramda';
 import { ComponentID } from '@teambit/component-id';
 import Consumer from '@teambit/legacy/dist/consumer/consumer';
 import { Workspace } from '@teambit/workspace';
 import logger from '@teambit/legacy/dist/logger/logger';
+import { isEmpty } from 'lodash';
 import Component from '@teambit/legacy/dist/consumer/component/consumer-component';
 import { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';
 import Dependencies from '@teambit/legacy/dist/consumer/component/dependencies/dependencies';
@@ -127,7 +127,7 @@ export function updateDependenciesVersions(
 
   function getIdFromComponentConfig(componentId: ComponentID): ComponentID | undefined {
     const dependencies = component.overrides.getComponentDependenciesWithVersion();
-    if (R.isEmpty(dependencies)) return undefined;
+    if (isEmpty(dependencies)) return undefined;
     const dependency = Object.keys(dependencies).find((idStr) => componentId.toStringWithoutVersion() === idStr);
     if (!dependency) return undefined;
     return componentId.changeVersion(dependencies[dependency]);

package/dist/dependencies-loader/apply-overrides.js

@@ -4,55 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ApplyOverrides = void 0;
-function _forEachObjIndexed2() {
-  const data = _interopRequireDefault(require("ramda/src/forEachObjIndexed"));
-  _forEachObjIndexed2 = function () {
-    return data;
-  };
-  return data;
-}
-function _pick2() {
-  const data = _interopRequireDefault(require("ramda/src/pick"));
-  _pick2 = function () {
-    return data;
-  };
-  return data;
-}
-function _keys2() {
-  const data = _interopRequireDefault(require("ramda/src/keys"));
-  _keys2 = function () {
-    return data;
-  };
-  return data;
-}
-function _difference2() {
-  const data = _interopRequireDefault(require("ramda/src/difference"));
-  _difference2 = function () {
-    return data;
-  };
-  return data;
-}
-function _isEmpty2() {
-  const data = _interopRequireDefault(require("ramda/src/isEmpty"));
-  _isEmpty2 = function () {
-    return data;
-  };
-  return data;
-}
-function _pickBy2() {
-  const data = _interopRequireDefault(require("ramda/src/pickBy"));
-  _pickBy2 = function () {
-    return data;
-  };
-  return data;
-}
-function _uniq2() {
-  const data = _interopRequireDefault(require("ramda/src/uniq"));
-  _uniq2 = function () {
-    return data;
-  };
-  return data;
-}
 function _path() {
   const data = _interopRequireDefault(require("path"));
   _path = function () {
@@ -223,7 +174,7 @@ class ApplyOverrides {
     // the custom react uses the "teambit.envs/env" env, which will add react ^17.0.0 to every component that uses it
     // we want to make sure that the custom react is using 16.4.0 not 17.
     await this.applyAutoDetectedPeersFromEnvOnEnvItSelf();
-    this.coreAspects = (0, _uniq2().default)(this.coreAspects);
+    this.coreAspects = (0, _lodash().uniq)(this.coreAspects);
   }
   removeIgnoredComponentsByOverrides() {
     const shouldBeIncluded = (dep, fileType) => !this.overridesDependencies.shouldIgnorePackage(dep.packageName, fileType);
@@ -253,8 +204,8 @@ class ApplyOverrides {
   removeIgnoredPackagesByOverrides() {
     const shouldBeIncluded = (pkgVersion, pkgName) => !this.overridesDependencies.shouldIgnorePackageByType(pkgName, 'dependencies');
     const shouldBeIncludedDev = (pkgVersion, pkgName) => !this.overridesDependencies.shouldIgnorePackageByType(pkgName, 'devDependencies');
-    this.allPackagesDependencies.packageDependencies = (0, _pickBy2().default)(shouldBeIncluded, this.allPackagesDependencies.packageDependencies);
-    this.allPackagesDependencies.devPackageDependencies = (0, _pickBy2().default)(shouldBeIncludedDev, this.allPackagesDependencies.devPackageDependencies);
+    this.allPackagesDependencies.packageDependencies = (0, _lodash().pickBy)(this.allPackagesDependencies.packageDependencies, shouldBeIncluded);
+    this.allPackagesDependencies.devPackageDependencies = (0, _lodash().pickBy)(this.allPackagesDependencies.devPackageDependencies, shouldBeIncludedDev);
   }
 
   // TODO: maybe cache those results??
@@ -323,7 +274,7 @@ class ApplyOverrides {
       if (components[depField] && components[depField].length) {
         components[depField].forEach(depData => this.allDependencies[depField].push(new (_dependencies().Dependency)(depData.componentId, [], depData.packageName)));
       }
-      if (packages[depField] && !(0, _isEmpty2().default)(packages[depField])) {
+      if (packages[depField] && !(0, _lodash().isEmpty)(packages[depField])) {
         Object.assign(this.allPackagesDependencies[this._pkgFieldMapping(depField)], packages[depField]);
       }
     });
@@ -348,8 +299,8 @@ class ApplyOverrides {
    */
   removeDevAndEnvDepsIfTheyAlsoRegulars() {
     // remove dev and env packages that are also regular packages
-    const getNotRegularPackages = packages => (0, _difference2().default)((0, _keys2().default)(packages), (0, _keys2().default)(this.allPackagesDependencies.packageDependencies));
-    this.allPackagesDependencies.devPackageDependencies = (0, _pick2().default)(getNotRegularPackages(this.allPackagesDependencies.devPackageDependencies), this.allPackagesDependencies.devPackageDependencies);
+    const getNotRegularPackages = packages => (0, _lodash().difference)(Object.keys(packages), Object.keys(this.allPackagesDependencies.packageDependencies));
+    this.allPackagesDependencies.devPackageDependencies = (0, _lodash().pick)(this.allPackagesDependencies.devPackageDependencies, getNotRegularPackages(this.allPackagesDependencies.devPackageDependencies));
     // remove dev dependencies that are also regular dependencies
     // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
     const componentDepsIds = new (_componentId().ComponentIdList)(...this.allDependencies.dependencies.map(c => c.id));
@@ -363,7 +314,7 @@ class ApplyOverrides {
     };
     const projectPeerDependencies = getPeerDependencies();
     const peerPackages = {};
-    if ((0, _isEmpty2().default)(projectPeerDependencies)) return;
+    if ((0, _lodash().isEmpty)(projectPeerDependencies)) return;
 
     // check whether the peer-dependencies was actually require in the code. if so, remove it from
     // the packages/dev-packages and add it as a peer-package.
@@ -386,7 +337,7 @@ class ApplyOverrides {
     const pkgJsonRegularDeps = packageJson.dependencies || {};
     const peerDeps = this.allPackagesDependencies.peerPackageDependencies || {};
     ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'].forEach(field => {
-      (0, _forEachObjIndexed2().default)((_pkgVal, pkgName) => {
+      (0, _lodash().forEach)(this.allPackagesDependencies[field], (_pkgVal, pkgName) => {
         const peerVersionFromPkgJson = pkgJsonPeer[pkgName];
         const regularVersionFromPkgJson = pkgJsonRegularDeps[pkgName];
         if (peerVersionFromPkgJson) {
@@ -396,7 +347,7 @@ class ApplyOverrides {
           delete this.allPackagesDependencies.peerPackageDependencies?.[pkgName];
           this.allPackagesDependencies[field][pkgName] = regularVersionFromPkgJson;
         }
-      }, this.allPackagesDependencies[field]);
+      });
     });
     this.allPackagesDependencies.peerPackageDependencies = peerDeps;
   }
@@ -409,7 +360,7 @@ class ApplyOverrides {
     // we are not iterate component deps since they are resolved from what actually installed
     // the policy used for installation only in that case
     ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'].forEach(field => {
-      (0, _forEachObjIndexed2().default)((_pkgVal, pkgName) => {
+      (0, _lodash().forEach)(this.allPackagesDependencies[field], (_pkgVal, pkgName) => {
         const peerVersionFromWsPolicy = wsPeer[pkgName];
         const regularVersionFromWsPolicy = wsRegular[pkgName];
         if (peerVersionFromWsPolicy) {
@@ -419,7 +370,7 @@ class ApplyOverrides {
           delete this.allPackagesDependencies.peerPackageDependencies?.[pkgName];
           this.allPackagesDependencies[field][pkgName] = regularVersionFromWsPolicy;
         }
-      }, this.allPackagesDependencies[field]);
+      });
     });
     this.allPackagesDependencies.peerPackageDependencies = peerDeps;
   }
@@ -455,7 +406,7 @@ class ApplyOverrides {
       missingPackages = (0, _lodash().uniq)(missingData.map(d => d.missingPackages).flat());
     }
     ['dependencies', 'devDependencies', 'peerDependencies'].forEach(field => {
-      (0, _forEachObjIndexed2().default)((pkgVal, pkgName) => {
+      (0, _lodash().forEach)(autoDetectOverrides[field], (pkgVal, pkgName) => {
         if (this.overridesDependencies.shouldIgnorePeerPackage(pkgName)) return;
         // Validate it was auto detected, we only affect stuff that were detected
         const existsInCompsDeps = this.allDependencies.dependencies.find(dep => {
@@ -512,7 +463,7 @@ class ApplyOverrides {
         if (pkgVal !== _constants().MANUALLY_REMOVE_DEPENDENCY && (!existsInCompsDeps && !existsInCompsDevDeps || field === 'peerDependencies')) {
           this.allPackagesDependencies[key][pkgName] = pkgVal;
         }
-      }, autoDetectOverrides[field]);
+      });
     });
   }
   async applyAutoDetectedPeersFromEnvOnEnvItSelf() {
@@ -526,12 +477,12 @@ class ApplyOverrides {
     // we are not iterate component deps since they are resolved from what actually installed
     // the policy used for installation only in that case
     ['packageDependencies', 'devPackageDependencies', 'peerPackageDependencies'].forEach(field => {
-      (0, _forEachObjIndexed2().default)((_pkgVal, pkgName) => {
+      (0, _lodash().forEach)(this.allPackagesDependencies[field], (_pkgVal, pkgName) => {
         const peerVersionFromEnvPolicy = envPolicyManifest[pkgName];
         if (peerVersionFromEnvPolicy) {
           delete this.allPackagesDependencies[field][pkgName];
         }
-      }, this.allPackagesDependencies[field]);
+      });
     });
     Object.assign(deps, envPolicyManifest);
     // TODO: handle component deps once we support peers between components