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

fix(bit-tag-snap): avoid saving duplicate aspects to the model #6567

Merged
merged 4 commits into from
Oct 19, 2022
Merged

fix(bit-tag-snap): avoid saving duplicate aspects to the model #6567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1c5286
fix(bit-tag-snap): avoid saving duplicate aspects to the model
davidfirst Oct 19, 2022
c9fa692
Merge branch 'master' into duplicate-aspedcts
davidfirst Oct 19, 2022
b6e1d8b
avoid throwing the error when was tagged with previous bit-version
davidfirst Oct 19, 2022
08cf8c0
Merge branch 'duplicate-aspedcts' of https://github.com/teambit/bit i…
davidfirst Oct 19, 2022
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
3 changes: 2 additions & 1 deletion scopes/workspace/workspace/workspace-component/workspace-component-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,9 @@ export class WorkspaceComponentLoader {
}

private async upsertExtensionData(component: Component, extension: string, data: any) {
if (!data) return;
const existingExtension = component.state.config.extensions.findExtension(extension);
if (existingExtension && data) {
if (existingExtension) {
// Only merge top level of extension data
Object.assign(existingExtension.data, data);
return;
Expand Down
9 changes: 7 additions & 2 deletions src/scope/version-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { PJV } from 'package-json-validator';
import R from 'ramda';
import { lt } from 'semver';
import packageNameValidate from 'validate-npm-package-name';

import { BitId, BitIds } from '../bit-id';
Expand Down Expand Up @@ -100,7 +101,6 @@ export default function validateVersionInstance(version: Version): void {
});
};

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const validateNoDuplicateExtensionEntry = (extensions: ExtensionDataList) => {
const existingMap = new Map();
const duplications: string[] = [];
Expand All @@ -116,13 +116,18 @@ export default function validateVersionInstance(version: Version): void {
}
});
if (duplications.length) {
// a bug causing duplicate aspects was fixed in https://github.com/teambit/bit/pull/6567
// all Version objects snapped before 0.0.882 might have this bug. ignore them.
if (!version.bitVersion || lt(version.bitVersion, '0.0.882')) {
return;
}
throw new VersionInvalid(`${message} the following extensions entries are duplicated ${duplications.join(', ')}`);
}
};

const _validateExtensions = (extensions: ExtensionDataList) => {
if (extensions) {
// validateNoDuplicateExtensionEntry(extensions);
validateNoDuplicateExtensionEntry(extensions);
extensions.map(_validateExtension);
validateArtifacts(extensions);
}
Expand Down