From 39c6fa4acea5656911a756367e60a1de6b23a9c0 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulipchat.com>
Date: Sat, 25 Apr 2020 17:11:51 -0700
Subject: [PATCH] xo: Enable @typescript-eslint/member-ordering.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
---
 app/renderer/js/components/functional-tab.ts | 11 ++++++-----
 app/renderer/js/components/server-tab.ts     | 10 +++++-----
 app/renderer/js/components/webview.ts        |  8 ++++----
 app/renderer/js/utils/logger-util.ts         |  2 +-
 package.json                                 |  1 -
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/renderer/js/components/functional-tab.ts b/app/renderer/js/components/functional-tab.ts
index 8def1ef3..2e5ca3c0 100644
--- a/app/renderer/js/components/functional-tab.ts
+++ b/app/renderer/js/components/functional-tab.ts
@@ -2,6 +2,12 @@ import Tab, { TabProps } from './tab';
 
 export default class FunctionalTab extends Tab {
 	$closeButton: Element;
+
+	constructor(props: TabProps) {
+		super(props);
+		this.init();
+	}
+
 	template(): string {
 		return `<div class="tab functional-tab" data-tab-id="${this.props.tabIndex}">
 					<div class="server-tab-badge close-button">
@@ -13,11 +19,6 @@ export default class FunctionalTab extends Tab {
 				</div>`;
 	}
 
-	constructor(props: TabProps) {
-		super(props);
-		this.init();
-	}
-
 	init(): void {
 		this.$el = this.generateNodeFromTemplate(this.template());
 		if (this.props.name !== 'Settings') {
diff --git a/app/renderer/js/components/server-tab.ts b/app/renderer/js/components/server-tab.ts
index 08352daf..c1fc9207 100644
--- a/app/renderer/js/components/server-tab.ts
+++ b/app/renderer/js/components/server-tab.ts
@@ -6,6 +6,11 @@ import * as SystemUtil from '../utils/system-util';
 export default class ServerTab extends Tab {
 	$badge: Element;
 
+	constructor(props: TabProps) {
+		super(props);
+		this.init();
+	}
+
 	template(): string {
 		return `<div class="tab" data-tab-id="${this.props.tabIndex}">
 					<div class="server-tooltip" style="display:none">${this.props.name}</div>
@@ -17,11 +22,6 @@ export default class ServerTab extends Tab {
 				</div>`;
 	}
 
-	constructor(props: TabProps) {
-		super(props);
-		this.init();
-	}
-
 	init(): void {
 		this.$el = this.generateNodeFromTemplate(this.template());
 		this.props.$root.append(this.$el);
diff --git a/app/renderer/js/components/webview.ts b/app/renderer/js/components/webview.ts
index 8ee3438e..31822311 100644
--- a/app/renderer/js/components/webview.ts
+++ b/app/renderer/js/components/webview.ts
@@ -28,6 +28,10 @@ interface WebViewProps {
 }
 
 export default class WebView extends BaseComponent {
+	// This is required because in main.js we access WebView.method as
+	// webview[method].
+	[key: string]: any;
+
 	props: WebViewProps;
 	zoomFactor: number;
 	badgeCount: number;
@@ -37,10 +41,6 @@ export default class WebView extends BaseComponent {
 	$el: Electron.WebviewTag;
 	domReady?: Promise<void>;
 
-	// This is required because in main.js we access WebView.method as
-	// webview[method].
-	[key: string]: any;
-
 	constructor(props: WebViewProps) {
 		super();
 
diff --git a/app/renderer/js/utils/logger-util.ts b/app/renderer/js/utils/logger-util.ts
index 9594dbf0..32b5ba0d 100644
--- a/app/renderer/js/utils/logger-util.ts
+++ b/app/renderer/js/utils/logger-util.ts
@@ -45,11 +45,11 @@ const browserConsole: PatchedConsole = console;
 const logDir = `${app.getPath('userData')}/Logs`;
 
 export default class Logger {
+	[key: string]: any;
 	nodeConsole: PatchedConsole;
 	timestamp?: () => string;
 	level: boolean;
 	logInDevMode: boolean;
-	[key: string]: any;
 
 	constructor(options: LoggerOptions = {}) {
 		let {
diff --git a/package.json b/package.json
index 7be8c77f..9bd27ee0 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,6 @@
   },
   "xo": {
     "rules": {
-      "@typescript-eslint/member-ordering": "off",
       "@typescript-eslint/no-dynamic-delete": "off",
       "@typescript-eslint/no-unused-vars": "off",
       "@typescript-eslint/prefer-readonly-parameter-types": "off",