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): generated package.json should not include duplicates and optional peer deeps #13438

Merged
merged 2 commits into from Nov 28, 2022
Merged

fix(core): generated package.json should not include duplicates and optional peer deeps #13438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4c88d9
fix(core): generated package.json should not include duplicates and o…
meeroslav Nov 28, 2022
a601f4d
fix(node): fix broken test
meeroslav Nov 28, 2022
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
7 changes: 3 additions & 4 deletions e2e/node/src/node.test.ts
View file
Open in desktop
Expand Up @@ -227,7 +227,9 @@ describe('Node Applications', () => {
describe('Build Node apps', () => {
beforeEach(() => newProject());

it('should generate a package.json with the `--generatePackageJson` flag', async () => {
afterEach(() => cleanupProject());

it('should generate a package.json with the `--generatePackageJson` flag MMM', async () => {
const scope = newProject();
const nestapp = uniq('nestapp');
runCLI(`generate @nrwl/nest:app ${nestapp} --linter=eslint`);
Expand All @@ -251,9 +253,6 @@ describe('Build Node apps', () => {
expect(
satisfies(packageJson.dependencies['@nestjs/core'], '^9.0.0')
).toBeTruthy();
expect(
satisfies(packageJson.dependencies['@nestjs/platform-express'], '^9.0.0')
).toBeTruthy();
expect(
satisfies(packageJson.dependencies['reflect-metadata'], '^0.1.13')
).toBeTruthy();
Expand Down
6 changes: 3 additions & 3 deletions packages/nx/package.json
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@
"@yarnpkg/lockfile": "^1.1.0",
"@yarnpkg/parsers": "^3.0.0-rc.18",
"@zkochan/js-yaml": "0.0.6",
"axios": "^1.0.0",
"chalk": "4.1.0",
"chokidar": "^3.5.1",
"cli-cursor": "3.1.0",
Expand All @@ -49,6 +50,7 @@
"fs-extra": "^10.1.0",
"glob": "7.1.4",
"ignore": "^5.0.4",
"js-yaml": "4.1.0",
"jsonc-parser": "3.2.0",
"minimatch": "3.0.5",
"npm-run-path": "^4.0.1",
Expand All @@ -62,9 +64,7 @@
"tslib": "^2.3.0",
"v8-compile-cache": "2.3.0",
"yargs": "^17.6.2",
"yargs-parser": "21.1.1",
"js-yaml": "4.1.0",
"axios": "^1.0.0"
"yargs-parser": "21.1.1"
},
"peerDependencies": {
"@swc-node/register": "^1.4.2",
Expand Down
13 changes: 10 additions & 3 deletions packages/nx/src/utils/create-package-json.ts
View file
Open in desktop
Expand Up @@ -40,7 +40,10 @@ export function createPackageJson(

const rootPackageJson = readJsonFile(`${options.root || '.'}/package.json`);
Object.entries(npmDeps).forEach(([packageName, version]) => {
if (rootPackageJson.devDependencies?.[packageName]) {
if (
rootPackageJson.devDependencies?.[packageName] &&
!packageJson.dependencies[packageName]
) {
packageJson.devDependencies[packageName] = version;
} else {
packageJson.dependencies[packageName] = version;
Expand Down Expand Up @@ -106,8 +109,12 @@ function recursivelyCollectPeerDependencies(
.map((dependency) => graph.externalNodes[dependency])
.filter(Boolean)
.forEach((node) => {
list[node.data.packageName] = node.data.version;
recursivelyCollectPeerDependencies(node.name, graph, list, seen);
if (
!packageJson.peerDependenciesMeta?.[node.data.packageName]?.optional
) {
list[node.data.packageName] = node.data.version;
recursivelyCollectPeerDependencies(node.name, graph, list, seen);
}
});
return list;
} catch (e) {
Expand Down