Skip to content

Commit 1fb9db1

Browse files
committed
update extractInternal
1 parent 212eba2 commit 1fb9db1

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

packages/app-builder-lib/src/node-module-collector/nodeModulesCollector.ts

+12-11
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,18 @@ export abstract class NodeModulesCollector<T extends Dependency<T, OptionalsType
6464
}
6565

6666
protected extractInternal(deps: T["dependencies"]): T["dependencies"] {
67-
return deps && Object.keys(deps).length > 0
68-
? Object.entries(deps).reduce((accum, [packageName, depObjectOrVersionString]) => {
69-
return {
70-
...accum,
71-
[packageName]:
72-
typeof depObjectOrVersionString === "object" && Object.keys(depObjectOrVersionString).length > 0
73-
? this.extractRelevantData(depObjectOrVersionString)
74-
: depObjectOrVersionString,
75-
}
76-
}, {})
77-
: undefined
67+
if (!deps || Object.keys(deps).length === 0) {
68+
return undefined
69+
}
70+
71+
return Object.fromEntries(
72+
Object.entries(deps).map(([packageName, depObjectOrVersionString]) => [
73+
packageName,
74+
typeof depObjectOrVersionString === "object" && Object.keys(depObjectOrVersionString).length > 0
75+
? this.extractRelevantData(depObjectOrVersionString)
76+
: depObjectOrVersionString,
77+
])
78+
) as T["dependencies"]
7879
}
7980

8081
protected resolvePath(filePath: string): string {

packages/app-builder-lib/src/node-module-collector/pnpmNodeModulesCollector.ts

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmDependenc
4646
const prodDependencies = { ...packageJson.dependencies, ...packageJson.optionalDependencies }
4747

4848
const deps = { ...(tree.dependencies || {}), ...(tree.optionalDependencies || {}) }
49+
this.productionGraph[newKey] = { dependencies: [] }
4950
const dependencies = Object.entries(deps)
5051
.map(([packageName, dependency]) => {
5152
// check if the optional dependency's path is existing

0 commit comments

Comments
 (0)