@@ -54,27 +54,45 @@ var fetch = require('unfetch')
 The [UMD](https://github.com/umdjs/umd) build is also available on [unpkg](https://unpkg.com):
 
 ```html
-<script src="https://unpkg.com/unfetch/dist/unfetch.umd.js"></script>
+<script src="//unpkg.com/unfetch/dist/unfetch.umd.js"></script>
 ```
 
-This exposes a `fetch` global if not already present.
+This exposes the `unfetch()` function as a global.
 
 * * *
 
 ## Usage
 
+As a [**ponyfill**](https://ponyfill.com):
+
 ```js
-import fetch from 'unfetch'
+import fetch from 'unfetch';
+
+fetch('/foo.json')
+  .then( r => r.json() )
+  .then( data => {
+    console.log(data);
+  });
+```
+
+Globally, as a [**polyfill**](https://ponyfill.com/#polyfill):
+
+```js
+import 'unfetch/polyfill';
+
+// "fetch" is now installed globally if it wasn't already available
 
 fetch('/foo.json')
   .then( r => r.json() )
   .then( data => {
-    console.log(data)
-  })
+    console.log(data);
+  });
 ```
 
 ## Examples & Demos
 
+[**Real Example on JSFiddle**](https://jsfiddle.net/developit/qrh7tLc0/) ➡️
+
 ```js
 // simple GET request:
 fetch('/foo')
 
@@ -1,19 +1,21 @@
 {
   "name": "unfetch",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Bare minimum 500b fetch polyfill.",
+  "module": "src/index.js",
   "jsnext:main": "src/index.js",
   "main": "dist/unfetch.js",
   "umd:main": "dist/unfetch.umd.js",
   "scripts": {
     "test": "eslint src test && mocha --compilers js:babel-register test/**/*.js",
     "build": "npm-run-all clean -p rollup:* -p minify:* -s size",
     "clean": "rimraf dist && mkdirp dist",
-    "rollup:cjs": "rollup -c rollup.config.js -m -f cjs -n $npm_package_name $npm_package_jsnext_main -o $npm_package_main",
-    "rollup:umd": "rollup -c rollup.config.js -m -f umd -n $npm_package_name $npm_package_jsnext_main -o $npm_package_umd_main",
+    "rollup:cjs": "rollup -c rollup.config.js -m -f cjs -n $npm_package_name $npm_package_module -o $npm_package_main",
+    "rollup:umd": "rollup -c rollup.config.js -m -f umd -n $npm_package_name $npm_package_module -o $npm_package_umd_main",
     "minify:cjs": "uglifyjs $npm_package_main -cm toplevel -o $npm_package_main -p relative --in-source-map ${npm_package_main}.map --source-map ${npm_package_main}.map",
     "minify:umd": "uglifyjs $npm_package_umd_main -cm -o $npm_package_umd_main -p relative --in-source-map ${npm_package_umd_main}.map --source-map ${npm_package_umd_main}.map",
     "size": "echo \"Gzipped Size: $(strip-json-comments --no-whitespace $npm_package_main | gzip-size)\"",
+    "prepublish": "npm run -s build",
     "release": "npm run build -s && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags && npm publish"
   },
   "repository": "developit/unfetch",
@@ -30,7 +32,8 @@
   "license": "MIT",
   "files": [
     "src",
-    "dist"
+    "dist",
+    "polyfill.js"
   ],
   "eslintConfig": {
     "parser": "babel-eslint",
@@ -60,6 +63,7 @@
     "rimraf": "^2.5.2",
     "rollup": "^0.41.4",
     "rollup-plugin-buble": "^0.15.0",
+    "rollup-plugin-post-replace": "^1.0.0",
     "sinon": "^1.17.4",
     "sinon-chai": "^2.8.0",
     "strip-json-comments-cli": "^1.0.1",
 
@@ -0,0 +1 @@
+if (!window.fetch) window.fetch = require('.');
@@ -1,8 +1,13 @@
 import buble from 'rollup-plugin-buble';
+import replace from 'rollup-plugin-post-replace';
 
 export default {
 	useStrict: false,
 	plugins: [
-		buble()
+		buble(),
+		replace({
+			'module.exports = index;': '',
+			'var index =': 'module.exports ='
+		})
 	]
 };
@@ -1,4 +1,4 @@
-export default function fetch(url, options) {
+export default typeof fetch=='function' ? fetch : function(url, options) {
 	options = options || {};
 	return new Promise( (resolve, reject) => {
 		let request = new XMLHttpRequest();
@@ -14,44 +14,41 @@ export default function fetch(url, options) {
 		}
 
 		request.onload = () => {
-			resolve(response(request));
+			resolve(response());
 		};
 
-		request.onerror = () => {
-			reject(Error('Network Error'));
-		};
+		request.onerror = reject;
 
-		request.send(options.body || null);
+		request.send(options.body);
 
-		function response(xhr) {
-			let headerText = xhr.getAllResponseHeaders(),
-				keys = [],
+		function response() {
+			let keys = [],
 				all = [],
 				headers = {},
-				reg = /^\s*(.*?)\s*\:\s*([\s\S]*?)\s*$/gm,
-				match, key;
-			while ((match=reg.exec(headerText))) {
-				keys.push(key = match[1].toLowerCase());
-				all.push([key, match[2]]);
-				headers[key] = (headers[key]?(headers[key]+','):'') + match[2];
-			}
+				header;
+
+			request.getAllResponseHeaders().replace(/^(.*?):\s*([\s\S]*?)$/gm, (m, key, value) => {
+				keys.push(key = key.toLowerCase());
+				all.push([key, value]);
+				header = headers[key];
+				headers[key] = header ? `${header},${value}` : value;
+			});
 
 			return {
-				type: 'cors',
-				ok: xhr.status/200|0 == 1,		// 200-399
-				status: xhr.status,
-				statusText: xhr.statusText,
-				url: xhr.responseURL,
-				clone: () => response(xhr),
-				text: () => Promise.resolve(xhr.responseText),
-				json: () => Promise.resolve(xhr.responseText).then(JSON.parse),
-				xml: () => Promise.resolve(xhr.responseXML),
-				blob: () => Promise.resolve(xhr.response),
+				ok: (request.status/200|0) == 1,		// 200-399
+				status: request.status,
+				statusText: request.statusText,
+				url: request.responseURL,
+				clone: response,
+				text: () => Promise.resolve(request.responseText),
+				json: () => Promise.resolve(request.responseText).then(JSON.parse),
+				xml: () => Promise.resolve(request.responseXML),
+				blob: () => Promise.resolve(new Blob([request.response])),
 				headers: {
 					keys: () => keys,
 					entries: () => all,
 					get: n => headers[n.toLowerCase()],
-					has: n => !!headers[n.toLowerCase()]
+					has: n => n.toLowerCase() in headers
 				}
 			};
 		}
 
@@ -44,7 +44,7 @@ describe('unfetch', () => {
 
 					expect(xhr.setRequestHeader).to.have.been.calledOnce.and.calledWith('a', 'b');
 					expect(xhr.open).to.have.been.calledOnce.and.calledWith('get', '/foo');
-					expect(xhr.send).to.have.been.calledOnce.and.calledWith(null);
+					expect(xhr.send).to.have.been.calledOnce.and.calledWith();
 
 					delete global.XMLHttpRequest;
 				});
Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ if (!window.fetch) window.fetch = require('.');