diff --git a/.prettierignore b/.prettierignore index daa44791f..9b82a8665 100644 --- a/.prettierignore +++ b/.prettierignore @@ -10,3 +10,4 @@ lexicons/tools lexicons/games js/app/assets/emoji-data-stripped.json **/routeTree.gen.ts +*.html diff --git a/js/app/package.json b/js/app/package.json index 5b8c451b7..03cbf3004 100644 --- a/js/app/package.json +++ b/js/app/package.json @@ -14,7 +14,7 @@ "export": "expo export --dump-sourcemap || expo export --dump-sourcemap", "check": "bash -c 'set -euo pipefail;export OUT=$(mktemp -d); npx tsc -p . --outDir $OUT; rm -rf $OUT'", "prebuild": "EXPO_NO_GIT_STATUS=1 expo prebuild --clean && sed -i.bak 's/org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m/org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m/' android/gradle.properties && pnpm run find-node", - "prepare": "which pod && pnpm run prepare-ios || echo 'not a mac, not installing pods' && mkdir -p ./public && cp -r ../components/public/locales ./public/", + "prepare": "which pod && pnpm run prepare-ios || echo 'not a mac, not installing pods' && mkdir -p ./public && cp -r ../i18n/public/locales ./public/", "prepare-ios": "cd ios && pod install && pnpm run find-node", "find-node": "node -p '`NODE_BINARY=${process.argv[0]}`' > ios/.xcode.env.local", "code-signing-dev": "mkdir -p code-signing-dev/keys code-signing-dev/certs && expo-updates codesigning:generate --key-output-directory code-signing-dev/keys --certificate-output-directory code-signing-dev/certs --certificate-validity-duration-years 10 --certificate-common-name 'Streamplace'", diff --git a/js/web/.prettierrc b/js/web/.prettierrc new file mode 100644 index 000000000..89a72ee22 --- /dev/null +++ b/js/web/.prettierrc @@ -0,0 +1,18 @@ +{ + "proseWrap": "always", + "overrides": [ + { + "files": "*.yml", + "options": { + "proseWrap": "preserve" + } + }, + { + "files": "*.md", + "options": { + "proseWrap": "preserve" + } + } + ], + "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"] +} diff --git a/js/web/package.json b/js/web/package.json index 53fdfc56c..66c8ab92d 100644 --- a/js/web/package.json +++ b/js/web/package.json @@ -38,7 +38,7 @@ "react": "^19.2.0", "react-dom": "^19.2.0", "react-i18next": "^15.7.3", - "recharts": "^2.15.4", + "recharts": "^3.8.1", "sonare": "^0.0.1", "sonner": "^2.0.7", "streamplace": "workspace:*", @@ -54,6 +54,8 @@ "@types/react": "^19.2.0", "@types/react-dom": "^19.2.0", "@vitejs/plugin-react": "^4.3.0", + "prettier": "3.4.2", + "prettier-plugin-tailwindcss": "^0.8.0", "tailwindcss": "^4.3.0", "typescript": "^5.8.3", "vite": "^6.0.0" diff --git a/js/web/src/components/dashboard/activity-picker.tsx b/js/web/src/components/dashboard/activity-picker.tsx index 85f055b41..bc80845c4 100644 --- a/js/web/src/components/dashboard/activity-picker.tsx +++ b/js/web/src/components/dashboard/activity-picker.tsx @@ -142,12 +142,12 @@ export function ActivityPicker({ value, onChange }: ActivityPickerProps) { return (
-