Skip to content

Commit

Permalink
Merge pull request osutcj#121 from osutcj/release/1.0.0
Browse files Browse the repository at this point in the history
Release/1.0.0
  • Loading branch information
Alex7734 authored Sep 17, 2023
2 parents 8bf5ad6 + 11f1c99 commit a455742
Show file tree
Hide file tree
Showing 50 changed files with 16,200 additions and 882 deletions.
10 changes: 10 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/.firebase
node_modules
assets
/.husky
/.github
/.vscode
/.idea
dist


27 changes: 9 additions & 18 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
module.exports = {
env: {
browser: true,
es2021: true,
es2021: true
},
extends: [
'plugin:react/recommended',
'airbnb',
'airbnb-typescript',
'plugin:prettier/recommended',
],
extends: ['plugin:prettier/recommended'],
// extends: ['plugin:prettier/recommended', 'plugin:react/recommended', 'plugin:@typescript-eslint/recommended']
// Normally, we would use the above line, but we are using just prettier for now. We will add the other plugins later.
ignorePatterns: ['lint-staged.config.js'],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaFeatures: {
jsx: true,
jsx: true
},
ecmaVersion: 'latest',
sourceType: 'module',
},
plugins: ['react', '@typescript-eslint'],
rules: {
'react/jsx-filename-extension': [
1,
{ extensions: ['.js', '.jsx', '.ts', '.tsx'] },
],
},
ecmaVersion: 2021,
project: './tsconfig.json'
}
};
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ jobs:
with:
args: deploy --only hosting --project ${{ steps.set_firebase_vars.outputs.FIREBASE_PROJECT_ID }}
env:
FIREBASE_TOKEN: ${{ steps.set_firebase_vars.outputs.FIREBASE_TOKEN }}
FIREBASE_TOKEN: ${{ steps.set_firebase_vars.outputs.FIREBASE_TOKEN }}
8 changes: 8 additions & 0 deletions .husky/common.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
command_exists() {
command -v "$1" >/dev/null 2>&1
}

# Workaround for Windows 10, Git Bash and Yarn
if command_exists winpty && test -t 1; then
exec </dev/tty
fi
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged
4 changes: 0 additions & 4 deletions .prettierrc

This file was deleted.

7 changes: 7 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
singleQuote: true,
arrowParens: 'always',
trailingComma: 'none',
printWidth: 100,
tabWidth: 2
};
16 changes: 16 additions & 0 deletions lint-staged.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module.exports = {
'**/*.{js,jsx,ts,tsx}': (filenames) => [
`npx eslint --fix ${filenames
.map((filename) => `"${filename}"`)
.join(' ')}`,
],
'**/*.(md|json)': (filenames) =>
`npx prettier --write ${filenames
.map((filename) => `"${filename}"`)
.join(' ')}`,
'src/translations/*.(json)': (filenames) => [
`npx eslint --fix ${filenames
.map((filename) => `"${filename}"`)
.join(' ')}`,
],
};
Loading

0 comments on commit a455742

Please sign in to comment.