@teambit/dependency-resolver 1.0.339 → 1.0.341

package/dist/dependency-resolver.main.runtime.d.ts

@@ -221,12 +221,7 @@ export declare class DependencyResolverMain {
     getPackageName(component: Component): string;
     getDepResolverData(component: Component): DependencyResolverComponentData | undefined;
     calcPackageName(component: Component): string;
-    getRuntimeModulePathInWorkspace(component: Component, opts: {
-        workspacePath: string;
-        rootComponentsPath: string;
-    }): string;
-    getRuntimeModulePathInCapsules(component: Component): string;
-    _getRuntimeModulePath(component: Component, rootComponentsRelativePath?: string): string;
+    getRuntimeModulePath(component: Component, isInWorkspace?: boolean): string;
     /**
      * returns the package path in the /node_modules/ folder
      * In case you call this in order to run the code from the path, please refer to the `getRuntimeModulePath` API

package/dist/dependency-resolver.main.runtime.js

@@ -44,9 +44,9 @@ function _bit() {
   };
   return data;
 }
-function _workspace() {
-  const data = require("@teambit/workspace.root-components");
-  _workspace = function () {
+function _bitRoots() {
+  const data = require("@teambit/bit-roots");
+  _bitRoots = function () {
     return data;
   };
   return data;
@@ -632,35 +632,17 @@ class DependencyResolverMain {
     return (0, _pkgModules().componentIdToPackageName)(component.state._consumer);
   }
 
-  /*
-   * Returns the location where the component is installed with its peer dependencies inside a workspace.
-   * This is used in cases you want to actually run the components and make sure all the dependencies (especially peers) are resolved correctly
-   */
-  getRuntimeModulePathInWorkspace(component, opts) {
-    const rootComponentsRelativePath = (0, _path().relative)(opts.workspacePath, opts.rootComponentsPath);
-    return this._getRuntimeModulePath(component, rootComponentsRelativePath);
-  }
-
-  /*
-   * Returns the location where the component is installed with its peer dependencies inside capsules.
-   * This is used in cases you want to actually run the components and make sure all the dependencies (especially peers) are resolved correctly
-   */
-  getRuntimeModulePathInCapsules(component) {
-    return this._getRuntimeModulePath(component);
-  }
-
   /*
    * Returns the location where the component is installed with its peer dependencies
    * This is used in cases you want to actually run the components and make sure all the dependencies (especially peers) are resolved correctly
    */
-  _getRuntimeModulePath(component, rootComponentsRelativePath) {
+  getRuntimeModulePath(component, isInWorkspace = false) {
     if (!this.hasRootComponents()) {
       const modulePath = this.getModulePath(component);
       return modulePath;
     }
     const pkgName = this.getPackageName(component);
-    const getRelativeRootComponentDir = _workspace().getRootComponentDir.bind(null, rootComponentsRelativePath ?? '');
-    const selfRootDir = getRelativeRootComponentDir(rootComponentsRelativePath == null ? component.id.toString() : component.id.toStringWithoutVersion());
+    const selfRootDir = (0, _bitRoots().getRelativeRootComponentDir)(!isInWorkspace ? component.id.toString() : component.id.toStringWithoutVersion());
     // In case the component is it's own root we want to load it from it's own root folder
     if (_fsExtra().default.pathExistsSync(selfRootDir)) {
       const innerDir = (0, _path().join)(selfRootDir, 'node_modules', pkgName);
@@ -670,7 +652,7 @@ class DependencyResolverMain {
       return this.getModulePath(component);
     }
     const envId = this.envs.getEnvId(component);
-    const dirInEnvRoot = (0, _path().join)(getRelativeRootComponentDir(envId), 'node_modules', pkgName);
+    const dirInEnvRoot = (0, _path().join)((0, _bitRoots().getRelativeRootComponentDir)(envId), 'node_modules', pkgName);
     if (_fsExtra().default.pathExistsSync(dirInEnvRoot)) return dirInEnvRoot;
     return this.getModulePath(component);
   }