diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0913182d1..79b3bd11c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,4 +70,4 @@ jobs: node-version: "20" cache: "npm" - run: npm ci - - run: npx prettier --check . + - run: npx biome format . diff --git a/biome.json b/biome.json index d5f38ddd3..89d5e8288 100644 --- a/biome.json +++ b/biome.json @@ -9,7 +9,7 @@ "enabled": true }, "files": { - "ignoreUnknown": false + "ignoreUnknown": true }, "formatter": { "enabled": true, diff --git a/package-lock.json b/package-lock.json index 1ab775282..c0caf3114 100644 --- a/package-lock.json +++ b/package-lock.json @@ -76,7 +76,6 @@ "css-loader": "^7.1.2", "d3": "^7.9.0", "eslint": "^9.21.0", - "eslint-config-prettier": "^10.1.1", "eslint-formatter-gha": "^1.5.2", "eslint-plugin-jest": "^29.0.1", "eslint-webpack-plugin": "^5.0.0", @@ -11266,22 +11265,6 @@ } } }, - "node_modules/eslint-config-prettier": { - "version": "10.1.5", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz", - "integrity": "sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==", - "dev": true, - "license": "MIT", - "bin": { - "eslint-config-prettier": "bin/cli.js" - }, - "funding": { - "url": "https://opencollective.com/eslint-config-prettier" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, "node_modules/eslint-formatter-gha": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/eslint-formatter-gha/-/eslint-formatter-gha-1.5.2.tgz", diff --git a/src/client/graphics/layers/EventsDisplay.ts b/src/client/graphics/layers/EventsDisplay.ts index f1bd977be..40621a87c 100644 --- a/src/client/graphics/layers/EventsDisplay.ts +++ b/src/client/graphics/layers/EventsDisplay.ts @@ -470,6 +470,9 @@ export class EventsDisplay extends LitElement implements Layer { }, ], createdAt: this.game.ticks(), + description: translateText("events_display.request_alliance", { + name: requestor.name(), + }), duration: this.game.config().allianceRequestDuration() - 20, // 2 second buffer focusID: update.requestorID, priority: 0, @@ -477,6 +480,7 @@ export class EventsDisplay extends LitElement implements Layer { // Recipient sent a separate request, so they became allied without the recipient responding. return requestor.isAlliedWith(recipient); }, + type: MessageType.ALLIANCE_REQUEST, }); }