Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(diff), auto-import missing objects #8861

Merged
merged 1 commit into from
May 7, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';
import { BitError } from '@teambit/bit-error';
import { WorkspaceAspect, OutsideWorkspaceError, Workspace } from '@teambit/workspace';
import { ComponentID } from '@teambit/component-id';
import { ComponentID, ComponentIdList } from '@teambit/component-id';
import { ScopeMain, ScopeAspect } from '@teambit/scope';
import { GraphqlAspect, GraphqlMain } from '@teambit/graphql';
import { BuilderAspect } from '@teambit/builder';
Expand Down Expand Up @@ -190,6 +190,8 @@ export class ComponentCompareMain {
throw new BitError(`component ${component.id.toString()} doesn't have any version yet`);
}
const repository = consumer.scope.objects;
const idList = ComponentIdList.fromArray([component.id.changeVersion(version)]);
await consumer.scope.scopeImporter.importWithoutDeps(idList, { cache: true, reason: 'to show diff' });
const fromVersionObject: Version = await modelComponent.loadVersion(version, repository);
const versionFiles = await fromVersionObject.modelFilesToSourceFiles(repository);
const fsFiles = consumerComponent.files;
Expand All @@ -212,7 +214,8 @@ export class ComponentCompareMain {
throw new BitError(`component ${id.toString()} doesn't have any version yet`);
}
const repository = consumer.scope.objects;

const idList = ComponentIdList.fromArray([id.changeVersion(version), id.changeVersion(toVersion)]);
await consumer.scope.scopeImporter.importWithoutDeps(idList, { cache: true, reason: 'to show diff' });
const fromVersionObject: Version = await modelComponent.loadVersion(version, repository);
const toVersionObject: Version = await modelComponent.loadVersion(toVersion, repository);
const fromVersionFiles = await fromVersionObject.modelFilesToSourceFiles(repository);
Expand Down