5.5 KiB
- Introduction
- Code Formatting
- Commit Messages
- Unit Testing
- Documentation
- Versioning
- Branching
- Merge Requests
- Code Review
Introduction
This document contains a set of rules and principles that every contributor has to follow while working on our projects. These rules apply to every project regardless of size, development stage, or delivery method. Doing this will allow us to prepare tools and guides to reduce the time to set up new projects, automate release/deployment workflow, reduce communication overhead, and ultimately increase productivity.
Code Formatting
The code style across all files of the same type should be consistent. Please do not leave the code formatting to the contributor or their editor. Enforce code formatting by defining a Git hook to format staged files before committing. Doing this will ease reviewing merge requests and the project's history. Another important thing is to stick with the conventions while configuring your code formatter.
Setup code formatting for JS/TS projects:
- Install Husky for Git hooks:
yarn add -D husky
- Install Prettier and Pretty Quick for code formatting:
yarn add -D prettier pretty-quick && \
npm pkg set scripts.prepare="husky install" && \
npm pkg set scripts.prettier="pretty-quick" && \
npm pkg set scripts.prettier:staged="pretty-quick --staged"
- Create a hook:
npx husky add .husky/pre-commit "yarn prettier:staged"
- Create a config file for Prettier:
echo """{
"tabWidth": 2,
"semi": false,
"singleQuote": true,
"trailingComma": "all"
}""" > .prettierrc
Commit Messages
Use conventional commit messages: Writing conventional commit messages should be enforced as it is essential for automated semantic versioning. It also helps to understand what's changed by the commit quickly.
Write short meaningful commit messages that describe an atomic change:
As a rule of thumb, reverting a commit should not result in side effects other than what you'd expect from the commit message.
A commit message should be short; if it describes more than one distinct change, your commit is not atomic. In this case, you need to break it into multiple commits. To provide more context, add a link to an issue on the remote server by adding refs #[issue]
or closes #[issue]
to the commit message.
Tools:
- Commitizen: enforce conventional commits.
Unit Testing
Each project should have a configured unit testing framework: Setup a unit testing framework when you start a new project and create a template unit test to help and encourage contributors to write tests.
Write unit tests for your changes in the same commit: It's good practice to write tests for your changes in the same commit to demonstrate they're working correctly.
Documentation
Update the documentation according to your changes in the same commit: Update the documentation before committing your changes; this way, you won't forget to do it later. Also, it's good to have the documentation in sync with the codes in each commit, and it will prevent causing extra troubles when reverting changes.
Versioning
All of our projects will use semantic versioning. Since we use conventional commit messages, a version could be determined at any point based on the history of commits.
A summary from the referenced website:
Given a version number MAJOR.MINOR.PATCH, increment the:
MAJOR version when you make incompatible API changes MINOR version when you add functionality in a backwards compatible manner PATCH version when you make backwards compatible bug fixes
Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format.
Branching
Branches deployed to primary pre-defined environments(e.g., staging, production) and the branches you will cut releases from should all be protected, and no one should be allowed to push to them directly.
Specify the branch type by choosing a prefix from this list:
topic-
for features, issues, choreshotfix-
for hotfixes
Merge Requests
Merge only tested and successfully built changes: Always ensure all changes will build successfully and pass all the tests. Depending on the project's branching strategy, it might be required to run build and test scripts against all commits.
DO NOT squash commits: Since we rely on conventional commits, squashing commits upon merging can break our workflow. It might also make finding the reason behind a particular change challenging. Note that it's not the maintainer's job to clean up the contributor's work history; the maintainer should ask for another pull request.
Review the changes before merging: Merging should only be allowed with a review or approval from the project's maintainer(s).
Code Review
Ensure the changes are aligned with the contribution rules: It's the maintainer's responsibility to ensure all changes in a merge request are aligned with our contribution rules described in this document and the project's branching strategy.
Ask to add the missing unit tests: It's the maintainer's responsibility to ensure no necessary important unit test is missing.