From 9a0fc5cc876480bcda982abce87e277da7ca4115 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Sat, 27 Feb 2021 16:14:05 -0800
Subject: [PATCH] js: Convert static/js/user_events.js to ES6 module.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 .eslintrc.json                        |  1 -
 frontend_tests/node_tests/dispatch.js |  3 ++-
 frontend_tests/node_tests/tutorial.js |  2 --
 static/js/bundles/app.js              |  1 -
 static/js/global.d.ts                 |  1 -
 static/js/server_events_dispatch.js   |  1 +
 static/js/user_events.js              | 22 +++++++++-------------
 7 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index cddf306229..8b68bbc003 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -187,7 +187,6 @@
                 "unread": false,
                 "unread_ops": false,
                 "upload_widget": false,
-                "user_events": false,
                 "widgetize": false,
                 "zxcvbn": false
             }
diff --git a/frontend_tests/node_tests/dispatch.js b/frontend_tests/node_tests/dispatch.js
index 5148d41663..5fec609ca2 100644
--- a/frontend_tests/node_tests/dispatch.js
+++ b/frontend_tests/node_tests/dispatch.js
@@ -74,7 +74,8 @@ rewiremock("../../static/js/submessage").with(submessage);
 const typing_events = set_global("typing_events", {});
 const ui = set_global("ui", {});
 const unread_ops = set_global("unread_ops", {});
-const user_events = set_global("user_events", {});
+const user_events = {__esModule: true};
+rewiremock("../../static/js/user_events").with(user_events);
 const user_groups = {__esModule: true};
 
 rewiremock("../../static/js/user_groups").with(user_groups);
diff --git a/frontend_tests/node_tests/tutorial.js b/frontend_tests/node_tests/tutorial.js
index d44d5afb0c..4c86e9a535 100644
--- a/frontend_tests/node_tests/tutorial.js
+++ b/frontend_tests/node_tests/tutorial.js
@@ -373,8 +373,6 @@ run_test("add_user_event", () => {
 
 const noop = () => {};
 
-zrequire("user_events");
-
 run_test("update_user_event", (override) => {
     const new_bob = {
         email: "bob@example.com",
diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js
index 83fbabff45..585aaf12e6 100644
--- a/static/js/bundles/app.js
+++ b/static/js/bundles/app.js
@@ -33,7 +33,6 @@ import "../notifications";
 import "../message_events";
 import "../server_events";
 import "../zulip";
-import "../user_events";
 import "../timerender";
 import "../hotspots";
 import "../templates";
diff --git a/static/js/global.d.ts b/static/js/global.d.ts
index 8a21ba1e77..2e469f4fbf 100644
--- a/static/js/global.d.ts
+++ b/static/js/global.d.ts
@@ -57,7 +57,6 @@ declare let ui: any;
 declare let unread: any;
 declare let unread_ops: any;
 declare let upload_widget: any;
-declare let user_events: any;
 declare let widgetize: any;
 
 interface JQuery {
diff --git a/static/js/server_events_dispatch.js b/static/js/server_events_dispatch.js
index 5ad84836de..ba0ee43109 100644
--- a/static/js/server_events_dispatch.js
+++ b/static/js/server_events_dispatch.js
@@ -24,6 +24,7 @@ import * as stream_data from "./stream_data";
 import * as stream_events from "./stream_events";
 import * as stream_topic_history from "./stream_topic_history";
 import * as submessage from "./submessage";
+import * as user_events from "./user_events";
 import * as user_groups from "./user_groups";
 import * as user_status from "./user_status";
 
diff --git a/static/js/user_events.js b/static/js/user_events.js
index bec827753b..2646376292 100644
--- a/static/js/user_events.js
+++ b/static/js/user_events.js
@@ -1,19 +1,17 @@
-"use strict";
-
 // This module is kind of small, but it will help us keep
 // server_events.js simple while breaking some circular
 // dependencies that existed when this code was in people.js.
 // (We should do bot updates here too.)
-const activity = require("./activity");
-const compose = require("./compose");
-const gear_menu = require("./gear_menu");
-const message_live_update = require("./message_live_update");
-const narrow_state = require("./narrow_state");
-const people = require("./people");
-const pm_list = require("./pm_list");
-const settings_config = require("./settings_config");
+import * as activity from "./activity";
+import * as compose from "./compose";
+import * as gear_menu from "./gear_menu";
+import * as message_live_update from "./message_live_update";
+import * as narrow_state from "./narrow_state";
+import * as people from "./people";
+import * as pm_list from "./pm_list";
+import * as settings_config from "./settings_config";
 
-exports.update_person = function update(person) {
+export const update_person = function update(person) {
     const person_obj = people.get_by_user_id(person.user_id);
 
     if (!person_obj) {
@@ -106,5 +104,3 @@ exports.update_person = function update(person) {
         person_obj.bot_owner_id = person.bot_owner_id;
     }
 };
-
-window.user_events = exports;