Skip to content

Commit

Permalink
Merge pull request #36 from openforge/feature/UpdateDependencies
Browse files Browse the repository at this point in the history
feature/UpdateDependencies
  • Loading branch information
jedihacks authored Aug 5, 2024
2 parents 5ba7868 + d27a42f commit 2c90733
Show file tree
Hide file tree
Showing 41 changed files with 102,218 additions and 36,888 deletions.
40 changes: 23 additions & 17 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"root": true,
"plugins": ["prettier", "simple-import-sort", "@angular-eslint", "@typescript-eslint", "import"],
"plugins": ["@nx","prettier", "simple-import-sort", "@angular-eslint", "@typescript-eslint", "import"],
"parserOptions": {
"project": "tsconfig.*.json"
},
Expand All @@ -15,25 +15,37 @@
}
}
},
"ignorePatterns": ["node_modules/**"],
"ignorePatterns": ["node_modules/**", "test.ts", "main.ts", "**.vue"],
"overrides": [
{
"files": ["*.ts"],
"files": ["*.ts", "*.tsx", "*.js", "*.jsx", "*.vue"],
"rules": {
"vue/multi-word-component-names": "off"
}
},
{
"files": ["*.ts", "*.tsx"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": ["./tsconfig.base.json"],
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"extends": [
"eslint:recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates",
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:import/recommended",
"plugin:import/typescript",
"plugin:prettier/recommended",
"prettier",
"plugin:@angular-eslint/recommended--extra"
"prettier"
],
"rules": {
"@typescript-eslint/no-unsafe-argument": "warn",
"@typescript-eslint/no-misused-promises": [
"error",
{
Expand All @@ -42,12 +54,7 @@
}
],
"@typescript-eslint/unbound-method": "error",
"@typescript-eslint/restrict-plus-operands": [
"error",
{
"checkCompoundAssignments": true
}
],
"@typescript-eslint/restrict-plus-operands": "error",
"@typescript-eslint/restrict-template-expressions": "error",
"@typescript-eslint/no-floating-promises": [
"error",
Expand Down Expand Up @@ -147,11 +154,10 @@
},
{
"files": ["*.js"],
"parserOptions": {
"sourceType": "module"
},
"parser": "babel-eslint"
},
{
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended", "plugin:@nrwl/nx/angular-template"]
}
]
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,6 @@ dist

# Angular cache
.angular
.idea
.nx/cache
.nx/workspace-data
7 changes: 4 additions & 3 deletions .lintstagedrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"lint-staged": {
"*": ["eslint --fix", "git add"]
}
"*.{js,jsx,ts,tsx,html}": [
"eslint --fix",
"git add"
]
}
Loading

0 comments on commit 2c90733

Please sign in to comment.