Merge branch 'master' into release

Author: jmdobry

.babelrc

@@ -0,0 +1,9 @@
+{
+  "presets": [
+    "es2015"
+  ],
+  "plugins": [
+    "syntax-async-functions",
+    "transform-regenerator"
+  ]
+}

.gitignore

@@ -1,3 +1,5 @@
+# IDE files
+.idea/
 # Logs
 logs
 *.log
@@ -35,3 +37,6 @@ node_modules
 coverage/
 doc/
 .nyc_output/
+yarn.lock
+*.log
+package-lock.json

AUTHORS

@@ -8,3 +8,4 @@
 Cory Robinson <[email protected]>
 Dave Ramirez <[email protected]>
 Jason Dobry <[email protected]>
+Jens Böttcher <[email protected]>

CHANGELOG.md

@@ -1,3 +1,13 @@
+#### 1.0.0 - 06 September 2017
+
+Stable 1.0.0 release
+
+##### Bug fixes
+- #23 - orderBy does not work in most cases. Fixed by @eljenso
+
+#### Other
+- Upgraded dependencies
+
 #### 1.0.0-rc.1 - 26 August 2016
 
 ##### Backwards compatible changes

CONTRIBUTORS

@@ -6,3 +6,4 @@
 Cory Robinson <[email protected]>
 Dave Ramirez <[email protected]>
 Jason Dobry <[email protected]>
+Jens Böttcher <[email protected]>

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 js-data-express project authors
+Copyright (c) 2016-2017 js-data-express project authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -13,40 +13,43 @@ Generate Express.js-compatible route middleware for [js-data](http://www.js-data
 To get started, visit __[http://js-data.io](http://www.js-data.io/docs/js-data-express)__.
 
 ```js
-import express from 'express'
-import {mount, queryParser, Router} from 'js-data-express'
-import {Container} from 'js-data'
-
-const app = express()
-const store = new Container()
-const UserMapper = store.defineMapper('user')
-const CommentMapper = store.defineMapper('comment')
+import express from 'express';
+import { mount, queryParser, Router } from 'js-data-express';
+import { Container } from 'js-data';
+
+const app = express();
+const store = new Container();
+const UserMapper = store.defineMapper('user');
+const CommentMapper = store.defineMapper('comment');
 ```
 
 ```js
 // Mount queryParser and store at "/"
-mount(app, store)
+mount(app, store);
 
 // Mount queryParser and store at "/api"
-mount(app, store, '/api')
+mount(app, store, '/api');
 
 // Mount queryParser at "/"
-app.use(queryParser)
+app.use(queryParser);
 // Mount store at "/"
-app.use(new Router(store).router)
+app.use(new Router(store).router);
 
 // Mount queryParser at "/api"
-app.use('/api' queryParser)
+app.use('/api' queryParser);
 // Mount store at "/api"
-app.use('/api', new Router(store).router)
+app.use('/api', new Router(store).router);
 
-var api = app.route('/api')
-// Mount queryParser at "/api"
-api.use(queryParser)
+// Create an express Router instance
+const api = express().Router();
+// Mount queryParser
+api.use(queryParser);
 // Mount UserMapper at "/api/user"
-api.use('/user', new Router(UserMapper).router)
+api.use('/user', new Router(UserMapper).router);
 // Mount UserMapper at "/api/comment"
-api.use('/comment', new Router(CommentMapper).router)
+api.use('/comment', new Router(CommentMapper).router);
+// Use api Router in an existing express app instance
+app.use('/api', api);
 ```
 
 ## Links
@@ -63,7 +66,7 @@ api.use('/comment', new Router(CommentMapper).router)
 
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 js-data-express project authors
+Copyright (c) 2016-2017 js-data-express project authors
 
 * [LICENSE](https://github.com/js-data/js-data-express/blob/master/LICENSE)
 * [AUTHORS](https://github.com/js-data/js-data-express/blob/master/AUTHORS)

circle.yml

@@ -1,15 +1,18 @@
+# Adjust the behavior of the virtual machine (VM)
+machine:
+  node:
+    version: 6.11.2
+
+# Use for broader build-related configuration
 general:
   branches:
     ignore:
       - gh-pages
-machine:
-  node:
-    version: 5.7.0
+
 dependencies:
   pre:
     - npm i -g npm
     - npm i -g codecov nyc
-    - npm i js-data@^3.0.0-rc.4 express
 test:
   post:
-    - nyc report --reporter=lcov | codecov
+    - nyc report --reporter=lcov > coverage.lcov && codecov

conf.json

@@ -14,7 +14,7 @@
   "templates": {
     "theme": "jsdata",
     "systemName": "js-data-express",
-    "copyright": "js-data-express Copyright © 2016 js-data-express project authors",
+    "copyright": "js-data-express Copyright © 2016-2017 js-data-express project authors",
     "outputSourceFiles": true,
     "linenums": true,
     "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>",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-express",
   "description": "Generate Express.js-compatible route middleware for JSData models.",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0",
   "homepage": "https://github.com/js-data/js-data-express",
   "repository": {
     "type": "git",
@@ -32,28 +32,45 @@
       "dist/"
     ]
   },
-  "babel": {
-    "presets": [
-      "es2015"
-    ]
-  },
   "scripts": {
     "doc": "jsdoc -c conf.json src",
-    "lint": "repo-tools lint \"**/*.js\"",
-    "bundle": "rollup -c rollup.config.js -f cjs -o dist/js-data-express.js -m dist/js-data-express.js.map src/index.js && repo-tools write-version dist/js-data-express.js",
+    "lint": "standard '**/*.js'",
+    "bundle": "rollup src/index.js -c -o dist/js-data-express.js -m dist/js-data-express.js.map -f cjs && repo-tools write-version dist/js-data-express.js",
     "build": "npm run lint && npm run bundle",
     "mocha": "mocha --recursive -t 30000 -R dot -r babel-core/register -r babel-polyfill",
     "cover": "nyc --require babel-core/register --require babel-polyfill --cache mocha --recursive -t 20000 -R dot && nyc report --reporter=html",
     "test": "npm run build && npm run cover",
-    "release": "npm test && npm run doc && repo-tools updates && repo-tools changelog && repo-tools authors"
+    "release": "npm test && npm run doc && repo-tools changelog && repo-tools authors"
+  },
+  "dependencies": {
+    "body-parser": "1.17.2",
+    "express": "4.15.4",
+    "js-data": ">=3.0.0"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-rc.4"
+    "body-parser": "1.17.2",
+    "express": "4.15.4",
+    "js-data": ">=3.0.0"
   },
   "devDependencies": {
-    "express": "4.14.0",
-    "js-data-repo-tools": "0.5.6",
-    "supertest": "2.0.0",
-    "body-parser": "1.15.2"
+    "babel-core": "6.26.0",
+    "babel-eslint": "7.2.3",
+    "babel-plugin-external-helpers": "6.22.0",
+    "babel-plugin-syntax-async-functions": "6.13.0",
+    "babel-plugin-transform-regenerator": "6.26.0",
+    "babel-polyfill": "6.26.0",
+    "babel-preset-es2015": "6.24.1",
+    "chai": "4.1.2",
+    "ink-docstrap": "git+https://github.com/js-data/docstrap.git#cfbe45fa313e1628c493076d5e15d2b855dfbf2c",
+    "js-data-repo-tools": "1.0.0",
+    "jsdoc": "3.5.4",
+    "mocha": "3.5.0",
+    "node-mocks-http": "1.6.4",
+    "nyc": "11.2.1",
+    "rollup": "0.49.2",
+    "rollup-plugin-babel": "3.0.2",
+    "sinon": "3.2.1",
+    "standard": "10.0.3",
+    "supertest": "3.0.0"
   }
 }