Merge branch 'master' into add-client-tests-for-content-type

Author: shockey

.travis.yml

@@ -1,19 +1,16 @@
+sudo: false
 language: node_js
 node_js:
 - '4.7'
 - '6.9'
-env:
-  - CXX=g++-4.8
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
+cache:
+  directories:
+    - node_modules
 branches:
   only:
   - master
   - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+before_script: "npm update"
 before_deploy: "npm run build"
 deploy:
   provider: npm

README.md

@@ -64,7 +64,7 @@ This lib exposes these functionalities:
 HTTP Client
 -----------
 
-`Swagger.http(req)` exposes a [Fetch-like interface](https://github.com/matthew-andrews/isomorphic-fetch) with a twist: allowing `url` in the request object so that it can be passed around and mutated. It extends Fetch to support request and response interceptors and performs response & header serialization. This method could be overridden to change how SwaggerJS performs HTTP requests.
+`Swagger.http(req)` exposes a [Fetch-like interface](https://github.com/lquixada/cross-fetch) with a twist: allowing `url` in the request object so that it can be passed around and mutated. It extends Fetch to support request and response interceptors and performs response & header serialization. This method could be overridden to change how SwaggerJS performs HTTP requests.
 
 ```js
 // Fetch-like, but support `url`, `query` and `xxxInterceptor`
@@ -279,6 +279,7 @@ npm run test         # run test
 npm run test:watch   # run test with change watching
 npm run lint         # run lint
 npm run build        # package to release
+npm run build-dev    # package with non-minified dist/index.js (for debugging)
 npm run build-bundle # build browser version available at .../browser
 ```
 

package.json

@@ -17,6 +17,7 @@
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack -p --config ./webpack.config.js",
+    "build-dev": "cross-env NODE_ENV=development webpack --config ./webpack.config.js",
     "build-bundle": "cross-env NODE_ENV=production webpack -p --config ./webpack.bundle.config.js",
     "watch": "webpack --config webpack.config.js --watch --progress",
     "test": "npm run just-test && npm run lint",
@@ -64,12 +65,12 @@
     "babel-runtime": "^6.23.0",
     "btoa": "1.1.2",
     "cookie": "^0.3.1",
+    "cross-fetch": "0.0.8",
     "deep-extend": "^0.4.1",
     "fast-json-patch": "1.1.8",
-    "isomorphic-fetch": "2.2.1",
     "isomorphic-form-data": "0.0.1",
     "js-yaml": "^3.8.1",
-    "lodash": "4.16.2",
+    "lodash": "^4.16.2",
     "qs": "^6.3.0",
     "url": "^0.11.0"
   }

src/http.js

@@ -1,4 +1,4 @@
-import 'isomorphic-fetch'
+import 'cross-fetch/polyfill'
 import qs from 'qs'
 import jsYaml from 'js-yaml'
 import isString from 'lodash/isString'

src/specmap/lib/refs.js

@@ -1,4 +1,4 @@
-import fetch from 'isomorphic-fetch'
+import {fetch} from 'cross-fetch'
 import url from 'url'
 import lib from '../lib'
 import createError from '../lib/create-error'

test/http.js

@@ -105,8 +105,8 @@ describe('http', () => {
   describe('serializeHeaders', function () {
     it('should handle FetchAPI Headers object, which is iterable', function () {
       // Given
-      // isomorphic-fetch exposes FetchAPI methods onto global
-      require('isomorphic-fetch')
+      // cross-fetch exposes FetchAPI methods onto global
+      require('cross-fetch/polyfill')
       expect(global.Headers).toBeA(Function)
       const headers = new Headers() // eslint-disable-line no-undef
       headers.append('Authorization', 'Basic hoop-la')
@@ -124,8 +124,8 @@ describe('http', () => {
 
     it('should handle two of the same headers', function () {
       // Given
-      // isomorphic-fetch exposes FetchAPI methods onto global
-      require('isomorphic-fetch')
+      // cross-fetch exposes FetchAPI methods onto global
+      require('cross-fetch/polyfill')
       expect(global.Headers).toBeA(Function)
       const headers = new Headers() // eslint-disable-line no-undef
       headers.append('Authorization', 'Basic hoop-la')
@@ -142,8 +142,8 @@ describe('http', () => {
 
     it('should handle multiple headers', function () {
       // Given
-      // isomorphic-fetch exposes FetchAPI methods onto global
-      require('isomorphic-fetch')
+      // cross-fetch exposes FetchAPI methods onto global
+      require('cross-fetch/polyfill')
       expect(global.Headers).toBeA(Function)
       const headers = new Headers() // eslint-disable-line no-undef
       headers.append('Authorization', 'Basic hoop-la')

test/index.js

@@ -180,7 +180,7 @@ describe('constructor', () => {
 
     it('should serialize the response', function () {
       // Given
-      require('isomorphic-fetch') // To ensure global.Headers
+      require('cross-fetch/polyfill') // To ensure global.Headers
       const xapp = xmock().get('https://swagger.io/one', function (req, res, next) {
         res.set('hi', 'ho')
         return res.send({me: true})