mirror of
https://github.com/apache/superset.git
synced 2026-09-08 00:04:36 +00:00
Claude Code
42c6746339
A second, smaller conflict landed while pushing the previous rebase fix: master's Prettier-to-Oxfmt migration touched every plugin package.json, colliding with this branch's own renames/deletions of the legacy-prefixed packages. Resolved: - Two modify/delete conflicts (legacy-plugin-chart-rose, legacy-preset-chart-nvd3): kept deleted. Both packages are fully removed on this branch with no replacement package (Rose now lives inside plugin-chart-echarts/src/Rose/). - Five package.json field-reordering conflicts (chord, country-map, paired-t-test, parallel-coordinates, world-map): master's migration reordered/added fields (keywords, homepage) on the old legacy- prefixed paths while this branch had independently reordered the same renamed files. Reconstructed each to the canonical field order already used by sibling packages that merged cleanly (partition, echarts). - One content conflict in paired-t-test/src/TTestTable.tsx: discarded master's dead legacy reactable-based sortConfig block, already fully replaced by this branch's own COMPARATORS object earlier in the same file. package-lock.json regenerated via a clean npm install (no --legacy-peer-deps, after clearing corrupted npm cache entries) to correctly reflect both the dependency-tree changes from this rebase and the Oxfmt migration's own devDependency swap (prettier/eslint- plugin-prettier out, oxfmt in).