From 8add2ffc4e07a52cf41453afad4e1be05a10b26b Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Tue, 23 Feb 2021 19:59:56 -0800
Subject: [PATCH] js: Convert static/js/fetch_status.js to ES6 module.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 .eslintrc.json                                 | 1 -
 frontend_tests/node_tests/fetch_status.js      | 2 +-
 frontend_tests/node_tests/message_fetch.js     | 1 -
 frontend_tests/node_tests/message_list.js      | 1 -
 frontend_tests/node_tests/message_list_data.js | 1 -
 frontend_tests/node_tests/message_list_view.js | 1 -
 frontend_tests/node_tests/narrow_activate.js   | 1 -
 frontend_tests/node_tests/narrow_local.js      | 1 -
 frontend_tests/node_tests/stream_data.js       | 1 -
 static/js/bundles/app.js                       | 1 -
 static/js/fetch_status.js                      | 6 +-----
 static/js/global.d.ts                          | 1 -
 static/js/message_list_data.js                 | 1 +
 13 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index ae90f82a91..0dcec5b73d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -126,7 +126,6 @@
             "files": ["static/js/**"],
             "globals": {
                 "$": false,
-                "FetchStatus": false,
                 "Filter": false,
                 "ListCursor": false,
                 "MessageListData": false,
diff --git a/frontend_tests/node_tests/fetch_status.js b/frontend_tests/node_tests/fetch_status.js
index 41222d6662..f092baa677 100644
--- a/frontend_tests/node_tests/fetch_status.js
+++ b/frontend_tests/node_tests/fetch_status.js
@@ -5,7 +5,7 @@ const {strict: assert} = require("assert");
 const {set_global, zrequire} = require("../zjsunit/namespace");
 const {run_test} = require("../zjsunit/test");
 
-const FetchStatus = zrequire("fetch_status");
+const {FetchStatus} = zrequire("fetch_status");
 set_global("message_scroll", {
     hide_loading_older: () => {},
     show_loading_older: () => {},
diff --git a/frontend_tests/node_tests/message_fetch.js b/frontend_tests/node_tests/message_fetch.js
index 3fad932d26..f7e1e6be36 100644
--- a/frontend_tests/node_tests/message_fetch.js
+++ b/frontend_tests/node_tests/message_fetch.js
@@ -19,7 +19,6 @@ function MessageListView() {
 }
 set_global("MessageListView", MessageListView);
 
-zrequire("FetchStatus", "js/fetch_status");
 const Filter = zrequire("Filter", "js/filter");
 zrequire("MessageListData", "js/message_list_data");
 const message_list = zrequire("message_list");
diff --git a/frontend_tests/node_tests/message_list.js b/frontend_tests/node_tests/message_list.js
index df8ec5d9db..25c830381e 100644
--- a/frontend_tests/node_tests/message_list.js
+++ b/frontend_tests/node_tests/message_list.js
@@ -25,7 +25,6 @@ set_global("document", {
 const narrow_state = set_global("narrow_state", {});
 const stream_data = set_global("stream_data", {});
 
-zrequire("FetchStatus", "js/fetch_status");
 const muting = zrequire("muting");
 zrequire("MessageListData", "js/message_list_data");
 zrequire("MessageListView", "js/message_list_view");
diff --git a/frontend_tests/node_tests/message_list_data.js b/frontend_tests/node_tests/message_list_data.js
index 0fc50fb271..a1580ff2de 100644
--- a/frontend_tests/node_tests/message_list_data.js
+++ b/frontend_tests/node_tests/message_list_data.js
@@ -9,7 +9,6 @@ const muting = zrequire("muting");
 zrequire("unread");
 
 zrequire("Filter", "js/filter");
-zrequire("FetchStatus", "js/fetch_status");
 const MessageListData = zrequire("MessageListData", "js/message_list_data");
 
 set_global("page_params", {});
diff --git a/frontend_tests/node_tests/message_list_view.js b/frontend_tests/node_tests/message_list_view.js
index 648a26f8e0..d4d714efe8 100644
--- a/frontend_tests/node_tests/message_list_view.js
+++ b/frontend_tests/node_tests/message_list_view.js
@@ -10,7 +10,6 @@ const {run_test} = require("../zjsunit/test");
 set_global("document", "document-stub");
 
 const Filter = zrequire("Filter", "js/filter");
-zrequire("FetchStatus", "js/fetch_status");
 zrequire("MessageListData", "js/message_list_data");
 const MessageListView = zrequire("MessageListView", "js/message_list_view");
 const message_list = zrequire("message_list");
diff --git a/frontend_tests/node_tests/narrow_activate.js b/frontend_tests/node_tests/narrow_activate.js
index 46b5e29a6f..019ece9f78 100644
--- a/frontend_tests/node_tests/narrow_activate.js
+++ b/frontend_tests/node_tests/narrow_activate.js
@@ -13,7 +13,6 @@ set_global("resize", {
 });
 const stream_data = zrequire("stream_data");
 zrequire("Filter", "js/filter");
-zrequire("FetchStatus", "js/fetch_status");
 zrequire("MessageListData", "js/message_list_data");
 zrequire("unread");
 const narrow = zrequire("narrow");
diff --git a/frontend_tests/node_tests/narrow_local.js b/frontend_tests/node_tests/narrow_local.js
index e60572184d..1d54c9adee 100644
--- a/frontend_tests/node_tests/narrow_local.js
+++ b/frontend_tests/node_tests/narrow_local.js
@@ -6,7 +6,6 @@ const {set_global, zrequire} = require("../zjsunit/namespace");
 const {run_test} = require("../zjsunit/test");
 
 const Filter = zrequire("Filter", "js/filter");
-zrequire("FetchStatus", "js/fetch_status");
 const MessageListData = zrequire("MessageListData", "js/message_list_data");
 const narrow_state = zrequire("narrow_state");
 const narrow = zrequire("narrow");
diff --git a/frontend_tests/node_tests/stream_data.js b/frontend_tests/node_tests/stream_data.js
index 6676660523..2132570916 100644
--- a/frontend_tests/node_tests/stream_data.js
+++ b/frontend_tests/node_tests/stream_data.js
@@ -19,7 +19,6 @@ const stream_topic_history = zrequire("stream_topic_history");
 const people = zrequire("people");
 const stream_color = zrequire("stream_color");
 const stream_data = zrequire("stream_data");
-zrequire("FetchStatus", "js/fetch_status");
 zrequire("Filter", "js/filter");
 zrequire("MessageListData", "js/message_list_data");
 zrequire("MessageListView", "js/message_list_view");
diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js
index aad8769c03..73ec286917 100644
--- a/static/js/bundles/app.js
+++ b/static/js/bundles/app.js
@@ -45,7 +45,6 @@ import "../filter";
 import "../poll_widget";
 import "../widgetize";
 import "../submessage";
-import "../fetch_status";
 import "../message_list_data";
 import "../message_list_view";
 import "../message_list";
diff --git a/static/js/fetch_status.js b/static/js/fetch_status.js
index 09428e35c1..702fda4876 100644
--- a/static/js/fetch_status.js
+++ b/static/js/fetch_status.js
@@ -1,5 +1,3 @@
-"use strict";
-
 function max_id_for_messages(messages) {
     let max_id = 0;
     for (const msg of messages) {
@@ -8,7 +6,7 @@ function max_id_for_messages(messages) {
     return max_id;
 }
 
-class FetchStatus {
+export class FetchStatus {
     // The FetchStatus object tracks tracks the state of a
     // message_list_data object, whether rendered in the DOM or not,
     // and is the source of truth for whether the message_list_data
@@ -134,5 +132,3 @@ class FetchStatus {
         );
     }
 }
-module.exports = FetchStatus;
-window.FetchStatus = FetchStatus;
diff --git a/static/js/global.d.ts b/static/js/global.d.ts
index bd890d1949..43b543b846 100644
--- a/static/js/global.d.ts
+++ b/static/js/global.d.ts
@@ -3,7 +3,6 @@
 // remove each declaration when the corresponding module is migrated
 // to TS.
 
-declare let FetchStatus: any;
 declare let Filter: any;
 declare let ListCursor: any;
 declare let MessageListData: any;
diff --git a/static/js/message_list_data.js b/static/js/message_list_data.js
index 01f00cbed2..e11abe0c84 100644
--- a/static/js/message_list_data.js
+++ b/static/js/message_list_data.js
@@ -2,6 +2,7 @@
 
 const _ = require("lodash");
 
+const {FetchStatus} = require("./fetch_status");
 const util = require("./util");
 
 class MessageListData {