From 14dbfb4c2b52dadefa1cf79c1fc5e28aee2ad7d0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 13 Nov 2017 20:21:19 -0500
Subject: [PATCH] Remove underscore and deprecated functions from reload
 package.

---
 packages/reload/deprecated.js |  8 --------
 packages/reload/package.js    |  5 ++---
 packages/reload/reload.js     | 14 +++++++++-----
 3 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 packages/reload/deprecated.js

diff --git a/packages/reload/deprecated.js b/packages/reload/deprecated.js
deleted file mode 100644
index a815626d42..0000000000
--- a/packages/reload/deprecated.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Reload functionality used to live on Meteor._reload. Be nice and try not to
-// break code that uses it, even though it's internal.
-// XXX COMPAT WITH 0.6.4
-Meteor._reload = {
-  onMigrate: Reload._onMigrate,
-  migrationData: Reload._migrationData,
-  reload: Reload._reload
-};
diff --git a/packages/reload/package.js b/packages/reload/package.js
index b1d955764f..e0289995ed 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -4,10 +4,9 @@ Package.describe({
 });
 
 Package.onUse(function (api) {
-  api.use(['underscore', 'ecmascript-runtime'], 'client');
+  api.use('ecmascript');
+  api.mainModule('reload.js', 'client');
   api.export('Reload', 'client');
-  api.addFiles('reload.js', 'client');
-  api.addFiles('deprecated.js', 'client');
 });
 
 Package.onTest(function (api) {
diff --git a/packages/reload/reload.js b/packages/reload/reload.js
index 3af40a9266..5ec40abaaf 100644
--- a/packages/reload/reload.js
+++ b/packages/reload/reload.js
@@ -31,7 +31,7 @@
 // useful for apps using `window.onbeforeunload`. See
 // https://github.com/meteor/meteor/pull/657
 
-Reload = {};
+export const Reload = {};
 
 var KEY_NAME = 'Meteor_Reload';
 
@@ -141,7 +141,7 @@ var pollProviders = function (tryReload, options) {
   options = options || {};
 
   var migrationData = {};
-  var remaining = _.clone(providers);
+  var remaining = providers.slice(0);
   var allReady = true;
   while (remaining.length) {
     var p = remaining.shift();
@@ -193,7 +193,7 @@ Reload._migrate = function (tryReload, options) {
 
 // Allows tests to isolate the list of providers.
 Reload._withFreshProvidersForTest = function (f) {
-  var originalProviders = _.clone(providers);
+  var originalProviders = providers.slice(0);
   providers = [];
   try {
     f();
@@ -216,7 +216,11 @@ Reload._reload = function (options) {
     return;
   reloading = true;
 
-  var tryReload = function () { _.defer(function () {
+  function tryReload() {
+    setTimeout(reload, 1);
+  }
+
+  function reload() {
     if (Reload._migrate(tryReload, options)) {
       // We'd like to make the browser reload the page using location.replace()
       // instead of location.reload(), because this avoids validating assets
@@ -229,7 +233,7 @@ Reload._reload = function (options) {
         window.location.replace(window.location.href);
       }
     }
-  }); };
+  }
 
   tryReload();
 };