Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
adityapawar1 committed Oct 18, 2023
2 parents c58ac50 + 0f24043 commit 61d2470
Show file tree
Hide file tree
Showing 17 changed files with 886 additions and 368 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/.expo
node_modules
15 changes: 10 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
module.exports = {
extends: ['@calblueprint/eslint-config-react'],
rules: {
'react/react-in-jsx-scope': 'off',
'react/jsx-uses-react': 'off',
},
root: true,
extends: ['universe/native', 'universe/shared/typescript-analysis'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
],
};
9 changes: 7 additions & 2 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
module.exports = {
...require('@calblueprint/prettier-config'),
// Add any overrides here
arrowParens: 'avoid',
bracketSameLine: false,
bracketSpacing: true,
printWidth: 80,
semi: true,
singleQuote: true,
trailingComma: 'all',
};
3 changes: 1 addition & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.formatDocument": true,
"source.fixAll.eslint": true,
"source.organizeImports": true
"source.fixAll.eslint": true
}
}
Loading

0 comments on commit 61d2470

Please sign in to comment.