INTEGRATION [PR#6297 > development/9.5] CLDSRV-1002: format the whole codebase with prettier - #6309
Merged
bert-e merged 17 commits intoSep 28, 2026
Conversation
The lint job of the tests workflow runs prettier --check on every file, next to ESLint, instead of a separate workflow diffing the files a pull request touches; the diff script goes away. Issue: CLDSRV-1002
Prettier and max-len both cap lines at 120 columns, but Prettier cannot break string literals, template literals or comments, so it leaves some lines longer and max-len reports them: 109 errors on the reformatted tree. Fixing them would mean hand-split strings or disable comments, which is the concatenation noise the reformat removes. Turn max-len off. The eslint-disable max-len directives become unused, which ESLint 9 reports as warnings and the lint job fails on (--max-warnings 0), so they are removed with it. Issue: CLDSRV-1002
The website fixtures' exact bytes are asserted as ETags in websiteHead.js and websiteHeadWithACL.js. monitoring/dashboard.json is generated from dashboard.py by grafanalib; it is also marked as generated so GitHub collapses its diff. Issue: CLDSRV-1002
Plain output of `yarn prettier:write`, no manual edit on top. Issue: CLDSRV-1002
Prettier pads markdown table cells for alignment, which pushed this table to 82 columns and tripped MD013. mdlint's config lives in the shared Guidelines package and cannot be relaxed per repo, so shorten the widest cell instead. Issue: CLDSRV-1002
Adds .git-blame-ignore-revs, which GitHub reads automatically; the file explains the one-time git config needed locally. Issue: CLDSRV-1002
Prettier reflowed the code to 120 columns, which left many messages and test descriptions as chains of short literals joined with `+`. Merge adjacent literals into a single string wherever the result fits; strings that cannot fit are re-split into as few pieces as possible. Issue: CLDSRV-1002
Strings that were wrapped by hand for the old 80-column limit kept their short pieces after the Prettier reflow, often as one short line followed by several full ones. Re-split them into as few balanced pieces as fit in 120 columns, or into a single literal when it fits. Issue: CLDSRV-1002
Where a message was built as a plain string concatenated with a template literal, merge the pieces into a single template literal. Kept separate from the plain-string merges so it can be reviewed, or dropped, on its own. Issue: CLDSRV-1002
Merging the hand-wrapped literals exposed pieces that had been joined without a separating space (and one doubled space), in test names and in a few error messages. Add the missing spaces. Issue: CLDSRV-1002
Covers code added to development/9.4 after the cleanup was written and every remaining plain, template or mixed pair joined with + on one line, so no-useless-concat has nothing left to report. The ACL XML builder now pushes whole fragments instead of separate hardcoded entries joined with ''. String values are unchanged, checked by comparing the parsed string contents of every file before and after. Issue: CLDSRV-1002
Joins that glued two words (badconfig, localCachesentinel, ...), a missing space after a colon, a double space, and the localCache password assertion message. No test asserts these messages. Issue: CLDSRV-1002
Nothing is left for it to report after the string cleanup; enabling it stops new '...' + '...' joins on one line. Chains split over several lines are not reported, by the rule's design. Issue: CLDSRV-1002
From review: drop quotes docker-compose does not need, keep the async check ternary on three lines (an empty trailing comment stops prettier joining it), merge the completempu test title, add blank lines between tests, indent the encryption test XML bodies with the code, and drop the quotes around function names in describe titles. Issue: CLDSRV-1002
The template literal carried the code indentation into the response body, between the XML declaration and the root element. Only that whitespace changes; the document is the same. Issue: CLDSRV-1002
`.then(() => cb()).catch(cb)` calls cb a second time with the error when cb itself throws. Pass cb as the rejection handler instead, and let the bucket logging cleanup return its promise to mocha. Issue: CLDSRV-1002
…-whole-repo' into w/9.5/improvement/CLDSRV-1002/prettier-whole-repo # Conflicts: # lib/api/apiUtils/object/coldStorage.js # tests/unit/api/apiUtils/coldStorage.js
Codecov Report❌ Patch coverage is Additional details and impacted files
@@ Coverage Diff @@
## development/9.5 #6309 +/- ##
===================================================
- Coverage 86.57% 86.55% -0.02%
===================================================
Files 213 213
Lines 14620 14607 -13
===================================================
- Hits 12657 12643 -14
- Misses 1963 1964 +1
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
bert-e
deleted the
w/9.5/improvement/CLDSRV-1002/prettier-whole-repo
branch
September 28, 2026 14:38
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
4 participants
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.
This pull request has been created automatically.
It is linked to its parent pull request #6297.
Do not edit this pull request directly.
If you need to amend/cancel the changeset on branch
w/9.5/improvement/CLDSRV-1002/prettier-whole-repo, please follow thisprocedure:
git fetch git checkout w/9.5/improvement/CLDSRV-1002/prettier-whole-repo # <amend or cancel the changeset by _adding_ new commits> git push origin w/9.5/improvement/CLDSRV-1002/prettier-whole-repoPlease always comment pull request #6297 instead of this one.