Skip to content

Commit bc969e2

Browse files
tervaytervay
committed
Moved conflict logic to store. Add prettier
1 parent e1afbfd commit bc969e2

32 files changed

+3184
-1811
lines changed

‎.dockerignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dist/
2+
node_modules/
3+
.git/

‎.eslintrc.cjs

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ module.exports = {
22
root: true,
33
env: { browser: true, es2020: true },
44
extends: [
5-
'eslint:recommended',
6-
'plugin:@typescript-eslint/recommended',
7-
'plugin:react-hooks/recommended',
5+
"eslint:recommended",
6+
"plugin:@typescript-eslint/recommended",
7+
"plugin:react-hooks/recommended",
88
],
9-
ignorePatterns: ['dist', '.eslintrc.cjs'],
10-
parser: '@typescript-eslint/parser',
11-
plugins: ['react-refresh'],
9+
ignorePatterns: ["dist", ".eslintrc.cjs"],
10+
parser: "@typescript-eslint/parser",
11+
plugins: ["react-refresh"],
1212
rules: {
13-
'react-refresh/only-export-components': [
14-
'warn',
13+
"react-refresh/only-export-components": [
14+
"warn",
1515
{ allowConstantExport: true },
1616
],
1717
},
18-
}
18+
};

‎.prettierrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

‎Dockerfile

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM node:20.15.1
2+
3+
WORKDIR /app
4+
5+
RUN npm install -g pnpm
6+
7+
COPY package.json pnpm-lock.yaml ./
8+
9+
RUN pnpm install
10+
11+
COPY . .
12+
13+
EXPOSE 8080
14+
ENTRYPOINT [ "pnpm", "run", "dev", "--port", "8080", "--host", "0.0.0.0" ]

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ If you are developing a production application, we recommend updating the config
1717
export default {
1818
// other rules...
1919
parserOptions: {
20-
ecmaVersion: 'latest',
21-
sourceType: 'module',
22-
project: ['./tsconfig.json', './tsconfig.node.json', './tsconfig.app.json'],
20+
ecmaVersion: "latest",
21+
sourceType: "module",
22+
project: ["./tsconfig.json", "./tsconfig.node.json", "./tsconfig.app.json"],
2323
tsconfigRootDir: __dirname,
2424
},
25-
}
25+
};
2626
```
2727

2828
- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`

‎components.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
"components": "@/components",
1515
"utils": "@/lib/utils"
1616
}
17-
}
17+
}

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"eslint-plugin-react-hooks": "4.6.2",
4949
"eslint-plugin-react-refresh": "0.4.7",
5050
"postcss": "8.4.40",
51+
"prettier": "3.3.3",
5152
"tailwindcss": "3.4.7",
5253
"typescript": "5.2.2",
5354
"vite": "5.3.4"

0 commit comments

Comments
 (0)