Merge branch 'master' into feature/abortable-fetch

niftylettuce · web-flow · commit a27fddd39578 · 2019-06-01T12:01:55.000-05:00
diff --git a/.babelrc b/.babelrc
diff --git a/.browserslistrc b/.browserslistrc
@@ -2,4 +2,3 @@
 
 > 1%
 last 2 versions
-ie >= 9
diff --git a/.dist.babelrc b/.dist.babelrc
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["@babel/env", {
+      "targets": {
+        "browsers": [ "> 1%", "last 2 versions" ]
+      }
+    }]
+  ],
+  "plugins": [ "@babel/transform-runtime" ]
+}
diff --git a/.dist.eslintrc b/.dist.eslintrc
@@ -0,0 +1,40 @@
+{
+  "extends": ["eslint:recommended"],
+  "env": {
+    "node": true,
+    "browser": true,
+    "amd": true,
+    "es6": true
+  },
+  "plugins": ["compat"],
+  "rules": {
+    "compat/compat": "error",
+    "no-func-assign": "off",
+    "no-redeclare": "off",
+    "no-console": "off",
+    "no-constant-condition": "off",
+    "no-unused-vars": "off",
+    "no-empty": "off",
+    "no-useless-escape": "off",
+    "no-fallthrough": "off",
+    "getter-return": "off"
+  },
+  "globals": {
+    "regeneratorRuntime": "writable"
+  },
+  "settings": {
+    "polyfills": [
+      "fetch",
+      "Promise",
+      "Symbol",
+      "Array.from",
+      "ArrayBuffer.isView",
+      "Headers",
+      "Request",
+      "Response",
+      "Object.setPrototypeOf",
+      "Object.getOwnPropertySymbols",
+      "Uint8Array"
+    ]
+  }
+}
diff --git a/.eslintrc b/.eslintrc
diff --git a/.lib.babelrc b/.lib.babelrc
@@ -0,0 +1,9 @@
+{
+  "presets": [
+    ["@babel/env", {
+      "targets": {
+        "node": "6.4.0"
+      }
+    }]
+  ]
+}
diff --git a/.lib.eslintrc b/.lib.eslintrc
@@ -0,0 +1,6 @@
+{
+  "extends": ["eslint:recommended", "plugin:node/recommended"],
+  "rules": {
+    "no-unused-vars": "off"
+  }
+}
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ Modern [fetch-based][fetch] alternative to [axios][]/[superagent][]/[request][].
   * [Example](#example)
   * [API](#api)
   * [Common Issues](#common-issues)
+  * [Required ES6 Features](#required-es6-features)
 * [Frequently Asked Questions](#frequently-asked-questions)
   * [How do I unset a default header](#how-do-i-unset-a-default-header)
   * [Why do my form uploads randomly fail with React Native](#why-do-my-form-uploads-randomly-fail-with-react-native)
@@ -62,12 +63,10 @@ Modern [fetch-based][fetch] alternative to [axios][]/[superagent][]/[request][].
 
 #### VanillaJS
 
-See [usage example and API below](#usage) for a more complete example.
+1. Load the package via `<script>` tag (note you will need to polyfill with [required ES6 features](#required-es6-features)):
 
 ```html
-<!-- until this PR is merged we will need to use specific path for es6-promise -->
-<!-- https://github.com/stefanpenner/es6-promise/pull/343 -->
-<script src="https://unpkg.com/es6-promise/dist/es6-promise.auto.min.js"></script>
+<script crossorigin="anonymous" src="https://polyfill.io/v3/polyfill.min.js?features=fetch%2CPromise%2CSymbol%2CArray.from%2CObject.setPrototypeOf%2CUint8Array"></script>
 <script src="https://unpkg.com/frisbee"></script>
 <script type="text/javascript">
   (function() {
@@ -91,6 +90,8 @@ See [usage example and API below](#usage) for a more complete example.
 </script>
 ```
 
+2. See [usage example and API below](#usage) for a more complete example.
+
 #### Bundler
 
 1. Install the required package:
@@ -99,21 +100,9 @@ See [usage example and API below](#usage) for a more complete example.
    npm install frisbee
    ```
 
-2. (Optional) Install `es6-promise` to polyfill older browsers with `Promise`:
-
-   ```sh
-   npm install es6-promise
-   ```
-
-3. (Optional) Ensure that you invoke the polyfill for `es6-promise` if you are using it:
-
-   ```js
-    // add optional support for older browsers
-    const es6promise = require('es6-promise');
-    es6promise.polyfill();
-   ```
+2. Ensure that your environment is polyfilled with [required ES6 features](#required-es6-features) (e.g. use [@babel/polyfill][babel-polyfill] globally or a service like [polyfill.io](https://polyfill.io))
 
-4. See [usage example and API below](#usage)
+3. See [usage example and API below](#usage)
 
 
 ## Usage
@@ -323,6 +312,19 @@ Upon being invoked, `Frisbee` returns an object with the following chainable met
 * If you're using `node-fetch`, you need `node-fetch@v1.5.3+` to use `form-data` with files properly (due to [bitinn/node-fetch#102](https://github.com/bitinn/node-fetch/issues/102))
 * If you experience form file upload issues, please see [facebook/react-native#7564 (comment)](https://github.com/facebook/react-native/issues/7564#issuecomment-266323928).
 
+### Required ES6 Features
+
+This list is sourced from ESLint output and polyfilled settings through [eslint-plugin-compat][].
+
+* `fetch`
+* `Promise`
+* `Symbol`
+* `Array.from`
+* `ArrayBuffer.isView`
+* `Object.setPrototypeOf`
+* `Object.getOwnPropertySymbols`
+* `Uint8Array`
+
 
 ## Frequently Asked Questions
 
@@ -507,3 +509,7 @@ Therefore we created `frisbee` to serve as our API glue, and hopefully it'll ser
 [request]: https://github.com/request/request
 
 [fetch-methods]: https://developer.mozilla.org/en-US/docs/Web/API/Body
+
+[babel-polyfill]: https://babeljs.io/docs/en/babel-polyfill
+
+[eslint-plugin-compat]: https://github.com/amilajack/eslint-plugin-compat
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frisbee",
   "description": "Modern fetch-based alternative to axios/superagent/request. Great for React Native.",
-  "version": "2.0.6",
+  "version": "2.0.9",
   "author": "Nick Baugh <niftylettuce@gmail.com> (http://niftylettuce.com/)",
   "ava": {
     "failFast": true,
@@ -42,46 +42,43 @@
     "abortcontroller-polyfill": "^1.2.4",
     "caseless": "^0.12.0",
     "common-tags": "^1.8.0",
-    "cross-fetch": "^3.0.1",
-    "qs": "^6.6.0",
+    "cross-fetch": "^3.0.2",
+    "qs": "^6.7.0",
     "url-join": "^4.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.2.2",
-    "@babel/plugin-proposal-object-rest-spread": "^7.3.2",
-    "@babel/plugin-transform-runtime": "^7.2.0",
-    "@babel/preset-env": "^7.3.1",
+    "@babel/cli": "^7.4.4",
+    "@babel/core": "^7.4.4",
+    "@babel/plugin-transform-runtime": "^7.4.4",
+    "@babel/preset-env": "^7.4.4",
     "@commitlint/cli": "^7.5.2",
     "@commitlint/config-conventional": "^7.5.0",
-    "ava": "^1.2.1",
+    "ava": "^1.4.1",
     "babelify": "^10.0.0",
-    "body-parser": "^1.18.3",
+    "body-parser": "^1.19.0",
     "browserify": "^16.2.3",
-    "caniuse-lite": "^1.0.30000938",
-    "codecov": "^3.2.0",
+    "codecov": "^3.3.0",
     "cors": "^2.8.5",
     "cross-env": "^5.2.0",
-    "es6-promise": "^4.2.5",
-    "eslint": "^5.13.0",
+    "es6-promise": "^4.2.6",
+    "eslint": "^5.16.0",
     "eslint-config-xo-lass": "^1.0.3",
-    "eslint-plugin-compat": "^2.7.0",
+    "eslint-plugin-compat": "^3.1.1",
     "eslint-plugin-node": "^8.0.1",
     "express": "^4.16.4",
     "fixpack": "^2.3.1",
-    "husky": "^1.3.1",
-    "is-stream": "^1.1.0",
-    "jsdom": "^13.2.0",
-    "lint-staged": "^8.1.4",
+    "husky": "^2.1.0",
+    "is-stream": "^2.0.0",
+    "jsdom": "^15.0.0",
+    "lint-staged": "^8.1.5",
     "lodash": "^4.17.11",
-    "nyc": "^13.3.0",
-    "prettier": "^1.16.4",
+    "nyc": "^14.0.0",
     "remark-cli": "^6.0.1",
     "remark-preset-github": "^0.0.13",
     "rimraf": "^2.6.3",
-    "sinon": "^7.2.3",
+    "sinon": "^7.3.2",
     "tinyify": "^2.5.0",
-    "uglify-js": "^3.4.9",
+    "uglify-js": "^3.5.9",
     "xo": "0.24.0"
   },
   "engines": {
@@ -156,14 +153,14 @@
   },
   "scripts": {
     "ava": "cross-env NODE_ENV=test ava",
-    "browserify": "browserify src/index.js -o dist/frisbee.js -s Frisbee -d -t babelify",
+    "browserify": "browserify src/index.js -o dist/frisbee.js -s Frisbee -d -t [ babelify --configFile ./.dist.babelrc ]",
     "build": "npm run build:clean && npm run build:lib && npm run build:dist",
     "build:clean": "rimraf lib dist",
     "build:dist": "npm run browserify && npm run minify",
-    "build:lib": "babel src --out-dir lib",
+    "build:lib": "babel --config-file ./.lib.babelrc src --out-dir lib",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
-    "lint": "xo && remark . -qfo && eslint lib",
-    "minify": "cross-env NODE_ENV=production browserify src/index.js -o dist/frisbee.min.js -s Frisbee -t babelify -p tinyify",
+    "lint": "xo && remark . -qfo && eslint -c .lib.eslintrc lib && eslint -c .dist.eslintrc dist",
+    "minify": "cross-env NODE_ENV=production browserify src/index.js -o dist/frisbee.min.js -s Frisbee -t [ babelify --configFile ./.dist.babelrc ] -p tinyify",
     "nyc": "cross-env NODE_ENV=test nyc ava",
     "test": "npm run build && npm run lint && npm run ava",
     "test-coverage": "npm run build && npm run lint && npm run nyc"
diff --git a/src/index.js b/src/index.js
@@ -1,10 +1,12 @@
 const caseless = require('caseless');
 const qs = require('qs');
-const fetch = require('cross-fetch');
 const urlJoin = require('url-join');
 // eslint-disable-next-line import/no-unassigned-import
 require('abortcontroller-polyfill/dist/polyfill-patch-fetch');
 
+// eslint-disable-next-line import/no-unassigned-import
+require('cross-fetch/polyfill');
+
 const Interceptor = require('./interceptor');
 
 const methods = ['get', 'head', 'post', 'put', 'del', 'options', 'patch'];
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,3 @@`
`2`	`2`
`3`	`3`	`> 1%`
`4`	`4`	`last 2 versions`
`5`		`-ie >= 9`