Skip to content

fix(package.json): align OpenTelemetry peer dependency ordering with generated output#244

Merged
Nelson-PROIA merged 1 commit into
mainfrom
fix/package-json-otel-dependency-ordering
Jun 23, 2026
Merged

fix(package.json): align OpenTelemetry peer dependency ordering with generated output#244
Nelson-PROIA merged 1 commit into
mainfrom
fix/package-json-otel-dependency-ordering

Conversation

@Nelson-PROIA

@Nelson-PROIA Nelson-PROIA commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

What

Reorder the OpenTelemetry peer-dependency keys in package.json to match the position the code generator emits:

  • peerDependenciesMeta → after license
  • peerDependencies → after scripts

Why

These keys are generator-managed but were committed in a non-canonical position (both blocks at the end of the file). On regeneration the generator re-emits them in their canonical position, which collided with the committed ordering and produced a package.json merge conflict during generation.

Reordering to match the generated output resolves the conflict. No dependency values change — only key positions.

…pendencies

The peerDependencies and peerDependenciesMeta keys were committed at the end
of package.json, but the code generator emits peerDependencies after scripts
and peerDependenciesMeta after license. That position mismatch caused a
package.json merge conflict on regeneration. Reorder to match the generated
output; no dependency values change.

@andreaonofrei01 andreaonofrei01 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@Nelson-PROIA Nelson-PROIA force-pushed the fix/package-json-otel-dependency-ordering branch from 759cce2 to 13403d9 Compare June 23, 2026 08:56
@Nelson-PROIA Nelson-PROIA merged commit 5970841 into main Jun 23, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants