Merge branch 'master' into release

Author: jmdobry

.babelrc

@@ -0,0 +1,5 @@
+{
+  "presets": [
+    "es2015"
+  ]
+}

CHANGELOG.md

@@ -1,3 +1,11 @@
+##### 3.0.0 - 02 July 2017
+
+**v3 stable release**
+
+###### Bug fixes
+- #65 - axios as devDependency
+- #68 - Impossible to set timeout globally
+
 ##### 3.0.0-rc.3 - 18 August 2016
 
 ###### Backwards compatible changes

fetch/karma.start.js

@@ -2,7 +2,7 @@
 
 before(function () {
   var Test = this
-  Test.TEST_FETCH = true
+  Test.TEST_FETCH = window.navigator.userAgent.indexOf('MSIE 9.0') === -1
   Test.fail = function (msg) {
     if (msg instanceof Error) {
       console.log(msg.stack)
@@ -49,6 +49,7 @@ beforeEach(function () {
 
   Test.requests = []
 
+  Test.adapter.isFetch = true
   Test.adapter.http = function (config) {
     config.headers || (config.headers = {})
     config.headers.Accept = 'application/json, text/plain, */*'

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-rc.3",
+  "version": "3.0.0",
   "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
@@ -21,9 +21,10 @@
     "http"
   ],
   "dependencies": {
-    "js-data-adapter": "~0.8.2"
+    "js-data": ">= 3.0.0",
+    "js-data-adapter": "1.0.0"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-rc.4"
+    "js-data": ">= 3.0.0"
   }
 }

fetch/rollup.config.js

@@ -1,9 +1,11 @@
-var babel = require('rollup-plugin-babel')
-var replace = require('rollup-plugin-replace')
+import babel from 'rollup-plugin-babel'
+import replace from 'rollup-plugin-replace'
 
-module.exports = {
+export default {
   moduleName: 'JSDataHttp',
-  moduleId: 'js-data-fetch',
+  amd: {
+    id: 'js-data-fetch'
+  },
   external: [
     'js-data'
   ],
@@ -16,9 +18,18 @@ module.exports = {
     }),
     babel({
       babelrc: false,
+      plugins: [
+        'external-helpers'
+      ],
       presets: [
-        'es2015-rollup'
-      ]
+        [
+          'es2015',
+          {
+            modules: false
+          }
+        ]
+      ],
+      exclude: 'node_modules/axios/**'
     })
   ]
 }

karma.conf.js

@@ -52,7 +52,6 @@ module.exports = function (config) {
     browsers: browsers,
     files: [
       'node_modules/babel-polyfill/dist/polyfill.js',
-      'node_modules/whatwg-fetch/fetch.js',
       'node_modules/js-data/dist/js-data.js',
       'dist/js-data-http.js',
       'karma.start.js',

node/mocha.start.js

@@ -49,6 +49,7 @@ beforeEach(function () {
 
   Test.requests = []
 
+  Test.adapter.isNode = true
   Test.adapter.http = function (config) {
     config.headers || (config.headers = {})
     config.headers.Accept = 'application/json, text/plain, */*'

node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-http-node",
   "description": "Node.js HTTP adapter for js-data.",
-  "version": "3.0.0-rc.3",
+  "version": "3.0.0",
   "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
@@ -22,10 +22,11 @@
     "node.js"
   ],
   "dependencies": {
-    "js-data-adapter": "~0.8.2"
+    "js-data": ">= 3.0.0",
+    "js-data-adapter": "1.0.0"
   },
   "peerDependencies": {
-    "axios": "^0.13.1",
-    "js-data": "^3.0.0-rc.4"
+    "axios": "0.16.2",
+    "js-data": ">= 3.0.0"
   }
 }

node/rollup.config.js

@@ -1,9 +1,11 @@
-var babel = require('rollup-plugin-babel')
-var replace = require('rollup-plugin-replace')
+import babel from 'rollup-plugin-babel'
+import replace from 'rollup-plugin-replace'
 
-module.exports = {
+export default {
   moduleName: 'JSDataHttpNode',
-  moduleId: 'js-data-http-node',
+  amd: {
+    id: 'js-data-http-node'
+  },
   external: [
     'axios',
     'js-data',
@@ -21,9 +23,18 @@ module.exports = {
     }),
     babel({
       babelrc: false,
+      plugins: [
+        'external-helpers'
+      ],
       presets: [
-        'es2015-rollup'
-      ]
+        [
+          'es2015',
+          {
+            modules: false
+          }
+        ]
+      ],
+      exclude: 'node_modules/axios/**'
     })
   ]
 }