Skip to content

Commit 05aedcb

Browse files
committed
Prepare for 3.0.0-beta.2
1 parent 69ea83a commit 05aedcb

File tree

13 files changed

+223
-216
lines changed

13 files changed

+223
-216
lines changed

.github/CONTRIBUTING.md

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
1-
# Contributing
1+
# Contributing to js-data-rethinkdb
22

3-
[Read the Contributing Guide](http://js-data.io/docs/contributing).
3+
[Read the general Contributing Guide](http://js-data.io/docs/contributing).
44

5-
## Support
5+
## Project structure
66

7-
[Find out how to Get Support](http://js-data.io/docs/support).
7+
* `dist/` - Contains final build files for distribution
8+
* `doc/` - Output folder for JSDocs
9+
* `src/` - Project source code
10+
* `test/` - Project tests
811

9-
## Community
12+
## Clone, build & test
1013

11-
[Explore the Community](http://js-data.io/docs/community).
14+
1. `clone [email protected]:js-data/js-data-rethinkdb.git`
15+
1. `cd js-data-rethinkdb`
16+
1. `npm install`
17+
1. `npm run build` - Lint and build distribution files
18+
1. `npm run mocha` - Run tests (RethinkDB must be running)
1219

13-
### Have write access?
14-
15-
To cut a release:
20+
## To cut a release
1621

1722
1. Checkout master
1823
1. Bump version in `package.json` appropriately
19-
1. Run `npm run release`
2024
1. Update `CHANGELOG.md` appropriately
21-
1. Commit and push changes, including the `dist/` folder
25+
1. Run `npm run release`
26+
1. Commit and push changes
27+
1. Checkout `release`, merge `master` into `release`
28+
1. Run `npm run release` again
29+
1. Commit and push changes
2230
1. Make a GitHub release
31+
- tag from `release` branch
2332
- set tag name to version
2433
- set release name to version
2534
- set release body to changelog entry for the version
26-
- attach the files in the `dist/` folder
2735
1. `npm publish .`
36+
37+
See also [Community & Support](http://js-data.io/docs/community).

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
(delete this line) GitHub Issues are NOT for support questions.
2-
(delete this line) GitHub Issues ARE for bug reports, feature requests, and other issues.
3-
(delete this line) Find out how to Get Support here: http://js-data.io/docs/support.
1+
(delete this line) Find out how to get help here: http://js-data.io/docs/community.
42

5-
<your detailed, discussable, actionable, and helpful text goes here>
3+
<your detailed, actionable, and helpful text goes here>
64

75
Thanks!

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
Fixes #<issue_number_goes_here> (it's a good idea to open an issue first for discussion)
22

33
- [ ] - `npm test` succeeds
4-
- [ ] - Pull request has been squashed into 1 commit
5-
- [ ] - I did NOT commit changes to `dist/`
64
- [ ] - Code coverage does not decrease (if any source code was changed)
75
- [ ] - Appropriate JSDoc comments were updated in source code (if applicable)
86
- [ ] - Approprate changes to js-data.io docs have been suggested ("Suggest Edits" button)

.npmignore

Lines changed: 0 additions & 39 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
##### 3.0.0-beta.2 - 29 April 2016
2+
3+
###### Breaking changes
4+
- How you must now import in ES2015:
5+
6+
```js
7+
import RethinkDBAdapter from 'js-data-rethinkdb'
8+
const adapter = new RethinkDBAdapter()
9+
```
10+
or
11+
```js
12+
import {RethinkDBAdapter, version} from 'js-data-rethinkdb'
13+
console.log(version)
14+
const adapter = new RethinkDBAdapter()
15+
```
16+
17+
- How you must now import in ES5:
18+
19+
```js
20+
var JSDataRethinkDB = require('js-data-rethinkdb')
21+
var RethinkDBAdapter = JSDataRethinkDB.RethinkDBAdapter
22+
var adapter = new RethinkDBAdapter()
23+
```
24+
25+
- `OPERATORS` is now an export, not a static property of the `RethinkDBAdapter` class.
26+
27+
###### Other
28+
- Upgraded dependencies
29+
- Improved JSDoc comments
30+
- Now using js-data JSDoc template
31+
132
##### 3.0.0-beta.1 - 17 April 2016
233

334
Official v3 beta release

README.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
[![Circle CI][circle_b]][circle_l]
88
[![npm downloads][dn_b]][dn_l]
99
[![Coverage Status][cov_b]][cov_l]
10-
[![Codacy][cod_b]][cod_l]
1110

1211
RethinkDB adapter for [js-data](http://www.js-data.io/).
1312

14-
To get started, visit __[http://js-data.io](http://www.js-data.io/v3.0/docs/js-data-rethinkdb)__.
13+
To get started, visit __[http://js-data.io](http://www.js-data.io/docs/js-data-rethinkdb)__.
1514

1615
## Links
1716

18-
* [Quick start](http://www.js-data.io/v3.0/docs/js-data-rethinkdb)
19-
* [Guides and Tutorials](http://www.js-data.io/v3.0/docs/home)
20-
* [API Reference Docs](http://api.js-data.io/js-data-rethinkdb)
21-
* [Community](http://js-data.io/docs/community)
22-
* [Support](http://js-data.io/docs/support)
23-
* [Contributing](http://js-data.io/docs/contributing)
17+
* [Quick start](http://www.js-data.io/docs/home#quick-start) - Get started in 5 minutes
18+
* [Guides and Tutorials](http://www.js-data.io/docs/home) - Learn how to use JSData
19+
* [`RethinkDBAdapter` Guide](http://www.js-data.io/docs/js-data-rethinkdb) - Learn how to use `RethinkDBAdapter`
20+
* [API Reference Docs](http://api.js-data.io) - Explore components, methods, options, etc.
21+
* [Community & Support](http://js-data.io/docs/community) - Find solutions and chat with the community
22+
* [General Contributing Guide](http://js-data.io/docs/contributing) - Give back and move the project forward
23+
* [Contributing to js-data-rethinkdb](https://github.com/js-data/js-data-rethinkdb/blob/master/.github/CONTRIBUTING.md)
2424

2525
## License
2626

@@ -36,11 +36,9 @@ Copyright (c) 2014-2016 js-data-rethinkdb project authors
3636
[sl_l]: http://slack.js-data.io
3737
[npm_b]: https://img.shields.io/npm/v/js-data-rethinkdb.svg?style=flat
3838
[npm_l]: https://www.npmjs.org/package/js-data-rethinkdb
39-
[circle_b]: https://img.shields.io/circleci/project/js-data/js-data-rethinkdb/master.svg?style=flat
40-
[circle_l]: https://circleci.com/gh/js-data/js-data-rethinkdb/tree/master
39+
[circle_b]: https://img.shields.io/circleci/project/js-data/js-data-rethinkdb.svg?style=flat
40+
[circle_l]: https://circleci.com/gh/js-data/js-data-rethinkdb
4141
[dn_b]: https://img.shields.io/npm/dm/js-data-rethinkdb.svg?style=flat
4242
[dn_l]: https://www.npmjs.org/package/js-data-rethinkdb
43-
[cov_b]: https://img.shields.io/codecov/c/github/js-data/js-data-rethinkdb/v3.svg?style=flat
43+
[cov_b]: https://img.shields.io/codecov/c/github/js-data/js-data-rethinkdb.svg?style=flat
4444
[cov_l]: https://codecov.io/github/js-data/js-data-rethinkdb
45-
[cod_b]: https://img.shields.io/codacy/69206fcb0df6462ca559610af32fd1fb.svg
46-
[cod_l]: https://www.codacy.com/app/jasondobry/js-data-rethinkdb/dashboard

conf.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"package": "./package.json"
1313
},
1414
"templates": {
15-
"theme": "lumen",
15+
"theme": "jsdata",
1616
"systemName": "js-data-rethinkdb",
1717
"copyright": "js-data-rethinkdb Copyright © 2014-2016 js-data-rethinkdb project authors",
18-
"syntaxTheme": "dark",
18+
"outputSourceFiles": true,
1919
"linenums": true,
20-
"footer": "<div style=\"text-align:center\">Back to <a href=\"http://api.js-data.io\">api.js-data.io</a></div>",
20+
"footer": "<div style=\"text-align:center\"><a href=\"/\">api.js-data.io</a>&nbsp;&#8226;&nbsp;<a href=\"http://js-data.io\">js-data.io</a></div>",
2121
"analytics": {
2222
"ua": "UA-55528236-2",
2323
"domain": "api.js-data.io"

0 commit comments

Comments
 (0)