Skip to content

chore: adopt a formatter — fix mangled whitespace, add .editorconfig and SDK lint - #278

Merged
wagmiiii merged 2 commits into
accensa:mainfrom
timo126:chore-98-adopt-formatter
Aug 29, 2026
Merged

chore: adopt a formatter — fix mangled whitespace, add .editorconfig and SDK lint#278
wagmiiii merged 2 commits into
accensa:mainfrom
timo126:chore-98-adopt-formatter

Conversation

@timo126

@timo126 timo126 commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

Summary

Closes #98

This PR adopts Prettier as the project-wide formatter, repairs all mangled string literals left behind by bad merges, extends ESLint coverage to packages/sdk, and adds .editorconfig + .gitattributes so editors and git agree on whitespace before code is ever committed.

What changed

Commit 1: fix: resolve merge conflict, repair mangled strings, add .editorconfig and SDK lint

Merge conflict resolution

  • apps/web/src/app/api/sync/route.ts had unresolved conflict markers. Both imports (isAuthorizedCronRequest and createHmac) are used — kept both.

Mangled string literals repaired (16 instances)
A grep for [a-zA-Z]"[a-zA-Z] across apps/web/src confirmed 16 locations where quotes were jammed against adjacent words. These are inside comments, JSDoc, and template-literal SQL — syntactically valid, so no linter or formatter will ever flag them. All 16 were fixed by hand.

Examples:

  • db.ts:80: COLUMN"timestamp"TOCOLUMN "timestamp" TO
  • sync/route.ts:362: dashboard's"Sync now"buttondashboard's "Sync now" button
  • stellar-events.ts:13: e.g."native"or"USDC:GA..."e.g. "native" or "USDC:GA..."

Post-fix grep confirms zero remaining mangled strings.

.editorconfig added — matches the Prettier config (2-space indent, LF, UTF-8).

.gitattributes added — enforces eol=lf repo-wide so Windows contributors never commit CRLF.

ESLint extended to packages/sdk — flat config with typescript-eslint recommended rules + lint script added to package.json.

apps/demo-merchant ESLint gap (justified) — plain JS demo app with no build step; adding ESLint there would require a separate config for a handful of rarely-changing files.

CONTRIBUTING.md updated — now mentions .editorconfig, ESLint coverage, and the full pre-commit workflow.

.gitignore updated — prevents local tooling artifacts (node_dist/, *.zip, etc.) from being committed.


Commit 2: style: apply prettier formatting across the entire codebase

A single prettier --write . run that touches only formatting — no logic, no renames, no API changes. Listed in .git-blame-ignore-revs.


Commit 3: chore: add format commit to .git-blame-ignore-revs

Records the format commit in .git-blame-ignore-revs alongside the two earlier format commits.

Acceptance criteria checklist

  • Prettier configured, config matches existing clean files (packages/sdk/index.ts)
  • Whole-repo reformat is a single isolated commit (054f864)
  • Format commit listed in .git-blame-ignore-revs
  • Mangled string literals repaired by hand; grep confirms none remain
  • format:check runs in CI over every workspace (already in ci.yml)
  • ESLint coverage extended to packages/sdk; apps/demo-merchant gap justified
  • .editorconfig committed; CONTRIBUTING.md mentions the formatter

@vercel

vercel Bot commented Aug 28, 2026

Copy link
Copy Markdown

@samlogy1 is attempting to deploy a commit to the ACCENSA Team on Vercel.

A member of the Team first needs to authorize it.

@mergekeeper

mergekeeper Bot commented Aug 28, 2026

Copy link
Copy Markdown

MergeKeeper review

Scope: in scope for linked issue #98.
Verdict: clean

The PR successfully resolves the formatting and tooling requirements specified in issue #98.

Reviewed commit: 57567be93ebd38c8007c022dd9aadddf46eac4b6.
CI and merge eligibility are checked separately.

@mergekeeper

mergekeeper Bot commented Aug 28, 2026

Copy link
Copy Markdown

MergeKeeper merge status

Status: blocked
PR state: open
Mergeability: conflicts / not mergeable
Checked commit: 57567be93ebd38c8007c022dd9aadddf46eac4b6.

Reason: This branch has merge conflicts with the current base branch.

Next steps:

  1. Update this branch with the latest main (rebase or merge main into the branch).
  2. Resolve every conflict locally.
  3. Run the relevant tests, commit the resolution, and push it.
  4. MergeKeeper will automatically re-review the new head commit after the push.

@drips-wave

drips-wave Bot commented Aug 28, 2026

Copy link
Copy Markdown

@timo126 Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits.

You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀

Learn more about application limits

@mergekeeper

mergekeeper Bot commented Aug 28, 2026

Copy link
Copy Markdown

Needs changes

The PR modifies apps/web/src/lib/freighter.ts to rewrite the entire file instead of merely formatting/repairing string literals, which falls outside the scope of issue #98.

  • apps/web/src/lib/freighter.ts:1: Substantial rewrite of freighter.ts was included in this PR, which is outside the scope of adopting a formatter, fixing mangled strings, adding .editorconfig, and extending SDK linting.

Reviewed commit: 24b845828556bc8091a76c3cab063487fcd8d37a.

mergekeeper[bot]
mergekeeper Bot previously requested changes Aug 28, 2026

@mergekeeper mergekeeper Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Needs changes

The PR modifies apps/web/src/lib/freighter.ts to rewrite the entire file instead of merely formatting/repairing string literals, which falls outside the scope of issue #98.

  • apps/web/src/lib/freighter.ts:1: Substantial rewrite of freighter.ts was included in this PR, which is outside the scope of adopting a formatter, fixing mangled strings, adding .editorconfig, and extending SDK linting.

Reviewed commit: 24b845828556bc8091a76c3cab063487fcd8d37a.

@timo126
timo126 force-pushed the chore-98-adopt-formatter branch from 6982901 to 6716760 Compare August 29, 2026 09:18
@timo126
timo126 force-pushed the chore-98-adopt-formatter branch from baa0da5 to 57567be Compare August 29, 2026 12:26
@wagmiiii
wagmiiii merged commit 57cef43 into accensa:main Aug 29, 2026
0 of 9 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.

chore: adopt a formatter — several files carry mangled whitespace from bad merges

3 participants