Skip to content

Commit

Permalink
Merge pull request #146 from ufabc-next/fix/eslint-ci
Browse files Browse the repository at this point in the history
fix: eslint ci
  • Loading branch information
FusiDaniel authored Oct 11, 2023
2 parents b9d0dff + 0181049 commit 5d5fe27
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 7 deletions.
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"files.eol": "\n"
}
4 changes: 0 additions & 4 deletions apps/react/.eslintrc.js

This file was deleted.

9 changes: 9 additions & 0 deletions apps/react/.eslintrc.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
root: true,
extends: ['custom', 'react-ts'],
parserOptions: {
sourceType: 'module',
project: ['./tsconfig.json'],
tsconfigRootDir: __dirname,
},
};
1 change: 1 addition & 0 deletions packages/eslint-config-custom/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module.exports = {
extends: ['turbo', 'prettier'],
parserOptions: {
sourceType: 'module',
project: ['./tsconfig.json'],
},
env: {
es6: true,
Expand Down
4 changes: 2 additions & 2 deletions packages/stores/auth/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import { User } from 'services/users';
import { persist } from 'zustand/middleware';
import { createStore } from 'zustand/vanilla';

type OAuth = {
export type OAuth = {
email: string;
google: string;
facebook: string;
picture: string;
emailFacebook: string;
};

type Device = {
export type Device = {
_id: string;
deviceId: string;
token: string;
Expand Down
3 changes: 2 additions & 1 deletion packages/tsconfig/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"allowSyntheticDefaultImports": true,
"useDefineForClassFields": true,
"sourceMap": true,
"baseUrl": "."
"baseUrl": ".",
"allowJs": true
},
"exclude": ["node_modules"]
}

0 comments on commit 5d5fe27

Please sign in to comment.