Switch back to whatwg-fetch, close pretenderjs#235

README.md

@@ -40,7 +40,16 @@ $.get('/photos/12', {success() => { ... }})
 
 ## Usage examples
 
+You can import Pretender as a module or use it directly in the browser.
 
+```javascript
+import Pretender from 'pretender';
+const server = new Pretender(function() {});
+```
+
+```javascript
+<script src="pretender.js"></script>
+```
 
 ## The Server DSL
 The server DSL is inspired by express/sinatra. Pass a function to the Pretender constructor

karma.conf.js

@@ -21,7 +21,7 @@ module.exports = function(config) {
       'bower_components/jquery/dist/jquery.js',
       'node_modules/es6-promise/dist/es6-promise.auto.js',
       'node_modules/abortcontroller-polyfill/dist/abortcontroller-polyfill-only.js',
-      'node_modules/@xg-wang/whatwg-fetch/dist/fetch.umd.js',
+      'node_modules/whatwg-fetch/dist/fetch.umd.js',
       'pretender.js',
       'test/**/*.js'
     ],

package.json

@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@babel/plugin-external-helpers": "^7.2.0",
-    "@xg-wang/whatwg-fetch": "^3.0.0",
+    "whatwg-fetch": "^3.0.0",
     "fake-xml-http-request": "^2.0.0",
     "route-recognizer": "^0.3.3"
   },
@@ -59,7 +59,7 @@
         "deps": [
           "route-recognizer",
           "fake-xml-http-request",
-          "@xg-wang/whatwg-fetch"
+          "whatwg-fetch"
         ],
         "exports": "Pretender"
       }

pretender.js

@@ -9,7 +9,6 @@ var Pretender = (function (self, RouteRecognizer, FakeXMLHttpRequest, FakeFetch)
   self = self && self.hasOwnProperty('default') ? self['default'] : self;
   RouteRecognizer = RouteRecognizer && RouteRecognizer.hasOwnProperty('default') ? RouteRecognizer['default'] : RouteRecognizer;
   FakeXMLHttpRequest = FakeXMLHttpRequest && FakeXMLHttpRequest.hasOwnProperty('default') ? FakeXMLHttpRequest['default'] : FakeXMLHttpRequest;
-  FakeFetch = FakeFetch && FakeFetch.hasOwnProperty('default') ? FakeFetch['default'] : FakeFetch;
 
   /**
    * parseURL - decompose a URL into its parts

rollup.config.js

@@ -9,7 +9,7 @@ module.exports = {
   input: 'src/index.ts',
   external: [
     selfId,
-    '@xg-wang/whatwg-fetch',
+    'whatwg-fetch',
     'fake-xml-http-request',
     'route-recognizer',
   ],
@@ -20,7 +20,7 @@ module.exports = {
       format: 'iife',
       globals: {
         [selfId]: 'self',
-        '@xg-wang/whatwg-fetch': 'FakeFetch',
+        'whatwg-fetch': 'FakeFetch',
         'fake-xml-http-request': 'FakeXMLHttpRequest',
         'route-recognizer': 'RouteRecognizer',
       },
@@ -33,10 +33,6 @@ module.exports = {
       file: 'src/pretender.es.js',
       format: 'es'
     },
-    {
-      file: 'src/pretender.cjs.js',
-      format: 'cjs'
-    },
   ],
   plugins: [
     resolve(),

src/index.ts

@@ -1,10 +1,7 @@
 import self from './iife-self-placeholder';
 import RouteRecognizer from 'route-recognizer';
 import FakeXMLHttpRequest from 'fake-xml-http-request';
-
-// fetch related ponyfills
-// TODO: use whatwg-fetch once new version release
-import FakeFetch from '@xg-wang/whatwg-fetch';
+import * as FakeFetch from 'whatwg-fetch';
 
 /**
  * parseURL - decompose a URL into its parts