Skip to content

Commit

Permalink
Merge branch 'master' into feat-zodios-from-openapi
Browse files Browse the repository at this point in the history
  • Loading branch information
vucinatim committed May 29, 2024
2 parents fddbded + eefd415 commit 80df1e7
Show file tree
Hide file tree
Showing 7 changed files with 755 additions and 762 deletions.
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged
8 changes: 4 additions & 4 deletions docs/README.md → README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ Getting started with this Next.js template is straightforward. Follow these step
- [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react)
- [eslint-plugin-react-hooks](https://www.npmjs.com/package/eslint-plugin-react-hooks)
- [eslint-plugin-sonarjs](https://github.com/SonarSource/eslint-plugin-sonarjs)
- [Husky](https://typicode.github.io/husky/) for Git hooks
- [Husky](https://typicode.github.io/husky/) for Git hooks with:
- [commitlint](https://commitlint.js.org/) for conventional commits
- [lint-staged](https://github.com/lint-staged/lint-staged)
- [.vscode](https://code.visualstudio.com/) settings for consistent development environment
- [Prettier format + fix on save](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
- Prevent auto imports from `@radix-ui` and `tailwindcss`
Expand Down Expand Up @@ -80,11 +82,8 @@ Here's an overview of the folder structure provided in this template:
.
├── .github # GitHub Actions configurations for CI/CD + PR template
├── .husky # Husky configurations for managing Git hooks
├── .next # Auto-generated folder for optimized production builds
├── .vscode # VSCode settings to maintain consistency in development environments
├── docs # Extended documentation and guides
│ └── README.md # The main README file for the project
├── node_modules # Contains all the project's pnpm dependencies
├── public # Stores static files like images and fonts
├── scripts # Custom scripts for development tasks like testing and linting
├── src # Source files for the Next.js application
Expand All @@ -105,6 +104,7 @@ Here's an overview of the folder structure provided in this template:
│ │ └── utils.ts # Utility functions for common tasks
│ ├── env.ts # Environment-specific configurations
│ └── middleware.ts # Custom middleware functions
└── README.md # The main README file for the project
```

## 🔧 Configuration
Expand Down
Empty file added docs/.gitkeep
Empty file.
11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-sonarjs": "^1.0.3",
"husky": ">=7",
"husky": "^8.0.3",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": ">=10",
"lint-staged": "^15.2.2",
"openapi-zod-client": "^1.18.1",
"postcss": "^8",
"prettier": "^3.2.5",
Expand All @@ -86,6 +86,11 @@
"typescript-eslint": "^7.8.0"
},
"lint-staged": {
"*.js": "eslint --cache --fix"
"*.{js,jsx,ts,tsx}": [
"eslint --quiet --fix"
],
"**/*": [
"prettier --write --ignore-unknown"
]
}
}
Loading

0 comments on commit 80df1e7

Please sign in to comment.