@teambit/workspace 0.0.749 → 0.0.752

package/dist/workspace.js

@@ -221,16 +221,6 @@ function _legacyBitId() {
   return data;
 }
 
-function _laneId() {
-  const data = require("@teambit/lane-id");
-
-  _laneId = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _consumer2() {
   const data = require("@teambit/legacy/dist/consumer");
 
@@ -1006,29 +996,26 @@ class Workspace {
 
 
   async getCurrentRemoteLane() {
-    const currentLane = this.getCurrentLaneId();
+    const currentLaneId = this.getCurrentLaneId();
 
-    if (currentLane.isDefault()) {
-      return null;
-    }
-
-    const trackData = this.scope.legacyScope.lanes.getRemoteTrackedDataByLocalLane(currentLane.name);
-
-    if (!trackData) {
+    if (currentLaneId.isDefault()) {
       return null;
     }
 
     const scopeComponentImporter = _scopeComponentsImporter().default.getInstance(this.consumer.scope);
 
-    const laneId = _laneId().LaneId.from(trackData.remoteLane, trackData.remoteScope);
-
     try {
-      const lanes = await scopeComponentImporter.importLanes([laneId]);
-      if (!lanes || lanes.length === 0) return null;
+      const lanes = await scopeComponentImporter.importLanes([currentLaneId]);
       return lanes[0];
     } catch (err) {
       if (err instanceof _legacyBitId().InvalidScopeName || err instanceof _scopeNotFoundOrDenied().ScopeNotFoundOrDenied || err instanceof _laneNotFound().LaneNotFound || err instanceof _legacyBitId().InvalidScopeNameFromRemote) {
-        // the lane could be a local lane so no need to throw an error in such case
+        const bitMapLaneId = this.bitMap.getExportedLaneId();
+
+        if (bitMapLaneId !== null && bitMapLaneId !== void 0 && bitMapLaneId.isEqual(currentLaneId)) {
+          throw err; // we know the lane is not new, so the error is legit
+        } // 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}`);