Merge branch 'master' into release

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,11 @@
+##### 3.0.0-rc.1 - 10 August 2016
+
+###### Breaking changes
+- Now depending on js-data 3.0.0-rc.4 or greater
+
+###### Backwards compatible changes
+- Upgraded dependencies
+
 ##### 3.0.0-beta.8 - 08 July 2016
 
 ###### Backwards compatible changes

circle.yml

@@ -9,7 +9,7 @@ dependencies:
   pre:
     - npm i -g npm
     - npm i -g codecov
-    - npm i js-data@beta
+    - npm i js-data@rc
 test:
   post:
     - cat ./coverage/lcov.info | codecov

conf.json

@@ -12,13 +12,13 @@
     "package": "./package.json"
   },
   "templates": {
-    "theme": "lumen",
+    "theme": "jsdata",
     "systemName": "js-data-http",
     "copyright": "js-data-http Copyright © 2014-2016 js-data-http project authors",
     "outputSourceFiles": true,
-    "syntaxTheme": "dark",
     "linenums": true,
-    "footer": "<div style=\"text-align:center\">Back to <a href=\"http://js-data.io\">js-data.io</a></div>",
+    "logoFile": "https://raw.githubusercontent.com/js-data/js-data/master/js-data-64.png",
+    "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>",
     "analytics": {
       "ua": "UA-55528236-2",
       "domain": "api.js-data.io"

fetch/package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-fetch",
   "description": "HTTP adapter for js-data that uses the fetch API.",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.0-rc.1",
   "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
@@ -22,9 +22,9 @@
     "fetch"
   ],
   "dependencies": {
-    "js-data-adapter": "~0.7.4"
+    "js-data-adapter": "~0.8.0"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-beta.10"
+    "js-data": "^3.0.0-rc.4"
   }
 }

node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-http-node",
   "description": "Node.js HTTP adapter for js-data.",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.0-rc.1",
   "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
@@ -22,10 +22,10 @@
     "node.js"
   ],
   "dependencies": {
-    "js-data-adapter": "~0.7.4"
+    "js-data-adapter": "~0.8.0"
   },
   "peerDependencies": {
-    "axios": "^0.12.0",
-    "js-data": "^3.0.0-beta.10"
+    "axios": "^0.13.1",
+    "js-data": "^3.0.0-rc.4"
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-http",
   "description": "HTTP (XHR) adapter for js-data in the browser.",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.0-rc.1",
   "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
@@ -54,7 +54,7 @@
   },
   "scripts": {
     "lint": "repo-tools lint \"**/*.js\"",
-    "doc": "jsdoc -c conf.json src node_modules/js-data-adapter/src && node scripts/cleanup.js",
+    "doc": "jsdoc -c conf.json src node_modules/js-data-adapter/src node_modules/js-data/src/Component.js",
     "version": "repo-tools write-version dist/js-data-http.js fetch/dist/js-data-fetch.js node/dist/js-data-http-node.js",
     "bundle_http": "rollup -c rollup.config.js -f umd -o dist/js-data-http.js -m dist/js-data-http.js.map src/index.js",
     "bundle_fetch": "rollup -c fetch/rollup.config.js -f umd -o fetch/dist/js-data-fetch.js -m fetch/dist/js-data-fetch.js.map src/index.js",
@@ -74,26 +74,26 @@
     "release": "npm test && npm run doc && repo-tools updates && repo-tools changelog && repo-tools authors"
   },
   "dependencies": {
-    "js-data-adapter": "0.7.4"
+    "js-data-adapter": "~0.8.0"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-beta.10"
+    "js-data": "^3.0.0-rc.4"
   },
   "devDependencies": {
-    "axios": "0.12.0",
-    "babel-plugin-syntax-async-functions": "6.8.0",
-    "babel-plugin-transform-regenerator": "6.9.0",
+    "axios": "0.13.1",
+    "babel-plugin-syntax-async-functions": "6.13.0",
+    "babel-plugin-transform-regenerator": "6.11.4",
     "babel-preset-stage-0": "6.5.0",
     "istanbul": "0.4.4",
-    "js-data-repo-tools": "0.5.5",
-    "karma": "1.1.1",
+    "js-data-repo-tools": "0.5.6",
+    "karma": "1.1.2",
     "karma-browserstack-launcher": "1.0.1",
     "karma-chai": "0.1.0",
     "karma-mocha": "1.1.1",
     "karma-phantomjs-launcher": "1.0.1",
     "karma-sinon": "1.0.5",
-    "phantomjs-prebuilt": "2.1.7",
-    "rollup-plugin-commonjs": "3.1.0",
+    "phantomjs-prebuilt": "2.1.11",
+    "rollup-plugin-commonjs": "3.3.1",
     "rollup-plugin-replace": "1.1.1",
     "uglify-js": "2.7.0"
   }