fix(templates) - resolve env id set by template to add env version to…

… generated component (#8787)
teambit · Apr 15, 2024 · ca73801 · ca73801
1 parent f2775bf
commit ca73801
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/scopes/generator/generator/component-generator.ts b/scopes/generator/generator/component-generator.ts
@@ -224,7 +224,15 @@ export class ComponentGenerator {
         setBy: hasEnvConfiguredOriginally ? 'workspace variants' : '<default>',
       };
     };
-    const { envId, setBy } = getEnvData();
+    // eslint-disable-next-line prefer-const
+    let { envId, setBy } = getEnvData();
+    if (envId) {
+      const isInWorkspace = this.workspace.exists(envId);
+      const isSameAsThisEnvId = envId === this.envId?.toString() || envId === this.envId?.toStringWithoutVersion();
+      if (isSameAsThisEnvId && this.envId) {
+        envId = isInWorkspace ? this.envId.toStringWithoutVersion() : this.envId.toString();
+      }
+    }
     return {
       id: componentId,
       dir: componentPath,