mirror of
https://github.com/nexu-io/open-design.git
synced 2026-06-01 03:14:35 +07:00
c14baf07d3
PR #2461 sync prep — resolves 14 conflicts merging 84 main-side commits on top of 58 release-side commits accumulated during the 0.8.0 cycle. Resolution summary: Take main (theirs) where main carried deliberate forward progress: - apps/web/src/components/PluginCard.tsx — 7 hunks, i18n migration: hardcoded English aria-labels/titles replaced with t() calls keyed on pluginCard.* (all 8 keys verified present in en.ts). - apps/web/src/components/TasksView.tsx — 1 hunk, source-ingestion feature: sortedRoutines (newest-first), sourceIngestionTemplates, patchSourceForm, submitSourceIngestion. activeCount/pausedCount semantics preserved (now keyed on sortedRoutines, count unchanged). - e2e/ui/app.test.ts — new node:fs/promises + tmpdir + path + @/timeouts imports needed by main-side test helpers. - e2e/ui/settings-local-cli-codex-fallback.test.ts — menu-dismissal helper block added by main. Keep both sides where each added a different field to the same object literal: - apps/web/src/components/ProjectView.tsx (locale + analyticsHints spread). - apps/web/src/components/DesignSystemFlow.tsx (locale + analyticsHints). Take release (ours) where release carried deliberate work that ships 0.8.0: - CHANGELOG.md — release-side 0.8.0 entry + PR link refs; main's Unreleased section was the same body of work, now finalized. - apps/landing-page/public/{apple-touch-icon,favicon}.png + apps/web/public/app-icon.svg — release-side visual refresh assets consistent with 0.8.0 stable ship. - tools/pack/src/linux.ts — packageVersion const required by line 466; taking main's empty line would build-error. - e2e/ui/project-management-flows.test.ts + e2e/ui/settings-api-protocol.test.ts + e2e/ui/settings-memory-routines.test.ts — release-side release-smoke hardening (shangxinyu1 + PerishFire) takes precedence on overlap. Closes-issue / unblocks: PR #2461 sync release/v0.8.0 → main. |
||
|---|---|---|
| .. | ||
| adr | ||
| assets | ||
| deployment | ||
| examples | ||
| plans | ||
| rfc-drafts | ||
| schemas | ||
| screenshots | ||
| superpowers/plans | ||
| testing | ||
| agent-adapters.md | ||
| architecture.md | ||
| atoms.md | ||
| blog-indexing-automation.md | ||
| blog-indexing-status.json | ||
| blog-indexing-status.md | ||
| blog-traffic-digest.md | ||
| code-review-guidelines.md | ||
| codex-pets.md | ||
| critique-theater.md | ||
| design-systems.md | ||
| install-guide.md | ||
| modes.md | ||
| new-agent-runtime-acp.md | ||
| notebooklm.md | ||
| plugins-spec.md | ||
| plugins-spec.zh-CN.md | ||
| publishing-a-plugin.md | ||
| publishing-a-plugin.zh-CN.md | ||
| references.md | ||
| roadmap.md | ||
| self-hosting-a-registry.md | ||
| seo-daily-report.md | ||
| skills-contributing.md | ||
| skills-protocol.md | ||
| spec.md | ||
| v0.8.0-announcement.md | ||
| v0.8.0-announcement.zh-CN.md | ||
| windows-troubleshooting.md | ||