Skip to content

Commit

Permalink
Merge pull request #6 from ZapZapMe/react
Browse files Browse the repository at this point in the history
eslint and format before commit
  • Loading branch information
imaginator authored Feb 5, 2025
2 parents a1a330c + 0f5580c commit 50947af
Show file tree
Hide file tree
Showing 10 changed files with 862 additions and 396 deletions.
14 changes: 5 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.ts]
quote_type = single
ij_typescript_use_double_quotes = false

[*.md]
max_line_length = off
[*.{diff,md}]
trim_trailing_whitespace = false
max_line_length = 70
8 changes: 2 additions & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
"jsx": true
}
},
"plugins": [
"react",
"react-hooks",
"@typescript-eslint"
],
"plugins": ["react", "react-hooks", "@typescript-eslint"],
"rules": {
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
Expand All @@ -43,4 +39,4 @@
}
}
]
}
}
38 changes: 24 additions & 14 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
{
"projects": {
"default": "beta-zap-zap-me"
},
"targets": {
"zapzap-me": {
"hosting": {
"beta": [
"zapzap-beta",
"zapzap-me"
]
}
"hosting": [
{
"target": "production",
"public": "build",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
},
{
"target": "beta",
"public": "build",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
},
"etags": {}
}
]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ Thumbs.db
.env.development.local
.env.test.local
.env.production.local
.env.development
2 changes: 2 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
npm run format
npm run lint
2 changes: 2 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"recommendations": [
"dbaeumer.vscode-eslint",
"dsznajder.es7-react-js-snippets"
"editorconfig.editorconfig",
]
}

20 changes: 0 additions & 20 deletions .vscode/launch.json

This file was deleted.

15 changes: 15 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"eslint.validate": [
"javascript",
"typescript",
"typescriptreact",
"javascriptreact"
],
"editor.formatOnSave": true
}
Loading

0 comments on commit 50947af

Please sign in to comment.