Merge first 3 commits from sync upstream obytes#151
Merged
Conversation
- Remove Prettier and related dependencies - Install @antfu/eslint-config with React and TypeScript support - Update ESLint config to use flat config with antfu preset - Configure stylistic rules (indent: 2, quotes: single, semi: true) - Update VS Code settings to use ESLint for formatting - Update lint-staged to use ESLint only - Add rule to prefer type over interface - Auto-fix formatting across codebase - Fix TypeScript type errors from interface to type conversions - Remove obsolete eslint-disable comments and ts-ignore directives - Adjust rules for React Native development patterns Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
…est setup refactor: clean up imports and reformat component props in Card and Colors components
# Conflicts: # .github/actions/eas-build/action.yml # .github/actions/setup-node-pnpm-install/action.yml # .github/workflows/eas-build-qa.yml # .github/workflows/new-app-version.yml # .vscode/settings.json # __tests__/components/ui/button.test.tsx # __tests__/components/ui/checkbox.test.tsx # __tests__/components/ui/input.test.tsx # __tests__/components/ui/select.test.tsx # env.js # eslint.config.mjs # jest-setup.ts # lint-staged.config.js # package.json # pnpm-lock.yaml # src/api/common/client.tsx # src/api/common/utils.tsx # src/api/posts/use-add-post.ts # src/api/posts/use-post.ts # src/api/posts/use-posts.ts # src/app/(app)/_layout.tsx # src/app/(app)/index.tsx # src/app/(app)/settings.tsx # src/app/_layout.tsx # src/app/feed/[id].tsx # src/app/feed/add-post.tsx # src/app/login.tsx # src/app/onboarding.tsx # src/components/buttons.tsx # src/components/card.tsx # src/components/colors.tsx # src/components/cover.tsx # src/components/inputs.tsx # src/components/login-form.test.tsx # src/components/login-form.tsx # src/components/settings/item.tsx # src/components/settings/items-container.tsx # src/components/settings/language-item.tsx # src/components/settings/theme-item.tsx # src/components/title.tsx # src/components/typography.tsx # src/components/ui/button.tsx # src/components/ui/checkbox.tsx # src/components/ui/focus-aware-status-bar.tsx # src/components/ui/icons/arrow-right.tsx # src/components/ui/icons/caret-down.tsx # src/components/ui/icons/feed.tsx # src/components/ui/icons/github.tsx # src/components/ui/icons/language.tsx # src/components/ui/icons/rate.tsx # src/components/ui/icons/settings.tsx # src/components/ui/icons/share.tsx # src/components/ui/icons/style.tsx # src/components/ui/icons/support.tsx # src/components/ui/icons/website.tsx # src/components/ui/image.tsx # src/components/ui/input.tsx # src/components/ui/list.tsx # src/components/ui/modal-keyboard-aware-scroll-view.tsx # src/components/ui/modal.tsx # src/components/ui/progress-bar.tsx # src/components/ui/select.tsx # src/components/ui/text.tsx # src/components/ui/utils.tsx # src/lib/auth/index.tsx # src/lib/hooks/use-selected-theme.tsx # src/lib/i18n/index.tsx # src/lib/i18n/utils.tsx # src/lib/test-utils.tsx # src/lib/use-theme-config.tsx # src/lib/utils.ts
💯 Test Coverage
😎 Tests Results
👀 Tests Details • (56%)
|
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
2 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.
What does this do?
Reconciles the first three commits of the
update-upstream-v9.0.0branch (Prettier→@antfu/eslint-config migration, ESLint/Jest config fixes, and thecreateMMKVstorage refactor) withmastervia a merge. These changes already landed onmasterthrough separate commits (e.g. #147), so the resulting tree is identical tomaster— there are no net content changes. The upstream-only/migrationdocs folder is excluded, and.gitignoreis kept asmaster's (already a superset).Why did you do this?
The
update-upstream-v9.0.0PR (#143) has heavy conflicts withmaster. This merge clears the redundant foundation commits first — the ones whose workmasteralready absorbed — so the remaining upstream changes (uniwind, TanStack Form, folder restructure) can be integrated in smaller, conflict-free steps.Who/what does this impact?
No runtime or UI impact — the merge produces no content diff against
master. Affects git history only: it records that the first three upstream commits are reconciled withmaster. No dependency, config, or source changes ship in this PR.How did you test this?
Verified
git diff origin/master...HEADis empty (tree identical tomaster) and that no conflict markers remain. No app build required since there is no content change.Notes:
master, since every difference was lint/formatting noise from a divergent antfu config — no app logic was unique to the upstream commits.storage.tsxalready usedcreateMMKVonmaster, so the storage commit was a no-op./migrationfolder (11.mdfiles) from the upstream branch was intentionally dropped.Screenshots / Previews
No UI changes — nothing to preview.