@teambit/workspace 1.0.338 → 1.0.339

package/dist/{preview-1721186478884.js → preview-1721223204715.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.338/dist/workspace.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.338/dist/workspace.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.339/dist/workspace.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.339/dist/workspace.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/types.d.ts

@@ -18,6 +18,11 @@ export interface WorkspaceExtConfig {
      * set the default directory when there is no matching for the component in the components array.
      */
     defaultDirectory: string;
+    /**
+     * sets the location of the root components directory.
+     * The location is a relative path to the workspace root and should use linux path separators (/).
+     */
+    rootComponentsDirectory?: string;
     /**
      * set the default structure of components in your project
      */

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["interface VendorConfig {\n  directory: string;\n}\n\nexport interface WorkspaceExtConfig {\n  /**\n   * name of the workspace.\n   */\n  name: string;\n\n  /**\n   * path to icon.\n   */\n  icon: string;\n\n  /**\n   * set the default scope when there is no matching for the component in the components array.\n   */\n  defaultScope: string;\n\n  /**\n   * set the default directory when there is no matching for the component in the components array.\n   */\n  defaultDirectory: string;\n\n  /**\n   * set the default structure of components in your project\n   */\n  vendor: VendorConfig;\n\n  /**\n   * All component extensions applied by default on all components in the workspace (except vendor components)\n   */\n  extensions: { [extensionsId: string]: string };\n\n  /**\n   * If set to\n   * `true`, it allows the workspace to resolve scope's aspects from node modules\n   * installed in the workspace's `node_modules` directory. If not set or set to `false`, aspects will only be resolved\n   * from the scope aspects capsule.\n   */\n  resolveAspectsFromNodeModules?: boolean;\n\n  /**\n   * If set to `true`, it allows the workspace to resolve envs from node modules\n   * installed in the workspace's `node_modules` directory.\n   * the envs will be resolved from the node_modules of the env's root (workspace/node_modules/.bit_roots/{envId})\n   * and if not found (usually when the env was hoisted to the root node_modules) then from the node_modules of the\n   * workspace.\n   * If not set or set to `false`, envs will only be resolved from the scope envs capsule.\n   */\n  resolveEnvsFromRoots?: boolean;\n\n  /**\n   * If set to `true`, bit will try to load aspects dependencies automatically.\n   * even if the aspects dependencies are not configured in the workspace.jsonc root config.\n   * for example having the aspect\n   * main aspect\n   * export class MainAspectMain {\n   *  ...\n   *   static dependencies = [MyDepAspect];\n   * }\n   * and the in the workspace.jsonc file:\n   * {\n   *  ...\n   *   main-aspect: {}\n   * }\n   * when set to true, bit will try to load MyDepAspect automatically.\n   */\n  autoLoadAspectsDeps?: boolean;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["interface VendorConfig {\n  directory: string;\n}\n\nexport interface WorkspaceExtConfig {\n  /**\n   * name of the workspace.\n   */\n  name: string;\n\n  /**\n   * path to icon.\n   */\n  icon: string;\n\n  /**\n   * set the default scope when there is no matching for the component in the components array.\n   */\n  defaultScope: string;\n\n  /**\n   * set the default directory when there is no matching for the component in the components array.\n   */\n  defaultDirectory: string;\n\n  /**\n   * sets the location of the root components directory.\n   * The location is a relative path to the workspace root and should use linux path separators (/).\n   */\n  rootComponentsDirectory?: string;\n\n  /**\n   * set the default structure of components in your project\n   */\n  vendor: VendorConfig;\n\n  /**\n   * All component extensions applied by default on all components in the workspace (except vendor components)\n   */\n  extensions: { [extensionsId: string]: string };\n\n  /**\n   * If set to\n   * `true`, it allows the workspace to resolve scope's aspects from node modules\n   * installed in the workspace's `node_modules` directory. If not set or set to `false`, aspects will only be resolved\n   * from the scope aspects capsule.\n   */\n  resolveAspectsFromNodeModules?: boolean;\n\n  /**\n   * If set to `true`, it allows the workspace to resolve envs from node modules\n   * installed in the workspace's `node_modules` directory.\n   * the envs will be resolved from the node_modules of the env's root (workspace/node_modules/.bit_roots/{envId})\n   * and if not found (usually when the env was hoisted to the root node_modules) then from the node_modules of the\n   * workspace.\n   * If not set or set to `false`, envs will only be resolved from the scope envs capsule.\n   */\n  resolveEnvsFromRoots?: boolean;\n\n  /**\n   * If set to `true`, bit will try to load aspects dependencies automatically.\n   * even if the aspects dependencies are not configured in the workspace.jsonc root config.\n   * for example having the aspect\n   * main aspect\n   * export class MainAspectMain {\n   *  ...\n   *   static dependencies = [MyDepAspect];\n   * }\n   * and the in the workspace.jsonc file:\n   * {\n   *  ...\n   *   main-aspect: {}\n   * }\n   * when set to true, bit will try to load MyDepAspect automatically.\n   */\n  autoLoadAspectsDeps?: boolean;\n}\n"],"mappings":"","ignoreList":[]}

package/dist/workspace.d.ts

@@ -178,6 +178,10 @@ export declare class Workspace implements ComponentFactory {
      * root path of the Workspace.
      */
     get path(): string;
+    /**
+     * Get the location of the bit roots folder
+     */
+    get rootComponentsPath(): string;
     /** get the `node_modules` folder of this workspace */
     private get modulesPath();
     get isLegacy(): boolean;
@@ -501,6 +505,7 @@ export declare class Workspace implements ComponentFactory {
      */
     _reloadConsumer(): Promise<void>;
     getComponentPackagePath(component: Component): Promise<string>;
+    _getComponentRelativePath(component: Component): Promise<string>;
     get defaultDirectory(): string;
     get legacyDefaultDirectory(): string;
     resolveComponentIdFromPackageName(packageName: string): Promise<ComponentID>;

package/dist/workspace.js

@@ -429,6 +429,9 @@ class Workspace {
     if ((0, _lodash().isEmpty)(this.config)) throw new (_bitError().BitError)(`fatal: workspace config is empty. probably one of bit files is missing. please run "bit init" to rewrite them`);
     const defaultScope = this.config.defaultScope;
     if (!defaultScope) throw new (_bitError().BitError)('defaultScope is missing');
+    if (this.config.rootComponentsDirectory === '') {
+      throw new (_bitError().BitError)('rootComponentsDirectory cannot be empty. Root components directory location cannot be the same as the workspace directory path');
+    }
     if (!(0, _legacyBitId().isValidScopeName)(defaultScope)) throw new (_legacyBitId().InvalidScopeName)(defaultScope);
   }
 
@@ -439,6 +442,13 @@ class Workspace {
     return this.consumer.getPath();
   }
 
+  /**
+   * Get the location of the bit roots folder
+   */
+  get rootComponentsPath() {
+    return this.config.rootComponentsDirectory ?? _path().default.join(this.modulesPath, '.bit_roots');
+  }
+
   /** get the `node_modules` folder of this workspace */
   get modulesPath() {
     return _path().default.join(this.path, 'node_modules');
@@ -1677,9 +1687,16 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     await this.clearCache();
   }
   async getComponentPackagePath(component) {
-    const inInWs = await this.hasId(component.id);
-    const relativePath = this.dependencyResolver.getRuntimeModulePath(component, inInWs);
-    return _path().default.join(this.path, relativePath);
+    return _path().default.join(this.path, await this._getComponentRelativePath(component));
+  }
+  async _getComponentRelativePath(component) {
+    if (this.hasId(component.id)) {
+      return this.dependencyResolver.getRuntimeModulePathInWorkspace(component, {
+        workspacePath: this.path,
+        rootComponentsPath: this.rootComponentsPath
+      });
+    }
+    return this.dependencyResolver.getRuntimeModulePathInCapsules(component);
   }
 
   // TODO: should we return here the dir as it defined (aka components) or with /{name} prefix (as it used in legacy)