remove superagent

demos/gcal.html

@@ -5,7 +5,6 @@
 <link href='../dist/core/main.css' rel='stylesheet' />
 <link href='../dist/daygrid/main.css' rel='stylesheet' />
 <link href='../dist/list/main.css' rel='stylesheet' />
-<script src='../node_modules/superagent/superagent.js'></script>
 <script src='../dist/core/main.js'></script>
 <script src='../dist/interaction/main.js'></script>
 <script src='../dist/daygrid/main.js'></script>

demos/json.html

@@ -6,7 +6,6 @@
 <link href='../dist/daygrid/main.css' rel='stylesheet' />
 <link href='../dist/timegrid/main.css' rel='stylesheet' />
 <link href='../dist/list/main.css' rel='stylesheet' />
-<script src='../node_modules/superagent/superagent.js'></script>
 <script src='../dist/core/main.js'></script>
 <script src='../dist/interaction/main.js'></script>
 <script src='../dist/daygrid/main.js'></script>

demos/time-zones.html

@@ -6,7 +6,6 @@
 <link href='../dist/daygrid/main.css' rel='stylesheet' />
 <link href='../dist/timegrid/main.css' rel='stylesheet' />
 <link href='../dist/list/main.css' rel='stylesheet' />
-<script src='../node_modules/superagent/superagent.js'></script>
 <script src='../dist/core/main.js'></script>
 <script src='../dist/interaction/main.js'></script>
 <script src='../dist/daygrid/main.js'></script>
@@ -59,8 +58,8 @@
     calendar.render();
 
     // load the list of available timezones, build the <select> options
-    superagent.get('php/get-time-zones.php').end(function(err, res) {
-      var timeZones = res ? (res.body || JSON.parse(res.text)) : [];
+    // it's HIGHLY recommended to use a different library for network requests, not this internal util func
+    FullCalendar.requestJson('GET', 'php/get-time-zones.php', {}, function(timeZones) {
 
       timeZones.forEach(function(timeZone) {
         var optionEl;
@@ -72,6 +71,8 @@
           timeZoneSelectorEl.appendChild(optionEl);
         }
       });
+    }, function() {
+      // TODO: handle error
     });
 
     // when the timezone selector changes, dynamically change the calendar option

karma.config.js

@@ -15,7 +15,6 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
 
-      'node_modules/superagent/superagent.js',
       'node_modules/moment/moment.js',
       'node_modules/moment/locale/es.js', // only spanish for testing
       'node_modules/moment-timezone/builds/moment-timezone-with-data.js',

package.json

@@ -66,7 +66,6 @@
     "rollup-plugin-node-resolve": "^4.0.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
     "rrule": "^2.6.0",
-    "superagent": "^3.8.3",
     "tslib": "^1.9.3",
     "tslint": "^5.12.1",
     "tslint-config-standard": "^7.1.0",

rollup.config.js

@@ -15,7 +15,6 @@ if (!/^(development|production)$/.test(process.env.BUILD)) {
 }
 
 let packageGlobals = {
-  superagent: 'superagent',
   luxon: 'luxon',
   moment: 'moment',
   rrule: 'rrule',

src/core/event-sources/json-feed-event-source.ts

@@ -1,4 +1,4 @@
-import request from 'superagent'
+import requestJson from '../util/requestJson'
 import Calendar from '../Calendar'
 import { EventSourceDef } from '../structs/event-source'
 import { DateRange } from '../datelib/date-range'
@@ -35,36 +35,17 @@ let eventSourceDef: EventSourceDef = {
 
   fetch(arg, success, failure) {
     let meta: JsonFeedMeta = arg.eventSource.meta
-    let theRequest
     let requestParams = buildRequestParams(meta, arg.range, arg.calendar)
 
-    if (meta.method === 'GET') {
-      theRequest = request.get(meta.url).query(requestParams) // querystring params
-    } else {
-      theRequest = request(meta.method, meta.url).send(requestParams) // body data
-    }
-
-    theRequest.end((error, res) => {
-      let rawEvents
-
-      if (!error) {
-        if (res.body) { // parsed JSON
-          rawEvents = res.body
-        } else if (res.text) {
-          // if the server doesn't set Content-Type, won't be parsed as JSON. parse anyway.
-          rawEvents = JSON.parse(res.text)
-        }
-
-        if (rawEvents) {
-          success({ rawEvents, response: res })
-        } else {
-          failure({ message: 'Invalid JSON response', response: res })
-        }
-
-      } else {
-        failure(error) // error has { error, response }
+    requestJson(
+      meta.method, meta.url, requestParams,
+      function(rawEvents, xhr) {
+        success({ rawEvents, xhr })
+      },
+      function(errorMessage, xhr) {
+        failure({ message: errorMessage, xhr })
       }
-    })
+    )
   }
 
 }

src/core/main.ts

@@ -168,3 +168,5 @@ export { default as Slicer, SlicedProps } from './common/slicing-utils'
 export { EventMutation, applyMutationToEventStore } from './structs/event-mutation'
 export { Constraint, ConstraintInput, AllowFunc, isPropsValid, isInteractionValid } from './validation'
 export { default as EventApi } from './api/EventApi'
+
+export { default as requestJson } from './util/requestJson'

src/core/reducers/eventSources.ts

@@ -138,10 +138,10 @@ function fetchSource(eventSource: EventSource, fetchRange: DateRange, calendar:
       let sourceSuccessRes
 
       if (eventSource.success) {
-        sourceSuccessRes = eventSource.success(rawEvents, res.response)
+        sourceSuccessRes = eventSource.success(rawEvents, res.xhr)
       }
       if (calSuccess) {
-        calSuccessRes = calSuccess(rawEvents, res.response)
+        calSuccessRes = calSuccess(rawEvents, res.xhr)
       }
 
       rawEvents = sourceSuccessRes || calSuccessRes || rawEvents

src/core/structs/event-source.ts

@@ -88,7 +88,7 @@ export type EventSourceFetcher = (
     calendar: Calendar
     range: DateRange
   },
-  success: (res: { rawEvents: EventInput[], response?: any }) => void,
+  success: (res: { rawEvents: EventInput[], xhr?: XMLHttpRequest }) => void,
   failure: (error: EventSourceError) => void
 ) => (void | PromiseLike<EventInput[]>)
 

src/core/util/requestJson.ts

@@ -0,0 +1,49 @@
+
+export default function requestJson(method: string, url: string, params: object, successCallback, failureCallback) {
+  method = method.toUpperCase()
+
+  let body = null
+  if (method === 'GET') {
+    url = injectQueryStringParams(url, params)
+  } else {
+    body = encodeParams(params)
+  }
+
+  let xhr = new XMLHttpRequest()
+  xhr.open(method, url, true)
+
+  xhr.onload = function() {
+    if (xhr.status >= 200 && xhr.status < 400) {
+      try {
+        let res = JSON.parse(xhr.responseText)
+        successCallback(res, xhr)
+      } catch (err) {
+        failureCallback('Failure parsing JSON', xhr)
+      }
+    } else {
+      failureCallback('Request failed', xhr)
+    }
+  }
+
+  xhr.onerror = function() {
+    failureCallback('Request failed', xhr)
+  }
+
+  xhr.send(body)
+}
+
+function injectQueryStringParams(url: string, params) {
+  return url +
+    (url.indexOf('?') === -1 ? '?' : '&') +
+    encodeParams(params)
+}
+
+function encodeParams(params) {
+  let parts = []
+
+  for (let key in params) {
+    parts.push(encodeURIComponent(key) + '=' + encodeURIComponent(params[key]))
+  }
+
+  return parts.join('&')
+}

src/gcal/main.ts

@@ -1,5 +1,4 @@
-import * as request from 'superagent'
-import { createPlugin, EventSourceDef, refineProps, addDays, DateEnv } from '@fullcalendar/core'
+import { createPlugin, EventSourceDef, refineProps, addDays, DateEnv, requestJson } from '@fullcalendar/core'
 
 // TODO: expose somehow
 const API_BASE = 'https://www.googleapis.com/calendar/v3/calendars'
@@ -53,31 +52,27 @@ let eventSourceDef: EventSourceDef = {
         calendar.dateEnv
       )
 
-      request.get(url)
-        .query(requestParams)
-        .end((error, res) => {
-
-          // make an error object with more info if we can
-          if (res && res.body && res.body.error) {
-            error = {
-              message: 'Google Calendar API: ' + res.body.error.message,
-              response: res,
-              errors: res.body.error.errors
-            }
-          }
-
-          if (error) {
-            onFailure(error)
-          } else {
-            onSuccess({
-              rawEvents: gcalItemsToRawEventDefs(
-                res.body.items,
-                requestParams.timeZone
-              ),
-              response: res
-            })
-          }
-        })
+      requestJson('GET', url, requestParams, function(body, xhr) {
+
+        if (body.error) {
+          onFailure({
+            message: 'Google Calendar API: ' + body.error.message,
+            errors: body.error.errors,
+            xhr
+          })
+        } else {
+          onSuccess({
+            rawEvents: gcalItemsToRawEventDefs(
+              body.items,
+              requestParams.timeZone
+            ),
+            xhr
+          })
+        }
+
+      }, function(message, xhr) {
+        onFailure({ message, xhr })
+      })
     }
   }
 }

src/gcal/package.json

@@ -1,6 +1,3 @@
 {
-  "title": "FullCalendar Google Calendar Plugin",
-  "dependencies": {
-    "superagent": ""
-  }
+  "title": "FullCalendar Google Calendar Plugin"
 }