@teambit/workspace 0.0.627 → 0.0.629

package/__preview-1642994756471.js

@@ -0,0 +1 @@
+

package/dist/ui/workspace-components-drawer/workspace-components-drawer.module.scss

@@ -2,3 +2,7 @@
   padding: 8px 8px 0 28px;
   display: block;
 }
+
+.collapseIcon {
+  width: 16px;
+}

package/dist/ui/workspace-components-drawer/workspace-components.drawer.d.ts

@@ -5,5 +5,9 @@ export declare class WorkspaceComponentsDrawer implements DrawerType {
     private treeNodeSlot;
     constructor(treeNodeSlot: ComponentTreeSlot);
     name: string;
+    widget: JSX.Element;
+    Context: ({ children }: {
+        children: any;
+    }) => JSX.Element;
     render: () => JSX.Element;
 }

package/dist/ui/workspace-components-drawer/workspace-components.drawer.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+require("core-js/modules/es.array.iterator.js");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -111,12 +113,32 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const WorkspaceTreeContext = /*#__PURE__*/(0, _react().createContext)({
+  collapsed: true,
+  setCollapsed: () => {}
+});
+
 class WorkspaceComponentsDrawer {
   constructor(treeNodeSlot) {
     this.treeNodeSlot = treeNodeSlot;
     (0, _defineProperty2().default)(this, "name", 'COMPONENTS');
+    (0, _defineProperty2().default)(this, "widget", /*#__PURE__*/_react().default.createElement(Widget, null));
+    (0, _defineProperty2().default)(this, "Context", ({
+      children
+    }) => {
+      const [collapsed, setCollapsed] = (0, _react().useState)(true);
+      return /*#__PURE__*/_react().default.createElement(WorkspaceTreeContext.Provider, {
+        value: {
+          collapsed,
+          setCollapsed
+        }
+      }, children);
+    });
     (0, _defineProperty2().default)(this, "render", () => {
       const workspace = (0, _react().useContext)(_workspaceContext().WorkspaceContext);
+      const {
+        collapsed
+      } = (0, _react().useContext)(WorkspaceTreeContext);
       const {
         treeNodeSlot
       } = this;
@@ -124,16 +146,22 @@ class WorkspaceComponentsDrawer {
         const children = props.node.children;
         if (!children) return /*#__PURE__*/_react().default.createElement(_uiFoundationUi2().ComponentView, (0, _extends2().default)({}, props, {
           treeNodeSlot: treeNodeSlot
-        }));
+        })); // non collapse
+
         if (props.node.payload instanceof _uiFoundationUi2().ScopePayload) return /*#__PURE__*/_react().default.createElement(_uiFoundationUi2().ScopeTreeNode, props);
         return /*#__PURE__*/_react().default.createElement(_uiFoundationUi2().NamespaceTreeNode, props);
       }, [treeNodeSlot]);
       if (!workspace) return /*#__PURE__*/_react().default.createElement(_uiFoundationUi().FullLoader, null);
-      if (workspace.components.length === 0) return /*#__PURE__*/_react().default.createElement("span", {
-        className: (0, _classnames().default)(_designUiStyles().mutedItalic, _designUiStyles2().ellipsis, _workspaceComponentsDrawerModule().default.emptyWorkspace)
-      }, "Workspace is empty");
+
+      if (workspace.components.length === 0) {
+        return /*#__PURE__*/_react().default.createElement("span", {
+          className: (0, _classnames().default)(_designUiStyles().mutedItalic, _designUiStyles2().ellipsis, _workspaceComponentsDrawerModule().default.emptyWorkspace)
+        }, "Workspace is empty");
+      }
+
       return /*#__PURE__*/_react().default.createElement(_uiFoundationUi2().ComponentTree, {
         components: workspace.components,
+        isCollapsed: collapsed,
         TreeNode: TreeNodeRenderer
       });
     });
@@ -143,4 +171,17 @@ class WorkspaceComponentsDrawer {
 
 exports.WorkspaceComponentsDrawer = WorkspaceComponentsDrawer;
 
+function Widget() {
+  const {
+    collapsed,
+    setCollapsed
+  } = (0, _react().useContext)(WorkspaceTreeContext);
+  const icon = collapsed ? 'https://static.bit.dev/bit-icons/expand.svg' : 'https://static.bit.dev/bit-icons/collapse.svg';
+  return /*#__PURE__*/_react().default.createElement("img", {
+    src: icon,
+    className: _workspaceComponentsDrawerModule().default.collapseIcon,
+    onClick: () => setCollapsed(!collapsed)
+  });
+}
+
 //# sourceMappingURL=workspace-components.drawer.js.map

package/dist/ui/workspace-components-drawer/workspace-components.drawer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["workspace-components.drawer.tsx"],"names":["WorkspaceComponentsDrawer","constructor","treeNodeSlot","workspace","WorkspaceContext","TreeNodeRenderer","TreeNode","props","children","node","payload","ScopePayload","components","length","mutedItalic","ellipsis","styles","emptyWorkspace"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAWA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;;;;;AAEO,MAAMA,yBAAN,CAAsD;AAC3DC,EAAAA,WAAW,CAASC,YAAT,EAA0C;AAAA,SAAjCA,YAAiC,GAAjCA,YAAiC;AAAA,kDAE9C,YAF8C;AAAA,oDAI5C,MAAM;AACb,YAAMC,SAAS,GAAG,yBAAWC,oCAAX,CAAlB;AACA,YAAM;AAAEF,QAAAA;AAAF,UAAmB,IAAzB;AAEA,YAAMG,gBAAgB,GAAG,0BACvB,SAASC,QAAT,CAAkBC,KAAlB,EAAqD;AACnD,cAAMC,QAAQ,GAAGD,KAAK,CAACE,IAAN,CAAWD,QAA5B;AAEA,YAAI,CAACA,QAAL,EAAe,oBAAO,+BAAC,gCAAD,+BAAmBD,KAAnB;AAA0B,UAAA,YAAY,EAAEL;AAAxC,WAAP;AAEf,YAAIK,KAAK,CAACE,IAAN,CAAWC,OAAX,YAA8BC,+BAAlC,EAAgD,oBAAO,+BAAC,gCAAD,EAAmBJ,KAAnB,CAAP;AAEhD,4BAAO,+BAAC,oCAAD,EAAuBA,KAAvB,CAAP;AACD,OATsB,EAUvB,CAACL,YAAD,CAVuB,CAAzB;AAaA,UAAI,CAACC,SAAL,EAAgB,oBAAO,+BAAC,4BAAD,OAAP;AAChB,UAAIA,SAAS,CAACS,UAAV,CAAqBC,MAArB,KAAgC,CAApC,EACE,oBAAO;AAAM,QAAA,SAAS,EAAE,2BAAWC,6BAAX,EAAwBC,2BAAxB,EAAkCC,2CAAOC,cAAzC;AAAjB,8BAAP;AACF,0BAAO,+BAAC,gCAAD;AAAe,QAAA,UAAU,EAAEd,SAAS,CAACS,UAArC;AAAiD,QAAA,QAAQ,EAAEP;AAA3D,QAAP;AACD,KAzBoD;AAAE;;AADI","sourcesContent":["import type { DrawerType } from '@teambit/ui-foundation.ui.tree.drawer';\nimport { FullLoader } from '@teambit/ui-foundation.ui.full-loader';\nimport {\n  ComponentTree,\n  PayloadType,\n  ComponentView,\n  ScopeTreeNode,\n  NamespaceTreeNode,\n  ScopePayload,\n} from '@teambit/ui-foundation.ui.side-bar';\n\nimport type { TreeNodeProps } from '@teambit/base-ui.graph.tree.recursive-tree';\n\nimport React, { useCallback, useContext } from 'react';\nimport classNames from 'classnames';\nimport { ComponentTreeSlot } from '@teambit/component-tree';\nimport { mutedItalic } from '@teambit/design.ui.styles.muted-italic';\nimport { ellipsis } from '@teambit/design.ui.styles.ellipsis';\nimport { WorkspaceContext } from '../workspace/workspace-context';\nimport styles from './workspace-components-drawer.module.scss';\n\nexport class WorkspaceComponentsDrawer implements DrawerType {\n  constructor(private treeNodeSlot: ComponentTreeSlot) {}\n\n  name = 'COMPONENTS';\n\n  render = () => {\n    const workspace = useContext(WorkspaceContext);\n    const { treeNodeSlot } = this;\n\n    const TreeNodeRenderer = useCallback(\n      function TreeNode(props: TreeNodeProps<PayloadType>) {\n        const children = props.node.children;\n\n        if (!children) return <ComponentView {...props} treeNodeSlot={treeNodeSlot} />;\n\n        if (props.node.payload instanceof ScopePayload) return <ScopeTreeNode {...props} />;\n\n        return <NamespaceTreeNode {...props} />;\n      },\n      [treeNodeSlot]\n    );\n\n    if (!workspace) return <FullLoader />;\n    if (workspace.components.length === 0)\n      return <span className={classNames(mutedItalic, ellipsis, styles.emptyWorkspace)}>Workspace is empty</span>;\n    return <ComponentTree components={workspace.components} TreeNode={TreeNodeRenderer} />;\n  };\n}\n"]}
+{"version":3,"sources":["workspace-components.drawer.tsx"],"names":["WorkspaceTreeContext","collapsed","setCollapsed","WorkspaceComponentsDrawer","constructor","treeNodeSlot","children","workspace","WorkspaceContext","TreeNodeRenderer","TreeNode","props","node","payload","ScopePayload","components","length","mutedItalic","ellipsis","styles","emptyWorkspace","Widget","icon","collapseIcon"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AASA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;;;;;AAEA,MAAMA,oBAAoB,gBAAG,4BAA0E;AACrGC,EAAAA,SAAS,EAAE,IAD0F;AAErGC,EAAAA,YAAY,EAAE,MAAM,CAAE;AAF+E,CAA1E,CAA7B;;AAKO,MAAMC,yBAAN,CAAsD;AAC3DC,EAAAA,WAAW,CAASC,YAAT,EAA0C;AAAA,SAAjCA,YAAiC,GAAjCA,YAAiC;AAAA,kDAE9C,YAF8C;AAAA,iEAI3C,+BAAC,MAAD,OAJ2C;AAAA,qDAM3C,CAAC;AAAEC,MAAAA;AAAF,KAAD,KAAkB;AAC1B,YAAM,CAACL,SAAD,EAAYC,YAAZ,IAA4B,uBAAS,IAAT,CAAlC;AACA,0BACE,+BAAC,oBAAD,CAAsB,QAAtB;AAA+B,QAAA,KAAK,EAAE;AAAED,UAAAA,SAAF;AAAaC,UAAAA;AAAb;AAAtC,SAAoEI,QAApE,CADF;AAGD,KAXoD;AAAA,oDAa5C,MAAM;AACb,YAAMC,SAAS,GAAG,yBAAWC,oCAAX,CAAlB;AACA,YAAM;AAAEP,QAAAA;AAAF,UAAgB,yBAAWD,oBAAX,CAAtB;AACA,YAAM;AAAEK,QAAAA;AAAF,UAAmB,IAAzB;AAEA,YAAMI,gBAAgB,GAAG,0BACvB,SAASC,QAAT,CAAkBC,KAAlB,EAAqD;AACnD,cAAML,QAAQ,GAAGK,KAAK,CAACC,IAAN,CAAWN,QAA5B;AAEA,YAAI,CAACA,QAAL,EAAe,oBAAO,+BAAC,gCAAD,+BAAmBK,KAAnB;AAA0B,UAAA,YAAY,EAAEN;AAAxC,WAAP,CAHoC,CAG6B;;AAEhF,YAAIM,KAAK,CAACC,IAAN,CAAWC,OAAX,YAA8BC,+BAAlC,EAAgD,oBAAO,+BAAC,gCAAD,EAAmBH,KAAnB,CAAP;AAEhD,4BAAO,+BAAC,oCAAD,EAAuBA,KAAvB,CAAP;AACD,OATsB,EAUvB,CAACN,YAAD,CAVuB,CAAzB;AAaA,UAAI,CAACE,SAAL,EAAgB,oBAAO,+BAAC,4BAAD,OAAP;;AAChB,UAAIA,SAAS,CAACQ,UAAV,CAAqBC,MAArB,KAAgC,CAApC,EAAuC;AACrC,4BAAO;AAAM,UAAA,SAAS,EAAE,2BAAWC,6BAAX,EAAwBC,2BAAxB,EAAkCC,2CAAOC,cAAzC;AAAjB,gCAAP;AACD;;AAED,0BAAO,+BAAC,gCAAD;AAAe,QAAA,UAAU,EAAEb,SAAS,CAACQ,UAArC;AAAiD,QAAA,WAAW,EAAEd,SAA9D;AAAyE,QAAA,QAAQ,EAAEQ;AAAnF,QAAP;AACD,KArCoD;AAAE;;AADI;;;;AAyC7D,SAASY,MAAT,GAAkB;AAChB,QAAM;AAAEpB,IAAAA,SAAF;AAAaC,IAAAA;AAAb,MAA8B,yBAAWF,oBAAX,CAApC;AACA,QAAMsB,IAAI,GAAGrB,SAAS,GAClB,6CADkB,GAElB,+CAFJ;AAGA,sBAAO;AAAK,IAAA,GAAG,EAAEqB,IAAV;AAAgB,IAAA,SAAS,EAAEH,2CAAOI,YAAlC;AAAgD,IAAA,OAAO,EAAE,MAAMrB,YAAY,CAAC,CAACD,SAAF;AAA3E,IAAP;AACD","sourcesContent":["import type { DrawerType } from '@teambit/ui-foundation.ui.tree.drawer';\nimport { FullLoader } from '@teambit/ui-foundation.ui.full-loader';\nimport {\n  ComponentTree,\n  PayloadType,\n  ComponentView,\n  ScopeTreeNode,\n  NamespaceTreeNode,\n  ScopePayload,\n} from '@teambit/ui-foundation.ui.side-bar';\nimport { TreeNodeProps } from '@teambit/design.ui.tree';\nimport React, { useCallback, useContext, useState, createContext } from 'react';\nimport classNames from 'classnames';\nimport { ComponentTreeSlot } from '@teambit/component-tree';\nimport { mutedItalic } from '@teambit/design.ui.styles.muted-italic';\nimport { ellipsis } from '@teambit/design.ui.styles.ellipsis';\nimport { WorkspaceContext } from '../workspace/workspace-context';\nimport styles from './workspace-components-drawer.module.scss';\n\nconst WorkspaceTreeContext = createContext<{ collapsed: boolean; setCollapsed: (x: boolean) => void }>({\n  collapsed: true,\n  setCollapsed: () => {},\n});\n\nexport class WorkspaceComponentsDrawer implements DrawerType {\n  constructor(private treeNodeSlot: ComponentTreeSlot) {}\n\n  name = 'COMPONENTS';\n\n  widget = (<Widget />);\n\n  Context = ({ children }) => {\n    const [collapsed, setCollapsed] = useState(true);\n    return (\n      <WorkspaceTreeContext.Provider value={{ collapsed, setCollapsed }}>{children}</WorkspaceTreeContext.Provider>\n    );\n  };\n\n  render = () => {\n    const workspace = useContext(WorkspaceContext);\n    const { collapsed } = useContext(WorkspaceTreeContext);\n    const { treeNodeSlot } = this;\n\n    const TreeNodeRenderer = useCallback(\n      function TreeNode(props: TreeNodeProps<PayloadType>) {\n        const children = props.node.children;\n\n        if (!children) return <ComponentView {...props} treeNodeSlot={treeNodeSlot} />; // non collapse\n\n        if (props.node.payload instanceof ScopePayload) return <ScopeTreeNode {...props} />;\n\n        return <NamespaceTreeNode {...props} />;\n      },\n      [treeNodeSlot]\n    );\n\n    if (!workspace) return <FullLoader />;\n    if (workspace.components.length === 0) {\n      return <span className={classNames(mutedItalic, ellipsis, styles.emptyWorkspace)}>Workspace is empty</span>;\n    }\n\n    return <ComponentTree components={workspace.components} isCollapsed={collapsed} TreeNode={TreeNodeRenderer} />;\n  };\n}\n\nfunction Widget() {\n  const { collapsed, setCollapsed } = useContext(WorkspaceTreeContext);\n  const icon = collapsed\n    ? 'https://static.bit.dev/bit-icons/expand.svg'\n    : 'https://static.bit.dev/bit-icons/collapse.svg';\n  return <img src={icon} className={styles.collapseIcon} onClick={() => setCollapsed(!collapsed)} />;\n}\n"]}

package/dist/workspace.d.ts

@@ -26,6 +26,7 @@ import { PathOsBased, PathOsBasedRelative, PathOsBasedAbsolute } from '@teambit/
 import ConsumerComponent from '@teambit/legacy/dist/consumer/component';
 import type { ComponentLog } from '@teambit/legacy/dist/scope/models/model-component';
 import { CompilationInitiator } from '@teambit/compiler';
+import { Lane } from '@teambit/legacy/dist/scope/models';
 import { OnComponentAdd, OnComponentChange, OnComponentEventResult, OnComponentLoad, OnComponentRemove } from './on-component-events';
 import { WorkspaceExtConfig } from './types';
 import { Watcher, WatchOptions } from './watch/watcher';
@@ -123,6 +124,7 @@ export declare class Workspace implements ComponentFactory {
     componentsScopeDirsMap: ComponentScopeDirMap;
     componentLoader: WorkspaceComponentLoader;
     bitMap: BitMap;
+    private componentLoadedSelfAsAspects;
     constructor(
     /**
      * private pubsub.
@@ -264,7 +266,10 @@ export declare class Workspace implements ComponentFactory {
      * if checked out to a lane and the lane exists in the remote,
      * return the remote lane id (name+scope). otherwise, return null.
      */
-    getCurrentRemoteLaneId(): RemoteLaneId | null;
+    getCurrentRemoteLaneId(): Promise<{
+        laneId: RemoteLaneId;
+        lane: Lane;
+    } | null>;
     getDefaultExtensions(): ExtensionDataList;
     ejectConfig(id: ComponentID, options: EjectConfOptions): Promise<EjectConfResult>;
     private resolveScopeAspectListIds;
@@ -355,6 +360,7 @@ export declare class Workspace implements ComponentFactory {
      * the component.json file in the component folder
      * matching pattern in the variants config
      * defaults extensions from workspace config
+     * extensions from the model.
      */
     componentExtensions(componentId: ComponentID, componentFromScope?: Component): Promise<ExtensionDataList>;
     private filterEnvsFromExtensionsIfNeeded;

package/dist/workspace.js

@@ -229,20 +229,30 @@ function _consumer2() {
   return data;
 }
 
-function _bitMap() {
-  const data = require("@teambit/legacy/dist/consumer/bit-map/bit-map");
+function _addComponents() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component-ops/add-components"));
 
-  _bitMap = function () {
+  _addComponents = function () {
     return data;
   };
 
   return data;
 }
 
-function _addComponents() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component-ops/add-components"));
+function _inMemoryCache() {
+  const data = require("@teambit/legacy/dist/cache/in-memory-cache");
 
-  _addComponents = function () {
+  _inMemoryCache = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _cacheFactory() {
+  const data = require("@teambit/legacy/dist/cache/cache-factory");
+
+  _cacheFactory = function () {
     return data;
   };
 
@@ -349,6 +359,46 @@ function _component2() {
   return data;
 }
 
+function _scopeComponentsImporter() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/scope/component-ops/scope-components-importer"));
+
+  _scopeComponentsImporter = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _loader() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/cli/loader"));
+
+  _loader = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _laneNotFound() {
+  const data = require("@teambit/legacy/dist/api/scope/lib/exceptions/lane-not-found");
+
+  _laneNotFound = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _scopeNotFoundOrDenied() {
+  const data = require("@teambit/legacy/dist/remotes/exceptions/scope-not-found-or-denied");
+
+  _scopeNotFoundOrDenied = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _componentConfigFile() {
   const data = require("./component-config-file");
 
@@ -429,10 +479,10 @@ function _buildGraphFromFs() {
   return data;
 }
 
-function _bitMap2() {
+function _bitMap() {
   const data = require("./bit-map");
 
-  _bitMap2 = function () {
+  _bitMap = function () {
     return data;
   };
 
@@ -452,6 +502,7 @@ const DEFAULT_VENDOR_DIR = 'vendor';
  */
 
 class Workspace {
+  // cache loaded components
   constructor(
   /**
    * private pubsub.
@@ -511,12 +562,16 @@ class Workspace {
     (0, _defineProperty2().default)(this, "componentsScopeDirsMap", void 0);
     (0, _defineProperty2().default)(this, "componentLoader", void 0);
     (0, _defineProperty2().default)(this, "bitMap", void 0);
+    (0, _defineProperty2().default)(this, "componentLoadedSelfAsAspects", void 0);
     (0, _defineProperty2().default)(this, "watcher", new (_watcher().Watcher)(this, this.pubsub));
-    // TODO: refactor - prefer to avoid code inside the constructor.
+    this.componentLoadedSelfAsAspects = (0, _cacheFactory().createInMemoryCache)({
+      maxSize: (0, _inMemoryCache().getMaxSizeForComponents)()
+    }); // TODO: refactor - prefer to avoid code inside the constructor.
+
     this.owner = (_this$config = this.config) === null || _this$config === void 0 ? void 0 : _this$config.defaultOwner;
     this.componentLoader = new (_workspaceComponentLoader().WorkspaceComponentLoader)(this, logger, dependencyResolver, envs);
     this.validateConfig();
-    this.bitMap = new (_bitMap2().BitMap)(this.consumer.bitMap, this.consumer); // memoize this method to improve performance.
+    this.bitMap = new (_bitMap().BitMap)(this.consumer.bitMap, this.consumer); // memoize this method to improve performance.
 
     this.componentDefaultScopeFromComponentDirAndNameWithoutConfigFile = (0, _memoizee().default)(this.componentDefaultScopeFromComponentDirAndNameWithoutConfigFile.bind(this), {
       primitive: true,
@@ -787,7 +842,33 @@ class Workspace {
 
   async get(componentId, forCapsule = false, legacyComponent, useCache = true, storeInCache = true) {
     this.logger.debug(`get ${componentId.toString()}`);
-    return this.componentLoader.get(componentId, forCapsule, legacyComponent, useCache, storeInCache);
+    const component = await this.componentLoader.get(componentId, forCapsule, legacyComponent, useCache, storeInCache); // When loading a component if it's an env make sure to load it as aspect as well
+    // We only want to try load it as aspect if it's the first time we load the component
+
+    const tryLoadAsAspect = this.componentLoadedSelfAsAspects.get(component.id.toString()) === undefined; // const config = this.harmony.get<ConfigMain>('teambit.harmony/config');
+    // We are loading the component as aspect if it's an env, in order to be able to run the env-preview-template task which run only on envs.
+    // Without this loading we will have a problem in case the env is the only component in the workspace. in that case we will load it as component
+    // then we don't run it's provider so it doesn't register to the env slot, so we don't know it's an env.
+
+    if (tryLoadAsAspect && this.envs.isUsingEnvEnv(component) && !this.aspectLoader.isCoreAspect(component.id.toStringWithoutVersion()) && !this.aspectLoader.isAspectLoaded(component.id.toString()) && (await this.hasId(component.id)) // !config.extension(component.id.toStringWithoutVersion(), true)
+    ) {
+      try {
+        this.componentLoadedSelfAsAspects.set(component.id.toString(), true);
+        this.logger.debug(`trying to load self as aspect with id ${component.id.toString()}`);
+        await this.loadAspects([component.id.toString()]); // In most cases if the load self as aspect failed we don't care about it.
+        // we only need it in specific cases to work, but this workspace.get runs on different
+        // cases where it might fail (like when importing aspect, after the import objects
+        // when we write the package.json we run the applyTransformers which get to pkg which call
+        // host.get, but the component not written yet to the fs, so it fails.)
+      } catch (e) {
+        this.logger.debug(`fail to load self as aspect with id ${component.id.toString()}`);
+        this.componentLoadedSelfAsAspects.delete(component.id.toString());
+        return component;
+      }
+    }
+
+    this.componentLoadedSelfAsAspects.set(component.id.toString(), false);
+    return component;
   } // TODO: @gilad we should refactor this asap into to the envs aspect.
 
 
@@ -910,7 +991,7 @@ class Workspace {
    */
 
 
-  getCurrentRemoteLaneId() {
+  async getCurrentRemoteLaneId() {
     const currentLane = this.getCurrentLaneId();
 
     if (currentLane.isDefault()) {
@@ -919,14 +1000,32 @@ class Workspace {
 
     const trackData = this.scope.legacyScope.lanes.getRemoteTrackedDataByLocalLane(currentLane.name);
 
-    const remoteLane = this.consumer.bitMap.getContent()[_bitMap().LANE_KEY];
-
-    if (!trackData || !remoteLane) {
+    if (!trackData) {
       return null;
     }
 
-    const remoteLaneName = remoteLane.name;
-    return _laneId().RemoteLaneId.from(remoteLaneName, trackData.remoteScope);
+    const scopeComponentImporter = _scopeComponentsImporter().default.getInstance(this.consumer.scope);
+
+    const laneId = _laneId().RemoteLaneId.from(trackData.remoteLane, trackData.remoteScope);
+
+    try {
+      const lanes = await scopeComponentImporter.importLanes([laneId]);
+      if (!lanes || lanes.length === 0) return null;
+      return {
+        laneId,
+        lane: lanes[0]
+      };
+    } catch (err) {
+      if (err instanceof _legacyBitId().InvalidScopeName || err instanceof _scopeNotFoundOrDenied().ScopeNotFoundOrDenied || err instanceof _laneNotFound().LaneNotFound) {
+        // the lane could be a local lane so no need to throw an error in such case
+        _loader().default.stop();
+
+        this.logger.warn(`unable to get lane's data from a remote due to an error:\n${err.message}`);
+        return null;
+      }
+
+      throw err;
+    }
   }
 
   getDefaultExtensions() {
@@ -1243,6 +1342,7 @@ class Workspace {
    * the component.json file in the component folder
    * matching pattern in the variants config
    * defaults extensions from workspace config
+   * extensions from the model.
    */
 
 
@@ -1474,20 +1574,12 @@ class Workspace {
     const components = await this.importAndGetAspects(componentIds);
 
     const isAspect = async bitId => {
-      var _component$config$ext;
-
       const id = await this.resolveComponentId(bitId);
       const component = await this.get(id);
-      let data = (_component$config$ext = component.config.extensions.findExtension(_envs().EnvsAspect.id)) === null || _component$config$ext === void 0 ? void 0 : _component$config$ext.data;
-
-      if (!data) {
-        // TODO: remove this once we re-export old components used to store the data here
-        data = component.state.aspects.get('teambit.workspace/workspace');
-      }
-
-      if (!data) return false;
+      const data = this.envs.getEnvData(component);
+      const isUsingAspectEnv = this.envs.isUsingAspectEnv(component);
 
-      if (data.type !== 'aspect' && idsWithoutCore.includes(component.id.toString())) {
+      if (!isUsingAspectEnv && idsWithoutCore.includes(component.id.toString())) {
         const err = new (_incorrectEnvAspect().IncorrectEnvAspect)(component.id.toString(), data.type, data.id);
 
         if (data.id === _envs().DEFAULT_ENV) {
@@ -1500,7 +1592,7 @@ class Workspace {
         }
       }
 
-      return data.type === 'aspect';
+      return isUsingAspectEnv;
     };
 
     const graph = await this.getAspectsGraphWithoutCore(components, isAspect);
@@ -2081,12 +2173,24 @@ your workspace.jsonc has this component-id set. you might want to remove/change
 
 
   async resolveComponentId(id) {
-    // This is required in case where you have in your workspace a component with the same name as a core aspect
+    const getDefaultScope = async (bitId, bitMapOptions) => {
+      if (bitId.scope) {
+        return bitId.scope;
+      }
+
+      const relativeComponentDir = this.componentDirFromLegacyId(bitId, bitMapOptions, {
+        relative: true
+      });
+      const defaultScope = await this.componentDefaultScopeFromComponentDirAndName(relativeComponentDir, bitId.toStringWithoutScopeAndVersion());
+      return defaultScope;
+    }; // This is required in case where you have in your workspace a component with the same name as a core aspect
     // let's say you have component called react-native (which is eventually my-org.my-scope/react-native)
     // and you set teambit.react/react-native as your env
     // bit will get here with the string teambit.react/react-native and will try to resolve it from the workspace
     // during this it will find the my-org.my-scope/react-native which is incorrect as the core one doesn't exist in the
     // workspace
+
+
     if (this.aspectLoader.isCoreAspect(id.toString())) {
       return _component().ComponentID.fromString(id.toString());
     }
@@ -2139,11 +2243,43 @@ your workspace.jsonc has this component-id set. you might want to remove/change
 
         if (_bitMapIdWithoutVersion.endsWith(idWithoutVersion) && _bitMapIdWithoutVersion !== idWithoutVersion) {
           return await this.scope.resolveComponentId(_bitMapIdWithVersion);
-        } // The id in the bitmap doesn't have scope, the source id has scope
-        // Handle use case 2 and use case 1
+        } // Handle case when I tagged the component locally with a default scope which is not the local scope
+        // but not exported it yet
+        // now i'm trying to load it with source id contain the default scope prefix
+        // we want to get it from the local first before assuming it's something coming from outside
+
+
+        if (!_bitMapId.scope) {
+          const defaultScopeForBitmapId = await getDefaultScope(_bitMapId, {
+            ignoreVersion: true
+          });
+
+          const getFromBitmapAddDefaultScope = () => {
+            let _bitmapIdWithVersionForSource = _bitMapId;
+
+            if (version) {
+              _bitmapIdWithVersionForSource = _bitMapId.changeVersion(version);
+            }
+
+            return _component().ComponentID.fromLegacy(_bitmapIdWithVersionForSource, defaultScopeForBitmapId);
+          }; // a case when the given id contains the default scope
+
+
+          if (idWithVersion.startsWith(`${defaultScopeForBitmapId}/${_bitMapIdWithoutVersion}`)) {
+            return getFromBitmapAddDefaultScope();
+          } // a case when the given id does not contain the default scope
+
 
+          const fromScope = await this.scope.resolveComponentId(idWithVersion);
+
+          if (!fromScope._legacy.hasScope()) {
+            return getFromBitmapAddDefaultScope();
+          }
+        }
 
         if (idWithoutVersion.endsWith(_bitMapIdWithoutVersion) && _bitMapIdWithoutVersion !== idWithoutVersion) {
+          // The id in the bitmap doesn't have scope, the source id has scope
+          // Handle use case 2 and use case 1
           if (id.toString().startsWith(this.scope.name)) {
             // Handle use case 1 - the provided id has scope name same as the local scope name
             // we want to send it as it appear in the bitmap
@@ -2163,18 +2299,6 @@ your workspace.jsonc has this component-id set. you might want to remove/change
       }
     }
 
-    const getDefaultScope = async bitId => {
-      if (bitId.scope) {
-        return bitId.scope;
-      }
-
-      const relativeComponentDir = this.componentDirFromLegacyId(bitId, undefined, {
-        relative: true
-      });
-      const defaultScope = await this.componentDefaultScopeFromComponentDirAndName(relativeComponentDir, bitId.toStringWithoutScopeAndVersion());
-      return defaultScope;
-    };
-
     const defaultScope = await getDefaultScope(legacyId);
     return _component().ComponentID.fromLegacy(legacyId, defaultScope);
   }