Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .oxfmtrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"$schema": "./node_modules/oxfmt/configuration_schema.json",
"printWidth": 80,
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"trailingComma": "es5",
"arrowParens": "always",
"sortTailwindcss": {
"stylesheet": "./src/styles/app.css",
"functions": ["cn", "cva"]
},
"ignorePatterns": [
".cache",
".db",
".history",
"output",
".vinxi",
"node_modules",
"package-lock.json",
"pnpm-lock.yaml",
"yarn.lock",
"public",
"**/*.md",
"**/*.mdx",
".env*",
"**/*.gen.ts",
"src/server/db/generated"
]
}
17 changes: 0 additions & 17 deletions .prettierignore

This file was deleted.

18 changes: 0 additions & 18 deletions .prettierrc.cjs

This file was deleted.

2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"recommendations": [
"lokalise.i18n-ally",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"oxc.oxc-vscode",
"ms-playwright.playwright",
"Prisma.prisma"
]
Expand Down
6 changes: 5 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ services:
- '${DOCKER_MAILDEV_SMTP_PORT:-1025}:1025'
- '${DOCKER_MAILDEV_UI_PORT:-1080}:1080'
healthcheck:
test: ['CMD-SHELL', 'wget --spider --no-verbose --tries=1 -T 3 http://localhost:1080/healthz']
test:
[
'CMD-SHELL',
'wget --spider --no-verbose --tries=1 -T 3 http://localhost:1080/healthz',
]
interval: 5s
timeout: 5s
retries: 5
Expand Down
4 changes: 2 additions & 2 deletions lefthook.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pre-commit:
commands:
check:
glob: '*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}'
run: pnpm prettier --write {staged_files}
glob: '*.{js,ts,cjs,mjs,jsx,tsx,json,jsonc,css,scss}'
run: pnpm oxfmt {staged_files}
stage_fixed: true

pre-push:
Expand Down
53 changes: 26 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,29 @@
"name": "start-ui-web",
"version": "3.0.0",
"private": true,
"type": "module",
"description": "Opinionated UI starter from the 🐻 BearStudio Team",
"engines": {
"node": ">=22"
"homepage": "https://github.com/bearstudio/start-ui-web#readme",
"bugs": {
"url": "https://github.com/bearstudio/start-ui-web/issues"
},
"license": "MIT",
"author": {
"name": "Ivan Dalmet",
"email": "ivan@dalmet.fr",
"url": "https://github.com/ivan-dalmet"
},
"contributors": [
{
"name": "Yoann Fleury",
"email": "yoannfleurydev@gmail.com",
"url": "https://github.com/yoannfleurydev"
}
],
"repository": {
"type": "git",
"url": "git+https://github.com/bearstudio/start-ui-web.git"
},
"type": "module",
"scripts": {
"postinstall": "run-p gen:prisma gen:build-info",
"prepare": "pnpm lefthook install",
Expand All @@ -19,13 +37,13 @@
"env:server": "dotenv -- node ./run-jiti ./src/env/server.ts",
"storybook": "storybook dev --no-open -p 6006",
"storybook:build": "storybook build && mv ./storybook-static ./public/storybook",
"pretty": "prettier -w .",
"format": "oxfmt",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Minor inconsistency with PR description.

The PR description mentions updating the pretty script, but this shows a format script. This may be intentional (renaming the script), but please verify this is the intended script name change.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@package.json` at line 22, The package.json currently defines a "format" npm
script but the PR description references updating the "pretty" script; verify
whether you intended to rename "pretty" to "format" or keep the original name.
If the rename is intentional, update the PR description to mention "format" (and
any CI/docs referencing "pretty") and ensure any tooling/README/CI that calls
"pretty" is updated to call "format"; if it was unintentional, change the script
key back to "pretty" so package.json matches the PR description.

"lint": "run-p lint:*",
"lint:eslint": "eslint ./src --fix",
"lint:ts": "tsc --noEmit",
"gen:prisma": "prisma generate --no-hints",
"gen:build-info": "dotenv -- node ./run-jiti ./src/features/build-info/script-to-generate-json.ts",
"gen:icons": "svgr --config-file src/components/icons/svgr.config.cjs src/components/icons/svg-sources && prettier -w src/components/icons/generated",
"gen:icons": "svgr --config-file src/components/icons/svgr.config.cjs src/components/icons/svg-sources && oxfmt src/components/icons/generated",
"test": "vitest --browser.headless",
"test:ci": "vitest run",
"test:ui": "vitest",
Expand Down Expand Up @@ -82,7 +100,6 @@
"nodemailer": "7.0.13",
"pino": "10.3.0",
"pino-pretty": "13.1.3",
"prettier": "3.8.1",
"react": "19.2.4",
"react-day-picker": "9.13.0",
"react-dom": "19.2.4",
Expand Down Expand Up @@ -133,8 +150,8 @@
"jiti": "2.6.1",
"lefthook": "2.0.16",
"npm-run-all": "4.1.5",
"oxfmt": "0.36.0",
"playwright": "1.58.0",
"prettier-plugin-tailwindcss": "0.7.2",
"prisma": "6.19.2",
"resize-observer-polyfill": "1.5.1",
"storybook": "10.2.14",
Expand All @@ -146,27 +163,9 @@
"vitest": "4.0.18",
"vitest-browser-react": "2.0.4"
},
"repository": {
"type": "git",
"url": "git+https://github.com/bearstudio/start-ui-web.git"
},
"author": {
"name": "Ivan Dalmet",
"email": "ivan@dalmet.fr",
"url": "https://github.com/ivan-dalmet"
},
"contributors": [
{
"name": "Yoann Fleury",
"email": "yoannfleurydev@gmail.com",
"url": "https://github.com/yoannfleurydev"
}
],
"license": "MIT",
"bugs": {
"url": "https://github.com/bearstudio/start-ui-web/issues"
"engines": {
"node": ">=22"
},
"homepage": "https://github.com/bearstudio/start-ui-web#readme",
"pnpm": {
"onlyBuiltDependencies": [
"@parcel/watcher",
Expand Down
Loading
Loading