chore(deps): bump mermaid from 11.16.0 to 11.16.1 in /public/visimer (#3347) - #26
Merged
Conversation
…(#3347) Rebuilt the branch on current main to clear a merge conflict. public/visimer is a standalone pnpm root and is not a member of the root pnpm-workspace.yaml, so a mermaid bump there cannot affect the monorepo root lockfile. Dependabot regenerated /pnpm-lock.yaml anyway as part of the bump. Because the root lockfile carries floating specifiers and registry sensitive resolutions, that regeneration reverted unrelated packages back to whatever main held when the branch was cut, for example @opentelemetry/api 1.9.1 back to 1.9.0 and @opentelemetry/core 2.6.1 back to 2.5.1. That stale revert was the entire source of the conflict, not the mermaid bump itself. The branch now carries only the three visimer app manifests plus visimer's own pnpm-lock.yaml. The root lockfile is left byte identical to main. Verified before push: - git diff origin/main -- pnpm-lock.yaml is empty, and the root lockfile md5 is unchanged from main - the visimer lockfile diff is 13 insertions and 13 deletions, limited to mermaid 11.16.0 to 11.16.1 and the mermaid-zenuml peer re-peg - mermaid 11.16.1 declares dependencies identical to 11.16.0 on npm, so no transitive churn is expected or present - pnpm --dir public/visimer install --frozen-lockfile exits 0 GitOrigin-RevId: 43dba5359a9e9b989068a2380a3a6f756a188b96
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Copybara-translated 1 Inkeep OSS change. Rebase-merge this PR so the prepared commit lands directly on public main.