@teambit/workspace 1.0.217 → 1.0.219
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/artifacts/__bit_junit.xml +1 -1
- package/artifacts/preview/teambit_workspace_workspace-preview.js +1 -1
- package/artifacts/schema.json +1999 -1915
- package/dist/{preview-1712134003388.js → preview-1712174136349.js} +2 -2
- package/dist/workspace-aspects-loader.js +3 -4
- package/dist/workspace-aspects-loader.js.map +1 -1
- package/dist/workspace-component/workspace-component-loader.js +13 -8
- package/dist/workspace-component/workspace-component-loader.js.map +1 -1
- package/dist/workspace.d.ts +2 -3
- package/dist/workspace.js +5 -13
- package/dist/workspace.js.map +1 -1
- package/package.json +20 -20
- package/workspace-component/workspace-component-loader.ts +12 -21
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/workspace",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.219",
|
|
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.
|
|
9
|
+
"version": "1.0.219"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"lodash": "4.17.21",
|
|
@@ -54,43 +54,43 @@
|
|
|
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.
|
|
58
|
-
"@teambit/dependency-resolver": "1.0.
|
|
59
|
-
"@teambit/envs": "1.0.
|
|
57
|
+
"@teambit/component": "1.0.219",
|
|
58
|
+
"@teambit/dependency-resolver": "1.0.219",
|
|
59
|
+
"@teambit/envs": "1.0.219",
|
|
60
60
|
"@teambit/logger": "0.0.951",
|
|
61
|
-
"@teambit/scope": "1.0.
|
|
62
|
-
"@teambit/graph": "1.0.
|
|
61
|
+
"@teambit/scope": "1.0.219",
|
|
62
|
+
"@teambit/graph": "1.0.219",
|
|
63
63
|
"@teambit/cli": "0.0.858",
|
|
64
|
-
"@teambit/isolator": "1.0.
|
|
65
|
-
"@teambit/component-tree": "1.0.
|
|
64
|
+
"@teambit/isolator": "1.0.219",
|
|
65
|
+
"@teambit/component-tree": "1.0.219",
|
|
66
66
|
"@teambit/harmony.modules.resolved-component": "0.0.497",
|
|
67
|
-
"@teambit/watcher": "1.0.
|
|
68
|
-
"@teambit/aspect-loader": "1.0.
|
|
69
|
-
"@teambit/config": "0.0.
|
|
67
|
+
"@teambit/watcher": "1.0.219",
|
|
68
|
+
"@teambit/aspect-loader": "1.0.219",
|
|
69
|
+
"@teambit/config": "0.0.970",
|
|
70
70
|
"@teambit/global-config": "0.0.861",
|
|
71
71
|
"@teambit/harmony.modules.requireable-component": "0.0.497",
|
|
72
72
|
"@teambit/toolbox.modules.module-resolver": "0.0.7",
|
|
73
73
|
"@teambit/workspace.modules.node-modules-linker": "0.0.166",
|
|
74
|
-
"@teambit/graphql": "1.0.
|
|
75
|
-
"@teambit/bundler": "1.0.
|
|
76
|
-
"@teambit/pubsub": "1.0.
|
|
77
|
-
"@teambit/ui": "1.0.
|
|
78
|
-
"@teambit/variants": "0.0.
|
|
74
|
+
"@teambit/graphql": "1.0.219",
|
|
75
|
+
"@teambit/bundler": "1.0.219",
|
|
76
|
+
"@teambit/pubsub": "1.0.219",
|
|
77
|
+
"@teambit/ui": "1.0.219",
|
|
78
|
+
"@teambit/variants": "0.0.1063",
|
|
79
79
|
"@teambit/component-issues": "0.0.142",
|
|
80
80
|
"@teambit/workspace.modules.match-pattern": "0.0.505",
|
|
81
81
|
"@teambit/component.ui.component-drawer": "0.0.397",
|
|
82
82
|
"@teambit/lanes.hooks.use-lane-components": "0.0.260",
|
|
83
83
|
"@teambit/lanes.hooks.use-lanes": "0.0.264",
|
|
84
84
|
"@teambit/lanes.ui.models.lanes-model": "0.0.216",
|
|
85
|
-
"@teambit/command-bar": "1.0.
|
|
85
|
+
"@teambit/command-bar": "1.0.219",
|
|
86
86
|
"@teambit/component.ui.component-filters.component-filter-context": "0.0.222",
|
|
87
87
|
"@teambit/component.ui.component-filters.deprecate-filter": "0.0.220",
|
|
88
88
|
"@teambit/component.ui.component-filters.env-filter": "0.0.228",
|
|
89
89
|
"@teambit/component.ui.component-filters.show-main-filter": "0.0.213",
|
|
90
|
-
"@teambit/sidebar": "1.0.
|
|
90
|
+
"@teambit/sidebar": "1.0.219",
|
|
91
91
|
"@teambit/ui-foundation.ui.react-router.slot-router": "0.0.508",
|
|
92
92
|
"@teambit/component-descriptor": "0.0.417",
|
|
93
|
-
"@teambit/deprecation": "1.0.
|
|
93
|
+
"@teambit/deprecation": "1.0.219",
|
|
94
94
|
"@teambit/ui-foundation.ui.buttons.collapser": "0.0.219",
|
|
95
95
|
"@teambit/cloud.hooks.use-cloud-scopes": "0.0.3",
|
|
96
96
|
"@teambit/preview.ui.preview-placeholder": "0.0.516",
|
|
@@ -134,10 +134,13 @@ export class WorkspaceComponentLoader {
|
|
|
134
134
|
|
|
135
135
|
const { components: loadedComponents, invalidComponents } = await this.getAndLoadSlotOrdered(
|
|
136
136
|
loadOrCached.idsToLoad || [],
|
|
137
|
-
loadOptsWithDefaults
|
|
138
|
-
throwOnFailure
|
|
137
|
+
loadOptsWithDefaults
|
|
139
138
|
);
|
|
140
139
|
|
|
140
|
+
invalidComponents.forEach(({ err }) => {
|
|
141
|
+
if (throwOnFailure) throw err;
|
|
142
|
+
});
|
|
143
|
+
|
|
141
144
|
const components = [...loadedComponents, ...loadOrCached.fromCache];
|
|
142
145
|
|
|
143
146
|
// this.logger.clearStatusLine();
|
|
@@ -147,11 +150,7 @@ export class WorkspaceComponentLoader {
|
|
|
147
150
|
return { components, invalidComponents };
|
|
148
151
|
}
|
|
149
152
|
|
|
150
|
-
private async getAndLoadSlotOrdered(
|
|
151
|
-
ids: ComponentID[],
|
|
152
|
-
loadOpts: ComponentLoadOptions,
|
|
153
|
-
throwOnFailure = true
|
|
154
|
-
): Promise<GetManyRes> {
|
|
153
|
+
private async getAndLoadSlotOrdered(ids: ComponentID[], loadOpts: ComponentLoadOptions): Promise<GetManyRes> {
|
|
155
154
|
if (!ids?.length) return { components: [], invalidComponents: [] };
|
|
156
155
|
|
|
157
156
|
const workspaceScopeIdsMap: WorkspaceScopeIdsMap = await this.groupAndUpdateIds(ids);
|
|
@@ -165,12 +164,7 @@ export class WorkspaceComponentLoader {
|
|
|
165
164
|
await mapSeries(groupsToHandle, async (group) => {
|
|
166
165
|
const { scopeIds, workspaceIds, aspects, core, seeders } = group;
|
|
167
166
|
if (!workspaceIds.length && !scopeIds.length) return undefined;
|
|
168
|
-
const res = await this.getAndLoadSlot(
|
|
169
|
-
workspaceIds,
|
|
170
|
-
scopeIds,
|
|
171
|
-
{ ...loadOpts, core, seeders, aspects },
|
|
172
|
-
throwOnFailure
|
|
173
|
-
);
|
|
167
|
+
const res = await this.getAndLoadSlot(workspaceIds, scopeIds, { ...loadOpts, core, seeders, aspects });
|
|
174
168
|
// We don't want to return components that were not asked originally (we do want to load them)
|
|
175
169
|
if (!group.seeders) return undefined;
|
|
176
170
|
return res;
|
|
@@ -270,14 +264,12 @@ export class WorkspaceComponentLoader {
|
|
|
270
264
|
private async getAndLoadSlot(
|
|
271
265
|
workspaceIds: ComponentID[],
|
|
272
266
|
scopeIds: ComponentID[],
|
|
273
|
-
loadOpts: GetAndLoadSlotOpts
|
|
274
|
-
throwOnFailure = true
|
|
267
|
+
loadOpts: GetAndLoadSlotOpts
|
|
275
268
|
): Promise<GetManyRes> {
|
|
276
269
|
const { workspaceComponents, scopeComponents, invalidComponents } = await this.getComponentsWithoutLoadExtensions(
|
|
277
270
|
workspaceIds,
|
|
278
271
|
scopeIds,
|
|
279
|
-
loadOpts
|
|
280
|
-
throwOnFailure
|
|
272
|
+
loadOpts
|
|
281
273
|
);
|
|
282
274
|
|
|
283
275
|
const components = workspaceComponents.concat(scopeComponents);
|
|
@@ -428,8 +420,7 @@ export class WorkspaceComponentLoader {
|
|
|
428
420
|
private async getComponentsWithoutLoadExtensions(
|
|
429
421
|
workspaceIds: ComponentID[],
|
|
430
422
|
scopeIds: ComponentID[],
|
|
431
|
-
loadOpts: GetAndLoadSlotOpts
|
|
432
|
-
throwOnFailure = true
|
|
423
|
+
loadOpts: GetAndLoadSlotOpts
|
|
433
424
|
) {
|
|
434
425
|
const invalidComponents: InvalidComponent[] = [];
|
|
435
426
|
const errors: { id: ComponentID; err: Error }[] = [];
|
|
@@ -462,8 +453,8 @@ export class WorkspaceComponentLoader {
|
|
|
462
453
|
legacyInvalidComponents.forEach((invalidComponent) => {
|
|
463
454
|
const entry = { id: idsIndex[invalidComponent.id.toString()], err: invalidComponent.error };
|
|
464
455
|
if (ConsumerComponent.isComponentInvalidByErrorType(invalidComponent.error)) {
|
|
465
|
-
if (throwOnFailure) throw invalidComponent.error;
|
|
466
456
|
invalidComponents.push(entry);
|
|
457
|
+
return;
|
|
467
458
|
}
|
|
468
459
|
if (
|
|
469
460
|
this.isComponentNotExistsError(invalidComponent.error) ||
|
|
@@ -475,7 +466,7 @@ export class WorkspaceComponentLoader {
|
|
|
475
466
|
|
|
476
467
|
const getWithCatch = (id, legacyComponent) => {
|
|
477
468
|
return this.get(id, legacyComponent, undefined, undefined, loadOptsWithDefaults).catch((err) => {
|
|
478
|
-
if (ConsumerComponent.isComponentInvalidByErrorType(err)
|
|
469
|
+
if (ConsumerComponent.isComponentInvalidByErrorType(err)) {
|
|
479
470
|
invalidComponents.push({
|
|
480
471
|
id,
|
|
481
472
|
err,
|