Skip to content

Bump prettier from 3.6.1 to 3.8.3 in /extensions/ql-vscode#4403

Merged
cklin merged 4 commits into
mainfrom
dependabot/npm_and_yarn/extensions/ql-vscode/prettier-3.8.3
Jun 5, 2026
Merged

Bump prettier from 3.6.1 to 3.8.3 in /extensions/ql-vscode#4403
cklin merged 4 commits into
mainfrom
dependabot/npm_and_yarn/extensions/ql-vscode/prettier-3.8.3

Conversation

@dependabot
Copy link
Copy Markdown
Contributor

@dependabot dependabot Bot commented on behalf of github May 21, 2026

Description

Bumps prettier from 3.6.1 to 3.8.3 in /extensions/ql-vscode.

Also resolves merge conflicts with main in package.json and package-lock.json by keeping the Prettier upgrade from this PR and preserving the upstream Storybook version from main (^10.4.1).

Remember to update the changelog if there have been user-facing changes!

Bumps [prettier](https://github.com/prettier/prettier) from 3.6.1 to 3.8.3.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.6.1...3.8.3)

---
updated-dependencies:
- dependency-name: prettier
  dependency-version: 3.8.3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot Bot added the Update dependencies Dependabot update PRs label May 21, 2026
@dependabot dependabot Bot requested a review from a team as a code owner May 21, 2026 15:52
@dependabot dependabot Bot added the Update dependencies Dependabot update PRs label May 21, 2026
@cklin
Copy link
Copy Markdown
Contributor

cklin commented Jun 4, 2026

@copilot resolve the merge conflicts in this pull request

Copy link
Copy Markdown
Contributor

Copilot AI commented Jun 4, 2026

@copilot resolve the merge conflicts in this pull request

Resolved by merging origin/main and fixing the conflicts in package.json and package-lock.json in commit f297067.

Copilot finished work on behalf of cklin June 4, 2026 22:05
Copilot AI requested a review from cklin June 4, 2026 22:05
@cklin
Copy link
Copy Markdown
Contributor

cklin commented Jun 5, 2026

@dependabot rebase

@dependabot @github
Copy link
Copy Markdown
Contributor Author

dependabot Bot commented on behalf of github Jun 5, 2026

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

@cklin cklin merged commit 85d772e into main Jun 5, 2026
28 of 29 checks passed
@cklin cklin deleted the dependabot/npm_and_yarn/extensions/ql-vscode/prettier-3.8.3 branch June 5, 2026 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Update dependencies Dependabot update PRs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants