CI fixes

Author: strickvl

docs/FAQ.md

@@ -81,7 +81,6 @@ You can change the config file's location using the `--config` flag or
 
 The default location respects `$XDG_CONFIG_HOME`.
 
-
 ## How do I make my keyboard shortcuts work?
 
 Many shortcuts will not work by default, since they'll be "caught" by the browser.

docs/README.md

@@ -61,7 +61,6 @@ code-server.
 We also have an in-depth [setup and
 configuration](https://coder.com/docs/code-server/latest/guide) guide.
 
-
 ## Questions?
 
 See answers to [frequently asked

docs/guide.md

@@ -22,6 +22,9 @@
   - [Proxying to a Svelte app](#proxying-to-a-svelte-app)
   - [Prefixing `/absproxy/<port>` with a path](#prefixing-absproxyport-with-a-path)
   - [Preflight requests](#preflight-requests)
+- [Internationalization and customization](#internationalization-and-customization)
+  - [Available keys and placeholders](#available-keys-and-placeholders)
+  - [Legacy flag](#legacy-flag)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- prettier-ignore-end -->
@@ -468,7 +471,7 @@ Create a JSON file with your custom strings:
 ```json
 {
   "WELCOME": "Welcome to {{app}}",
-  "LOGIN_TITLE": "{{app}} Access Portal", 
+  "LOGIN_TITLE": "{{app}} Access Portal",
   "LOGIN_BELOW": "Please log in to continue",
   "PASSWORD_PLACEHOLDER": "Enter Password"
 }

docs/install.md

@@ -287,7 +287,6 @@ docker run -it --name code-server -p 127.0.0.1:8080:8080 \
   codercom/code-server:latest
 ```
 
-
 Our official image supports `amd64` and `arm64`. For `arm32` support, you can
 use a [community-maintained code-server
 alternative](https://hub.docker.com/r/linuxserver/code-server).

src/node/cli.ts

@@ -285,7 +285,8 @@ export const options: Options<Required<UserProvidedArgs>> = {
   "app-name": {
     type: "string",
     short: "an",
-    description: "Will replace the {{app}} placeholder in any strings, which by default includes the title bar and welcome message",
+    description:
+      "Will replace the {{app}} placeholder in any strings, which by default includes the title bar and welcome message",
   },
   "welcome-text": {
     type: "string",
@@ -465,7 +466,6 @@ export const parse = (
     throw new Error("--cert-key is missing")
   }
 
-
   logger.debug(() => [`parsed ${opts?.configFile ? "config" : "command line"}`, field("args", redactArgs(args))])
 
   return args
@@ -600,7 +600,6 @@ export async function setDefaults(cliArgs: UserProvidedArgs, configArgs?: Config
     args["disable-proxy"] = true
   }
 
-
   const usingEnvHashedPassword = !!process.env.HASHED_PASSWORD
   if (process.env.HASHED_PASSWORD) {
     args["hashed-password"] = process.env.HASHED_PASSWORD

src/node/i18n/index.ts

@@ -24,7 +24,6 @@ const defaultResources = {
   },
 }
 
-
 export async function loadCustomStrings(filePath: string): Promise<void> {
   try {
     // Read custom strings from file path only
@@ -36,12 +35,14 @@ export async function loadCustomStrings(filePath: string): Promise<void> {
       i18next.addResourceBundle(locale, "translation", customStringsData)
     })
   } catch (error) {
-    if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+    if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
       throw new Error(`Custom strings file not found: ${filePath}\nPlease ensure the file exists and is readable.`)
     } else if (error instanceof SyntaxError) {
       throw new Error(`Invalid JSON in custom strings file: ${filePath}\n${error.message}`)
     } else {
-      throw new Error(`Failed to load custom strings from ${filePath}: ${error instanceof Error ? error.message : String(error)}`)
+      throw new Error(
+        `Failed to load custom strings from ${filePath}: ${error instanceof Error ? error.message : String(error)}`,
+      )
     }
   }
 }

test/unit/node/i18n.test.ts

@@ -12,18 +12,21 @@ describe("i18n", () => {
   beforeEach(async () => {
     // Create temporary directory for test files
     tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "code-server-i18n-test-"))
-    
+
     // Create test files
     validJsonFile = path.join(tempDir, "valid.json")
     invalidJsonFile = path.join(tempDir, "invalid.json")
     nonExistentFile = path.join(tempDir, "does-not-exist.json")
 
     // Write valid JSON file
-    await fs.writeFile(validJsonFile, JSON.stringify({
-      "WELCOME": "Custom Welcome",
-      "LOGIN_TITLE": "My Custom App",
-      "LOGIN_BELOW": "Please log in to continue"
-    }))
+    await fs.writeFile(
+      validJsonFile,
+      JSON.stringify({
+        WELCOME: "Custom Welcome",
+        LOGIN_TITLE: "My Custom App",
+        LOGIN_BELOW: "Please log in to continue",
+      }),
+    )
 
     // Write invalid JSON file
     await fs.writeFile(invalidJsonFile, '{"WELCOME": "Missing closing quote}')
@@ -42,44 +45,51 @@ describe("i18n", () => {
 
     it("should throw clear error for non-existent file", async () => {
       await expect(loadCustomStrings(nonExistentFile)).rejects.toThrow(
-        `Custom strings file not found: ${nonExistentFile}\nPlease ensure the file exists and is readable.`
+        `Custom strings file not found: ${nonExistentFile}\nPlease ensure the file exists and is readable.`,
       )
     })
 
     it("should throw clear error for invalid JSON", async () => {
       await expect(loadCustomStrings(invalidJsonFile)).rejects.toThrow(
-        `Invalid JSON in custom strings file: ${invalidJsonFile}`
+        `Invalid JSON in custom strings file: ${invalidJsonFile}`,
       )
     })
 
     it("should handle empty JSON object", async () => {
       const emptyJsonFile = path.join(tempDir, "empty.json")
       await fs.writeFile(emptyJsonFile, "{}")
-      
+
       await expect(loadCustomStrings(emptyJsonFile)).resolves.toBeUndefined()
     })
 
     it("should handle nested JSON objects", async () => {
       const nestedJsonFile = path.join(tempDir, "nested.json")
-      await fs.writeFile(nestedJsonFile, JSON.stringify({
-        "WELCOME": "Hello World",
-        "NESTED": {
-          "KEY": "Value"
-        }
-      }))
-      
+      await fs.writeFile(
+        nestedJsonFile,
+        JSON.stringify({
+          WELCOME: "Hello World",
+          NESTED: {
+            KEY: "Value",
+          },
+        }),
+      )
+
       await expect(loadCustomStrings(nestedJsonFile)).resolves.toBeUndefined()
     })
 
     it("should handle special characters and unicode", async () => {
       const unicodeJsonFile = path.join(tempDir, "unicode.json")
-      await fs.writeFile(unicodeJsonFile, JSON.stringify({
-        "WELCOME": "欢迎来到 code-server",
-        "LOGIN_TITLE": "Willkommen bei {{app}}",
-        "SPECIAL": "Special chars: àáâãäåæçèéêë 🚀 ♠️ ∆"
-      }), "utf8")
-      
+      await fs.writeFile(
+        unicodeJsonFile,
+        JSON.stringify({
+          WELCOME: "欢迎来到 code-server",
+          LOGIN_TITLE: "Willkommen bei {{app}}",
+          SPECIAL: "Special chars: àáâãäåæçèéêë 🚀 ♠️ ∆",
+        }),
+        "utf8",
+      )
+
       await expect(loadCustomStrings(unicodeJsonFile)).resolves.toBeUndefined()
     })
   })
-})
+})

test/unit/node/routes/login.test.ts

@@ -146,6 +146,5 @@ describe("login", () => {
       expect(resp.status).toBe(200)
       expect(htmlContent).toContain(`欢迎来到 code-server`)
     })
-
   })
 })