Skip to content

Commit 67fc322

Browse files
committed
Merge branch 'release-6.0.0'
2 parents 4c92400 + 590971a commit 67fc322

214 files changed

Lines changed: 43144 additions & 29168 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
end_of_line = lf
7+
indent_size = 2
8+
indent_style = space
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
workspace/

.eslintrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "@dadi",
3+
"rules": {
4+
"require-atomic-updates": "off"
5+
}
6+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ config/config.production.json
1616
workspace/media/*
1717

1818
test/acceptance/temp-workspace
19+
test/data.apisnapshot
1920

2021
scripts/coverage.svg

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
workspace/

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"@dadi/prettier-config"

CHANGELOG.md

Lines changed: 283 additions & 204 deletions
Large diffs are not rendered by default.

CODE_OF_CONDUCT.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
88

99
Examples of behavior that contributes to creating a positive environment include:
1010

11-
* Using welcoming and inclusive language
12-
* Being respectful of differing viewpoints and experiences
13-
* Gracefully accepting constructive criticism
14-
* Focusing on what is best for the community
15-
* Showing empathy towards other community members
11+
- Using welcoming and inclusive language
12+
- Being respectful of differing viewpoints and experiences
13+
- Gracefully accepting constructive criticism
14+
- Focusing on what is best for the community
15+
- Showing empathy towards other community members
1616

1717
Examples of unacceptable behavior by participants include:
1818

19-
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20-
* Trolling, insulting/derogatory comments, and personal or political attacks
21-
* Public or private harassment
22-
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23-
* Other conduct which could reasonably be considered inappropriate in a professional setting
19+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
- Trolling, insulting/derogatory comments, and personal or political attacks
21+
- Public or private harassment
22+
- Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
- Other conduct which could reasonably be considered inappropriate in a professional setting
2424

2525
## Our Responsibilities
2626

CONTRIBUTING.md

Lines changed: 86 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -6,90 +6,94 @@ We'd love for you to contribute to our source code and to make DADI API even bet
66

77
Here are the guidelines we'd like you to follow:
88

9-
- [Question or Problem?](#question)
10-
- [Issues and Bugs](#issue)
11-
- [Feature Requests](#feature)
12-
- [Submission Guidelines](#submit)
13-
- [Coding Rules](#rules)
14-
- [Git Commit Guidelines](#commit)
9+
- [Question or Problem?](#question)
10+
- [Issues and Bugs](#issue)
11+
- [Feature Requests](#feature)
12+
- [Submission Guidelines](#submit)
13+
- [Coding Rules](#rules)
14+
- [Git Commit Guidelines](#commit)
1515

1616
## <a name="question"></a> Got a Question or Problem?
1717

18-
Documentation can be found at the [docs.dadi.tech](https://docs.dadi.tech/api) site.
18+
Documentation can be found at the [docs.dadi.cloud](https://docs.dadi.cloud/api) site.
1919

20-
If the documentation doesn't answer your problem please feel free to email the
21-
DADI team directly on: team@dadi.tech, or join us on [Slack](http://dadi-chat.herokuapp.com).
20+
If the documentation doesn't answer your problem please feel free to email the DADI team directly on team@dadi.cloud.
2221

2322
## <a name="issue"></a> Found an Issue?
23+
2424
If you find a bug in the source code or a mistake in the documentation, you can help us by
2525
submitting an issue to our [GitHub Repository][github]. But we'd love it if you
2626
submitted a Pull Request with a fix instead!
2727

2828
**Please see the Submission Guidelines below**.
2929

3030
## <a name="feature"></a> Want a Feature?
31+
3132
You can request a new feature by submitting an issue to our [GitHub][issues] issue tracker.
3233
If you would like to implement a new feature then consider what kind of change it is:
3334

34-
* **Major Changes** that you wish to contribute to the project should be added as
35-
a Feature Request in the [GitHub][issues] issue tracker. This will get the conversation
36-
started.
37-
* **Small Changes** can be crafted and submitted to the [GitHub Repository][github] as a Pull Request.
35+
- **Major Changes** that you wish to contribute to the project should be added as
36+
a Feature Request in the [GitHub][issues] issue tracker. This will get the conversation
37+
started.
38+
- **Small Changes** can be crafted and submitted to the [GitHub Repository][github] as a Pull Request.
3839

3940
## <a name="submit"></a> Submission Guidelines
4041

4142
### Submitting an Issue
43+
4244
Before you submit your issue [search the archive][issues], maybe your question was already answered.
4345

4446
If your issue appears to be a bug, and hasn't been reported, open a new issue.
4547
Help us to maximize the effort we can spend fixing issues and adding new
46-
features, by not reporting duplicate issues. Providing the following information will increase the
48+
features, by not reporting duplicate issues. Providing the following information will increase the
4749
chances of your issue being dealt with quickly:
4850

49-
* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
50-
* **Motivation for or Use Case** - explain why this is a bug for you
51-
* **DADI API Version**
52-
* **Operating System**
53-
* **Steps to Reproduce** - provide a set of steps to follow to reproduce the error.
54-
* **Related Issues** - has a similar issue been reported before?
55-
* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
51+
- **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
52+
- **Motivation for or Use Case** - explain why this is a bug for you
53+
- **DADI API Version**
54+
- **Operating System**
55+
- **Steps to Reproduce** - provide a set of steps to follow to reproduce the error.
56+
- **Related Issues** - has a similar issue been reported before?
57+
- **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
5658
causing the problem (e.g. a line of code or a commit)
5759

5860
### Submitting a Pull Request
61+
5962
Before you submit your pull request consider the following guidelines:
6063

61-
* Search [GitHub][pulls] for an open or closed Pull Request
64+
- Search [GitHub][pulls] for an open or closed Pull Request
6265
that relates to your submission. You don't want to duplicate effort.
63-
* Fork the original repository and clone your fork ([see this GitHub article](https://help.github.com/articles/fork-a-repo/)).
64-
* Add the original repository as an upstream remote: `git remote add upstream https://github.com/dadi/api.git`
65-
66-
* Make your changes in a new git branch. Name your branch using the format `topic/branch_name`.
67-
Use `fix` for fixes and `feature` for features:
68-
69-
```shell
70-
git checkout -b fix/my-fix-branch master
71-
```
72-
```shell
73-
git checkout -b feature/my-new-feature-branch master
74-
```
75-
76-
* Create your patch, **including appropriate test cases**.
77-
* Follow our [Coding Rules](#rules).
78-
* Run the full test suite using `npm test` and ensure that all tests pass.
79-
* Commit your changes using a descriptive commit message that follows our
66+
- Fork the original repository and clone your fork ([see this GitHub article](https://help.github.com/articles/fork-a-repo/)).
67+
- Add the original repository as an upstream remote: `git remote add upstream https://github.com/dadi/api.git`
68+
69+
- Make your changes in a new git branch. Name your branch using the format `topic/branch_name`.
70+
Use `fix` for fixes and `feature` for features:
71+
72+
```shell
73+
git checkout -b fix/my-fix-branch master
74+
```
75+
76+
```shell
77+
git checkout -b feature/my-new-feature-branch master
78+
```
79+
80+
- Create your patch, **including appropriate test cases**.
81+
- Follow our [Coding Rules](#rules).
82+
- Run the full test suite using `npm test` and ensure that all tests pass.
83+
- Commit your changes using a descriptive commit message that follows our
8084
[commit message conventions](#commit-message-format) and passes our commit message presubmit hook. Adherence to the [commit message conventions](#commit-message-format) is required because release notes are automatically generated from these messages.
81-
* Push your branch to GitHub:
85+
- Push your branch to GitHub:
8286

8387
```shell
8488
git push origin fix/my-fix-branch
8589
```
8690

87-
* In GitHub, send a pull request to `dadi/api:master`.
88-
* If we suggest changes then:
89-
* Make the required updates.
90-
* Re-run the full test suite to ensure tests are still passing.
91-
* Commit your changes to your branch (e.g. `fix/my-fix-branch`).
92-
* Push the changes to GitHub (this will update your Pull Request).
91+
- In GitHub, send a pull request to `dadi/api:master`.
92+
- If we suggest changes then:
93+
- Make the required updates.
94+
- Re-run the full test suite to ensure tests are still passing.
95+
- Commit your changes to your branch (e.g. `fix/my-fix-branch`).
96+
- Push the changes to GitHub (this will update your Pull Request).
9397

9498
If the pull request gets too outdated we may ask you to rebase and force push to update the pull request:
9599

@@ -98,50 +102,51 @@ git rebase master -i
98102
git push origin fix/my-fix-branch -f
99103
```
100104

101-
*WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments on code that were previously made by you and others in your commits.*
105+
_WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments on code that were previously made by you and others in your commits._
102106

103-
* Documentation! Please add relevant documentation to the pull request. If this is a new feature then
104-
please document it fully within the pull request. If you're making changes to an existing feature, please
105-
give us a link to the existing [documentation][docs] along with your documentation changes. If you need
106-
an example of excellent pull request documentation, have a look at the [effort put in here](https://github.com/dadi/api/pull/27).
107+
- Documentation! Please add relevant documentation to the pull request. If this is a new feature then
108+
please document it fully within the pull request. If you're making changes to an existing feature, please
109+
give us a link to the existing [documentation][docs] along with your documentation changes. If you need
110+
an example of excellent pull request documentation, have a look at the [effort put in here](https://github.com/dadi/api/pull/27).
107111

108112
> That's it! Thank you for your contribution!
109113
110114
#### After your pull request is merged
111115

112116
After your pull request is merged, you can safely delete your branch and pull the changes from the main (upstream) repository:
113117

114-
* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
118+
- Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
115119

116120
```shell
117121
git push origin --delete my-fix-branch
118122
```
119123

120-
* Check out the master branch:
124+
- Check out the master branch:
121125

122126
```shell
123127
git checkout master -f
124128
```
125129

126-
* Delete the local branch:
130+
- Delete the local branch:
127131

128132
```shell
129133
git branch -D my-fix-branch
130134
```
131135

132-
* Update your master with the latest upstream version:
136+
- Update your master with the latest upstream version:
133137

134138
```shell
135139
git pull --ff upstream master
136140
```
137141

138142
## <a name="rules"></a> Coding Rules
143+
139144
To ensure consistency throughout the source code, keep these rules in mind as you are working:
140145

141-
* Please use **two-space indentation**, as used in Node.JS itself.
142-
* All features or bug fixes **must be tested** by one or more tests. Browse the [test
143-
suite][tests] for examples.
144-
* All public API methods **must be documented** with [JSDoc](http://usejsdoc.org/).
146+
- Please use **two-space indentation**, as used in Node.JS itself.
147+
- All features or bug fixes **must be tested** by one or more tests. Browse the [test
148+
suite][tests] for examples.
149+
- All public API methods **must be documented** with [JSDoc](http://usejsdoc.org/).
145150

146151
## <a name="commit"></a> Git Commit Guidelines
147152

@@ -153,7 +158,7 @@ Please don't include more than one change in each patch. If your commit message
153158

154159
### Commit Message Format
155160

156-
We have very precise rules over how our git commit messages can be formatted. This leads to **more readable messages** that are easy to follow when looking through the **project history**. We also use the git commit messages to **generate the change log**.
161+
We have very precise rules over how our git commit messages can be formatted. This leads to **more readable messages** that are easy to follow when looking through the **project history**. We also use the git commit messages to **generate the change log**.
157162

158163
We use [husky](https://www.npmjs.com/package/husky) and [validate-commit-msg](https://github.com/kentcdodds/validate-commit-msg) to perform the commit message validation. Commit messages will be validated when you commit. When validation fails, you'll see a message similar to the following:
159164

@@ -169,7 +174,7 @@ Any line of the commit message cannot be longer 100 characters. This allows the
169174

170175
#### Message Format
171176

172-
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special format that includes a **type** and a **subject**:
177+
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special format that includes a **type** and a **subject**:
173178

174179
```
175180
type: subject
@@ -181,43 +186,47 @@ Close #yyy
181186
Ref #zzz
182187
```
183188

184-
* Use `Fix #xxx` when the commit fixes an open issue.
185-
* Use `Close #xxx` when the commit closes an open pull request.
186-
* Use `Ref #xxx` when referencing an issue or pull request that is already closed or should remain open. Examples include partial fixes and commits that add a test but not a fix.
189+
- Use `Fix #xxx` when the commit fixes an open issue.
190+
- Use `Close #xxx` when the commit closes an open pull request.
191+
- Use `Ref #xxx` when referencing an issue or pull request that is already closed or should remain open. Examples include partial fixes and commits that add a test but not a fix.
187192

188193
### Reverting
189-
If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
194+
195+
If the commit reverts a previous commit, it should begin with `revert:`, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
190196

191197
### Type
198+
192199
Must be one of the following:
193200

194-
* **feat**: A new feature
195-
* **fix**: A bug fix
196-
* **docs**: Documentation only changes
197-
* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
198-
* **refactor**: A code change that neither fixes a bug nor adds a feature
199-
* **perf**: A code change that improves performance
200-
* **test**: Adding missing tests
201-
* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation generation
201+
- **feat**: A new feature
202+
- **fix**: A bug fix
203+
- **docs**: Documentation only changes
204+
- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
205+
- **refactor**: A code change that neither fixes a bug nor adds a feature
206+
- **perf**: A code change that improves performance
207+
- **test**: Adding missing tests
208+
- **chore**: Changes to the build process or auxiliary tools and libraries such as documentation generation
202209

203210
### Subject
211+
204212
The subject contains a succinct description of the change:
205213

206-
* use the imperative, present tense: "fix" not "fixed" nor "fixes"
207-
* don't capitalize first letter
208-
* no dot (.) at the end
214+
- use the imperative, present tense: "fix" not "fixed" nor "fixes"
215+
- don't capitalize first letter
216+
- no dot (.) at the end
209217

210218
### Body
219+
211220
Just as in the **subject**, write your commit message in the imperative: "Fix bug" and not "Fixed bug" or "Fixes bug". This convention matches up with commit messages generated by commands like `git merge` and `git revert`.
212221

213222
The body should include the motivation for the change and contrast this with previous behavior.
214223

215224
### Footer
225+
216226
The footer should contain any information about **Breaking Changes** and is also the place to reference GitHub issues that this commit **Closes**.
217227

218228
**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
219229

220-
221230
[github]: https://github.com/dadi/api
222231
[issues]: https://github.com/dadi/api/issues
223232
[pulls]: https://github.com/dadi/api/pulls

0 commit comments

Comments
 (0)