diff --git a/src/node/i18n/index.ts b/src/node/i18n/index.ts index 2bd7b18e9..daf271299 100644 --- a/src/node/i18n/index.ts +++ b/src/node/i18n/index.ts @@ -1,7 +1,7 @@ import i18next, { init } from "i18next" import * as en from "./locales/en.json" -import * as zhCn from "./locales/zh-cn.json" import * as th from "./locales/th.json" +import * as zhCn from "./locales/zh-cn.json" init({ lng: "en", fallbackLng: "en", // language to use if translations in user language are not available. diff --git a/src/node/routes/login.ts b/src/node/routes/login.ts index db796343d..73575e8ac 100644 --- a/src/node/routes/login.ts +++ b/src/node/routes/login.ts @@ -5,8 +5,8 @@ import * as path from "path" import { CookieKeys } from "../../common/http" import { rootPath } from "../constants" import { authenticated, getCookieOptions, redirect, replaceTemplates } from "../http" -import { getPasswordMethod, handlePasswordValidation, sanitizeString, escapeHtml } from "../util" import i18n from "../i18n" +import { getPasswordMethod, handlePasswordValidation, sanitizeString, escapeHtml } from "../util" // RateLimiter wraps around the limiter library for logins. // It allows 2 logins every minute plus 12 logins every hour. diff --git a/test/e2e/routes.test.ts b/test/e2e/routes.test.ts index 253a60e7b..2ac87d002 100644 --- a/test/e2e/routes.test.ts +++ b/test/e2e/routes.test.ts @@ -1,5 +1,5 @@ -import { describe, test, expect } from "./baseFixture" import { clean, getMaybeProxiedPathname } from "../utils/helpers" +import { describe, test, expect } from "./baseFixture" const routes = ["/", "/vscode", "/vscode/"] @@ -103,7 +103,7 @@ describe("VS Code Routes with no workspace or folder", ["--disable-workspace-tru // Closing the folder should stop the redirecting. await codeServerPage.navigate("/?ew=true") - let url = new URL(codeServerPage.page.url()) + const url = new URL(codeServerPage.page.url()) const pathname = getMaybeProxiedPathname(url) expect(pathname).toBe("/") expect(url.search).toBe("?ew=true") diff --git a/test/unit/node/routes/vscode.test.ts b/test/unit/node/routes/vscode.test.ts index ac6fb36da..a5a4fb72d 100644 --- a/test/unit/node/routes/vscode.test.ts +++ b/test/unit/node/routes/vscode.test.ts @@ -1,6 +1,6 @@ +import { mockLogger } from "../../../utils/helpers" import * as httpserver from "../../../utils/httpserver" import * as integration from "../../../utils/integration" -import { mockLogger } from "../../../utils/helpers" describe("vscode", () => { let codeServer: httpserver.HttpServer | undefined diff --git a/test/utils/globalE2eSetup.ts b/test/utils/globalE2eSetup.ts index 107dc85fa..1c146cea7 100644 --- a/test/utils/globalE2eSetup.ts +++ b/test/utils/globalE2eSetup.ts @@ -1,8 +1,8 @@ +import { promises as fs } from "fs" +import * as path from "path" import { workspaceDir } from "./constants" import { clean, tmpdir } from "./helpers" import * as wtfnode from "./wtfnode" -import * as path from "path" -import { promises as fs } from "fs" /** * Perform workspace cleanup and authenticate. This should be ran before e2e