From 30bedc1fe4f830ce77e03bb4d71e52f3db80e42e Mon Sep 17 00:00:00 2001
From: Sundar Guntnur <sundargs2000@github.com>
Date: Sat, 3 Apr 2021 23:36:32 +0530
Subject: [PATCH] src: Convert CommonJS modules to ES6 modules

---
 .babelrc                   |  2 +-
 package-lock.json          |  6 ++++++
 package.json               |  1 +
 src/api.js                 |  4 ++--
 src/events_wrapper.js      |  6 +++---
 src/helper.js              |  6 +++---
 src/index.js               | 29 ++++++++++++++---------------
 src/resources/accounts.js  |  4 ++--
 src/resources/emojis.js    |  4 ++--
 src/resources/events.js    |  4 ++--
 src/resources/filters.js   |  4 ++--
 src/resources/messages.js  |  4 ++--
 src/resources/queues.js    |  4 ++--
 src/resources/reactions.js |  4 ++--
 src/resources/server.js    |  4 ++--
 src/resources/streams.js   |  4 ++--
 src/resources/typing.js    |  4 ++--
 src/resources/users.js     |  4 ++--
 18 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/.babelrc b/.babelrc
index 2fdda15..c05c2ee 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,4 @@
 {
   "presets": ["@babel/preset-env"],
-  "plugins": ["@babel/plugin-transform-runtime"]
+  "plugins": ["@babel/plugin-transform-runtime", "add-module-exports"]
 }
diff --git a/package-lock.json b/package-lock.json
index b8af9c8..d45d8dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1397,6 +1397,12 @@
       "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
       "dev": true
     },
+    "babel-plugin-add-module-exports": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-1.0.4.tgz",
+      "integrity": "sha512-g+8yxHUZ60RcyaUpfNzy56OtWW+x9cyEe9j+CranqLiqbju2yf/Cy6ZtYK40EZxtrdHllzlVZgLmcOUCTlJ7Jg==",
+      "dev": true
+    },
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
diff --git a/package.json b/package.json
index 76a2292..def2ef4 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "@babel/core": "^7.12.10",
     "@babel/plugin-transform-runtime": "^7.12.10",
     "@babel/preset-env": "^7.12.10",
+    "babel-plugin-add-module-exports": "^1.0.4",
     "chai": "^4.2.0",
     "eslint": "^7.15.0",
     "eslint-config-airbnb": "^18.2.1",
diff --git a/src/api.js b/src/api.js
index dbd2cbf..619fc30 100644
--- a/src/api.js
+++ b/src/api.js
@@ -1,4 +1,4 @@
-const helper = require('./helper');
+import helper from './helper';
 
 async function api(baseUrl, config, method, params) {
   const url = new URL(baseUrl);
@@ -45,4 +45,4 @@ async function api(baseUrl, config, method, params) {
   }
 }
 
-module.exports = api;
+export default api;
diff --git a/src/events_wrapper.js b/src/events_wrapper.js
index 7f54f5f..6e7e83d 100644
--- a/src/events_wrapper.js
+++ b/src/events_wrapper.js
@@ -1,5 +1,5 @@
-const queues = require('./resources/queues');
-const events = require('./resources/events');
+import queues from './resources/queues';
+import events from './resources/events';
 
 function sleep(ms) {
   // TODO add jitter.
@@ -72,4 +72,4 @@ function eventsWrapper(config) {
   return callOnEachEvent;
 }
 
-module.exports = eventsWrapper;
+export default eventsWrapper;
diff --git a/src/helper.js b/src/helper.js
index 45935fb..3848047 100644
--- a/src/helper.js
+++ b/src/helper.js
@@ -1,7 +1,7 @@
-const fetch = require('isomorphic-fetch');
-const FormData = require('isomorphic-form-data');
+import fetch from 'isomorphic-fetch';
+import FormData from 'isomorphic-form-data';
 
-module.exports = {
+export default {
   fetch,
   FormData,
 };
diff --git a/src/index.js b/src/index.js
index 82cea08..2ab2e55 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,19 +1,18 @@
 import parseConfigFile from './zuliprc';
 
-const api = require('./api');
-
-const accounts = require('./resources/accounts');
-const streams = require('./resources/streams');
-const messages = require('./resources/messages');
-const queues = require('./resources/queues');
-const events = require('./resources/events');
-const users = require('./resources/users');
-const emojis = require('./resources/emojis');
-const typing = require('./resources/typing');
-const reactions = require('./resources/reactions');
-const server = require('./resources/server');
-const filters = require('./resources/filters');
-const eventsWapper = require('./events_wrapper');
+import api from './api';
+import accounts from './resources/accounts';
+import streams from './resources/streams';
+import messages from './resources/messages';
+import queues from './resources/queues';
+import events from './resources/events';
+import users from './resources/users';
+import emojis from './resources/emojis';
+import typing from './resources/typing';
+import reactions from './resources/reactions';
+import server from './resources/server';
+import filters from './resources/filters';
+import eventsWapper from './events_wrapper';
 
 function getCallEndpoint(config) {
   return function callEndpoint(endpoint, method = 'GET', params) {
@@ -64,4 +63,4 @@ async function zulip(initialConfig) {
   return resources(config);
 }
 
-module.exports = zulip;
+export default zulip;
diff --git a/src/resources/accounts.js b/src/resources/accounts.js
index 26c6220..8387e76 100644
--- a/src/resources/accounts.js
+++ b/src/resources/accounts.js
@@ -1,4 +1,4 @@
-const helper = require('../helper');
+import helper from '../helper';
 
 function accounts(config) {
   return {
@@ -16,4 +16,4 @@ function accounts(config) {
   };
 }
 
-module.exports = accounts;
+export default accounts;
diff --git a/src/resources/emojis.js b/src/resources/emojis.js
index aa35d96..f914617 100644
--- a/src/resources/emojis.js
+++ b/src/resources/emojis.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function emojis(config) {
   return {
@@ -9,4 +9,4 @@ function emojis(config) {
   };
 }
 
-module.exports = emojis;
+export default emojis;
diff --git a/src/resources/events.js b/src/resources/events.js
index c95c571..a241103 100644
--- a/src/resources/events.js
+++ b/src/resources/events.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function events(config) {
   return {
@@ -9,4 +9,4 @@ function events(config) {
   };
 }
 
-module.exports = events;
+export default events;
diff --git a/src/resources/filters.js b/src/resources/filters.js
index 8ecd8b4..6876d3b 100644
--- a/src/resources/filters.js
+++ b/src/resources/filters.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function filters(config) {
   return {
@@ -9,4 +9,4 @@ function filters(config) {
   };
 }
 
-module.exports = filters;
+export default filters;
diff --git a/src/resources/messages.js b/src/resources/messages.js
index 75bbf23..5956f93 100644
--- a/src/resources/messages.js
+++ b/src/resources/messages.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function messages(config) {
   const baseURL = `${config.apiURL}/messages`;
@@ -71,4 +71,4 @@ function messages(config) {
   };
 }
 
-module.exports = messages;
+export default messages;
diff --git a/src/resources/queues.js b/src/resources/queues.js
index d5c967b..dd6bb4d 100644
--- a/src/resources/queues.js
+++ b/src/resources/queues.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function queues(config) {
   return {
@@ -17,4 +17,4 @@ function queues(config) {
   };
 }
 
-module.exports = queues;
+export default queues;
diff --git a/src/resources/reactions.js b/src/resources/reactions.js
index b58f906..ddc1d00 100644
--- a/src/resources/reactions.js
+++ b/src/resources/reactions.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function reactions(config) {
   const url = (messageID) => `${config.apiURL}/messages/${messageID}/reactions`;
@@ -13,4 +13,4 @@ function reactions(config) {
   };
 }
 
-module.exports = reactions;
+export default reactions;
diff --git a/src/resources/server.js b/src/resources/server.js
index 83d5f95..1de29b4 100644
--- a/src/resources/server.js
+++ b/src/resources/server.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function server(config) {
   return {
@@ -9,4 +9,4 @@ function server(config) {
   };
 }
 
-module.exports = server;
+export default server;
diff --git a/src/resources/streams.js b/src/resources/streams.js
index d632169..ac47cc4 100644
--- a/src/resources/streams.js
+++ b/src/resources/streams.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function streams(config) {
   return {
@@ -35,4 +35,4 @@ function streams(config) {
   };
 }
 
-module.exports = streams;
+export default streams;
diff --git a/src/resources/typing.js b/src/resources/typing.js
index 0f9fbd4..5801414 100644
--- a/src/resources/typing.js
+++ b/src/resources/typing.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function typing(config) {
   return {
@@ -13,4 +13,4 @@ function typing(config) {
   };
 }
 
-module.exports = typing;
+export default typing;
diff --git a/src/resources/users.js b/src/resources/users.js
index 624faa8..ff4178c 100644
--- a/src/resources/users.js
+++ b/src/resources/users.js
@@ -1,4 +1,4 @@
-const api = require('../api');
+import api from '../api';
 
 function users(config) {
   return {
@@ -45,4 +45,4 @@ function users(config) {
   };
 }
 
-module.exports = users;
+export default users;