@teambit/workspace 1.0.310 → 1.0.312
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 +2390 -2382
- package/dist/{preview-1718853656395.js → preview-1719154175406.js} +2 -2
- package/dist/ui/workspace/use-workspace.d.ts +2 -2
- package/dist/ui/workspace/workspace-context.d.ts +0 -1
- package/dist/ui/workspace/workspace.d.ts +0 -1
- package/dist/workspace-component/workspace-component-loader.js +68 -21
- package/dist/workspace-component/workspace-component-loader.js.map +1 -1
- package/dist/workspace.d.ts +11 -9
- package/dist/workspace.js +2 -1
- package/dist/workspace.js.map +1 -1
- package/dist/workspace.ui.runtime.js +1 -0
- package/dist/workspace.ui.runtime.js.map +1 -1
- package/package.json +23 -23
- package/workspace-component/workspace-component-loader.ts +64 -22
- package/workspace.ui.runtime.tsx +2 -0
package/dist/workspace.d.ts
CHANGED
|
@@ -58,6 +58,16 @@ export interface EjectConfOptions {
|
|
|
58
58
|
export type ComponentExtensionsOpts = {
|
|
59
59
|
loadExtensions?: boolean;
|
|
60
60
|
};
|
|
61
|
+
type ComponentExtensionsResponse = {
|
|
62
|
+
extensions: ExtensionDataList;
|
|
63
|
+
beforeMerge: Array<{
|
|
64
|
+
extensions: ExtensionDataList;
|
|
65
|
+
origin: ExtensionsOrigin;
|
|
66
|
+
extraData: any;
|
|
67
|
+
}>;
|
|
68
|
+
errors?: Error[];
|
|
69
|
+
envId?: string;
|
|
70
|
+
};
|
|
61
71
|
export type ExtensionsOrigin = 'BitmapFile' | 'ModelSpecific' | 'ModelNonSpecific' | 'ConfigMerge' | 'WorkspaceVariants' | 'ComponentJsonFile' | 'FinalAfterMerge';
|
|
62
72
|
/**
|
|
63
73
|
* API of the Bit Workspace
|
|
@@ -409,15 +419,7 @@ export declare class Workspace implements ComponentFactory {
|
|
|
409
419
|
* defaults extensions from workspace config
|
|
410
420
|
* extensions from the model.
|
|
411
421
|
*/
|
|
412
|
-
componentExtensions(componentId: ComponentID, componentFromScope?: Component, excludeOrigins?: ExtensionsOrigin[], opts?: ComponentExtensionsOpts): Promise<
|
|
413
|
-
extensions: ExtensionDataList;
|
|
414
|
-
beforeMerge: Array<{
|
|
415
|
-
extensions: ExtensionDataList;
|
|
416
|
-
origin: ExtensionsOrigin;
|
|
417
|
-
extraData: any;
|
|
418
|
-
}>;
|
|
419
|
-
errors?: Error[];
|
|
420
|
-
}>;
|
|
422
|
+
componentExtensions(componentId: ComponentID, componentFromScope?: Component, excludeOrigins?: ExtensionsOrigin[], opts?: ComponentExtensionsOpts): Promise<ComponentExtensionsResponse>;
|
|
421
423
|
warnAboutMisconfiguredEnv(envId: string): Promise<void>;
|
|
422
424
|
getConfigMergeFilePath(): string;
|
|
423
425
|
getConflictMergeFile(): MergeConflictFile;
|
package/dist/workspace.js
CHANGED
|
@@ -1362,13 +1362,14 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
|
|
|
1362
1362
|
loadExtensions: true
|
|
1363
1363
|
}, opts);
|
|
1364
1364
|
const mergeRes = await this.aspectsMerger.merge(componentId, componentFromScope, excludeOrigins);
|
|
1365
|
+
const envId = await this.envs.getEnvIdFromEnvsLegacyExtensions(mergeRes.extensions);
|
|
1365
1366
|
if (optsWithDefaults.loadExtensions) {
|
|
1366
1367
|
await this.loadComponentsExtensions(mergeRes.extensions, componentId);
|
|
1367
|
-
const envId = await this.envs.getEnvIdFromEnvsLegacyExtensions(mergeRes.extensions);
|
|
1368
1368
|
if (envId) {
|
|
1369
1369
|
await this.warnAboutMisconfiguredEnv(envId);
|
|
1370
1370
|
}
|
|
1371
1371
|
}
|
|
1372
|
+
mergeRes.envId = envId;
|
|
1372
1373
|
return mergeRes;
|
|
1373
1374
|
}
|
|
1374
1375
|
async warnAboutMisconfiguredEnv(envId) {
|