From 4a345eb6d9489f2b3801ba12e29d436b6ad633f4 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Wed, 18 Dec 2019 00:10:50 +0200
Subject: [PATCH] Convert constants.js to commonjs

---
 .npmignore                             | 1 +
 client/components/App.vue              | 2 +-
 client/components/Message.vue          | 2 +-
 client/components/MessageCondensed.vue | 2 +-
 client/components/MessageList.vue      | 2 +-
 client/js/autocompletion.js            | 3 ++-
 client/js/constants.js                 | 3 ++-
 client/js/router.js                    | 3 ++-
 client/js/socket-events/commands.js    | 2 +-
 client/js/vue.js                       | 3 ++-
 test/client/js/constantsTest.js        | 2 +-
 11 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.npmignore b/.npmignore
index 7a6412fb..e902f20a 100644
--- a/.npmignore
+++ b/.npmignore
@@ -9,6 +9,7 @@
 # Ignore client folder as it's being built into public/ folder
 # except for the specified files which are used by the server
 client/**
+!client/js/constants.js
 !client/js/helpers/ircmessageparser/findLinks.js
 !client/js/helpers/ircmessageparser/cleanIrcMessage.js
 !client/index.html.tpl
diff --git a/client/components/App.vue b/client/components/App.vue
index be4d8e07..0b6d0fe7 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -10,8 +10,8 @@
 </template>
 
 <script>
+const constants = require("../js/constants");
 import throttle from "lodash/throttle";
-import constants from "../js/constants";
 import storage from "../js/localStorage";
 
 import Sidebar from "./Sidebar.vue";
diff --git a/client/components/Message.vue b/client/components/Message.vue
index 11c7c13f..bf3bc941 100644
--- a/client/components/Message.vue
+++ b/client/components/Message.vue
@@ -68,12 +68,12 @@
 </template>
 
 <script>
+const constants = require("../js/constants");
 import dayjs from "dayjs";
 import Username from "./Username.vue";
 import LinkPreview from "./LinkPreview.vue";
 import ParsedMessage from "./ParsedMessage.vue";
 import MessageTypes from "./MessageTypes";
-import constants from "../js/constants";
 
 MessageTypes.ParsedMessage = ParsedMessage;
 MessageTypes.LinkPreview = LinkPreview;
diff --git a/client/components/MessageCondensed.vue b/client/components/MessageCondensed.vue
index 35effab7..b14e6dd6 100644
--- a/client/components/MessageCondensed.vue
+++ b/client/components/MessageCondensed.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import constants from "../js/constants";
+const constants = require("../js/constants");
 import Message from "./Message.vue";
 
 export default {
diff --git a/client/components/MessageList.vue b/client/components/MessageList.vue
index 9c8fec3e..6858141f 100644
--- a/client/components/MessageList.vue
+++ b/client/components/MessageList.vue
@@ -56,7 +56,7 @@
 <script>
 require("intersection-observer");
 
-import constants from "../js/constants";
+const constants = require("../js/constants");
 import clipboard from "../js/clipboard";
 import socket from "../js/socket";
 import Message from "./Message.vue";
diff --git a/client/js/autocompletion.js b/client/js/autocompletion.js
index 1b281563..7fc622e0 100644
--- a/client/js/autocompletion.js
+++ b/client/js/autocompletion.js
@@ -1,11 +1,12 @@
 "use strict";
 
+const constants = require("./constants");
+
 import Mousetrap from "mousetrap";
 import {Textcomplete, Textarea} from "textcomplete";
 import fuzzy from "fuzzy";
 
 import emojiMap from "./helpers/simplemap.json";
-import constants from "./constants";
 import store from "./store";
 
 export default enableAutocomplete;
diff --git a/client/js/constants.js b/client/js/constants.js
index 55c5ab60..b8aacea6 100644
--- a/client/js/constants.js
+++ b/client/js/constants.js
@@ -26,7 +26,8 @@ const timeFormats = {
 	msgWithSeconds: "HH:mm:ss",
 };
 
-export default {
+// This file is required by server, can't use es6 export
+module.exports = {
 	colorCodeMap,
 	commands: [],
 	condensedTypes,
diff --git a/client/js/router.js b/client/js/router.js
index aaf7071b..da12f55c 100644
--- a/client/js/router.js
+++ b/client/js/router.js
@@ -1,5 +1,7 @@
 "use strict";
 
+const constants = require("./constants");
+
 import Vue from "vue";
 import VueRouter from "vue-router";
 
@@ -12,7 +14,6 @@ import Help from "../components/Windows/Help.vue";
 import Changelog from "../components/Windows/Changelog.vue";
 import NetworkEdit from "../components/Windows/NetworkEdit.vue";
 import RoutedChat from "../components/RoutedChat.vue";
-import constants from "./constants";
 import store from "./store";
 
 const router = new VueRouter({
diff --git a/client/js/socket-events/commands.js b/client/js/socket-events/commands.js
index 682e53ce..6bf2cc81 100644
--- a/client/js/socket-events/commands.js
+++ b/client/js/socket-events/commands.js
@@ -1,4 +1,4 @@
-import constants from "../constants";
+const constants = require("../constants");
 import socket from "../socket";
 
 socket.on("commands", function(commands) {
diff --git a/client/js/vue.js b/client/js/vue.js
index 542cb7e7..98116c06 100644
--- a/client/js/vue.js
+++ b/client/js/vue.js
@@ -1,12 +1,13 @@
 "use strict";
 
+const constants = require("./constants");
+
 import Vue from "vue";
 import store from "./store";
 import App from "../components/App.vue";
 import localetime from "./helpers/localetime";
 import storage from "./localStorage";
 import {router, navigate} from "./router";
-import constants from "./constants";
 import socket from "./socket";
 
 Vue.filter("localetime", localetime);
diff --git a/test/client/js/constantsTest.js b/test/client/js/constantsTest.js
index 05e8713a..853d12a9 100644
--- a/test/client/js/constantsTest.js
+++ b/test/client/js/constantsTest.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const expect = require("chai").expect;
-const constants = require("../../../client/js/constants").default;
+const constants = require("../../../client/js/constants");
 
 describe("client-side constants", function() {
 	describe(".colorCodeMap", function() {