-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge in ADGUARD-FILTERS/tsurlfilter from fix/improve-agtree-markdowns to master Squashed commit of the following: commit da4ef90 Author: scripthunter7 <[email protected]> Date: Fri Aug 11 13:44:33 2023 +0200 Format markdown files commit 89d6777 Author: scripthunter7 <[email protected]> Date: Fri Aug 11 13:43:53 2023 +0200 Update markdownlint config
- Loading branch information
1 parent
7ab0a54
commit d249887
Showing
8 changed files
with
112 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,68 @@ | ||
| # Contributing | ||
|
|
||
| You can contribute to the project by opening a pull request. People who | ||
| contribute to AdGuard projects can receive various rewards, see | ||
| [this page][contribute] for details. | ||
|
|
||
| [contribute]: https://adguard.com/contribute.html | ||
| You can contribute to the project by opening a pull request. People who contribute to AdGuard projects can receive | ||
| various rewards, see [this page][contribute] for details. | ||
|
|
||
| ## Development & Contribution | ||
|
|
||
| Here is a guide on how to set up the development environment and how to | ||
| submit your changes: | ||
| Here is a guide on how to set up the development environment and how to submit your changes: | ||
|
|
||
| - Pre-requisites: [Node.js][nodejs] (v14 or higher), [Yarn][yarn] (v2 or | ||
| higher), [Git][git]. It is important to use Yarn and not NPM, because the | ||
| project is optimized for Yarn. | ||
| - Fork the repository on GitHub. You will need to have a GitHub account for | ||
| this. If you already have a fork, make sure to update it with the latest | ||
| changes from the main repository. | ||
| - Clone *your forked repository* to your local machine with | ||
| `git clone <repository-url>`. It is important to clone your forked repository | ||
| and not the main repository, because you will not be able to push your | ||
| changes to the main repository, since you do not have the permissions to do | ||
| so. | ||
| - Pre-requisites: [Node.js][nodejs] (v14 or higher), [Yarn][yarn] (v2 or higher), [Git][git]. It is important to use | ||
| Yarn and not NPM, because the project is optimized for Yarn. | ||
| - Fork the repository on GitHub. You will need to have a GitHub account for this. If you already have a fork, make sure | ||
| to update it with the latest changes from the main repository. | ||
| - Clone *your forked repository* to your local machine with `git clone <repository-url>`. It is important to clone your | ||
| forked repository and not the main repository, because you will not be able to push your changes to the main | ||
| repository, since you do not have the permissions to do so. | ||
| - Install dependencies by following [this guide][main-dev-guide]. | ||
| - Create a new branch with `git checkout -b <branch-name>`. Example: | ||
| `git checkout -b feature/add-some-feature`. Please add `feature/` or `fix/` | ||
| prefix to your branch name, and refer to the issue number if there is one. | ||
| Example: `fix/42`. | ||
| - Create a new branch with `git checkout -b <branch-name>`. Example: `git checkout -b feature/add-some-feature`. Please | ||
| add `feature/` or `fix/` prefix to your branch name, and refer to the issue number if there is one. Example: `fix/42`. | ||
| - Open the **project root** folder in your editor. | ||
| - Make your changes and test them. | ||
| - Check code by running `yarn check-types`, `yarn lint` and `yarn test` | ||
| commands (Husky will run these commands automatically before each commit). | ||
| - If everything is OK, commit your changes and push them to your forked | ||
| repository. Example: | ||
| - Check code by running `yarn check-types`, `yarn lint` and `yarn test` commands (Husky will run these commands | ||
| automatically before each commit). | ||
| - If everything is OK, commit your changes and push them to your forked repository. Example: | ||
| - Add files to commit with `git add .` | ||
| - Commit files with `git commit -m "Add some feature"` | ||
| - Push changes to your forked repository with | ||
| `git push origin feature/add-some-feature`. | ||
| - When you are ready to submit your changes, go to your forked repository on | ||
| GitHub and create a pull request. Make sure to select the correct branch. | ||
| Example: `feature/add-some-feature` branch in your forked repository to | ||
| `master` branch in the main repository. | ||
| - After you open a pull request, GitHub Actions will run the tests on your | ||
| changes. If the tests fail, you can see the error details in the "Checks" | ||
| tab. If the tests pass, a green checkmark will appear in the "Checks" tab. | ||
| - Finally, wait for the maintainers to review your changes. If there are any | ||
| issues, you can fix them by pushing new commits to your branch. If everything | ||
| is OK, the maintainers will merge your pull request. | ||
|
|
||
| We would be happy to review your pull request and merge it if it is suitable for | ||
| the project. | ||
| - When you are ready to submit your changes, go to your forked repository on GitHub and create a pull request. Make sure | ||
| to select the correct branch. Example: `feature/add-some-feature` branch in your forked repository to `master` branch | ||
| in the main repository. | ||
| - After you open a pull request, GitHub Actions will run the tests on your changes. If the tests fail, you can see the | ||
| error details in the "Checks" tab. If the tests pass, a green checkmark will appear in the "Checks" tab. | ||
| - Finally, wait for the maintainers to review your changes. If there are any issues, you can fix them by pushing new | ||
| commits to your branch. If everything is OK, the maintainers will merge your pull request. | ||
|
|
||
| [git]: https://git-scm.com/ | ||
| [main-dev-guide]: https://github.com/AdguardTeam/tsurlfilter#development | ||
| [nodejs]: https://nodejs.org/en/ | ||
| [yarn]: https://yarnpkg.com/ | ||
| We would be happy to review your pull request and merge it if it is suitable for the project. | ||
|
|
||
| ### Available commands | ||
|
|
||
| During development, you can use the following commands (listed in | ||
| `package.json`): | ||
| During development, you can use the following commands (listed in `package.json`): | ||
|
|
||
| - `yarn build` - builds the library with [rollup][rollup] to the `dist` folder | ||
| - `yarn build-txt` - creates a `dist/build.txt` file which contains the version | ||
| of the library. | ||
| - `yarn build-types` - build type definitions with [TypeScript][typescript] to | ||
| the `dist/types` folder. | ||
| - `yarn check-compatibility-tables` - checks if the | ||
| [compatibility tables][compatibility-tables] are valid. | ||
| - `yarn check-types` - check type definitions with | ||
| [TypeScript][typescript]. | ||
| - `yarn build-txt` - creates a `dist/build.txt` file which contains the version of the library. | ||
| - `yarn build-types` - build type definitions with [TypeScript][typescript] to the `dist/types` folder. | ||
| - `yarn check-compatibility-tables` - checks if the [compatibility tables][compatibility-tables] are valid. | ||
| - `yarn check-types` - check type definitions with [TypeScript][typescript]. | ||
| - `yarn clean` - remove the `dist` folder. | ||
| - `yarn clean-types` - remove the `dist/types` folder. | ||
| - `yarn coverage` - run tests with [Jest][jest] and generate a code coverage | ||
| report. | ||
| - `yarn increment` - increment the version of the library in `package.json` | ||
| (patch version by default). | ||
| - `yarn coverage` - run tests with [Jest][jest] and generate a code coverage report. | ||
| - `yarn increment` - increment the version of the library in `package.json` (patch version by default). | ||
| - `yarn lint` - run all linters. | ||
| - `yarn lint:md` - lint the markdown files with [markdownlint][markdownlint]. | ||
| - `yarn lint:ts` - lint the code with [ESLint][eslint]. | ||
| - `yarn precommit` - run all checks before committing. | ||
| - `yarn test` - run tests with [Jest][jest]. | ||
|
|
||
| [compatibility-tables]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree/src/compatibility-tables | ||
| [contribute]: https://adguard.com/contribute.html | ||
| [eslint]: https://eslint.org/ | ||
| [git]: https://git-scm.com/ | ||
| [jest]: https://jestjs.io/ | ||
| [main-dev-guide]: https://github.com/AdguardTeam/tsurlfilter#development | ||
| [markdownlint]: markdownlint | ||
| [nodejs]: https://nodejs.org/en/ | ||
| [rollup]: https://rollupjs.org/ | ||
| [typescript]: https://www.typescriptlang.org/ | ||
| [yarn]: https://yarnpkg.com/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.