Skip to content

Commit

Permalink
chore: replaced ESLint & Prettier with Biome, reformatted the project…
Browse files Browse the repository at this point in the history
…, added lint & format check to pipeline
  • Loading branch information
jurerotar committed May 15, 2024
1 parent 35c34df commit cc35b0a
Show file tree
Hide file tree
Showing 171 changed files with 1,112 additions and 3,699 deletions.
110 changes: 0 additions & 110 deletions .eslintrc

This file was deleted.

6 changes: 6 additions & 0 deletions .github/workflows/develop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,11 @@ jobs:
- name: Type check
run: npm run type-check

- name: Lint
run: npm run lint:check

- name: Format
run: npm run format:check

- name: Run tests
run: npm test
6 changes: 6 additions & 0 deletions .github/workflows/master-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,11 @@ jobs:
- name: Type check
run: npm run type-check

- name: Lint
run: npm run lint:check

- name: Format
run: npm run format:check

- name: Run tests
run: npm test
6 changes: 6 additions & 0 deletions .github/workflows/other-branches-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,11 @@ jobs:
- name: Type check
run: npm run type-check

- name: Lint
run: npm run lint:check

- name: Format
run: npm run format:check

- name: Run tests
run: npm test
9 changes: 0 additions & 9 deletions .prettierignore

This file was deleted.

40 changes: 20 additions & 20 deletions __mocks__/game/game-environment.ts
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
import { QueryClient } from '@tanstack/react-query';
import { mapFiltersCacheKey } from 'app/[game]/[map]/hooks/use-map-filters';
import { achievementsCacheKey } from 'app/[game]/hooks/use-achievements';
import { currentServerCacheKey } from 'app/[game]/hooks/use-current-server';
import { effectsCacheKey } from 'app/[game]/hooks/use-effects';
import { eventsCacheKey } from 'app/[game]/hooks/use-events';
import { heroCacheKey } from 'app/[game]/hooks/use-hero';
import { mapCacheKey } from 'app/[game]/hooks/use-map';
import { playersCacheKey } from 'app/[game]/hooks/use-players';
import { questsCacheKey } from 'app/[game]/hooks/use-quests';
import { reportsCacheKey } from 'app/[game]/hooks/use-reports';
import { reputationsCacheKey } from 'app/[game]/hooks/use-reputations';
import { researchLevelsCacheKey } from 'app/[game]/hooks/use-research-levels';
import { villagesCacheKey } from 'app/[game]/hooks/use-villages';
import { currentServerCacheKey } from 'app/[game]/hooks/use-current-server';
import { Achievement } from 'interfaces/models/game/achievement';
import { Village } from 'interfaces/models/game/village';
import { Effect } from 'interfaces/models/game/effect';
import { Hero } from 'interfaces/models/game/hero';
import { Tile } from 'interfaces/models/game/tile';
import { Quest } from 'interfaces/models/game/quest';
import { ResearchLevel } from 'interfaces/models/game/research-level';
import { Server } from 'interfaces/models/game/server';
import { GameEvent } from 'interfaces/models/events/game-event';
import { Report } from 'interfaces/models/game/report';
import { serverMock } from 'mocks/models/game/server-mock';
import { Player } from 'interfaces/models/game/player';
import { playersCacheKey } from 'app/[game]/hooks/use-players';
import { Reputation } from 'interfaces/models/game/reputation';
import { reputationsCacheKey } from 'app/[game]/hooks/use-reputations';
import { mapFiltersCacheKey } from 'app/[game]/[map]/hooks/use-map-filters';
import { MapFilters } from 'interfaces/models/game/map-filters';
import { mapFiltersMock } from 'mocks/game/map-filters-mock';
import type { GameEvent } from 'interfaces/models/events/game-event';
import type { Achievement } from 'interfaces/models/game/achievement';
import type { Effect } from 'interfaces/models/game/effect';
import type { Hero } from 'interfaces/models/game/hero';
import type { MapFilters } from 'interfaces/models/game/map-filters';
import type { Player } from 'interfaces/models/game/player';
import type { Quest } from 'interfaces/models/game/quest';
import type { Report } from 'interfaces/models/game/report';
import type { Reputation } from 'interfaces/models/game/reputation';
import type { ResearchLevel } from 'interfaces/models/game/research-level';
import type { Server } from 'interfaces/models/game/server';
import type { Tile } from 'interfaces/models/game/tile';
import type { Village } from 'interfaces/models/game/village';
import { heroMock } from 'mocks/game/hero-mock';
import { reputationsMock } from 'mocks/game/reputations-mock';
import { mapFiltersMock } from 'mocks/game/map-filters-mock';
import { playersMock } from 'mocks/game/players-mock';
import { reputationsMock } from 'mocks/game/reputations-mock';
import { villagesMock } from 'mocks/game/villages-mock';
import { serverMock } from 'mocks/models/game/server-mock';

const { id: serverId, slug } = serverMock;

Expand Down
2 changes: 1 addition & 1 deletion __mocks__/game/hero-mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Hero } from 'interfaces/models/game/hero';
import type { Hero } from 'interfaces/models/game/hero';
import { serverMock } from 'mocks/models/game/server-mock';

const { id: serverId } = serverMock;
Expand Down
2 changes: 1 addition & 1 deletion __mocks__/game/map-filters-mock.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { MapFilters } from 'interfaces/models/game/map-filters';
import { serverMock } from 'mocks/models/game/server-mock';
import { MapFilters } from 'interfaces/models/game/map-filters';

const { id: serverId } = serverMock;

Expand Down
2 changes: 1 addition & 1 deletion __mocks__/game/players-mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Player } from 'interfaces/models/game/player';
import type { Player } from 'interfaces/models/game/player';
import { playerMock } from 'mocks/models/game/player-mock';

export const playersMock: Player[] = [playerMock];
2 changes: 1 addition & 1 deletion __mocks__/game/reputations-mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Reputation } from 'interfaces/models/game/reputation';
import type { Reputation } from 'interfaces/models/game/reputation';
import { npcReputationMock, playerReputationMock } from 'mocks/models/game/reputation-mock';

export const reputationsMock: Reputation[] = [
Expand Down
2 changes: 1 addition & 1 deletion __mocks__/game/villages-mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Village } from 'interfaces/models/game/village';
import type { Village } from 'interfaces/models/game/village';
import { villageMock } from 'mocks/models/game/village/village-mock';

export const villagesMock: Village[] = [villageMock];
6 changes: 3 additions & 3 deletions __mocks__/models/game/event-mock.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { GameEvent, GameEventType } from 'interfaces/models/events/game-event';
import { villageMock } from 'mocks/models/game/village/village-mock';
import { serverMock } from 'mocks/models/game/server-mock';
import { getBuildingData } from 'app/[game]/utils/common';
import { type GameEvent, GameEventType } from 'interfaces/models/events/game-event';
import { serverMock } from 'mocks/models/game/server-mock';
import { villageMock } from 'mocks/models/game/village/village-mock';

const cranny = getBuildingData('CRANNY');

Expand Down
2 changes: 1 addition & 1 deletion __mocks__/models/game/player-mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Player } from 'interfaces/models/game/player';
import type { Player } from 'interfaces/models/game/player';

export const playerMock: Player = {
id: '42c53448-ab04-4ae3-8ce5-dccad55162a7',
Expand Down
2 changes: 1 addition & 1 deletion __mocks__/models/game/reputation-mock.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Reputation } from 'interfaces/models/game/reputation';
import { serverMock } from 'mocks/models/game/server-mock';
import { Reputation } from 'interfaces/models/game/reputation';

export const playerReputationMock: Reputation = {
serverId: serverMock.id,
Expand Down
2 changes: 1 addition & 1 deletion __mocks__/models/game/server-mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Server } from 'interfaces/models/game/server';
import type { Server } from 'interfaces/models/game/server';

export const serverMock: Server = {
seed: '23223ca711',
Expand Down
2 changes: 1 addition & 1 deletion __mocks__/models/game/village/building-fields-mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BuildingField } from 'interfaces/models/game/village';
import type { BuildingField } from 'interfaces/models/game/village';

export const newVillageBuildingFieldsMock: BuildingField[] = [
{
Expand Down
2 changes: 1 addition & 1 deletion __mocks__/models/game/village/resource-fields-mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BuildingField } from 'interfaces/models/game/village';
import type { BuildingField } from 'interfaces/models/game/village';

export const resourceFields00018Mock: BuildingField[] = [
{
Expand Down
6 changes: 3 additions & 3 deletions __mocks__/models/game/village/village-mock.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Village } from 'interfaces/models/game/village';
import { serverMock } from 'mocks/models/game/server-mock';
import type { Village } from 'interfaces/models/game/village';
import { playerMock } from 'mocks/models/game/player-mock';
import { resourceFields4446Mock } from './resource-fields-mock';
import { serverMock } from 'mocks/models/game/server-mock';
import { newVillageBuildingFieldsMock } from './building-fields-mock';
import { resourceFields4446Mock } from './resource-fields-mock';

const { id: serverId } = serverMock;
const { id: playerId } = playerMock;
Expand Down
41 changes: 41 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"$schema": "https://biomejs.dev/schemas/1.7.3/schema.json",
"formatter": {
"enabled": true,
"formatWithErrors": false,
"indentStyle": "space",
"indentWidth": 2,
"lineEnding": "lf",
"lineWidth": 140,
"attributePosition": "multiline",
"ignore": ["./build", "./coverage", "./dist", "./out", "./public", "./.husky", "./.github", "./docs"]
},
"organizeImports": { "enabled": true },
"linter": {
"enabled": true,
"rules": {
"recommended": true,
"correctness": {
"noUnusedVariables": "error"
},
"style": {
"noNonNullAssertion": "off"
}
},
"ignore": ["*.js", "*.json", "node_modules/"]
},
"javascript": {
"formatter": {
"jsxQuoteStyle": "double",
"quoteProperties": "asNeeded",
"trailingComma": "es5",
"semicolons": "always",
"arrowParentheses": "always",
"bracketSpacing": true,
"bracketSameLine": false,
"quoteStyle": "single",
"attributePosition": "multiline"
}
},
"overrides": [{ "include": ["*.config.ts"], "linter": { "rules": {} } }]
}
Loading

0 comments on commit cc35b0a

Please sign in to comment.