Skip to content

Commit

Permalink
Merge pull request #868 from frontendnetwork/staging
Browse files Browse the repository at this point in the history
Staging → Prod
  • Loading branch information
philipbrembeck authored Nov 15, 2024
2 parents 2354969 + 8573bee commit 44e180e
Show file tree
Hide file tree
Showing 15 changed files with 353 additions and 253 deletions.
45 changes: 0 additions & 45 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ jobs:
node-version: "20"

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 9.12.1

Expand Down
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
}
],
"eslint.options": {
"overrideConfigFile": ".eslintrc.json"
"overrideConfigFile": "eslint.config.mjs"
},
"eslint.useFlatConfig": true,
"eslint.enable": true,
"typescript.tsdk": "node_modules/typescript",
"typescript.enablePromptUseWorkspaceTsdk": true
}
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@ or if you find something else you could improve, just open a new issue for it!

### Premium Supporters

<a href="https://uptimerobot.com">
<picture>
<source srcset="https://github.com/user-attachments/assets/2ae2e9eb-5099-4962-87fb-a99a0b069e29" media="(prefers-color-scheme: dark)" width="120">
<img src="https://github.com/user-attachments/assets/638da2ff-755d-4343-acc1-330e41fbda95" width="120">
</picture>
</a>

<a href="https://veganism.social/@mvtracing">
<picture>
<source srcset="https://user-images.githubusercontent.com/4144601/218593453-28333f8a-3e24-46d2-8bc9-856eb2e4a390.png" media="(prefers-color-scheme: dark)" width="120">
Expand Down
66 changes: 66 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import nextPlugin from "@next/eslint-plugin-next";
import reactPlugin from "eslint-plugin-react";
import hooksPlugin from "eslint-plugin-react-hooks";
import tsPlugin from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import importPlugin from "eslint-plugin-import";
import reactCompiler from 'eslint-plugin-react-compiler'

export default [
{
languageOptions: {
ecmaVersion: 2022,
sourceType: "module",
parser: tsParser,
parserOptions: {
project: "./tsconfig.json"
}
},
plugins: {
react: reactPlugin,
'react-hooks': hooksPlugin,
"@typescript-eslint": tsPlugin,
"import": importPlugin,
"@next/next": nextPlugin,
'react-compiler': reactCompiler,
},
files: ["**/*.{js,jsx,ts,tsx}"],
settings: {
"import/resolver": {
"typescript": {
"project": "./tsconfig.json"
},
"node": true
}
},
rules: {
...reactPlugin.configs['jsx-runtime'].rules,
...nextPlugin.configs.recommended.rules,
...nextPlugin.configs['core-web-vitals'].rules,
...tsPlugin.configs["strict"].rules,
...tsPlugin.configs["stylistic"].rules,
...importPlugin.configs["recommended"].rules,
...importPlugin.configs["typescript"].rules,
...hooksPlugin.configs.recommended.rules,
'react-compiler/react-compiler': 'warn',
"import/order": [
"error",
{
"groups": [
"builtin",
"external",
"internal",
"parent",
"sibling",
"index"
],
"newlines-between": "always",
"alphabetize": {
"order": "asc",
"caseInsensitive": true
}
}
]
}
}
];
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,26 @@
"prom-client": "^15.1.3",
"react": "19.0.0-rc-69d4b800-20241021",
"react-dom": "19.0.0-rc-69d4b800-20241021",
"sass": "^1.80.4",
"sass": "^1.81.0",
"sharp": "^0.33.5",
"typescript": "5.6.3"
},
"devDependencies": {
"@playwright/test": "^1.48.0",
"@playwright/test": "^1.48.2",
"@testing-library/jest-dom": "^6.6.2",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.14",
"@types/react": "npm:types-react@19.0.0-rc.1",
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.11.0",
"@typescript-eslint/typescript-estree": "^8.11.0",
"@typescript-eslint/eslint-plugin": "^8.14.0",
"@typescript-eslint/parser": "^8.14.0",
"@typescript-eslint/typescript-estree": "^8.14.0",
"eslint": "9.13.0",
"eslint-config-next": "15.0.1",
"eslint-config-sznm": "^2.0.3",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-react-compiler": "19.0.0-beta-63b359f-20241101",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"ts-node": "^10.9.2"
Expand Down
Loading

0 comments on commit 44e180e

Please sign in to comment.