1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-23 08:38:00 +08:00

merge alas

This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions

View File

@@ -8,20 +8,15 @@
"extends": [
"eslint:recommended",
/** @see https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#recommended-configs */
<<<<<<< HEAD
"plugin:@typescript-eslint/recommended",
"prettier",
"plugin:prettier/recommended"
=======
"plugin:@typescript-eslint/recommended"
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 12,
"sourceType": "module"
},
<<<<<<< HEAD
"plugins": ["@typescript-eslint"],
"ignorePatterns": ["node_modules/**", "**/dist/**"],
"rules": {
@@ -44,42 +39,10 @@
* This will make the history of changes in the hit a little cleaner
*/
"comma-dangle": ["warn", "always-multiline"],
=======
"plugins": [
"@typescript-eslint"
],
"ignorePatterns": [
"types/env.d.ts",
"node_modules/**",
"**/dist/**"
],
"rules": {
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/consistent-type-imports": "error",
/**
* Having a semicolon helps the optimizer interpret your code correctly.
* This avoids rare errors in optimized code.
* @see https://twitter.com/alex_kozack/status/1364210394328408066
*/
"semi": [
"error",
"always"
],
/**
* This will make the history of changes in the hit a little cleaner
*/
"comma-dangle": [
"warn",
"always-multiline"
],
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
/**
* Just for beauty
*/
"quotes": [
<<<<<<< HEAD
"warn",
"single",
{
@@ -88,9 +51,5 @@
],
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/ban-types": "off"
=======
"warn", "single"
]
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
}
}