-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
docs: Update documentation to reflect changes in v4.0 (#689)
- Loading branch information
Showing
14 changed files
with
41 additions
and
644 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,9 +6,9 @@ All contributions are welcome to this project. | |
|
||
Before a contribution can be merged into this project, please fill out the Contributor License Agreement (CLA) located at: | ||
|
||
https://opensource.box.com/cla/ | ||
https://cla-assistant.io/box/box-annotations | ||
|
||
To learn more about CLAs and why they are important to the UI Element projects, please see the [Wikipedia entry](http://en.wikipedia.org/wiki/Contributor_License_Agreement). | ||
To learn more about CLAs and why they are important to open source projects, please see the [Wikipedia entry](http://en.wikipedia.org/wiki/Contributor_License_Agreement). | ||
|
||
## Code of Conduct | ||
|
||
|
@@ -39,38 +39,21 @@ The upstream source is the project under the Box organization on GitHub. To add | |
git remote add upstream [email protected]:box/box-annotations.git | ||
``` | ||
|
||
This will be useful later. | ||
### Step 4: Push your feature branch to your fork | ||
|
||
### Step 4: Create a feature branch | ||
|
||
Create a branch with a descriptive name, such as `add-search`. | ||
|
||
### Step 5: Push your feature branch to your fork | ||
|
||
As you develop code, continue to push code to your remote feature branch. Please make sure to include the issue number you're addressing in your commit message, such as: | ||
Keep a separate feature branch for each issue you want to address. As you develop code, continue to push code to your remote feature branch. If applicable, please make sure to include the issue number you're addressing in your commit message, such as: | ||
|
||
``` | ||
Tag: Short description (fixes #1234) | ||
tag(scope): short description | ||
Longer description here if necessary | ||
fixes #1234 | ||
longer description here if necessary. | ||
include BREAKING CHANGE keyword for breaking changes. | ||
``` | ||
|
||
The Tag is one of the following: | ||
|
||
- `Fix` - for a bug fix. | ||
- `Update` - for a backwards-compatible enhancement or a change to a rule that increases the number of reported problems. | ||
- `New` - implemented a new feature. | ||
- `Breaking` - for a backwards-incompatible enhancement or feature. | ||
- `Docs` - changes to documentation only. | ||
- `Build` - changes to build process only. | ||
- `Upgrade` - for a dependency upgrade. | ||
- `Chore` - for refactoring, adding tests, etc. (anything that isn’t user-facing). | ||
|
||
The message summary should be a one-sentence description of the change, and it must be 72 characters in length or shorter. If the pull request addresses an issue, then the issue number should be mentioned at the end. | ||
|
||
Keep a separate feature branch for each issue you want to address. | ||
The message summary should be a one-sentence description of the change, and it must be 72 characters in length or shorter. For a list of tags, please see the conventional changelog [documentation](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum). | ||
|
||
### Step 6: Rebase | ||
### Step 5: Rebase | ||
|
||
Before sending a pull request, rebase against upstream, such as: | ||
|
||
|
@@ -81,11 +64,11 @@ git rebase upstream/master | |
|
||
This will add your changes on top of what's already in upstream, minimizing merge issues. | ||
|
||
### Step 7: Run the tests | ||
### Step 6: Run the tests | ||
|
||
Make sure that all tests are passing before submitting a pull request. | ||
|
||
### Step 8: Send the pull request | ||
### Step 7: Send the pull request | ||
|
||
Send the pull request from your feature branch to us. Be sure to include a description (as mentioned above in step 5) that lets us know what work you did. | ||
|
||
|
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,17 +1,16 @@ | ||
## Development Setup | ||
|
||
1. Install latest LTS version of Node `https://nodejs.org/en/download`. | ||
2. Install yarn package manager `https://yarnpkg.com/en/docs/install`. Alternatively, you can replace any `yarn` command with `npm`. | ||
3. Fork the upstream repo `https://github.com/box/box-annotations`. | ||
4. Clone your fork locally `git clone [email protected]:[YOUR GITHUB USERNAME]/box-annotations.git`. | ||
1. Install latest LTS version of Node `https://nodejs.org/en/download` | ||
2. Install yarn package manager `https://yarnpkg.com/en/docs/install` | ||
3. Fork the upstream repo `https://github.com/box/box-annotations` | ||
4. Clone the fork locally `git clone [email protected]:[YOUR GITHUB USERNAME]/box-annotations.git` | ||
5. Navigate to the cloned folder `cd box-annotations` | ||
6. Add the upstream repo to your remotes `git remote add upstream [email protected]:box/box-annotations.git`. | ||
7. Verify your remotes are properly set up `git remote -v`. You should pull updates from the Box repo `upstream` and push changes to your fork `origin`. | ||
6. Add the upstream repo remote `git remote add upstream [email protected]:box/box-annotations.git` | ||
7. Verify the remotes are properly set up `git remote -v`. You should pull updates from the Box repo `upstream` and push changes to your fork `origin`. | ||
8. Install dependencies `yarn install` | ||
9. Test your first build! `yarn build` | ||
10. To test only local annotation changes, see [instantiating a custom instance of Box Annotations](https://github.com/box/box-annotations/#passing-an-instance-of-box-annotations-into-box-content-preview). | ||
11. To link and test your local code changes along with your local Preview changes, run `yarn link` in this repository and `yarn link box-annotations` wherever [Box Content Preview](github.com/box/box-content-preview/) is cloned locally. | ||
12. To automatically rsync files after a Webpack build, add a scripts/rsync.json file with a `location` field. This file should look like: | ||
10. To link and test your local code changes along with your local Preview changes, run `yarn link` in this repository and `yarn link box-annotations` wherever [Box Content Preview](github.com/box/box-content-preview/) is cloned locally. | ||
11. To automatically rsync files after a Webpack build, add a scripts/rsync.json file with a `location` field. This file should look like: | ||
|
||
``` | ||
{ | ||
|
@@ -30,9 +29,9 @@ Install the following plugins in your preferred editor | |
|
||
### Yarn commands | ||
|
||
- `yarn build` to generate resource bundles and JS webpack bundles. | ||
- `yarn start` to only generate JS webpack bundles on file changes. | ||
- `yarn test` launches Jest. | ||
- `yarn test:watch` launches Jest for debugging. | ||
- `yarn build` to generate resource bundles and JS webpack bundles | ||
- `yarn start` to only generate JS webpack bundles on file changes | ||
- `yarn test` launches Jest | ||
- `yarn test:watch` launches Jest for debugging | ||
|
||
For more script commands see `package.json`. Test coverage reports are available under reports/coverage. | ||
For more script commands see `package.json`. |
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 was deleted.
Oops, something went wrong.
Oops, something went wrong.