Skip to content

Commit dd24689

Browse files
committed
fix(util): compose unique name for tree children
1 parent 862ca01 commit dd24689

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/if-merge/util/helpers.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import * as path from 'path';
2+
13
import {getFileName, getYamlFiles} from '../../common/util/fs';
24
import {Context} from '../../common/types/manifest';
35
import {load} from '../../common/lib/load';
@@ -35,6 +37,8 @@ const mergeManifestsData = async (manifests: string[], context: Context) => {
3537
for await (const manifest of manifests) {
3638
const manifestName = getFileName(manifest);
3739
const {rawManifest} = await load(manifest);
40+
const parentDir = path.basename(path.dirname(manifest));
41+
const uniqueName = `${parentDir}-${manifestName}`;
3842

3943
context.tags = Object.assign({}, context.tags, rawManifest.tags);
4044
context.initialize.plugins = {
@@ -43,7 +47,7 @@ const mergeManifestsData = async (manifests: string[], context: Context) => {
4347
};
4448

4549
Object.keys(rawManifest.tree.children).forEach(child => {
46-
tree.children[`${child}-${manifestName}`] = {
50+
tree.children[`${child}-${uniqueName}`] = {
4751
...rawManifest.tree.children[child],
4852
};
4953
});

0 commit comments

Comments
 (0)