Skip to content
Open
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
3 changes: 2 additions & 1 deletion client/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"tabWidth": 2,
"plugins": ["prettier-plugin-tailwindcss"]
"plugins": ["prettier-plugin-tailwindcss"],
"tailwindStylesheet": "./src/styles/globals.css"
}
1 change: 0 additions & 1 deletion client/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"rsc": false,
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"css": "src/styles/globals.css",
"baseColor": "slate",
"cssVariables": true,
Expand Down
72 changes: 53 additions & 19 deletions client/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,21 +1,58 @@
import { FlatCompat } from '@eslint/eslintrc'
import importPlugin from "eslint-plugin-import";
import simpleImportSort from "eslint-plugin-simple-import-sort";
import tsParser from "@typescript-eslint/parser";
// import { FlatCompat } from '@eslint/eslintrc'
//
// const compat = new FlatCompat({
// baseDirectory: import.meta.dirname,
// });
//
// const eslintConfig =[
// ...compat.config({
// extends: ["next/core-web-vitals", "next/typescript"]
// }),
// {
// files: ["**/*.ts", "**/*.tsx"],
// plugins: {
// 'simple-import-sort': simpleImportSort,
// import: importPlugin,
// },
// languageOptions: {
// parser: tsParser,
// },
// rules: {
// "simple-import-sort/imports": "warn",
// "simple-import-sort/exports": "warn",
// "import/first": "warn",
// "import/newline-after-import": "warn",
// "import/no-duplicates": "warn",
// },
// },
// {
// ignores: ["node_modules/**", ".next/**", "next-env.d.ts"]
// }
// ];
//
// export default eslintConfig

const compat = new FlatCompat({
baseDirectory: import.meta.dirname,
});
// import importPlugin from "eslint-plugin-import";
import tsParser from "@typescript-eslint/parser";
import { defineConfig, globalIgnores } from "eslint/config";
import nextVitals from "eslint-config-next/core-web-vitals";
import nextTs from "eslint-config-next/typescript";
import simpleImportSort from "eslint-plugin-simple-import-sort";

const eslintConfig =[
...compat.config({
extends: ["next/core-web-vitals", "next/typescript"]
}),
const eslintConfig = defineConfig([
...nextVitals,
...nextTs,
// Override default ignores of eslint-config-next.
globalIgnores([
// Default ignores of eslint-config-next:
".next/**",
"node_modules/**",
"next-env.d.ts",
]),
{
files: ["**/*.ts", "**/*.tsx"],
plugins: {
'simple-import-sort': simpleImportSort,
import: importPlugin,
"simple-import-sort": simpleImportSort,
// import: importPlugin,
},
languageOptions: {
parser: tsParser,
Expand All @@ -28,9 +65,6 @@ const eslintConfig =[
"import/no-duplicates": "warn",
},
},
{
ignores: ["node_modules/**", ".next/**", "next-env.d.ts"]
}
];
]);

export default eslintConfig
export default eslintConfig;
1 change: 1 addition & 0 deletions client/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const nextConfig = {
},
outputFileTracingRoot: import.meta.dirname,
images: {
unoptimized: process.env.NODE_ENV === 'development',
remotePatterns: [
{ protocol: 'http', hostname: '127.0.0.1' },
{ protocol: 'http', hostname: 'localhost' },
Expand Down
Loading
Loading