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

Jump to bottom

fix(core): consult root package.json when resolving peer deps on package generation #13949

Merged
merged 1 commit into from Dec 21, 2022
Merged

fix(core): consult root package.json when resolving peer deps on package generation #13949

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 33 additions & 16 deletions packages/nx/src/utils/create-package-json.ts
View file
Open in desktop
Expand Up @@ -56,18 +56,28 @@ export function createPackageJson(
});
Object.entries(npmDeps.peerDependencies).forEach(([packageName, version]) => {
if (!packageJson.peerDependencies?.[packageName]) {
packageJson.dependencies ??= {};
packageJson.dependencies[packageName] = version;
if (rootPackageJson.dependencies?.[packageName]) {
packageJson.dependencies ??= {};
packageJson.dependencies[packageName] = version;
return;
}

const isOptionalPeer =
npmDeps.peerDependenciesMeta[packageName]?.optional;
if (!isOptionalPeer) {
packageJson.peerDependencies ??= {};
packageJson.peerDependencies[packageName] = version;
} else if (!options.isProduction) {
// add peer optional dependencies if not in production
packageJson.peerDependencies ??= {};
packageJson.peerDependencies[packageName] = version;
packageJson.peerDependenciesMeta ??= {};
packageJson.peerDependenciesMeta[packageName] = {
optional: true,
};
}
}
});
if (options.isProduction && packageJson.peerDependencies) {
const mandatoryPeedDeps = filterOptionalPeerDependencies(packageJson);
if (mandatoryPeedDeps) {
packageJson.peerDependencies = mandatoryPeedDeps;
} else {
delete packageJson.peerDependencies;
}
}

packageJson.devDependencies &&= sortObjectByKeys(packageJson.devDependencies);
packageJson.dependencies &&= sortObjectByKeys(packageJson.dependencies);
Expand All @@ -87,7 +97,8 @@ function findAllNpmDeps(
list: {
dependencies: Record<string, string>;
peerDependencies: Record<string, string>;
} = { dependencies: {}, peerDependencies: {} },
peerDependenciesMeta: Record<string, { optional: boolean }>;
} = { dependencies: {}, peerDependencies: {}, peerDependenciesMeta: {} },
seen = new Set<string>()
) {
const node = graph.externalNodes[projectName];
Expand Down Expand Up @@ -125,6 +136,7 @@ function recursivelyCollectPeerDependencies(
list: {
dependencies: Record<string, string>;
peerDependencies: Record<string, string>;
peerDependenciesMeta: Record<string, { optional: boolean }>;
},
seen = new Set<string>()
) {
Expand All @@ -145,13 +157,18 @@ function recursivelyCollectPeerDependencies(
.map((dependency) => graph.externalNodes[dependency])
.filter(Boolean)
.forEach((node) => {
if (
!packageJson.peerDependenciesMeta?.[node.data.packageName]
?.optional &&
!seen.has(node.name)
) {
if (!seen.has(node.name)) {
seen.add(node.name);
list.peerDependencies[node.data.packageName] = node.data.version;
if (
packageJson.peerDependenciesMeta &&
packageJson.peerDependenciesMeta[node.data.packageName] &&
packageJson.peerDependenciesMeta[node.data.packageName].optional
) {
list.peerDependenciesMeta[node.data.packageName] = {
optional: true,
};
}
recursivelyCollectPeerDependencies(node.name, graph, list, seen);
}
});
Expand Down