Skip to content

Commit abb63c8

Browse files
authored
Merge pull request #2596 from Particular/john/updates
2 parents 60e7a95 + 1a10cbe commit abb63c8

File tree

9 files changed

+351
-360
lines changed

9 files changed

+351
-360
lines changed

src/Frontend/.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
**/*.svg
1+
**/*.svg
2+
**/mockServiceWorker.js

src/Frontend/.prettierrc.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
"options": {
1111
"singleQuote": true
1212
}
13-
}]
14-
}
13+
}
14+
]
15+
}

src/Frontend/eslint.config.mjs

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,28 @@ import globals from "globals";
22
import pluginJs from "@eslint/js";
33
import tseslint from "typescript-eslint";
44
import pluginVue from "eslint-plugin-vue";
5-
import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";
65
import pluginPromise from "eslint-plugin-promise";
6+
import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";
77

8-
export default tseslint.config({
9-
ignores: ["/node_modules/**/*", "/dist/**/*", "/public/js/app.constants.js"],
10-
files: ["**/*.{js,mjs,ts,vue}"],
11-
languageOptions: { globals: globals.browser, ecmaVersion: "latest", parserOptions: { parser: tseslint.parser } },
12-
extends: [pluginJs.configs.recommended, ...tseslint.configs.recommended, ...pluginVue.configs["flat/essential"], pluginPromise.configs["flat/recommended"], eslintPluginPrettierRecommended],
13-
rules: {
14-
"no-duplicate-imports": "error",
15-
"promise/prefer-await-to-then": "error",
16-
"require-await": "error",
17-
"no-await-in-loop": "warn",
18-
"prefer-rest-params": "error",
19-
"prefer-spread": "error",
20-
"no-var": "error",
21-
"prefer-const": "error",
22-
eqeqeq: ["error", "smart"],
23-
"no-throw-literal": "warn",
8+
export default tseslint.config(
9+
{
10+
ignores: ["node_modules/**", "dist/**", "public/js/app.constants.js"],
2411
},
25-
});
12+
{
13+
files: ["**/*.{js,mjs,ts,vue}"],
14+
languageOptions: { globals: globals.browser, ecmaVersion: "latest", parserOptions: { parser: tseslint.parser } },
15+
extends: [pluginJs.configs.recommended, ...tseslint.configs.recommended, ...pluginVue.configs["flat/essential"], pluginPromise.configs["flat/recommended"], eslintPluginPrettierRecommended],
16+
rules: {
17+
"no-duplicate-imports": "error",
18+
"promise/prefer-await-to-then": "error",
19+
"require-await": "error",
20+
"no-await-in-loop": "warn",
21+
"prefer-rest-params": "error",
22+
"prefer-spread": "error",
23+
"no-var": "error",
24+
"prefer-const": "error",
25+
eqeqeq: ["error", "smart"],
26+
"no-throw-literal": "warn",
27+
},
28+
}
29+
);

0 commit comments

Comments
 (0)