Skip to content

Commit 7618c57

Browse files
committed
[INTERNAL][WIP] VersionInfo: with manifest infos
simplified merge logic
1 parent d89c2eb commit 7618c57

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

lib/processors/versionInfoGenerator.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const resolve = (libName, libraryInfosMap, resolvedCache) => {
155155
return resolvedCache.get(libName);
156156
}
157157
const manifestHint = libraryInfosMap.get(libName);
158-
let resolved = {};
158+
let resolved = manifestHint;
159159
if (!manifestHint) {
160160
log.error(`no manifest information in dependencies for ${libName}`);
161161
resolvedCache.set(libName, resolved);
@@ -164,12 +164,11 @@ const resolve = (libName, libraryInfosMap, resolvedCache) => {
164164
const keys = Object.keys(manifestHint);
165165
keys.forEach((childLibName) => {
166166
const childResolved = resolve(childLibName, libraryInfosMap, resolvedCache);
167-
resolved = merge(resolved, childResolved);
167+
// set a copy of the resolved libraries to avoid modifying it while iterating (recursively)
168+
resolved = merge(resolved, clone(childResolved));
168169
});
169-
resolved = merge(resolved, libraryInfosMap.get(libName));
170170

171-
// set a copy of the resolved libraries to avoid modifying it while iterating (recursively)
172-
libraryInfosMap.set(libName, clone(resolved));
171+
libraryInfosMap.set(libName, resolved);
173172
resolvedCache.set(libName, resolved);
174173
return resolved;
175174
};

0 commit comments

Comments
 (0)