[refactor] build: use single .js extension instead of .jsx and .es6

authorizer/authorizer-client.es6 → authorizer/authorizer-client.js

@@ -5,9 +5,9 @@
 
 module.exports = (core, config, store) => {
 	const React = require("react"),
-		  handleAuthErrors = require("./handleAuthErrors.es6"),
-		  ToggleGroup = require("../ui/components/toggle-group.jsx")(core, config, store),
-		  ToggleSwitch = require("../ui/components/toggle-switch.jsx")(core, config, store);
+		  handleAuthErrors = require("./handleAuthErrors.js"),
+		  ToggleGroup = require("../ui/components/toggle-group.js")(core, config, store),
+		  ToggleSwitch = require("../ui/components/toggle-switch.js")(core, config, store);
 
 	class Authorizer extends React.Component {
 		constructor(props) {

authorizer/invites.es6 → authorizer/invites.js

@@ -3,7 +3,7 @@
 "use strict";
 
 module.exports = (core, config, store) => {
-	const promisedAction = require("../lib/promised-action.es6")(core, config, store),
+	const promisedAction = require("../lib/promised-action.js")(core, config, store),
 		getRoomPics = require("../../lib/get-room-pics.js");
 
 	core.on("pref-show", tabs => {

authorizer/requests.es6 → authorizer/requests.js

@@ -5,7 +5,7 @@
 const getAvatar = require("../lib/get-avatar.js");
 
 module.exports = (core, config, store) => {
-	const promisedAction = require("../lib/promised-action.es6")(core, config, store);
+	const promisedAction = require("../lib/promised-action.js")(core, config, store);
 
 	core.on("conf-show", tabs => {
 		let container = document.createElement("div"),

email/email-client.es6 → email/email-client.js

@@ -4,8 +4,8 @@
 
 module.exports = (core, config, store) => {
 	const React = require("react"),
-		  ToggleGroup = require("../ui/components/toggle-group.jsx")(core, config, store),
-		  ToggleSwitch = require("../ui/components/toggle-switch.jsx")(core, config, store);
+		  ToggleGroup = require("../ui/components/toggle-group.js")(core, config, store),
+		  ToggleSwitch = require("../ui/components/toggle-switch.js")(core, config, store);
 
 	class EmailConfig extends React.Component {
 		constructor(props) {

gulpfile.babel.js

@@ -29,7 +29,7 @@ import manifest from "gulp-manifest";
 import config from "./server-config-defaults.js";
 
 const babelify = babel.configure({
-	extensions: [ ".es6", ".jsx" ],
+	ignore: "**/bower_components/**",
 	optional: [
 		"runtime",
 		"validation.react"
@@ -47,7 +47,7 @@ const debug = !(gutil.env.production || config.env === "production"),
 	},
 	files = {
 		js: [
-			"**/*.js", "**/*.es6", "**/*.jsx", "!**/*.min.js",
+			"**/*.js", "!**/*.min.js",
 			"!node_modules/**", "!bower_components/**",
 			"!public/s/**/*.js"
 		],
@@ -171,7 +171,7 @@ gulp.task("bower", () =>
 
 // Build browserify bundles
 gulp.task("bundle", () =>
-	bundle("ui/app.es6", {
+	bundle("ui/app.js", {
 		transform: [ babelify, optional ]
 	}, bundled => bundled
 		.pipe(sourcemaps.init({ loadMaps: true }))

notification/desktop-notifications.es6 → notification/desktop-notifications.js

@@ -3,7 +3,7 @@
 "use strict";
 
 module.exports = (core, config, store) => {
-	const NotificationItem = require("./notification-item.es6")(core, config, store);
+	const NotificationItem = require("./notification-item.js")(core, config, store);
 
 	core.on("note-dn", note => {
 		if (typeof note.dismissTime === "number" || note.score < 70) {

notification/notification-center-item.jsx → notification/notification-center-item.js

@@ -6,7 +6,7 @@ const React = require("react"),
 	  friendlyTime = require("../lib/friendly-time.js");
 
 module.exports = (core, ...args) => {
-	const NotificationItem = require("./notification-item.es6")(core, ...args);
+	const NotificationItem = require("./notification-item.js")(core, ...args);
 
 	class NotificationCenterItem extends React.Component {
 		constructor(props) {

notification/notification-center.jsx → notification/notification-center.js

@@ -5,7 +5,7 @@
 const React = require("react");
 
 module.exports = (core, config, store) => {
-	const NotificationCenterItem = require("./notification-center-item.jsx")(core, config, store);
+	const NotificationCenterItem = require("./notification-center-item.js")(core, config, store);
 
 	class NotificationCenter extends React.Component {
 		constructor(props) {

notification/notification-client.js

@@ -0,0 +1,9 @@
+/* eslint-env es6 */
+
+"use strict";
+
+module.exports = (...args) => {
+	require("./notification-handler.js")(...args);
+	require("./desktop-notifications.js")(...args);
+	require("./titlebar-ticker.js")(...args);
+};

notification/titlebar-ticker.es6 → notification/titlebar-ticker.js

@@ -3,7 +3,7 @@
 "use strict";
 
 module.exports = (core, config, store) => {
-	const NotificationItem = require("./notification-item.es6")(core, config, store),
+	const NotificationItem = require("./notification-item.js")(core, config, store),
 		  regexUtils = require("../lib/regex-utils.js"),
 		  audio = "data:audio/wav;base64,UklGRnQGAABXQVZFZm10IBAAAAABAAEAESsAABErAAABAAgAZGF0YU8GAACBgIF/gn2Cf4B+gn5+fYJ/gIF/gH+BfX6AfXt5fXx7e3x9fH1+f4CAfnx9f3t9gIB9en2Dfn58fYKDgIJ9hnh7hIZ8gYR6fHyCe4GCioF+gH93foWCgoJ5gHx5gniAeYJ0dneCgXN1jn1+fI1zfHp8dYiCe3qIhHpmfXqMeZJ0ACb/AAD//wAAQ/8A3pYANv/qYek5OGp3tICeexjYUkWgYMzzAB//hDyVcX2Yi5ppXLNsXYKEZ3l7aHGTn1pnlZlwVpuUgqOKgIOMYIpsoXVydJKdc296kZl3h3OAcoV6ao6Be298ipCFhIFxk3yIeXNuh4eHiYh/c3h1eJCUenCCfH9yeZSKcHR7eH9ugYl+eImFfWxuhX1uiIx+gYZmg355hHlzgXl1dIeWdGmciXpteYWMc3GOfntye5Khh1+beoaFgmJ5k4KUe3CXim2GdJaFYXmec1GomG97b4mZcnCIbX6EbX6LbWd1e4B0d4x6cXuKcoKMdoB5eZt9doh0e32Ag5CSgnOEkIWBgX6AeYqRenJ9hoKDhIR6gIBte42DeHuFhm18g35we4x9dnmBgHp+bniBfIF2eYB3fYV3dX+FdIOCf3Z7foF8e4mAfHuCdn+Lc3WKhXyEhnt7goF4foSDhH17f4uFfnp/io90c4OBfHuCg4JyhIxycH2JgnuDiHl8hH98dIODdIKBeIZ8fHeCiXx+f3SIf3V7eYSCdHuCgnh6hIFzioV3gYuAeXl9e4V7e3+JgnV6gIJ7hIiCe3yIinx9hYGAhX17h4OBfICFfIiFfHh9hn93gnp2hYR6foF4dn9/dX1/eX9/dHN+goB3eoF8fHt6f316fIF6gIF8eH2Cgnt/goV6iHx3iIR6f4CDg3uGg3yAiIN9g4B/gn+CgX59hn96fn+FfX59f4SCgIR7foJ7fYGAfoF6f4F5fHyDfXmFfnt5hIB5fn1/fX1+gHl9foN8fYGCfoCGen6AgoB/gH9/g3p8fYWGfXqDhH17gIOCfn+CeoCDg3p6fIGFfXp/gYR9dYN/gX57e359foJ9foGAf357gICAfIJ7fn16hoV6fXyAgX+Bfn5+gnl5gYSBfH19e4h7fISEeIB+gH+Ed3+Cf3p6hX2Af3qAfX5/fn98f4GBgHt3gYZ/fX99gHx8gH97hoR3gX5/g3l+g31/g315f4N8fX+AgX6Af35+gH6AgX97foCCfX99gn1+gYF7gIR9en+DgH59f319gYB8fn1/f32Be3uCgXx+fYR/fH2Cf31+foKEfHyBg31/fn5/goJ7gIaAfX9/gn+Bgn56g4J/goF/foB/gIB/fn+Bf3uAgn96f398gIB/fnyAgHx9fn5+f3p+gnx9f3x/f398f399gH9/fn6Df3yBf39/gIB9f4F/gYF+f4CCfoF/f4KCgICAf4KAg4B+f4KCfX59goN9fYB/gIB6gH99fICAfX1/gnx7fYB/gXx9fn5/fn99fX5+fX5+fn5/f39/gX5/gnx+gIF/foCCfn2Af4J+foGBgX9/f4CCfIGAgYF/f36AgYB+gIGAgH2AgX99gH9/gH2Af3+AfXx9gHx+fHyAfX5+fH2Agnt7f35/fX9/f39/fXp+gH5+goB9f39/gn59gX+Af31/gIB/f39/gH6AgICBfoCEf4B+f4KBf4B/gYGDfn+Af4B/fn59foF+foKBfn9+fHyAfn5+fn+BeX+Fg3N7hX58gH+Afn6FdHuIgnh+g4B6e4iGeHqFhXh7g3+Af36Ag4SAeX+Een1+g4V7en6Ef3+AgX9/f4B+fHx+foJ/fH6ChHx9foGBg3t5foJ/f3x+fYF+f31+gICBgX5/f4F+fn5/fX59fn9+gIOAf3+Af4B9fn9+gX9+gX+BfoGBgIB/f31/gn+CfIB/fYF+f36Bf35/foB/f398gX+Af31/f4CBf358gIKAfn9+gn2Af35+gn99f36Bf31+f3+Af399f4CBfoCAfX+BfX+AgH6AgH9+gIZ9fYJ/iIB3fIt/dISBgHx/f4OFf32AgX53fIOCe4KBfn2Ben57f3t4f4N9gH6BgYKAgHl/gn1/f4N/f36DgoCBfoJ+eX17gH18e4F/fYB+hX6Dg4OBgIB8fHt+f39+fX9/foKBgIGEf31/gX6AgoGDfoCEf32BAA==";
 

store/rule-manager.es6 → store/rule-manager.js

@@ -2,8 +2,8 @@
 
 module.exports = (...args) => {
 	require("./rules/loadRooms.js")(...args);
-	require("./rules/loadRelatedUsers.es6")(...args);
-	require("./rules/handleUserPresence.es6")(...args);
+	require("./rules/loadRelatedUsers.js")(...args);
+	require("./rules/handleUserPresence.js")(...args);
 	require("./rules/preLoadThreads.js")(...args);
 	require("./rules/preLoadTexts.js")(...args);
 	require("./rules/resetNavRanges.js")(...args);
@@ -20,6 +20,6 @@ module.exports = (...args) => {
 	require("./rules/selectedTexts.js")(...args);
 	require("./rules/removeRelations.js")(...args);
 	require("./rules/embedNavigate.js")(...args);
-	require("./rules/dissmissNoteOnNav.es6")(...args);
-	require("./rules/clearQueuedActions.es6")(...args);
+	require("./rules/dissmissNoteOnNav.js")(...args);
+	require("./rules/clearQueuedActions.js")(...args);
 };

store/rules/handleUserPresence.es6 → store/rules/handleUserPresence.js

@@ -2,7 +2,7 @@
 
 module.exports = function(core, config, store) {
 	var userUtils = require("./../../lib/user-utils.js"),
-		promisedAction = require("../../lib/promised-action.es6")(core),
+		promisedAction = require("../../lib/promised-action.js")(core),
 		permissionLevels = require("./../../authorizer/permissionWeights.js"),
 		queueBack = [];
 

store/store.js

@@ -296,9 +296,9 @@ Store.prototype.isRoomWritable = function(roomId, userId) {
 module.exports = function(core, config) {
 	var store = new Store([ state ]);
 
-	require("./state-manager.es6")(core, config, store, state);
-	require("./action-handler.es6")(core, config, store, state);
-	require("./rule-manager.es6")(core, config, store, state);
+	require("./state-manager.js")(core, config, store, state);
+	require("./action-handler.js")(core, config, store, state);
+	require("./rule-manager.js")(core, config, store, state);
 	require("./socket.js")(core, config, store, state);
 	require("./session-manager.js")(core, config, store, state);
 	require("./guest-params-handler.js")(core, config, store, state);

threader/threader-client.es6 → threader/threader-client.js

@@ -4,7 +4,7 @@
 
 module.exports = (core, config, store) => {
 	const React = require("react"),
-		  ToggleSwitch = require("../ui/components/toggle-switch.jsx")(core, config, store);
+		  ToggleSwitch = require("../ui/components/toggle-switch.js")(core, config, store);
 
 	class ThreadSettings extends React.Component {
 		constructor(props) {

ui/app.es6 → ui/app.js

@@ -35,54 +35,54 @@ window.store = store = require("./../store/store.js")(core, config);
 let args = [ core, config, store ];
 
 // Trunks
-require("../widget/widget-client.es6")(...args);
+require("../widget/widget-client.js")(...args);
 require("../history/history-client.js")(...args);
 
 // Apps
-require("../notification/notification-client.es6")(...args);
+require("../notification/notification-client.js")(...args);
 require("../anti-abuse/anti-abuse-client.js")(...args);
-require("../authorizer/authorizer-client.es6")(...args);
-require("../authorizer/requests.es6")(...args);
-// require("../authorizer/invites.es6")(...args);
-require("../email/email-client.es6")(...args);
+require("../authorizer/authorizer-client.js")(...args);
+require("../authorizer/requests.js")(...args);
+// require("../authorizer/invites.js")(...args);
+require("../email/email-client.js")(...args);
 require("../http/notifications-client.js")(...args);
 require("../http/room-general-settings-client.js")(...args);
 require("../http/seo-client.js")(...args);
 require("../http/user-profile-settings-client.js")(...args);
 require("../irc/irc-client.js")(...args);
-require("../threader/threader-client.es6")(...args);
+require("../threader/threader-client.js")(...args);
 require("../twitter/twitter-client.js")(...args);
-require("../customization/customization-client.es6")(...args);
-require("../authorizer/error-handlers.es6")(...args);
+require("../customization/customization-client.js")(...args);
+require("../authorizer/error-handlers.js")(...args);
 
 // User menu providers
 require("../browserid-auth/browserid-auth-client.js")(...args);
 require("../facebook/facebook-client.js")(...args);
 require("../github/github-client.js")(...args);
 require("../google/google-client.js")(...args);
 require("../push-notification/gcm-client.js")(...args);
-require("../http/logout-client.es6")(...args);
+require("../http/logout-client.js")(...args);
 
 // Modules
-require("./modules/menu-listeners.es6")(...args);
-require("./modules/dialogs-listeners.es6")(...args);
+require("./modules/menu-listeners.js")(...args);
+require("./modules/dialogs-listeners.js")(...args);
 require("./modules/settings-room.js")(...args);
 require("./modules/settings-user.js")(...args);
-require("./modules/view-manager.es6")(...args);
+require("./modules/view-manager.js")(...args);
 require("./modules/swipes.js")(...args);
 require("./modules/ui-handle-errors.js")(...args);
-require("../store/init-user-up-manager.es6")(...args);
-require("../store/add-user-timezone.es6")(...args);
+require("../store/init-user-up-manager.js")(...args);
+require("../store/add-user-timezone.js")(...args);
 
 // Render the client
-require("./components/client.jsx")(...args);
+require("./components/client.js")(...args);
 
 // Miscellaneous
-require("./misc/fontloader.es6")(...args);
-require("./misc/appcache.es6")(...args);
-require("./misc/google-analytics.es6")(...args);
-require("./misc/load-indicator.es6")(...args);
-require("./misc/workarounds.es6")(...args);
+require("./misc/fontloader.js")(...args);
+require("./misc/appcache.js")(...args);
+require("./misc/google-analytics.js")(...args);
+require("./misc/load-indicator.js")(...args);
+require("./misc/workarounds.js")(...args);
 
 // Initialize
 require("../init/init.js")(...args);

ui/components/appbar-primary.jsx → ui/components/appbar-primary.js

@@ -11,9 +11,9 @@ const showMenu = require("../utils/show-menu.js"),
 
 module.exports = function(core, config, store) {
 	const React = require("react"),
-		  Badge = require("./badge.jsx")(core, config, store),
-		  NotificationCenter = require("../../notification/notification-center.jsx")(core, config, store),
-		  FollowButton = require("./follow-button.jsx")(core, config, store);
+		  Badge = require("./badge.js")(core, config, store),
+		  NotificationCenter = require("../../notification/notification-center.js")(core, config, store),
+		  FollowButton = require("./follow-button.js")(core, config, store);
 
 	let AppbarPrimary = React.createClass({
 		toggleSidebarRight: function() {

ui/components/banner.jsx → ui/components/banner.js

@@ -8,7 +8,7 @@ var format = require("../../lib/format.js"),
 
 module.exports = function(core, config, store) {
 	var React = require("react"),
-		RoomNameEntry = require("./room-name-entry.jsx")(core, config, store),
+		RoomNameEntry = require("./room-name-entry.js")(core, config, store),
 		Banner;
 
 	Banner = React.createClass({

ui/components/chat-area-messages.jsx → ui/components/chat-area-messages.js

@@ -4,7 +4,7 @@
 
 module.exports = function(core, config, store) {
 	const React = require("react"),
-		  ChatItem = require("./chat-item.jsx")(core, config, store),
+		  ChatItem = require("./chat-item.js")(core, config, store),
 		  Endless = require("../../bower_components/endless/endless.js"),
 		  rangeOps = require("../../lib/range-ops.js");
 

ui/components/chat-area.jsx → ui/components/chat-area.js

@@ -4,11 +4,11 @@
 
 module.exports = function(core, config, store) {
 	const React = require("react"),
-		  ChatAreaMessages = require("./chat-area-messages.jsx")(core, config, store),
-		  ScrollTo = require("./scroll-to.jsx")(core, config, store),
-		  Compose = require("./compose.jsx")(core, config, store),
-		  PrivateRoom = require("./private-room.jsx")(core, config, store),
-		  NoSuchRoom = require("./no-such-room.jsx")(core, config, store);
+		  ChatAreaMessages = require("./chat-area-messages.js")(core, config, store),
+		  ScrollTo = require("./scroll-to.js")(core, config, store),
+		  Compose = require("./compose.js")(core, config, store),
+		  PrivateRoom = require("./private-room.js")(core, config, store),
+		  NoSuchRoom = require("./no-such-room.js")(core, config, store);
 
 	let ChatArea = React.createClass({
 		scrollToBottom: function() {

ui/components/client.jsx → ui/components/client.js

@@ -4,18 +4,18 @@
 
 module.exports = function(core, config, store) {
 	var React = require("react"),
-		Landing = require("./landing.jsx")(core, config, store),
-		Banner = require("./banner.jsx")(core, config, store),
-		AppbarPrimary = require("./appbar-primary.jsx")(core, config, store),
-		CallToActionBar = require("./calltoactionbar.jsx")(core, config, store),
-		ConnectionStatus = require("./connectionstatus.jsx")(core, config, store),
-		SidebarRight = require("./sidebar-right.jsx")(core, config, store),
-		ChatArea = require("./chat-area.jsx")(core, config, store),
-		RoomList = require("./room-list.jsx")(core, config, store),
-		ThreadList = require("./thread-list.jsx")(core, config, store),
-		Footer = require("./footer.jsx")(core, config, store),
-		CreateRoomButton = require("./create-room-button.jsx")(core, config, store),
-		CurrentDialog = require("../dialogs/current-dialog.es6")(core, config, store),
+		Landing = require("./landing.js")(core, config, store),
+		Banner = require("./banner.js")(core, config, store),
+		AppbarPrimary = require("./appbar-primary.js")(core, config, store),
+		CallToActionBar = require("./calltoactionbar.js")(core, config, store),
+		ConnectionStatus = require("./connectionstatus.js")(core, config, store),
+		SidebarRight = require("./sidebar-right.js")(core, config, store),
+		ChatArea = require("./chat-area.js")(core, config, store),
+		RoomList = require("./room-list.js")(core, config, store),
+		ThreadList = require("./thread-list.js")(core, config, store),
+		Footer = require("./footer.js")(core, config, store),
+		CreateRoomButton = require("./create-room-button.js")(core, config, store),
+		CurrentDialog = require("../dialogs/current-dialog.js")(core, config, store),
 		Client;
 
 	Client = React.createClass({

ui/components/compose.jsx → ui/components/compose.js

@@ -8,10 +8,10 @@ const gen = require("../../lib/generate.browser.js"),
 
 module.exports = function(core, config, store) {
 	var React = require("react"),
-		TextArea = require("./textarea.jsx")(core, config, store),
-		Suggestions = require("./suggestions.jsx")(core, config, store),
-		FileUpload = require("./file-upload.jsx")(core, config, store),
-		Loader = require("./loader.jsx")(core, config, store),
+		TextArea = require("./textarea.js")(core, config, store),
+		Suggestions = require("./suggestions.js")(core, config, store),
+		FileUpload = require("./file-upload.js")(core, config, store),
+		Loader = require("./loader.js")(core, config, store),
 		Compose;
 
 	Compose = React.createClass({

ui/components/file-upload.jsx → ui/components/file-upload.js

@@ -2,7 +2,7 @@
 
 "use strict";
 
-const S3Upload = require("../../lib/s3-upload.es6");
+const S3Upload = require("../../lib/s3-upload.js");
 
 module.exports = core => {
 	const React = require("react");

ui/components/landing.jsx → ui/components/landing.js

@@ -4,7 +4,7 @@ var userUtils = require("../../lib/user-utils.js");
 
 module.exports = function(core, config, store) {
 	var React = require("react"),
-		RoomNameEntry = require("./room-name-entry.jsx")(core, config, store),
+		RoomNameEntry = require("./room-name-entry.js")(core, config, store),
 		Landing;
 
 	Landing = React.createClass({

ui/components/no-such-room.jsx → ui/components/no-such-room.js

@@ -4,7 +4,7 @@
 
 module.exports = (core, config, store) => {
 	const React = require("react"),
-		  CreateRoomButton = require("./create-room-button.jsx")(core, config, store);
+		  CreateRoomButton = require("./create-room-button.js")(core, config, store);
 
 	class NoSuchRoom extends React.Component {
 		constructor(props) {

ui/components/people-list.jsx → ui/components/people-list.js

@@ -2,8 +2,8 @@
 
 module.exports = function(core, config, store) {
 	var React = require("react"),
-		ListView = require("./list-view.jsx")(core, config, store),
-		PeopleListItem = require("./people-list-item.jsx")(core, config, store),
+		ListView = require("./list-view.js")(core, config, store),
+		PeopleListItem = require("./people-list-item.js")(core, config, store),
 		PeopleList;
 
 	PeopleList = React.createClass({

ui/components/private-room.jsx → ui/components/private-room.js

@@ -4,7 +4,7 @@
 
 module.exports = (core, config, store) => {
 	const React = require("react"),
-		  FollowButton = require("./follow-button.jsx")(core, config, store);
+		  FollowButton = require("./follow-button.js")(core, config, store);
 
 	class PrivateRoom extends React.Component {
 		constructor(props) {