Skip to content

Commit

Permalink
Merge pull request #2319 from Azure/master
Browse files Browse the repository at this point in the history 
Merge master into stable for release 2.9.0
  • Loading branch information
@cRui861
cRui861 authored Apr 29, 2021
2 parents f74884b + 0c24d45 commit fee5545
Show file tree
Hide file tree
Showing 86 changed files with 9,523 additions and 11,139 deletions.
30 changes: 30 additions & 0 deletions .eslintrc.common.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"plugins": [
"@typescript-eslint"
],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended"
],
"rules": {
"@typescript-eslint/ban-types": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-unused-vars": "off",
"max-len": [
"error",
{
"code": 140,
"ignoreComments": true,
"ignoreUrls": true,
"ignoreTemplateLiterals": true,
"ignoreRegExpLiterals": true
}
],
"no-case-declarations": "off",
"no-console": "error",
"no-extra-boolean-cast": "off",
"no-useless-escape": "off"
}
}
255 changes: 4 additions & 251 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,16 @@
{
"files": ["src/**/*.ts"],
"extends": [
"eslint:recommended",
"plugin:@angular-eslint/template/process-inline-templates",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
".eslintrc.common.json",
"prettier",
"prettier/@typescript-eslint"
],
"parserOptions": {
"project": [
"./tsconfig.eslint.json"
],
"sourceType": "module",
"createDefaultProgram": false
},
"plugins": [
"eslint-plugin-import",
"eslint-plugin-unicorn",
"@angular-eslint/eslint-plugin",
"@angular-eslint/eslint-plugin-template",
"eslint-plugin-jsdoc",
"eslint-plugin-prefer-arrow",
"@typescript-eslint",
"ban",
"import"
"@typescript-eslint"
],
"rules": {
"@angular-eslint/component-class-suffix": "error",
"@angular-eslint/component-selector": [
"error",
{
Expand All @@ -56,9 +39,6 @@
"style": "kebab-case"
}
],
"@angular-eslint/contextual-decorator": "error",
"@angular-eslint/contextual-lifecycle": "error",
"@angular-eslint/directive-class-suffix": "error",
"@angular-eslint/directive-selector": [
"error",
{
Expand All @@ -67,239 +47,12 @@
"style": "camelCase"
}
],
"@angular-eslint/no-attribute-decorator": "error",
"@angular-eslint/no-forward-ref": "off",
"@angular-eslint/no-host-metadata-property": "error",
"@angular-eslint/no-input-rename": "warn",
"@angular-eslint/no-inputs-metadata-property": "error",
"@angular-eslint/no-output-rename": "error",
"@angular-eslint/no-outputs-metadata-property": "error",
"@angular-eslint/use-lifecycle-interface": "warn",
"@angular-eslint/use-pipe-transform-interface": "error",
"@typescript-eslint/adjacent-overload-signatures": "off",
"@typescript-eslint/array-type": [
"error",
{
"default": "array-simple"
}
],
"@typescript-eslint/await-thenable": "warn",
"@typescript-eslint/ban-ts-comment": "warn",
"@typescript-eslint/ban-types": [
"warn",
{
"types": {
"Error": {
"message": "Try not to use a basic Error but a SanitizedError if possible or a custom error class"
}
}
}
],
"@typescript-eslint/consistent-type-assertions": "error",
"@typescript-eslint/consistent-type-definitions": "error",
"@typescript-eslint/explicit-member-accessibility": [
"warn",
{
"accessibility": "explicit"
}
],
"@typescript-eslint/explicit-module-boundary-types": "warn",
"@typescript-eslint/indent": [
"warn",
4
],
"@typescript-eslint/member-ordering": "warn",
"@typescript-eslint/no-empty-function": "warn",
"@typescript-eslint/no-empty-interface": "off",
"@typescript-eslint/no-extra-semi": "error",
"@typescript-eslint/no-extra-non-null-assertion": "error",
"@typescript-eslint/no-floating-promises": "warn",
"@typescript-eslint/no-for-in-array": "error",
"@typescript-eslint/no-implied-eval": "warn",
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-misused-new": "error",
"@typescript-eslint/no-misused-promises": "warn",
"@typescript-eslint/no-namespace": "error",
"@typescript-eslint/no-non-null-asserted-optional-chain": "error",
"@typescript-eslint/no-non-null-assertion": "warn",
"@typescript-eslint/no-this-alias": "error",
"@typescript-eslint/no-unnecessary-type-assertion": "warn",
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-call": "warn",
"@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/no-unsafe-return": "warn",
"@typescript-eslint/no-unused-expressions": [
"error",
{
"allowTernary": true
}
],
"@typescript-eslint/no-var-requires": "warn",
"@typescript-eslint/prefer-as-const": "error",
"@typescript-eslint/prefer-for-of": "error",
"@typescript-eslint/prefer-function-type": "error",
"@typescript-eslint/prefer-namespace-keyword": "error",
"@typescript-eslint/prefer-regexp-exec": "error",
"@typescript-eslint/quotes": [
"error",
"double",
{
"avoidEscape": true,
"allowTemplateLiterals": true
}
],
"@typescript-eslint/require-await": "warn",
"@typescript-eslint/restrict-plus-operands": "warn",
"@typescript-eslint/restrict-template-expressions": "warn",
"@typescript-eslint/semi": [
"error",
"always"
],
"@typescript-eslint/triple-slash-reference": [
"error",
{
"path": "always",
"types": "prefer-import",
"lib": "always"
}
],
"@typescript-eslint/type-annotation-spacing": "warn",
"@typescript-eslint/unbound-method": "warn",
"@typescript-eslint/unified-signatures": "error",
"ban/ban": [
"warn",
{
"name": [
"batchExplorerApp",
"debugCrash"
],
"message": "Should only be called while debugging"
},
{
"name": [
"log",
"debug"
],
"message": "Should only be called while debugging"
},
{
"name": "fdescribe",
"message": "Should only be called when focusing on a test suite"
},
{
"name": "fit",
"message": "Should only be called when focusing on a unit test"
},
{
"name": "allowInsecureRequest",
"message": "Should only be used for development with proxy"
}
],
"brace-style": [
"error",
"1tbs",
{
"allowSingleLine": true
}
],
"comma-dangle": [
"error",
"always-multiline"
],
"constructor-super": "error",
"curly": "error",
"eol-last": "error",
"eqeqeq": [
"error",
"smart"
],
"guard-for-in": "error",
"id-blacklist": [
"warn",
"any",
"Number",
"number",
"String",
"string",
"Boolean",
"boolean",
"Undefined",
"undefined"
],
"id-match": "error",
"import/no-relative-parent-imports": "error",
"import/order": [
"error",
{
"groups": [
[
"external",
"builtin"
]
]
}
],
"jsdoc/check-alignment": "error",
"jsdoc/check-indentation": "warn",
"jsdoc/newline-after-description": "warn",
"max-len": [
"warn",
{
"code": 120
}
],
"new-parens": "error",
"no-async-promise-executor": "warn",
"no-caller": "error",
"no-case-declarations": "warn",
"no-cond-assign": "error",
"no-console": "error",
"no-debugger": "error",
"no-duplicate-case": "error",
"no-duplicate-imports": "error",
"no-empty": "error",
"no-eval": "warn",
"no-extra-boolean-cast": "warn",
"no-irregular-whitespace": "error",
"no-multi-spaces": "warn",
"no-multiple-empty-lines": "error",
"no-new-func": "error",
"no-new-wrappers": "error",
"no-prototype-builtins": "warn",
"no-return-await": "error",
"no-self-assign": "warn",
"no-sequences": "error",
"no-sparse-arrays": "error",
"no-template-curly-in-string": "error",
"no-throw-literal": "error",
"no-trailing-spaces": "error",
"no-undef-init": "error",
"no-unsafe-finally": "error",
"no-unused-labels": "error",
"no-useless-escape": "warn",
"no-var": "error",
"one-var": [
"error",
"never"
],
"prefer-const": "error",
"prefer-rest-params": "warn",
"quote-props": [
"error",
"consistent-as-needed"
],
"radix": "error",
"spaced-comment": [
"warn",
"always",
{
"markers": [
"/"
]
}
],
"unicorn/filename-case": "error",
"use-isnan": "error"
"@typescript-eslint/no-empty-interface": "warn",
"@typescript-eslint/ban-ts-comment": "warn"
}
},
/*
Expand Down
23 changes: 23 additions & 0 deletions .markdownlint.jsonc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
// Use defaults for all rules
"default": true,

// Header levels should only increment by one level at a time
"MD001": false,

// Unordered list indentation
"MD007": { "indent": 4 },

// Line length
"MD013": false,

// Duplicate headings
"MD024": false,

// Multiple top level headers in the same document
"MD025": false,

// Emphasis used instead of a heading
"MD036": false

}
3 changes: 2 additions & 1 deletion .vscode/extensions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"msjsdiag.debugger-for-chrome",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"rvest.vs-code-prettier-eslint"
"rvest.vs-code-prettier-eslint",
"davidanson.vscode-markdownlint"
]
}
2 changes: 1 addition & 1 deletion .vsts/update-en-loc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ steps:
fi
today=`date +%Y-%m-%d`
git -c user.email=batch-ex@microsoft.com -c user.name='Batch Explorer Automated' commit -am "Updating english translations $today"
git -c user.email=batchexplorer@microsoft.com -c user.name='Batch Explorer Automated' commit -am "Updating english translations $today"
git status -s
git push https://dpwatrous:$(GH_TOKEN)@github.com/Azure/BatchExplorer loc
workingDirectory: $(locdir)
Expand Down
Loading

0 comments on commit fee5545

Please sign in to comment.