Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false
trim_trailing_whitespace = true
insert_final_newline = true
3 changes: 3 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:
- name: Run npm audit
run: npm audit --audit-level=high

- name: Check formatting
run: npx vp fmt --check

- name: Run lint
run: npm run lint

Expand Down
20 changes: 10 additions & 10 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{
"$schema": "./node_modules/oxlint/configuration_schema.json",
"plugins": [
"oxc",
"typescript",
"unicorn",
"react"
],
"plugins": ["oxc", "typescript", "unicorn", "react"],
"categories": {
"correctness": "warn"
},
Expand All @@ -19,9 +14,7 @@
],
"overrides": [
{
"files": [
"**/*.{ts,tsx}"
],
"files": ["**/*.{ts,tsx}"],
"rules": {
"constructor-super": "error",
"for-direction": "error",
Expand Down Expand Up @@ -130,6 +123,13 @@
"node": true,
"es2020": true
}
},
{
"files": ["tests/**/*.{ts,tsx}", "scripts/**/*.{ts,tsx}"],
"env": {
"node": true,
"es2020": true
}
}
]
}
}
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dist
server/dist
node_modules
package-lock.json
server/data
*.md
docker-compose*.yml
5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["oxc.oxc-vscode"]
}
2 changes: 1 addition & 1 deletion astro/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pfcontrol-astro",
"private": true,
"version": "0.0.0",
"private": true,
"type": "module",
"scripts": {
"dev": "astro dev --port 4321",
Expand Down
2 changes: 1 addition & 1 deletion astro/src/env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ declare module '@app/islands/FlightContent' {
props: FlightContentProps
) => import('react').JSX.Element;
export default FlightContent;
}
}
2 changes: 1 addition & 1 deletion astro/src/lib/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export async function fetchApi<T>(path: string): Promise<T | null> {
} catch {
return null;
}
}
}
2 changes: 1 addition & 1 deletion astro/src/lib/siteOrigin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ export function getSiteOrigin(request: Request): string {
}

return url.origin;
}
}
2 changes: 1 addition & 1 deletion astro/src/lib/spaSeo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ export const SPA_WEB_APPLICATION_LD = {
name: 'Cephie Studios',
url: SPA_SITE_URL,
},
};
};
2 changes: 1 addition & 1 deletion astro/src/lib/submitSeo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,4 @@ export function buildSubmitSessionSeo(
'@graph': graph,
},
};
}
}
2 changes: 1 addition & 1 deletion astro/src/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ export const onRequest = defineMiddleware(async (_context, next) => {
});
}
return response;
});
});
2 changes: 1 addition & 1 deletion astro/src/styles/global.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "tailwindcss";
@import 'tailwindcss';

@source "../../../src/**/*.{ts,tsx}";
@source "../../src/**/*.astro";
Expand Down
39 changes: 22 additions & 17 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,47 @@
import js from "@eslint/js";
import globals from "globals";
import reactHooks from "eslint-plugin-react-hooks";
import reactRefresh from "eslint-plugin-react-refresh";
import tseslint from "typescript-eslint";
import { defineConfig, globalIgnores } from "eslint/config";
import js from '@eslint/js';
import globals from 'globals';
import reactHooks from 'eslint-plugin-react-hooks';
import reactRefresh from 'eslint-plugin-react-refresh';
import tseslint from 'typescript-eslint';
import { defineConfig, globalIgnores } from 'eslint/config';

export default defineConfig([
globalIgnores(["dist/**", "server/dist/**", "src/utils/hateSpeechFilter.ts", "astro/.astro/**"]),
globalIgnores([
'dist/**',
'server/dist/**',
'src/utils/hateSpeechFilter.ts',
'astro/.astro/**',
]),
{
files: ["**/*.{ts,tsx}"],
files: ['**/*.{ts,tsx}'],
extends: [
js.configs.recommended,
tseslint.configs.recommended,
reactHooks.configs["recommended-latest"],
reactHooks.configs['recommended-latest'],
reactRefresh.configs.vite,
],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
},
rules: {
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"warn",
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': [
'warn',
{
argsIgnorePattern: "^_",
varsIgnorePattern: "^_",
caughtErrorsIgnorePattern: "^_",
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
caughtErrorsIgnorePattern: '^_',
},
],
},
},
{
files: ["server/**/*.ts"],
files: ['server/**/*.ts'],
languageOptions: {
globals: {
...globals.node,
},
},
},
]);
]);
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 33 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pfcontrol-2",
"private": true,
"version": "0.0.0",
"private": true,
"type": "module",
"scripts": {
"dev": "set NODE_ENV=development && npm run generate:developer-docs && concurrently \"vp dev\" \"npx nodemon\"",
Expand All @@ -18,8 +18,8 @@
"test": "vitest run",
"test:watch": "vitest",
"lint": "eslint .",
"format:check": "prettier --check .",
"format": "prettier --write .",
"format:check": "vp fmt --check",
"format": "vp fmt",
"type-check": "tsc --noEmit",
"postinstall": "node scripts/verify-node-modules.mjs"
},
Expand Down Expand Up @@ -82,36 +82,6 @@
"socket.io-client": "^4.8.1",
"tailwindcss": "^4.1.13"
},
"overrides": {
"react-floater": {
"react": "$react",
"react-dom": "$react-dom"
},
"@jridgewell/sourcemap-codec": "1.5.5"
},
"optionalDependencies": {
"@esbuild/linux-x64": "0.27.7",
"@img/sharp-libvips-linux-x64": "1.2.4",
"@img/sharp-libvips-linuxmusl-x64": "1.2.4",
"@img/sharp-linux-x64": "0.34.5",
"@img/sharp-linuxmusl-x64": "0.34.5",
"@oxfmt/binding-linux-x64-gnu": "0.46.0",
"@oxfmt/binding-linux-x64-musl": "0.46.0",
"@oxlint/binding-linux-x64-gnu": "1.61.0",
"@oxlint/binding-linux-x64-musl": "1.61.0",
"@resvg/resvg-js-linux-x64-gnu": "2.6.2",
"@resvg/resvg-js-linux-x64-musl": "2.6.2",
"@rolldown/binding-linux-x64-gnu": "1.0.0-rc.15",
"@rolldown/binding-linux-x64-musl": "1.0.0-rc.15",
"@rollup/rollup-linux-x64-gnu": "4.60.3",
"@rollup/rollup-linux-x64-musl": "4.60.3",
"@tailwindcss/oxide-linux-x64-gnu": "4.3.0",
"@tailwindcss/oxide-linux-x64-musl": "4.3.0",
"@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.20",
"@voidzero-dev/vite-plus-linux-x64-musl": "0.1.20",
"lightningcss-linux-x64-gnu": "1.32.0",
"lightningcss-linux-x64-musl": "1.32.0"
},
"devDependencies": {
"@eslint/js": "^9.36.0",
"@types/cookie-parser": "^1.4.9",
Expand All @@ -134,13 +104,42 @@
"eslint-plugin-react-refresh": "^0.4.20",
"globals": "^16.4.0",
"nodemon": "^3.1.10",
"prettier": "^3.6.2",
"ts-node": "^10.9.2",
"tsx": "^4.20.6",
"typescript": "~5.8.3",
"typescript-eslint": "^8.44.0",
"vite": "^8.0.8",
"vite-plus": "^0.1.16",
"vitest": "^4.1.8"
},
"optionalDependencies": {
"@esbuild/linux-x64": "0.27.7",
"@img/sharp-libvips-linux-x64": "1.2.4",
"@img/sharp-libvips-linuxmusl-x64": "1.2.4",
"@img/sharp-linux-x64": "0.34.5",
"@img/sharp-linuxmusl-x64": "0.34.5",
"@oxfmt/binding-linux-x64-gnu": "0.46.0",
"@oxfmt/binding-linux-x64-musl": "0.46.0",
"@oxlint/binding-linux-x64-gnu": "1.61.0",
"@oxlint/binding-linux-x64-musl": "1.61.0",
"@resvg/resvg-js-linux-x64-gnu": "2.6.2",
"@resvg/resvg-js-linux-x64-musl": "2.6.2",
"@rolldown/binding-linux-x64-gnu": "1.0.0-rc.15",
"@rolldown/binding-linux-x64-musl": "1.0.0-rc.15",
"@rollup/rollup-linux-x64-gnu": "4.60.3",
"@rollup/rollup-linux-x64-musl": "4.60.3",
"@tailwindcss/oxide-linux-x64-gnu": "4.3.0",
"@tailwindcss/oxide-linux-x64-musl": "4.3.0",
"@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.20",
"@voidzero-dev/vite-plus-linux-x64-musl": "0.1.20",
"lightningcss-linux-x64-gnu": "1.32.0",
"lightningcss-linux-x64-musl": "1.32.0"
},
"overrides": {
"@jridgewell/sourcemap-codec": "1.5.5",
"react-floater": {
"react": "$react",
"react-dom": "$react-dom"
}
}
}
Loading
Loading