Merge branch 'jy/formatting' into 'develop'

Pre-commit formatting

See merge request polycentric/polycentric!530

Author: markharding

.lintstagedrc.json

@@ -0,0 +1,4 @@
+{
+  "*": "biome check --write --files-ignore-unknown=true",
+  "{packages,services}/**/*.rs": "rustfmt --edition 2024"
+}

.prettierignore

@@ -35,6 +35,9 @@ rustup target add wasm32-unknown-unknown
 pnpm install
 pnpm build
 
+# Setup the git pre-commit hooks
+pnpm prepare
+
 # Start the server process
 docker compose up -d --build
 

.prettierrc.json

@@ -15,10 +15,8 @@ import {
 } from '@/src/common/theme';
 import { BlurView } from 'expo-blur';
 
-export interface TextInputProps extends Omit<
-  RNTextInputProps,
-  'placeholderTextColor'
-> {
+export interface TextInputProps
+  extends Omit<RNTextInputProps, 'placeholderTextColor'> {
   variant?: 'default' | 'plain';
   placeholderTextColor?: PaletteColorToken;
   disabled?: boolean;

README.md

@@ -173,19 +173,19 @@ export function PolycentricProvider({
           // re-refreshes once new events have been pulled in.
           useFollows.getState().refresh(c);
           useReposts.getState().refresh(c);
-          (useReactions.getState().refresh(c),
-            void c
-              .sync()
-              .then(() =>
-                Promise.all([
-                  useFollows.getState().refresh(c),
-                  useReposts.getState().refresh(c),
-                  useReactions.getState().refresh(c),
-                ]),
-              )
-              .catch((syncError) => {
-                console.warn('Initial Polycentric sync failed:', syncError);
-              }));
+          useReactions.getState().refresh(c);
+          void c
+            .sync()
+            .then(() =>
+              Promise.all([
+                useFollows.getState().refresh(c),
+                useReposts.getState().refresh(c),
+                useReactions.getState().refresh(c),
+              ]),
+            )
+            .catch((syncError) => {
+              console.warn('Initial Polycentric sync failed:', syncError);
+            });
         }
 
         setIsLoading(false);

apps/polycentric/src/common/components/primitives/TextInput.tsx

@@ -0,0 +1,71 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.4.16/schema.json",
+  "vcs": { "enabled": true, "clientKind": "git", "useIgnoreFile": true },
+  "files": {
+    "ignoreUnknown": false,
+    "includes": [
+      "**",
+      "!**/LICENSE",
+      "!**/public",
+      "!**/pnpm-lock.yaml",
+      "!**/justfile",
+      "!**/README.md",
+      "!legacy",
+      "!turbo.jsonc",
+      "!apps/polycentric/build",
+      "!apps/polycentric/android",
+      "!apps/polycentric/ios",
+      "!packages/react-native/android",
+      "!packages/react-native/ios",
+      "!packages/react-native/lib",
+      "!packages/react-native/src/generated",
+      "!packages/react-native/src/Native*",
+      "!packages/react-native/src/uniffi-init.tsx",
+      "!apps/polycentric/.expo",
+      "!apps/polycentric/expo-env.d.ts",
+      "!packages/rs-core",
+      "!packages/rs-core-wasm-browser",
+      "!packages/rs-core-wasm-node",
+      "!packages/js-core/src/proto/polycentric.ts",
+      "!packages/js-core/src/proto/polycentric/v2",
+      "!**/rust_modules"
+    ]
+  },
+  "formatter": {
+    "enabled": true,
+    "formatWithErrors": false,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "lineEnding": "lf",
+    "lineWidth": 80,
+    "attributePosition": "auto",
+    "bracketSameLine": false,
+    "bracketSpacing": true,
+    "expand": "auto",
+    "useEditorconfig": true
+  },
+  "linter": { "enabled": false, "rules": { "recommended": true } },
+  "javascript": {
+    "formatter": {
+      "jsxQuoteStyle": "double",
+      "quoteProperties": "asNeeded",
+      "trailingCommas": "all",
+      "semicolons": "always",
+      "arrowParentheses": "always",
+      "bracketSameLine": false,
+      "quoteStyle": "single",
+      "attributePosition": "auto",
+      "bracketSpacing": true
+    }
+  },
+  "html": {
+    "formatter": {
+      "indentScriptAndStyle": false,
+      "selfCloseVoidElements": "always"
+    }
+  },
+  "assist": {
+    "enabled": true,
+    "actions": { "source": { "organizeImports": "off" } }
+  }
+}

apps/polycentric/src/common/lib/polycentric-hooks/PolycentricProvider.tsx

@@ -5,8 +5,8 @@
   "scripts": {
     "dev": "turbo run dev",
     "build": "turbo run build",
-    "format": "prettier --check .",
-    "format:fix": "prettier --write .",
+    "format": "biome check",
+    "format:fix": "biome check --write",
     "generate": "turbo run generate",
     "lint": "turbo run lint",
     "lint:fix": "turbo run lint:fix",
@@ -16,12 +16,15 @@
     "ubrn:android": "pnpm -C packages/react-native ubrn:android",
     "ubrn:ios": "sh -c 'if [ \"$(uname -s)\" = Darwin ]; then pnpm -C packages/react-native ubrn:ios; else echo Skipping ubrn:ios: macOS-only build; fi'",
     "ubrn": "pnpm ubrn:android && pnpm ubrn:ios",
-    "ubrn:clean": "pnpm -C packages/react-native ubrn:clean && pnpm -C packages/rs-core-uniffi-web clean"
+    "ubrn:clean": "pnpm -C packages/react-native ubrn:clean && pnpm -C packages/rs-core-uniffi-web clean",
+    "prepare": "husky"
   },
   "devDependencies": {
+    "@biomejs/biome": "^2.4.16",
     "@types/react": "~19.2.10",
     "eslint": "^9.38.0",
-    "prettier": "^3.8.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^17.0.7",
     "turbo": "^2.6.1",
     "typescript-eslint": "^8.46.2"
   },

biome.json

@@ -21,9 +21,7 @@
       "default": "./src/index.ts"
     }
   },
-  "files": [
-    "dist"
-  ],
+  "files": ["dist"],
   "scripts": {
     "build": "tsc -b && webpack",
     "dev": "tsc -b && webpack --watch",

package.json

@@ -11,9 +11,7 @@
       "import": "./dist/index.es.js"
     }
   },
-  "files": [
-    "dist"
-  ],
+  "files": ["dist"],
   "scripts": {
     "generate": "mkdir -p ./src/proto && protoc --ts_out=./src/proto --proto_path=../../protos --experimental_allow_proto3_optional ../../protos/polycentric.proto ../../protos/polycentric/v2/keypair.proto ../../protos/polycentric/v2/event_key.proto ../../protos/polycentric/v2/identity.proto ../../protos/polycentric/v2/content.proto ../../protos/polycentric/v2/events.proto ../../protos/polycentric/v2/feeds.proto ../../protos/polycentric/v2/server.proto ../../protos/polycentric/v2/pairing_service.proto ../../protos/polycentric/v2/notifications.proto",
     "build": "tsc -b && webpack",