@teambit/workspace 1.0.495 → 1.0.497

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/workspace",
3
- "version": "1.0.495",
3
+ "version": "1.0.497",
4
4
  "homepage": "https://bit.cloud/teambit/workspace/workspace",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.workspace",
8
8
  "name": "workspace",
9
- "version": "1.0.495"
9
+ "version": "1.0.497"
10
10
  },
11
11
  "dependencies": {
12
12
  "lodash": "4.17.21",
@@ -54,64 +54,64 @@
54
54
  "@teambit/explorer.ui.gallery.component-grid": "0.0.496",
55
55
  "@teambit/scopes.scope-id": "0.0.7",
56
56
  "@teambit/workspace.ui.empty-workspace": "0.0.508",
57
- "@teambit/component": "1.0.495",
58
- "@teambit/dependency-resolver": "1.0.495",
59
- "@teambit/envs": "1.0.495",
60
- "@teambit/legacy.extension-data": "0.0.9",
61
- "@teambit/legacy.scope": "0.0.7",
62
- "@teambit/legacy.consumer-component": "0.0.8",
63
- "@teambit/legacy.consumer": "0.0.7",
64
- "@teambit/legacy.bit-map": "0.0.64",
57
+ "@teambit/component": "1.0.497",
58
+ "@teambit/dependency-resolver": "1.0.497",
59
+ "@teambit/envs": "1.0.497",
60
+ "@teambit/legacy.extension-data": "0.0.11",
61
+ "@teambit/legacy.scope": "0.0.9",
62
+ "@teambit/legacy.consumer-component": "0.0.10",
63
+ "@teambit/legacy.consumer": "0.0.9",
64
+ "@teambit/legacy.bit-map": "0.0.66",
65
65
  "@teambit/toolbox.fs.last-modified": "0.0.2",
66
66
  "@teambit/toolbox.path.path": "0.0.5",
67
- "@teambit/logger": "0.0.1165",
68
- "@teambit/scope.objects": "0.0.7",
69
- "@teambit/scope": "1.0.495",
70
- "@teambit/graph": "1.0.495",
71
- "@teambit/cli": "0.0.1072",
72
- "@teambit/isolator": "1.0.495",
73
- "@teambit/component-tree": "1.0.495",
67
+ "@teambit/logger": "0.0.1167",
68
+ "@teambit/scope.objects": "0.0.9",
69
+ "@teambit/scope": "1.0.497",
70
+ "@teambit/graph": "1.0.497",
71
+ "@teambit/cli": "0.0.1074",
72
+ "@teambit/isolator": "1.0.497",
73
+ "@teambit/component-tree": "1.0.497",
74
74
  "@teambit/legacy.constants": "0.0.3",
75
75
  "@teambit/harmony.modules.resolved-component": "0.0.499",
76
76
  "@teambit/legacy.utils": "0.0.11",
77
- "@teambit/watcher": "1.0.495",
78
- "@teambit/aspect-loader": "1.0.495",
79
- "@teambit/config": "0.0.1246",
80
- "@teambit/global-config": "0.0.1075",
77
+ "@teambit/watcher": "1.0.497",
78
+ "@teambit/aspect-loader": "1.0.497",
79
+ "@teambit/config": "0.0.1248",
80
+ "@teambit/global-config": "0.0.1077",
81
81
  "@teambit/harmony.modules.requireable-component": "0.0.499",
82
82
  "@teambit/toolbox.modules.module-resolver": "0.0.8",
83
- "@teambit/workspace.modules.node-modules-linker": "0.0.235",
84
- "@teambit/graphql": "1.0.495",
85
- "@teambit/bundler": "1.0.495",
86
- "@teambit/legacy.consumer-config": "0.0.7",
87
- "@teambit/pubsub": "1.0.495",
88
- "@teambit/ui": "1.0.495",
89
- "@teambit/variants": "0.0.1339",
83
+ "@teambit/workspace.modules.node-modules-linker": "0.0.237",
84
+ "@teambit/graphql": "1.0.497",
85
+ "@teambit/bundler": "1.0.497",
86
+ "@teambit/legacy.consumer-config": "0.0.9",
87
+ "@teambit/pubsub": "1.0.497",
88
+ "@teambit/ui": "1.0.497",
89
+ "@teambit/variants": "0.0.1341",
90
90
  "@teambit/component-issues": "0.0.152",
91
- "@teambit/component.sources": "0.0.59",
91
+ "@teambit/component.sources": "0.0.61",
92
92
  "@teambit/harmony.modules.in-memory-cache": "0.0.5",
93
- "@teambit/legacy.component-list": "0.0.61",
94
- "@teambit/legacy.scope-api": "0.0.62",
95
- "@teambit/scope.network": "0.0.7",
96
- "@teambit/scope.remotes": "0.0.7",
93
+ "@teambit/legacy.component-list": "0.0.63",
94
+ "@teambit/legacy.scope-api": "0.0.64",
95
+ "@teambit/scope.network": "0.0.9",
96
+ "@teambit/scope.remotes": "0.0.9",
97
97
  "@teambit/toolbox.path.is-path-inside": "0.0.497",
98
98
  "@teambit/workspace.modules.match-pattern": "0.0.506",
99
99
  "@teambit/component.ui.component-drawer": "0.0.424",
100
100
  "@teambit/lanes.hooks.use-lane-components": "0.0.274",
101
101
  "@teambit/lanes.hooks.use-lanes": "0.0.276",
102
102
  "@teambit/ui-foundation.ui.side-bar": "0.0.891",
103
- "@teambit/command-bar": "1.0.495",
103
+ "@teambit/command-bar": "1.0.497",
104
104
  "@teambit/component.ui.component-filters.component-filter-context": "0.0.231",
105
105
  "@teambit/component.ui.component-filters.deprecate-filter": "0.0.229",
106
106
  "@teambit/component.ui.component-filters.env-filter": "0.0.242",
107
107
  "@teambit/component.ui.component-filters.show-main-filter": "0.0.222",
108
- "@teambit/sidebar": "1.0.495",
108
+ "@teambit/sidebar": "1.0.497",
109
109
  "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.513",
110
110
  "@teambit/harmony.modules.concurrency": "0.0.4",
111
111
  "@teambit/toolbox.promise.map-pool": "0.0.2",
112
112
  "@teambit/workspace.ui.use-workspace-mode": "0.0.2",
113
113
  "@teambit/component-descriptor": "0.0.429",
114
- "@teambit/deprecation": "1.0.495",
114
+ "@teambit/deprecation": "1.0.497",
115
115
  "@teambit/ui-foundation.ui.buttons.collapser": "0.0.225",
116
116
  "@teambit/workspace.ui.preserve-workspace-mode": "0.0.2",
117
117
  "@teambit/cloud.hooks.use-cloud-scopes": "0.0.5",
@@ -5,7 +5,7 @@ import { ModelComponent, VERSION_ZERO } from '@teambit/scope.objects';
5
5
  import { Consumer, ComponentsPendingImport, ComponentOutOfSync } from '@teambit/legacy.consumer';
6
6
  import { LATEST } from '@teambit/legacy.constants';
7
7
  import { MissingBitMapComponent } from '@teambit/legacy.bit-map';
8
- import { ComponentNotFoundInPath } from '@teambit/legacy.consumer-component';
8
+ import { ComponentNotFoundInPath, ConsumerComponent } from '@teambit/legacy.consumer-component';
9
9
  import { Workspace } from '..';
10
10
 
11
11
  export type ComponentStatusLegacy = {
@@ -63,7 +63,7 @@ export class ComponentStatusLoader {
63
63
  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
64
64
  const status: ComponentStatusLegacy = {};
65
65
  const componentFromModel: ModelComponent | undefined = await this.consumer.scope.getModelComponentIfExist(id);
66
- let componentFromFileSystem;
66
+ let componentFromFileSystem: ConsumerComponent | undefined;
67
67
  try {
68
68
  // change to 'latest' before loading from FS. don't change to null, otherwise, it'll cause
69
69
  // loadOne to not find model component as it assumes there is no version
@@ -100,9 +100,13 @@ export class ComponentStatusLoader {
100
100
  }
101
101
 
102
102
  const lane = await this.consumer.getCurrentLaneObject();
103
- await componentFromModel.setDivergeData(this.consumer.scope.objects);
104
- status.staged = await componentFromModel.isLocallyChanged(this.consumer.scope.objects, lane);
105
103
  const versionFromFs = componentFromFileSystem.id.version;
104
+ status.staged = await componentFromModel.isLocallyChanged(
105
+ this.consumer.scope.objects,
106
+ lane,
107
+ componentFromFileSystem.id
108
+ );
109
+
106
110
  const idStr = id.toString();
107
111
  if (!componentFromFileSystem.id.hasVersion()) {
108
112
  throw new ComponentOutOfSync(idStr);