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.

Sign up for GitHub

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

refactor, populate consumerComponent.overrides later in the process #9277

Closed
wants to merge 1 commit into from
Closed

refactor, populate consumerComponent.overrides later in the process #9277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions scopes/dependencies/dependencies/dependencies-loader/apply-overrides.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import OverridesDependencies from './overrides-dependencies';
import { DependenciesData } from './dependencies-data';
import { DebugDependencies, FileType } from './auto-detect-deps';
import { Logger } from '@teambit/logger';
import ComponentOverrides from '@teambit/legacy/dist/consumer/config/component-overrides';

export type AllDependencies = {
dependencies: Dependency[];
Expand Down Expand Up @@ -77,6 +78,23 @@ export class ApplyOverrides {
this.debugDependenciesData = { components: [] };
}

private async setOverridesDependencies() {
const overrides = await this.getOverridesData();
this.component.overrides = overrides;
}

private async getOverridesData() {
if (this.component.overrides) return this.component.overrides;
const overrides = await ComponentOverrides.loadFromConsumer(
this.component.id,
this.workspace!.consumer.config,
this.component.componentFromModel?.overrides,
this.component.bitJson!,
this.component.files
);
return overrides;
}

get consumer(): Consumer | undefined {
return this.workspace?.consumer;
}
Expand All @@ -86,6 +104,7 @@ export class ApplyOverrides {
overridesDependencies: OverridesDependencies;
autoDetectOverrides?: Record<string, any>;
}> {
await this.setOverridesDependencies();
await this.populateDependencies();
const dependenciesData = new DependenciesData(
this.allDependencies,
Expand Down
13 changes: 1 addition & 12 deletions src/consumer/component/consumer-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { ComponentMap } from '@teambit/legacy.bit-map';
import { IgnoredDirectory } from './exceptions/ignored-directory';
import ComponentsPendingImport from '../exceptions/components-pending-import';
import { Dist, License, SourceFile, PackageJsonFile, DataToPersist } from '@teambit/component.sources';
import ComponentConfig, { ComponentConfigLoadOptions, ILegacyWorkspaceConfig } from '../config';
import ComponentConfig, { ComponentConfigLoadOptions } from '../config';
import ComponentOverrides from '../config/component-overrides';
import { ExtensionDataList } from '../config/extension-data';
import Consumer from '../consumer';
Expand Down Expand Up @@ -498,7 +498,6 @@ export default class Component {
consumer: Consumer;
loadOpts?: ComponentLoadOptions;
}): Promise<Component> {
const workspaceConfig: ILegacyWorkspaceConfig = consumer.config;
const modelComponent = await consumer.scope.getModelComponentIfExist(id);
const componentFromModel = await consumer.loadComponentFromModelIfExist(id);
if (!componentFromModel && id._legacy.hasScope()) {
Expand Down Expand Up @@ -530,16 +529,7 @@ export default class Component {

const bindingPrefix = componentFromModel?.bindingPrefix;

const overridesFromModel = componentFromModel ? componentFromModel.overrides.componentOverridesData : undefined;
const files = await getLoadedFiles(consumer, componentMap, id, compDirAbs);

const overrides = await ComponentOverrides.loadFromConsumer(
id,
workspaceConfig,
overridesFromModel,
componentConfig,
files
);
const packageJsonFile = (componentConfig && componentConfig.packageJsonFile) || undefined;
const packageJsonChangedProps = componentFromModel ? componentFromModel.packageJsonChangedProps : undefined;
const docsP = _getDocsForFiles(files, consumer.componentFsCache);
Expand Down Expand Up @@ -569,7 +559,6 @@ export default class Component {
componentMap,
docs: flattenedDocs,
deprecated,
overrides,
schema: getSchema(),
defaultScope: defaultScope || null,
packageJsonFile,
Expand Down