Skip to content

Release v1.5.0: Visual Conflict Resolver, HTML Export, and Stability Fixes - #71

Merged
phine-apps merged 1 commit into
mainfrom
release/v1.5.0
Aug 11, 2026
Merged

Release v1.5.0: Visual Conflict Resolver, HTML Export, and Stability Fixes#71
phine-apps merged 1 commit into
mainfrom
release/v1.5.0

Conversation

@phine-apps

Copy link
Copy Markdown
Owner

Summary of Changes in v1.5.0

This pull request contains the final updates and bug fixes for the v1.5.0 release:

⚔️ Visual Conflict Resolver

  • Interactive 3-Way Merge: Resolve Git merge conflicts (<<<<<<<, |||||||, =======, >>>>>>>) directly in rendered Markdown.
  • Scroll Position Persistence: Preserved scroll state during partial conflict resolution updates.
  • CSP Compliant Event Handling: Refactored to event delegation (data-block-id, data-choice) and strict Content Security Policy.
  • Modularized Parser/Renderer: Clean architecture separating webview shell, block rendering, and parsing in src/markdown/conflictParser.ts.

📄 HTML Export Enhancements

  • Standalone Module: Extracted export logic to src/exportHtml.ts.
  • Automatic Asset Inlining: Local images and resources converted to Base64 Data URIs.
  • CDN Fallback & Safe CSP: Highlight.js, Mermaid, and KaTeX web fonts replaced with CDN links; browser-compatible CSP configured.
  • Error Resilience: Graceful fallback when local assets cannot be read without crashing the export flow.

🐛 Bug Fixes & Rendering Stability

  • Mermaid Compact Arrow Parser ([MERMAID-03]): Fixed regex to prevent arrow hyphens (A-->B;) from being parsed as node names.
  • Code Block Newlines: Protected <pre>/<code> blocks in cleanupUnbalancedDiffTags to preserve diff tags for newlines and blank lines.
  • Checkbox Restoration: Merged token restoration from both old and new documents.
  • Table Alignment & Block Rediffing: Prevented structured tables from being inappropriately re-diffed as generic block elements.
  • Task List UI: Fixed paragraph inline alignment for task list checkbox items.

🧪 Test Coverage & Verification

  • Unit tests: 234 passing (pnpm run test:unit)
  • Linter: 0 errors (pnpm run lint)
  • TypeScript build: Success (pnpm run compile)
  • Added comprehensive unit tests in src/test/unit/exportHtml.test.ts, src/test/unit/mermaidDiff.test.ts, and src/test/unit/markdownDiff.test.ts.

@phine-apps
phine-apps merged commit bf72406 into main Aug 11, 2026
1 check 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.

1 participant