Skip to content
Merged
Show file tree
Hide file tree
Changes from 20 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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ jobs:
poetry run python manage.py test'

frontend_lint:
name: eslint & stylelint
name: biome
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -213,7 +213,8 @@ jobs:
cache-dependency-path: frontend/yarn.lock
- name: Install frontend dependencies
run: cd frontend && yarn --frozen-lockfile
- run: cd frontend && yarn lint
- name: Run Biome
run: cd frontend && yarn lint

mypy:
name: mypy
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"recommendations": [
"EditorConfig.EditorConfig",
"dbaeumer.vscode-eslint",
"stylelint.vscode-stylelint",
"bradlc.vscode-tailwindcss",
"biomejs.biome",
]
}
11 changes: 6 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
],
"eslint.format.enable": true,
"[javascript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true,
},
"[javascriptreact]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true,
},
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true,
},
"[typescriptreact]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true,
},
// stylelint
Expand All @@ -39,5 +39,6 @@
"mypy-type-checker.args": [
"--config-file=backend/mypy.ini"
],
"editor.formatOnSave": true
"json.format.enable": false,
"json.format.keepLines": true
}
405 changes: 222 additions & 183 deletions backend/poetry.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ package-mode = false

[tool.poetry.dependencies]
python = "^3.10"
django-cors-headers = "^4.5.0"
django-cors-headers = "^4.6.0"
django-environ = "^0.11.2"
django-filter = "^24.3"
djangorestframework = "^3.15.2"
psycopg2-binary = "^2.9.10"
jwt = "^1.3.1"
PyGithub = "^2.4.0"
PyGithub = "^2.5.0"
drf-extensions = "^0.7.1"
tzdata = "2024.2"
Pillow = "11.0"
Expand All @@ -23,11 +23,11 @@ django-resized = "^1.0.3"
django-cleanup = "^9.0.0"
m2c = {git="https://github.com/matt-kempster/m2c.git"}
asm-differ = {git="https://github.com/simonlindholm/asm-differ.git"}
sentry-sdk = "^2.17.0"
sentry-sdk = "^2.19.0"
django-session-timeout = "^0.1.0"
django = "^5.1.2"
django = "^5.1.3"
requests = "^2.32.3"
setuptools = "^75.2.0"
setuptools = "^75.6.0"

[tool.poetry.group.dev.dependencies]
black = "^24.10.0"
Expand Down
146 changes: 0 additions & 146 deletions frontend/.eslintrc.json

This file was deleted.

74 changes: 74 additions & 0 deletions frontend/biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
"vcs": {
"enabled": false,
"clientKind": "git",
"useIgnoreFile": false
},
"files": {
"ignoreUnknown": false,
"ignore": [".next", "cache", "node_modules"]
},
"formatter": {
"enabled": true,
"indentStyle": "space",
"indentWidth": 4
},
"organizeImports": {
"enabled": false
},
"linter": {
"enabled": true,
"rules": {
"recommended": true,
"style": {
"useImportType": "off",
"useTemplate": "off",
"noUselessElse": "off",
"noParameterAssign": "off",
"useNumberNamespace": "off",
"useDefaultParameterLast": "off",
"useEnumInitializers": "off",
"useSingleVarDeclarator": "off",
"useSelfClosingElements": "off",
"useNodejsImportProtocol": "off"
},
"a11y": {
"useValidAnchor": "off",
"useSemanticElements": "off",
"noLabelWithoutControl": "off",
"useButtonType": "off",
"useKeyWithClickEvents": "off",
"noNoninteractiveTabindex": "off"
},
"suspicious": {
"noExplicitAny": "off",
"noArrayIndexKey": "off",
"noDoubleEquals": "off",
"noAssignInExpressions": "off",
"noConfusingVoidType": "off",
"noImplicitAnyLet": "off"
},
"correctness": {
"useExhaustiveDependencies": "off",
"noUnreachable": "off",
"noUnnecessaryContinue": "off"
},
"complexity": {
"useLiteralKeys": "off",
"useOptionalChain": "off",
"noForEach": "off",
"noUselessFragments": "off"
},
"performance": {
"noDelete": "off",
"noAccumulatingSpread": "off"
}
}
},
"javascript": {
"formatter": {
"enabled": false
}
}
}
2 changes: 1 addition & 1 deletion frontend/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
8 changes: 2 additions & 6 deletions frontend/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ try {

const { withPlausibleProxy } = require("next-plausible")

const withPWA = require("next-pwa")({
dest: "public",
disable: !getEnvBool("FRONTEND_PWA"),
})
const removeImports = require("next-remove-imports")({
//test: /node_modules([\s\S]*?)\.(tsx|ts|js|mjs|jsx)$/,
//matchImports: "\\.(less|css|scss|sass|styl)$"
Expand All @@ -40,7 +36,7 @@ const mediaUrl = new URL(process.env.MEDIA_URL ?? "http://localhost")

let app = withPlausibleProxy({
customDomain: "https://stats.decomp.me",
})(removeImports(withPWA({
})(removeImports({
async redirects() {
return [
{
Expand Down Expand Up @@ -163,7 +159,7 @@ let app = withPlausibleProxy({
NEXT_PUBLIC_GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
NEXT_PUBLIC_COMMIT_HASH: git_hash,
},
})))
}))

if (process.env.ANALYZE == "true") {
app = require("@next/bundle-analyzer")(app)
Expand Down
Loading