From 760bb2c1d8c7d7a796eaa2a5179fd1b0232e259a Mon Sep 17 00:00:00 2001 From: Ryan Toronto Date: Thu, 19 Mar 2020 14:35:13 -0400 Subject: [PATCH] Vendor whatwg-fetch using rollup+devDep --- iife-wrapper.js | 5 ----- package.json | 11 +++++------ rollup.config.js | 1 - 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/iife-wrapper.js b/iife-wrapper.js index bd3730d..d8677e4 100644 --- a/iife-wrapper.js +++ b/iife-wrapper.js @@ -16,11 +16,6 @@ var Pretender = (function(self) { ? getModuleDefault(require('fake-xml-http-request')) : self.FakeXMLHttpRequest; - // fetch related ponyfills - var FakeFetch = appearsBrowserified - ? getModuleDefault(require('whatwg-fetch')) - : self.WHATWGFetch; - /*==ROLLUP_CONTENT==*/ if (typeof module === 'object') { diff --git a/package.json b/package.json index 20e25ef..af39928 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "devDependencies": { "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-node-resolve": "^7.1.1", - "rollup-plugin-typescript": "^1.0.0", "abortcontroller-polyfill": "^1.1.9", "coveralls": "^3.0.9", "es6-promise": "^4.0.5", @@ -45,16 +44,17 @@ "release-it": "^12.4.3", "release-it-lerna-changelog": "^1.0.3", "rollup": "^1.1.2", + "rollup-plugin-typescript": "^1.0.0", "sinon": "^9.0.0", "tslib": "^1.9.3", "typescript": "~3.1.1", "typescript-eslint-parser": "^21.0.2", - "url-parse": "^1.4.7" + "url-parse": "^1.4.7", + "whatwg-fetch": "^3.0.0" }, "dependencies": { "fake-xml-http-request": "^2.1.1", - "route-recognizer": "^0.3.3", - "whatwg-fetch": "^3.0.0" + "route-recognizer": "^0.3.3" }, "files": [ "dist", @@ -65,8 +65,7 @@ "pretender": { "deps": [ "route-recognizer", - "fake-xml-http-request", - "whatwg-fetch" + "fake-xml-http-request" ], "exports": "Pretender" } diff --git a/rollup.config.js b/rollup.config.js index 5485487..af7d2c5 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -4,7 +4,6 @@ const typescript = require('rollup-plugin-typescript'); const pkg = require('./package.json'); const fs = require('fs'); const globals = { - 'whatwg-fetch': 'FakeFetch', 'fake-xml-http-request': 'FakeXMLHttpRequest', 'route-recognizer': 'RouteRecognizer', 'url-parse': 'urlParse'