Merge pull request #973 from thelounge/xpaw/use-require

Use require() instead of import in client code

client/.eslintrc.yml

@@ -1,3 +0,0 @@
----
-parserOptions:
-  sourceType: module

client/js/libs/handlebars/colorClass.js

@@ -1,3 +1,5 @@
+"use strict";
+
 // Generates a string from "color-1" to "color-32" based on an input string
 module.exports = function(str) {
 	var hash = 0;

client/js/libs/handlebars/diff.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var diff;
 
 module.exports = function(a, opt) {

client/js/libs/handlebars/equal.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(a, b, opt) {
 	a = a.toString();
 	b = b.toString();

client/js/libs/handlebars/localedate.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(time) {
 	return new Date(time).toLocaleDateString();
 };

client/js/libs/handlebars/localetime.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(time) {
 	return new Date(time).toLocaleString();
 };

client/js/libs/handlebars/modes.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(mode) {
 	var modes = {
 		"~": "owner",

client/js/libs/handlebars/parse.js

@@ -1,5 +1,7 @@
-import Handlebars from "handlebars/runtime";
+"use strict";
-import URI from "urijs";
+
+const Handlebars = require("handlebars/runtime");
+const URI = require("urijs");
 
 module.exports = function(text) {
 	text = Handlebars.Utils.escapeExpression(text);

client/js/libs/handlebars/roundBadgeNumber.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(count) {
 	if (count < 1000) {
 		return count;

client/js/libs/handlebars/tojson.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(context) {
 	return window.JSON.stringify(context);
 };

client/js/libs/handlebars/tz.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(time) {
 	time = new Date(time);
 	var h = time.getHours();

client/js/libs/handlebars/users.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(count) {
 	return count + " " + (count === 1 ? "user" : "users");
 };

client/js/libs/slideout.js

@@ -1,7 +1,9 @@
+"use strict";
+
 /**
  * Simple slideout menu implementation.
  */
-export default function slideoutMenu(viewport, menu) {
+module.exports = function slideoutMenu(viewport, menu) {
 	var touchStartPos = null;
 	var touchCurPos = null;
 	var touchStartTime = 0;
@@ -98,4 +100,4 @@ export default function slideoutMenu(viewport, menu) {
 			return menuIsOpen;
 		}
 	};
-}
+};

client/js/lounge.js

@@ -1,18 +1,20 @@
+"use strict";
+
 // vendor libraries
-import "jquery-ui/ui/widgets/sortable";
+require("jquery-ui/ui/widgets/sortable");
-import $ from "jquery";
+const $ = require("jquery");
-import io from "socket.io-client";
+const io = require("socket.io-client");
-import Mousetrap from "mousetrap";
+const Mousetrap = require("mousetrap");
-import URI from "urijs";
+const URI = require("urijs");
 
 // our libraries
-import "./libs/jquery/inputhistory";
+require("./libs/jquery/inputhistory");
-import "./libs/jquery/stickyscroll";
+require("./libs/jquery/stickyscroll");
-import "./libs/jquery/tabcomplete";
+require("./libs/jquery/tabcomplete");
-import helpers_parse from "./libs/handlebars/parse";
+const helpers_parse = require("./libs/handlebars/parse");
-import helpers_roundBadgeNumber from "./libs/handlebars/roundBadgeNumber";
+const helpers_roundBadgeNumber = require("./libs/handlebars/roundBadgeNumber");
-import slideoutMenu from "./libs/slideout";
+const slideoutMenu = require("./libs/slideout");
-import templates from "../views";
+const templates = require("../views");
 
 $(function() {
 	var path = window.location.pathname + "socket.io/";

client/views/index.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = {
 	actions: {
 		action: require("./actions/action.tpl"),

webpack.config.js

@@ -74,6 +74,7 @@ let config = {
 
 if (process.env.NODE_ENV === "production") {
 	config.plugins.push(new webpack.optimize.UglifyJsPlugin({
+		sourceMap: true,
 		comments: false
 	}));
 } else {