@teambit/dependency-resolver 0.0.964 → 0.0.965

package/dist/manifest/workspace-manifest-factory.js

@@ -242,9 +242,14 @@ class WorkspaceManifestFactory {
 exports.WorkspaceManifestFactory = WorkspaceManifestFactory;
 function filterComponents(dependencyList, componentsToFilterOut) {
   const filtered = dependencyList.filter(dep => {
-    // Do not filter non components (like packages) dependencies
     if (!(dep instanceof _dependencies().ComponentDependency)) {
-      return true;
+      var _dep$getPackageName;
+      const depPkgName = (_dep$getPackageName = dep.getPackageName) === null || _dep$getPackageName === void 0 ? void 0 : _dep$getPackageName.call(dep);
+      if (!depPkgName) return true;
+      // If the package is already in the workspace as a local component,
+      // then we don't want to install that package as a dependency to node_modules.
+      // Otherwise, it would rewrite the local component inside the root node_modules that is created by bit link.
+      return !componentsToFilterOut.some(component => depPkgName === (0, _componentIdToPackageName().default)(component.state._consumer));
     }
     // Remove dependencies which has no version (they are new in the workspace)
     if (!dep.componentId.hasVersion()) return false;

package/dist/manifest/workspace-manifest-factory.js.map

@@ -1 +1 @@
-{"version":3,"names":["DEFAULT_CREATE_OPTIONS","filterComponentsFromManifests","createManifestForComponentsWithoutDependencies","dedupe","WorkspaceManifestFactory","constructor","dependencyResolver","aspectLoader","createFromComponents","name","version","rootPolicy","rootDir","components","options","optsWithDefaults","Object","assign","hasRootComponents","componentDependenciesMap","buildComponentDependenciesMap","dependencyFilterFn","dedupedDependencies","getEmptyDedupedDependencies","filter","dep","dependencyId","rootDependencies","dedupeDependencies","mapValues","deps","excludeWorkspaceDependencies","toManifest","componentsManifestsMap","getComponentsManifests","envSelfPeers","getEnvsSelfPeersPolicy","workspaceManifest","WorkspaceManifest","foundEnvs","component","values","push","envPolicy","peersPolicies","map","policy","selfPolicy","mergedPolicies","VariantPolicy","mergePolices","buildResultsP","packageName","componentIdToPackageName","state","_consumer","depList","getDependencies","includeHidden","componentPolicy","getPolicy","additionalDeps","coreAspectIds","getCoreAspectIds","comp","toTypeArray","compIdWithoutVersion","id","split","isExtension","includes","some","c","isEqual","componentId","pkgName","getPackageName","filterComponents","filterResolvedFromEnv","updateDependenciesVersions","depManifest","toDependenciesManifest","dependencies","result","Map","length","results","Promise","all","forEach","currResult","set","dependencyList","updateDependencyVersion","componentsManifests","pMapSeries","has","blankDependencies","devDependencies","peerDependencies","get","getVersion","hasVersion","snapToSemver","getComponentEnvPolicy","manifest","ComponentManifest","SemVer","componentsToFilterOut","filtered","ComponentDependency","existingComponent","find","toString","ignoreVersion","_legacy","isEqualWithoutVersion","fromPolicy","value","resolveFromEnv","pickBy","versionSpec","startsWith"],"sources":["workspace-manifest-factory.ts"],"sourcesContent":["import { AspectLoaderMain } from '@teambit/aspect-loader';\nimport { Component } from '@teambit/component';\nimport componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';\nimport { pickBy, mapValues } from 'lodash';\nimport { SemVer } from 'semver';\nimport pMapSeries from 'p-map-series';\nimport { snapToSemver } from '@teambit/component-package-version';\nimport { ComponentDependency, DependencyList, PackageName } from '../dependencies';\nimport { VariantPolicy, WorkspacePolicy, EnvPolicy } from '../policy';\nimport { DependencyResolverMain } from '../dependency-resolver.main.runtime';\nimport { ComponentsManifestsMap } from '../types';\nimport { ComponentManifest } from './component-manifest';\nimport { dedupeDependencies, DedupedDependencies, getEmptyDedupedDependencies } from './deduping';\nimport { ManifestToJsonOptions, ManifestDependenciesObject, DepObjectValue } from './manifest';\nimport { updateDependencyVersion } from './update-dependency-version';\nimport { WorkspaceManifest } from './workspace-manifest';\n\nexport type DepsFilterFn = (dependencies: DependencyList) => DependencyList;\n\nexport type ComponentDependenciesMap = Map<PackageName, ManifestDependenciesObject>;\nexport interface WorkspaceManifestToJsonOptions extends ManifestToJsonOptions {\n  includeDir?: boolean;\n}\n\nexport type CreateFromComponentsOptions = {\n  filterComponentsFromManifests: boolean;\n  createManifestForComponentsWithoutDependencies: boolean;\n  dedupe?: boolean;\n  dependencyFilterFn?: DepsFilterFn;\n};\n\nconst DEFAULT_CREATE_OPTIONS: CreateFromComponentsOptions = {\n  filterComponentsFromManifests: true,\n  createManifestForComponentsWithoutDependencies: true,\n  dedupe: true,\n};\nexport class WorkspaceManifestFactory {\n  constructor(private dependencyResolver: DependencyResolverMain, private aspectLoader: AspectLoaderMain) {}\n\n  async createFromComponents(\n    name: string,\n    version: SemVer,\n    rootPolicy: WorkspacePolicy,\n    rootDir: string,\n    components: Component[],\n    options: CreateFromComponentsOptions = DEFAULT_CREATE_OPTIONS\n  ): Promise<WorkspaceManifest> {\n    // Make sure to take other default if passed options with only one option\n    const optsWithDefaults = Object.assign({}, DEFAULT_CREATE_OPTIONS, options);\n    const hasRootComponents = this.dependencyResolver.hasRootComponents();\n    const componentDependenciesMap: ComponentDependenciesMap = await this.buildComponentDependenciesMap(\n      components,\n      optsWithDefaults.filterComponentsFromManifests,\n      rootPolicy,\n      optsWithDefaults.dependencyFilterFn,\n      hasRootComponents\n    );\n    let dedupedDependencies = getEmptyDedupedDependencies();\n    rootPolicy = rootPolicy.filter((dep) => dep.dependencyId !== '@teambit/legacy');\n    if (hasRootComponents) {\n      const { rootDependencies } = dedupeDependencies(rootPolicy, componentDependenciesMap);\n      // We hoist dependencies in order for the IDE to work.\n      // For runtime, the peer dependencies are installed inside:\n      // <ws root>/node_module/<comp name>/node_module/<comp name>/node_modules\n      dedupedDependencies.rootDependencies = mapValues(\n        rootDependencies,\n        (deps) => deps && excludeWorkspaceDependencies(deps)\n      );\n      dedupedDependencies.componentDependenciesMap = componentDependenciesMap;\n    } else if (options.dedupe) {\n      dedupedDependencies = dedupeDependencies(rootPolicy, componentDependenciesMap);\n    } else {\n      dedupedDependencies.rootDependencies = rootPolicy.toManifest();\n      dedupedDependencies.componentDependenciesMap = componentDependenciesMap;\n    }\n    const componentsManifestsMap = await this.getComponentsManifests(\n      dedupedDependencies,\n      components,\n      optsWithDefaults.createManifestForComponentsWithoutDependencies\n    );\n    const envSelfPeers = this.getEnvsSelfPeersPolicy(componentsManifestsMap);\n    const workspaceManifest = new WorkspaceManifest(\n      name,\n      version,\n      dedupedDependencies.rootDependencies,\n      envSelfPeers,\n      rootDir,\n      componentsManifestsMap\n    );\n    return workspaceManifest;\n  }\n\n  private getEnvsSelfPeersPolicy(componentsManifestsMap: ComponentsManifestsMap) {\n    const foundEnvs: EnvPolicy[] = [];\n    for (const component of componentsManifestsMap.values()) {\n      foundEnvs.push(component.envPolicy);\n    }\n    const peersPolicies = foundEnvs.map((policy) => policy.selfPolicy);\n    // TODO: At the moment we are just merge everything, so in case of conflicts one will be taken\n    // TODO: once we have root for each env, we should know to handle it differently\n    const mergedPolicies = VariantPolicy.mergePolices(peersPolicies);\n    return mergedPolicies;\n  }\n\n  /**\n   * Get the components and build a map with the package name (from the component) as key and the dependencies as values\n   *\n   * @param {Component[]} components\n   * @param {boolean} [filterComponentsFromManifests=true] - filter existing components from the dep graphs\n   * @returns\n   */\n  private async buildComponentDependenciesMap(\n    components: Component[],\n    filterComponentsFromManifests = true,\n    rootPolicy: WorkspacePolicy,\n    dependencyFilterFn: DepsFilterFn | undefined,\n    hasRootComponents?: boolean\n  ): Promise<ComponentDependenciesMap> {\n    const buildResultsP = components.map(async (component) => {\n      const packageName = componentIdToPackageName(component.state._consumer);\n      let depList = await this.dependencyResolver.getDependencies(component, { includeHidden: true });\n      const componentPolicy = await this.dependencyResolver.getPolicy(component);\n      const additionalDeps = {};\n      if (hasRootComponents) {\n        const coreAspectIds = this.aspectLoader.getCoreAspectIds();\n        for (const comp of depList.toTypeArray('component') as ComponentDependency[]) {\n          const [compIdWithoutVersion] = comp.id.split('@');\n          if (\n            !comp.isExtension &&\n            !coreAspectIds.includes(compIdWithoutVersion) &&\n            components.some((c) => c.id.isEqual(comp.componentId))\n          ) {\n            const pkgName = comp.getPackageName();\n            if (pkgName !== '@teambit/harmony') {\n              additionalDeps[pkgName] = `workspace:*`;\n            }\n          }\n        }\n      }\n      if (filterComponentsFromManifests) {\n        depList = filterComponents(depList, components);\n      }\n      depList = filterResolvedFromEnv(depList, componentPolicy);\n      // Remove bit bin from dep list\n      depList = depList.filter((dep) => dep.id !== '@teambit/legacy');\n      if (dependencyFilterFn) {\n        depList = dependencyFilterFn(depList);\n      }\n      await this.updateDependenciesVersions(component, rootPolicy, depList);\n      const depManifest = depList.toDependenciesManifest();\n      depManifest.dependencies = {\n        ...additionalDeps,\n        ...depManifest.dependencies,\n      };\n\n      return { packageName, depManifest };\n    });\n    const result: ComponentDependenciesMap = new Map();\n\n    if (buildResultsP.length) {\n      const results = await Promise.all(buildResultsP);\n      results.forEach((currResult) => {\n        result.set(currResult.packageName, currResult.depManifest);\n      });\n    }\n\n    return result;\n  }\n\n  private async updateDependenciesVersions(\n    component: Component,\n    rootPolicy: WorkspacePolicy,\n    dependencyList: DependencyList\n  ): Promise<void> {\n    const mergedPolicies = await this.dependencyResolver.getPolicy(component);\n    dependencyList.forEach((dep) => {\n      updateDependencyVersion(dep, rootPolicy, mergedPolicies);\n    });\n  }\n\n  /**\n   * Get the components manifests based on the calculated dedupedDependencies\n   *\n   * @param {DedupedDependencies} dedupedDependencies\n   * @param {Component[]} components\n   * @returns {ComponentsManifestsMap}\n   */\n  async getComponentsManifests(\n    dedupedDependencies: DedupedDependencies,\n    components: Component[],\n    createManifestForComponentsWithoutDependencies = true\n  ): Promise<ComponentsManifestsMap> {\n    const componentsManifests: ComponentsManifestsMap = new Map();\n    // don't use Promise.all, along the road this code might import an env from a remote, which can't be done in parallel.\n    // otherwise, it may import the same component multiple times, and if fails, the ref (remote-lane) files may be corrupted.\n    await pMapSeries(components, async (component) => {\n      const packageName = componentIdToPackageName(component.state._consumer);\n      if (\n        dedupedDependencies.componentDependenciesMap.has(packageName) ||\n        createManifestForComponentsWithoutDependencies\n      ) {\n        const blankDependencies: ManifestDependenciesObject = {\n          dependencies: {},\n          devDependencies: {},\n          peerDependencies: {},\n        };\n        let dependencies = blankDependencies;\n        if (dedupedDependencies.componentDependenciesMap.has(packageName)) {\n          dependencies = dedupedDependencies.componentDependenciesMap.get(packageName) as ManifestDependenciesObject;\n        }\n\n        const getVersion = (): string => {\n          if (!component.id.hasVersion()) return '0.0.1-new';\n          return snapToSemver(component.id.version as string);\n        };\n\n        const version = getVersion();\n        const envPolicy = await this.dependencyResolver.getComponentEnvPolicy(component);\n        const manifest = new ComponentManifest(packageName, new SemVer(version), dependencies, component, envPolicy);\n        componentsManifests.set(packageName, manifest);\n      }\n    });\n    return componentsManifests;\n  }\n}\n\nfunction filterComponents(dependencyList: DependencyList, componentsToFilterOut: Component[]): DependencyList {\n  const filtered = dependencyList.filter((dep) => {\n    // Do not filter non components (like packages) dependencies\n    if (!(dep instanceof ComponentDependency)) {\n      return true;\n    }\n    // Remove dependencies which has no version (they are new in the workspace)\n    if (!dep.componentId.hasVersion()) return false;\n    const existingComponent = componentsToFilterOut.find((component) => {\n      // For new components, the component has no version but the dependency id has version 0.0.1\n      if (!component.id.hasVersion()) {\n        return component.id.toString() === dep.componentId.toString({ ignoreVersion: true });\n      }\n      // We are checking against both component.id._legacy and component.state._consumer.id\n      // Because during tag operation, the component.id._legacy has the current version (before the tag)\n      // while the component.state._consumer.id has the upcoming version (the version that will be after the tag)\n      // The dependency in some cases is already updated to the upcoming version\n      return (\n        component.id._legacy.isEqualWithoutVersion(dep.componentId._legacy) ||\n        component.state._consumer.id.isEqualWithoutVersion(dep.componentId._legacy)\n      );\n    });\n    if (existingComponent) return false;\n    return true;\n  });\n  return filtered;\n}\n\n/**\n * Filter deps which should be resolved from the env, we don't want to install them, they will be linked manually later\n * @param dependencyList\n * @param componentPolicy\n */\nfunction filterResolvedFromEnv(dependencyList: DependencyList, componentPolicy: VariantPolicy): DependencyList {\n  const filtered = dependencyList.filter((dep) => {\n    const fromPolicy = componentPolicy.find(dep.id);\n    if (!fromPolicy) {\n      return true;\n    }\n    if (fromPolicy.value.resolveFromEnv) {\n      return false;\n    }\n    return true;\n  });\n  return filtered;\n}\n\nfunction excludeWorkspaceDependencies(deps: DepObjectValue): DepObjectValue {\n  return pickBy(deps, (versionSpec) => !versionSpec.startsWith('workspace:'));\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAGA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAAyD;AAAA;AAgBzD,MAAMA,sBAAmD,GAAG;EAC1DC,6BAA6B,EAAE,IAAI;EACnCC,8CAA8C,EAAE,IAAI;EACpDC,MAAM,EAAE;AACV,CAAC;AACM,MAAMC,wBAAwB,CAAC;EACpCC,WAAW,CAASC,kBAA0C,EAAUC,YAA8B,EAAE;IAAA,KAApFD,kBAA0C,GAA1CA,kBAA0C;IAAA,KAAUC,YAA8B,GAA9BA,YAA8B;EAAG;EAEzG,MAAMC,oBAAoB,CACxBC,IAAY,EACZC,OAAe,EACfC,UAA2B,EAC3BC,OAAe,EACfC,UAAuB,EACvBC,OAAoC,GAAGd,sBAAsB,EACjC;IAC5B;IACA,MAAMe,gBAAgB,GAAGC,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,EAAEjB,sBAAsB,EAAEc,OAAO,CAAC;IAC3E,MAAMI,iBAAiB,GAAG,IAAI,CAACZ,kBAAkB,CAACY,iBAAiB,EAAE;IACrE,MAAMC,wBAAkD,GAAG,MAAM,IAAI,CAACC,6BAA6B,CACjGP,UAAU,EACVE,gBAAgB,CAACd,6BAA6B,EAC9CU,UAAU,EACVI,gBAAgB,CAACM,kBAAkB,EACnCH,iBAAiB,CAClB;IACD,IAAII,mBAAmB,GAAG,IAAAC,uCAA2B,GAAE;IACvDZ,UAAU,GAAGA,UAAU,CAACa,MAAM,CAAEC,GAAG,IAAKA,GAAG,CAACC,YAAY,KAAK,iBAAiB,CAAC;IAC/E,IAAIR,iBAAiB,EAAE;MACrB,MAAM;QAAES;MAAiB,CAAC,GAAG,IAAAC,8BAAkB,EAACjB,UAAU,EAAEQ,wBAAwB,CAAC;MACrF;MACA;MACA;MACAG,mBAAmB,CAACK,gBAAgB,GAAG,IAAAE,mBAAS,EAC9CF,gBAAgB,EACfG,IAAI,IAAKA,IAAI,IAAIC,4BAA4B,CAACD,IAAI,CAAC,CACrD;MACDR,mBAAmB,CAACH,wBAAwB,GAAGA,wBAAwB;IACzE,CAAC,MAAM,IAAIL,OAAO,CAACX,MAAM,EAAE;MACzBmB,mBAAmB,GAAG,IAAAM,8BAAkB,EAACjB,UAAU,EAAEQ,wBAAwB,CAAC;IAChF,CAAC,MAAM;MACLG,mBAAmB,CAACK,gBAAgB,GAAGhB,UAAU,CAACqB,UAAU,EAAE;MAC9DV,mBAAmB,CAACH,wBAAwB,GAAGA,wBAAwB;IACzE;IACA,MAAMc,sBAAsB,GAAG,MAAM,IAAI,CAACC,sBAAsB,CAC9DZ,mBAAmB,EACnBT,UAAU,EACVE,gBAAgB,CAACb,8CAA8C,CAChE;IACD,MAAMiC,YAAY,GAAG,IAAI,CAACC,sBAAsB,CAACH,sBAAsB,CAAC;IACxE,MAAMI,iBAAiB,GAAG,KAAIC,sCAAiB,EAC7C7B,IAAI,EACJC,OAAO,EACPY,mBAAmB,CAACK,gBAAgB,EACpCQ,YAAY,EACZvB,OAAO,EACPqB,sBAAsB,CACvB;IACD,OAAOI,iBAAiB;EAC1B;EAEQD,sBAAsB,CAACH,sBAA8C,EAAE;IAC7E,MAAMM,SAAsB,GAAG,EAAE;IACjC,KAAK,MAAMC,SAAS,IAAIP,sBAAsB,CAACQ,MAAM,EAAE,EAAE;MACvDF,SAAS,CAACG,IAAI,CAACF,SAAS,CAACG,SAAS,CAAC;IACrC;IACA,MAAMC,aAAa,GAAGL,SAAS,CAACM,GAAG,CAAEC,MAAM,IAAKA,MAAM,CAACC,UAAU,CAAC;IAClE;IACA;IACA,MAAMC,cAAc,GAAGC,uBAAa,CAACC,YAAY,CAACN,aAAa,CAAC;IAChE,OAAOI,cAAc;EACvB;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACE,MAAc5B,6BAA6B,CACzCP,UAAuB,EACvBZ,6BAA6B,GAAG,IAAI,EACpCU,UAA2B,EAC3BU,kBAA4C,EAC5CH,iBAA2B,EACQ;IACnC,MAAMiC,aAAa,GAAGtC,UAAU,CAACgC,GAAG,CAAC,MAAOL,SAAS,IAAK;MACxD,MAAMY,WAAW,GAAG,IAAAC,mCAAwB,EAACb,SAAS,CAACc,KAAK,CAACC,SAAS,CAAC;MACvE,IAAIC,OAAO,GAAG,MAAM,IAAI,CAAClD,kBAAkB,CAACmD,eAAe,CAACjB,SAAS,EAAE;QAAEkB,aAAa,EAAE;MAAK,CAAC,CAAC;MAC/F,MAAMC,eAAe,GAAG,MAAM,IAAI,CAACrD,kBAAkB,CAACsD,SAAS,CAACpB,SAAS,CAAC;MAC1E,MAAMqB,cAAc,GAAG,CAAC,CAAC;MACzB,IAAI3C,iBAAiB,EAAE;QACrB,MAAM4C,aAAa,GAAG,IAAI,CAACvD,YAAY,CAACwD,gBAAgB,EAAE;QAC1D,KAAK,MAAMC,IAAI,IAAIR,OAAO,CAACS,WAAW,CAAC,WAAW,CAAC,EAA2B;UAC5E,MAAM,CAACC,oBAAoB,CAAC,GAAGF,IAAI,CAACG,EAAE,CAACC,KAAK,CAAC,GAAG,CAAC;UACjD,IACE,CAACJ,IAAI,CAACK,WAAW,IACjB,CAACP,aAAa,CAACQ,QAAQ,CAACJ,oBAAoB,CAAC,IAC7CrD,UAAU,CAAC0D,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACL,EAAE,CAACM,OAAO,CAACT,IAAI,CAACU,WAAW,CAAC,CAAC,EACtD;YACA,MAAMC,OAAO,GAAGX,IAAI,CAACY,cAAc,EAAE;YACrC,IAAID,OAAO,KAAK,kBAAkB,EAAE;cAClCd,cAAc,CAACc,OAAO,CAAC,GAAI,aAAY;YACzC;UACF;QACF;MACF;MACA,IAAI1E,6BAA6B,EAAE;QACjCuD,OAAO,GAAGqB,gBAAgB,CAACrB,OAAO,EAAE3C,UAAU,CAAC;MACjD;MACA2C,OAAO,GAAGsB,qBAAqB,CAACtB,OAAO,EAAEG,eAAe,CAAC;MACzD;MACAH,OAAO,GAAGA,OAAO,CAAChC,MAAM,CAAEC,GAAG,IAAKA,GAAG,CAAC0C,EAAE,KAAK,iBAAiB,CAAC;MAC/D,IAAI9C,kBAAkB,EAAE;QACtBmC,OAAO,GAAGnC,kBAAkB,CAACmC,OAAO,CAAC;MACvC;MACA,MAAM,IAAI,CAACuB,0BAA0B,CAACvC,SAAS,EAAE7B,UAAU,EAAE6C,OAAO,CAAC;MACrE,MAAMwB,WAAW,GAAGxB,OAAO,CAACyB,sBAAsB,EAAE;MACpDD,WAAW,CAACE,YAAY,mCACnBrB,cAAc,GACdmB,WAAW,CAACE,YAAY,CAC5B;MAED,OAAO;QAAE9B,WAAW;QAAE4B;MAAY,CAAC;IACrC,CAAC,CAAC;IACF,MAAMG,MAAgC,GAAG,IAAIC,GAAG,EAAE;IAElD,IAAIjC,aAAa,CAACkC,MAAM,EAAE;MACxB,MAAMC,OAAO,GAAG,MAAMC,OAAO,CAACC,GAAG,CAACrC,aAAa,CAAC;MAChDmC,OAAO,CAACG,OAAO,CAAEC,UAAU,IAAK;QAC9BP,MAAM,CAACQ,GAAG,CAACD,UAAU,CAACtC,WAAW,EAAEsC,UAAU,CAACV,WAAW,CAAC;MAC5D,CAAC,CAAC;IACJ;IAEA,OAAOG,MAAM;EACf;EAEA,MAAcJ,0BAA0B,CACtCvC,SAAoB,EACpB7B,UAA2B,EAC3BiF,cAA8B,EACf;IACf,MAAM5C,cAAc,GAAG,MAAM,IAAI,CAAC1C,kBAAkB,CAACsD,SAAS,CAACpB,SAAS,CAAC;IACzEoD,cAAc,CAACH,OAAO,CAAEhE,GAAG,IAAK;MAC9B,IAAAoE,kDAAuB,EAACpE,GAAG,EAAEd,UAAU,EAAEqC,cAAc,CAAC;IAC1D,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACE,MAAMd,sBAAsB,CAC1BZ,mBAAwC,EACxCT,UAAuB,EACvBX,8CAA8C,GAAG,IAAI,EACpB;IACjC,MAAM4F,mBAA2C,GAAG,IAAIV,GAAG,EAAE;IAC7D;IACA;IACA,MAAM,IAAAW,qBAAU,EAAClF,UAAU,EAAE,MAAO2B,SAAS,IAAK;MAChD,MAAMY,WAAW,GAAG,IAAAC,mCAAwB,EAACb,SAAS,CAACc,KAAK,CAACC,SAAS,CAAC;MACvE,IACEjC,mBAAmB,CAACH,wBAAwB,CAAC6E,GAAG,CAAC5C,WAAW,CAAC,IAC7DlD,8CAA8C,EAC9C;QACA,MAAM+F,iBAA6C,GAAG;UACpDf,YAAY,EAAE,CAAC,CAAC;UAChBgB,eAAe,EAAE,CAAC,CAAC;UACnBC,gBAAgB,EAAE,CAAC;QACrB,CAAC;QACD,IAAIjB,YAAY,GAAGe,iBAAiB;QACpC,IAAI3E,mBAAmB,CAACH,wBAAwB,CAAC6E,GAAG,CAAC5C,WAAW,CAAC,EAAE;UACjE8B,YAAY,GAAG5D,mBAAmB,CAACH,wBAAwB,CAACiF,GAAG,CAAChD,WAAW,CAA+B;QAC5G;QAEA,MAAMiD,UAAU,GAAG,MAAc;UAC/B,IAAI,CAAC7D,SAAS,CAAC2B,EAAE,CAACmC,UAAU,EAAE,EAAE,OAAO,WAAW;UAClD,OAAO,IAAAC,uCAAY,EAAC/D,SAAS,CAAC2B,EAAE,CAACzD,OAAO,CAAW;QACrD,CAAC;QAED,MAAMA,OAAO,GAAG2F,UAAU,EAAE;QAC5B,MAAM1D,SAAS,GAAG,MAAM,IAAI,CAACrC,kBAAkB,CAACkG,qBAAqB,CAAChE,SAAS,CAAC;QAChF,MAAMiE,QAAQ,GAAG,KAAIC,sCAAiB,EAACtD,WAAW,EAAE,KAAIuD,gBAAM,EAACjG,OAAO,CAAC,EAAEwE,YAAY,EAAE1C,SAAS,EAAEG,SAAS,CAAC;QAC5GmD,mBAAmB,CAACH,GAAG,CAACvC,WAAW,EAAEqD,QAAQ,CAAC;MAChD;IACF,CAAC,CAAC;IACF,OAAOX,mBAAmB;EAC5B;AACF;AAAC;AAED,SAASjB,gBAAgB,CAACe,cAA8B,EAAEgB,qBAAkC,EAAkB;EAC5G,MAAMC,QAAQ,GAAGjB,cAAc,CAACpE,MAAM,CAAEC,GAAG,IAAK;IAC9C;IACA,IAAI,EAAEA,GAAG,YAAYqF,mCAAmB,CAAC,EAAE;MACzC,OAAO,IAAI;IACb;IACA;IACA,IAAI,CAACrF,GAAG,CAACiD,WAAW,CAAC4B,UAAU,EAAE,EAAE,OAAO,KAAK;IAC/C,MAAMS,iBAAiB,GAAGH,qBAAqB,CAACI,IAAI,CAAExE,SAAS,IAAK;MAClE;MACA,IAAI,CAACA,SAAS,CAAC2B,EAAE,CAACmC,UAAU,EAAE,EAAE;QAC9B,OAAO9D,SAAS,CAAC2B,EAAE,CAAC8C,QAAQ,EAAE,KAAKxF,GAAG,CAACiD,WAAW,CAACuC,QAAQ,CAAC;UAAEC,aAAa,EAAE;QAAK,CAAC,CAAC;MACtF;MACA;MACA;MACA;MACA;MACA,OACE1E,SAAS,CAAC2B,EAAE,CAACgD,OAAO,CAACC,qBAAqB,CAAC3F,GAAG,CAACiD,WAAW,CAACyC,OAAO,CAAC,IACnE3E,SAAS,CAACc,KAAK,CAACC,SAAS,CAACY,EAAE,CAACiD,qBAAqB,CAAC3F,GAAG,CAACiD,WAAW,CAACyC,OAAO,CAAC;IAE/E,CAAC,CAAC;IACF,IAAIJ,iBAAiB,EAAE,OAAO,KAAK;IACnC,OAAO,IAAI;EACb,CAAC,CAAC;EACF,OAAOF,QAAQ;AACjB;;AAEA;AACA;AACA;AACA;AACA;AACA,SAAS/B,qBAAqB,CAACc,cAA8B,EAAEjC,eAA8B,EAAkB;EAC7G,MAAMkD,QAAQ,GAAGjB,cAAc,CAACpE,MAAM,CAAEC,GAAG,IAAK;IAC9C,MAAM4F,UAAU,GAAG1D,eAAe,CAACqD,IAAI,CAACvF,GAAG,CAAC0C,EAAE,CAAC;IAC/C,IAAI,CAACkD,UAAU,EAAE;MACf,OAAO,IAAI;IACb;IACA,IAAIA,UAAU,CAACC,KAAK,CAACC,cAAc,EAAE;MACnC,OAAO,KAAK;IACd;IACA,OAAO,IAAI;EACb,CAAC,CAAC;EACF,OAAOV,QAAQ;AACjB;AAEA,SAAS9E,4BAA4B,CAACD,IAAoB,EAAkB;EAC1E,OAAO,IAAA0F,gBAAM,EAAC1F,IAAI,EAAG2F,WAAW,IAAK,CAACA,WAAW,CAACC,UAAU,CAAC,YAAY,CAAC,CAAC;AAC7E"}
+{"version":3,"names":["DEFAULT_CREATE_OPTIONS","filterComponentsFromManifests","createManifestForComponentsWithoutDependencies","dedupe","WorkspaceManifestFactory","constructor","dependencyResolver","aspectLoader","createFromComponents","name","version","rootPolicy","rootDir","components","options","optsWithDefaults","Object","assign","hasRootComponents","componentDependenciesMap","buildComponentDependenciesMap","dependencyFilterFn","dedupedDependencies","getEmptyDedupedDependencies","filter","dep","dependencyId","rootDependencies","dedupeDependencies","mapValues","deps","excludeWorkspaceDependencies","toManifest","componentsManifestsMap","getComponentsManifests","envSelfPeers","getEnvsSelfPeersPolicy","workspaceManifest","WorkspaceManifest","foundEnvs","component","values","push","envPolicy","peersPolicies","map","policy","selfPolicy","mergedPolicies","VariantPolicy","mergePolices","buildResultsP","packageName","componentIdToPackageName","state","_consumer","depList","getDependencies","includeHidden","componentPolicy","getPolicy","additionalDeps","coreAspectIds","getCoreAspectIds","comp","toTypeArray","compIdWithoutVersion","id","split","isExtension","includes","some","c","isEqual","componentId","pkgName","getPackageName","filterComponents","filterResolvedFromEnv","updateDependenciesVersions","depManifest","toDependenciesManifest","dependencies","result","Map","length","results","Promise","all","forEach","currResult","set","dependencyList","updateDependencyVersion","componentsManifests","pMapSeries","has","blankDependencies","devDependencies","peerDependencies","get","getVersion","hasVersion","snapToSemver","getComponentEnvPolicy","manifest","ComponentManifest","SemVer","componentsToFilterOut","filtered","ComponentDependency","depPkgName","existingComponent","find","toString","ignoreVersion","_legacy","isEqualWithoutVersion","fromPolicy","value","resolveFromEnv","pickBy","versionSpec","startsWith"],"sources":["workspace-manifest-factory.ts"],"sourcesContent":["import { AspectLoaderMain } from '@teambit/aspect-loader';\nimport { Component } from '@teambit/component';\nimport componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';\nimport { pickBy, mapValues } from 'lodash';\nimport { SemVer } from 'semver';\nimport pMapSeries from 'p-map-series';\nimport { snapToSemver } from '@teambit/component-package-version';\nimport { ComponentDependency, DependencyList, PackageName } from '../dependencies';\nimport { VariantPolicy, WorkspacePolicy, EnvPolicy } from '../policy';\nimport { DependencyResolverMain } from '../dependency-resolver.main.runtime';\nimport { ComponentsManifestsMap } from '../types';\nimport { ComponentManifest } from './component-manifest';\nimport { dedupeDependencies, DedupedDependencies, getEmptyDedupedDependencies } from './deduping';\nimport { ManifestToJsonOptions, ManifestDependenciesObject, DepObjectValue } from './manifest';\nimport { updateDependencyVersion } from './update-dependency-version';\nimport { WorkspaceManifest } from './workspace-manifest';\n\nexport type DepsFilterFn = (dependencies: DependencyList) => DependencyList;\n\nexport type ComponentDependenciesMap = Map<PackageName, ManifestDependenciesObject>;\nexport interface WorkspaceManifestToJsonOptions extends ManifestToJsonOptions {\n  includeDir?: boolean;\n}\n\nexport type CreateFromComponentsOptions = {\n  filterComponentsFromManifests: boolean;\n  createManifestForComponentsWithoutDependencies: boolean;\n  dedupe?: boolean;\n  dependencyFilterFn?: DepsFilterFn;\n};\n\nconst DEFAULT_CREATE_OPTIONS: CreateFromComponentsOptions = {\n  filterComponentsFromManifests: true,\n  createManifestForComponentsWithoutDependencies: true,\n  dedupe: true,\n};\nexport class WorkspaceManifestFactory {\n  constructor(private dependencyResolver: DependencyResolverMain, private aspectLoader: AspectLoaderMain) {}\n\n  async createFromComponents(\n    name: string,\n    version: SemVer,\n    rootPolicy: WorkspacePolicy,\n    rootDir: string,\n    components: Component[],\n    options: CreateFromComponentsOptions = DEFAULT_CREATE_OPTIONS\n  ): Promise<WorkspaceManifest> {\n    // Make sure to take other default if passed options with only one option\n    const optsWithDefaults = Object.assign({}, DEFAULT_CREATE_OPTIONS, options);\n    const hasRootComponents = this.dependencyResolver.hasRootComponents();\n    const componentDependenciesMap: ComponentDependenciesMap = await this.buildComponentDependenciesMap(\n      components,\n      optsWithDefaults.filterComponentsFromManifests,\n      rootPolicy,\n      optsWithDefaults.dependencyFilterFn,\n      hasRootComponents\n    );\n    let dedupedDependencies = getEmptyDedupedDependencies();\n    rootPolicy = rootPolicy.filter((dep) => dep.dependencyId !== '@teambit/legacy');\n    if (hasRootComponents) {\n      const { rootDependencies } = dedupeDependencies(rootPolicy, componentDependenciesMap);\n      // We hoist dependencies in order for the IDE to work.\n      // For runtime, the peer dependencies are installed inside:\n      // <ws root>/node_module/<comp name>/node_module/<comp name>/node_modules\n      dedupedDependencies.rootDependencies = mapValues(\n        rootDependencies,\n        (deps) => deps && excludeWorkspaceDependencies(deps)\n      );\n      dedupedDependencies.componentDependenciesMap = componentDependenciesMap;\n    } else if (options.dedupe) {\n      dedupedDependencies = dedupeDependencies(rootPolicy, componentDependenciesMap);\n    } else {\n      dedupedDependencies.rootDependencies = rootPolicy.toManifest();\n      dedupedDependencies.componentDependenciesMap = componentDependenciesMap;\n    }\n    const componentsManifestsMap = await this.getComponentsManifests(\n      dedupedDependencies,\n      components,\n      optsWithDefaults.createManifestForComponentsWithoutDependencies\n    );\n    const envSelfPeers = this.getEnvsSelfPeersPolicy(componentsManifestsMap);\n    const workspaceManifest = new WorkspaceManifest(\n      name,\n      version,\n      dedupedDependencies.rootDependencies,\n      envSelfPeers,\n      rootDir,\n      componentsManifestsMap\n    );\n    return workspaceManifest;\n  }\n\n  private getEnvsSelfPeersPolicy(componentsManifestsMap: ComponentsManifestsMap) {\n    const foundEnvs: EnvPolicy[] = [];\n    for (const component of componentsManifestsMap.values()) {\n      foundEnvs.push(component.envPolicy);\n    }\n    const peersPolicies = foundEnvs.map((policy) => policy.selfPolicy);\n    // TODO: At the moment we are just merge everything, so in case of conflicts one will be taken\n    // TODO: once we have root for each env, we should know to handle it differently\n    const mergedPolicies = VariantPolicy.mergePolices(peersPolicies);\n    return mergedPolicies;\n  }\n\n  /**\n   * Get the components and build a map with the package name (from the component) as key and the dependencies as values\n   *\n   * @param {Component[]} components\n   * @param {boolean} [filterComponentsFromManifests=true] - filter existing components from the dep graphs\n   * @returns\n   */\n  private async buildComponentDependenciesMap(\n    components: Component[],\n    filterComponentsFromManifests = true,\n    rootPolicy: WorkspacePolicy,\n    dependencyFilterFn: DepsFilterFn | undefined,\n    hasRootComponents?: boolean\n  ): Promise<ComponentDependenciesMap> {\n    const buildResultsP = components.map(async (component) => {\n      const packageName = componentIdToPackageName(component.state._consumer);\n      let depList = await this.dependencyResolver.getDependencies(component, { includeHidden: true });\n      const componentPolicy = await this.dependencyResolver.getPolicy(component);\n      const additionalDeps = {};\n      if (hasRootComponents) {\n        const coreAspectIds = this.aspectLoader.getCoreAspectIds();\n        for (const comp of depList.toTypeArray('component') as ComponentDependency[]) {\n          const [compIdWithoutVersion] = comp.id.split('@');\n          if (\n            !comp.isExtension &&\n            !coreAspectIds.includes(compIdWithoutVersion) &&\n            components.some((c) => c.id.isEqual(comp.componentId))\n          ) {\n            const pkgName = comp.getPackageName();\n            if (pkgName !== '@teambit/harmony') {\n              additionalDeps[pkgName] = `workspace:*`;\n            }\n          }\n        }\n      }\n      if (filterComponentsFromManifests) {\n        depList = filterComponents(depList, components);\n      }\n      depList = filterResolvedFromEnv(depList, componentPolicy);\n      // Remove bit bin from dep list\n      depList = depList.filter((dep) => dep.id !== '@teambit/legacy');\n      if (dependencyFilterFn) {\n        depList = dependencyFilterFn(depList);\n      }\n      await this.updateDependenciesVersions(component, rootPolicy, depList);\n      const depManifest = depList.toDependenciesManifest();\n      depManifest.dependencies = {\n        ...additionalDeps,\n        ...depManifest.dependencies,\n      };\n\n      return { packageName, depManifest };\n    });\n    const result: ComponentDependenciesMap = new Map();\n\n    if (buildResultsP.length) {\n      const results = await Promise.all(buildResultsP);\n      results.forEach((currResult) => {\n        result.set(currResult.packageName, currResult.depManifest);\n      });\n    }\n\n    return result;\n  }\n\n  private async updateDependenciesVersions(\n    component: Component,\n    rootPolicy: WorkspacePolicy,\n    dependencyList: DependencyList\n  ): Promise<void> {\n    const mergedPolicies = await this.dependencyResolver.getPolicy(component);\n    dependencyList.forEach((dep) => {\n      updateDependencyVersion(dep, rootPolicy, mergedPolicies);\n    });\n  }\n\n  /**\n   * Get the components manifests based on the calculated dedupedDependencies\n   *\n   * @param {DedupedDependencies} dedupedDependencies\n   * @param {Component[]} components\n   * @returns {ComponentsManifestsMap}\n   */\n  async getComponentsManifests(\n    dedupedDependencies: DedupedDependencies,\n    components: Component[],\n    createManifestForComponentsWithoutDependencies = true\n  ): Promise<ComponentsManifestsMap> {\n    const componentsManifests: ComponentsManifestsMap = new Map();\n    // don't use Promise.all, along the road this code might import an env from a remote, which can't be done in parallel.\n    // otherwise, it may import the same component multiple times, and if fails, the ref (remote-lane) files may be corrupted.\n    await pMapSeries(components, async (component) => {\n      const packageName = componentIdToPackageName(component.state._consumer);\n      if (\n        dedupedDependencies.componentDependenciesMap.has(packageName) ||\n        createManifestForComponentsWithoutDependencies\n      ) {\n        const blankDependencies: ManifestDependenciesObject = {\n          dependencies: {},\n          devDependencies: {},\n          peerDependencies: {},\n        };\n        let dependencies = blankDependencies;\n        if (dedupedDependencies.componentDependenciesMap.has(packageName)) {\n          dependencies = dedupedDependencies.componentDependenciesMap.get(packageName) as ManifestDependenciesObject;\n        }\n\n        const getVersion = (): string => {\n          if (!component.id.hasVersion()) return '0.0.1-new';\n          return snapToSemver(component.id.version as string);\n        };\n\n        const version = getVersion();\n        const envPolicy = await this.dependencyResolver.getComponentEnvPolicy(component);\n        const manifest = new ComponentManifest(packageName, new SemVer(version), dependencies, component, envPolicy);\n        componentsManifests.set(packageName, manifest);\n      }\n    });\n    return componentsManifests;\n  }\n}\n\nfunction filterComponents(dependencyList: DependencyList, componentsToFilterOut: Component[]): DependencyList {\n  const filtered = dependencyList.filter((dep) => {\n    if (!(dep instanceof ComponentDependency)) {\n      const depPkgName = dep.getPackageName?.();\n      if (!depPkgName) return true;\n      // If the package is already in the workspace as a local component,\n      // then we don't want to install that package as a dependency to node_modules.\n      // Otherwise, it would rewrite the local component inside the root node_modules that is created by bit link.\n      return !componentsToFilterOut.some((component) =>\n        depPkgName === componentIdToPackageName(component.state._consumer)\n      );\n    }\n    // Remove dependencies which has no version (they are new in the workspace)\n    if (!dep.componentId.hasVersion()) return false;\n    const existingComponent = componentsToFilterOut.find((component) => {\n      // For new components, the component has no version but the dependency id has version 0.0.1\n      if (!component.id.hasVersion()) {\n        return component.id.toString() === dep.componentId.toString({ ignoreVersion: true });\n      }\n      // We are checking against both component.id._legacy and component.state._consumer.id\n      // Because during tag operation, the component.id._legacy has the current version (before the tag)\n      // while the component.state._consumer.id has the upcoming version (the version that will be after the tag)\n      // The dependency in some cases is already updated to the upcoming version\n      return (\n        component.id._legacy.isEqualWithoutVersion(dep.componentId._legacy) ||\n        component.state._consumer.id.isEqualWithoutVersion(dep.componentId._legacy)\n      );\n    });\n    if (existingComponent) return false;\n    return true;\n  });\n  return filtered;\n}\n\n/**\n * Filter deps which should be resolved from the env, we don't want to install them, they will be linked manually later\n * @param dependencyList\n * @param componentPolicy\n */\nfunction filterResolvedFromEnv(dependencyList: DependencyList, componentPolicy: VariantPolicy): DependencyList {\n  const filtered = dependencyList.filter((dep) => {\n    const fromPolicy = componentPolicy.find(dep.id);\n    if (!fromPolicy) {\n      return true;\n    }\n    if (fromPolicy.value.resolveFromEnv) {\n      return false;\n    }\n    return true;\n  });\n  return filtered;\n}\n\nfunction excludeWorkspaceDependencies(deps: DepObjectValue): DepObjectValue {\n  return pickBy(deps, (versionSpec) => !versionSpec.startsWith('workspace:'));\n}\n"],"mappings":"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"}

package/dist/{preview-1674098968766.js → preview-1674271762484.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.dependencies_dependency-resolver@0.0.964/dist/dependency-resolver.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.dependencies_dependency-resolver@0.0.964/dist/dependency-resolver.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.dependencies_dependency-resolver@0.0.965/dist/dependency-resolver.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.dependencies_dependency-resolver@0.0.965/dist/dependency-resolver.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/manifest/workspace-manifest-factory.ts

@@ -226,9 +226,15 @@ export class WorkspaceManifestFactory {
 
 function filterComponents(dependencyList: DependencyList, componentsToFilterOut: Component[]): DependencyList {
   const filtered = dependencyList.filter((dep) => {
-    // Do not filter non components (like packages) dependencies
     if (!(dep instanceof ComponentDependency)) {
-      return true;
+      const depPkgName = dep.getPackageName?.();
+      if (!depPkgName) return true;
+      // If the package is already in the workspace as a local component,
+      // then we don't want to install that package as a dependency to node_modules.
+      // Otherwise, it would rewrite the local component inside the root node_modules that is created by bit link.
+      return !componentsToFilterOut.some((component) =>
+        depPkgName === componentIdToPackageName(component.state._consumer)
+      );
     }
     // Remove dependencies which has no version (they are new in the workspace)
     if (!dep.componentId.hasVersion()) return false;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/dependency-resolver",
-  "version": "0.0.964",
+  "version": "0.0.965",
   "homepage": "https://bit.dev/teambit/dependencies/dependency-resolver",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.dependencies",
     "name": "dependency-resolver",
-    "version": "0.0.964"
+    "version": "0.0.965"
   },
   "dependencies": {
     "cli-highlight": "2.1.9",
@@ -31,20 +31,20 @@
     "@teambit/harmony": "0.4.6",
     "@pnpm/network.ca-file": "1.0.2",
     "@teambit/component-version": "0.0.406",
-    "@teambit/envs": "0.0.964",
-    "@teambit/aspect-loader": "0.0.964",
-    "@teambit/component": "0.0.964",
-    "@teambit/logger": "0.0.740",
+    "@teambit/envs": "0.0.965",
+    "@teambit/aspect-loader": "0.0.965",
+    "@teambit/component": "0.0.965",
+    "@teambit/logger": "0.0.741",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/graphql": "0.0.964",
-    "@teambit/bit": "0.0.966",
-    "@teambit/cli": "0.0.647",
-    "@teambit/config": "0.0.660",
-    "@teambit/global-config": "0.0.649",
+    "@teambit/graphql": "0.0.965",
+    "@teambit/bit": "0.0.967",
+    "@teambit/cli": "0.0.648",
+    "@teambit/config": "0.0.661",
+    "@teambit/global-config": "0.0.650",
     "@teambit/harmony.modules.requireable-component": "0.0.491",
     "@teambit/legacy-bit-id": "0.0.421",
-    "@teambit/snapping": "0.0.279",
-    "@teambit/isolator": "0.0.964",
+    "@teambit/snapping": "0.0.280",
+    "@teambit/isolator": "0.0.965",
     "@teambit/component-issues": "0.0.85",
     "@teambit/component-package-version": "0.0.421",
     "@teambit/component-id": "0.0.425"
@@ -64,7 +64,7 @@
     "@teambit/dependencies.aspect-docs.dependency-resolver": "0.0.157"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.427",
+    "@teambit/legacy": "1.0.429",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },