Skip to content

Commit 724dc43

Browse files
committed
chore: merge w/ masteR
2 parents ef8518a + d1bfec5 commit 724dc43

File tree

15 files changed

+1393
-234
lines changed

15 files changed

+1393
-234
lines changed

.eslintrc.js

+38-17
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,47 @@
11
module.exports = {
22
root: true,
3-
parser: "@typescript-eslint/parser",
4-
plugins: ["@typescript-eslint", "prettier"],
5-
extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
3+
parser: '@typescript-eslint/parser',
4+
plugins: ['@typescript-eslint', 'prettier', 'simple-import-sort', 'import'],
5+
extends: [
6+
'eslint:recommended',
7+
'plugin:@typescript-eslint/recommended',
8+
'prettier/prettier',
9+
'plugin:import/recommended',
10+
'plugin:import/typescript',
11+
],
612
ignorePatterns: [
7-
".eslintrc.js",
8-
"dist",
9-
"node_modules",
10-
"rust-wasm",
11-
"scripts",
13+
'.eslintrc.js',
14+
'dist',
15+
'node_modules',
16+
'rust-wasm',
17+
'scripts',
18+
'prettier.config.js',
1219
],
1320
rules: {
14-
"comma-spacing": ["error", { before: false, after: true }],
15-
"no-unused-vars": "off",
16-
"@typescript-eslint/no-unused-vars": [
17-
"warn",
21+
'comma-spacing': ['error', { before: false, after: true }],
22+
'no-unused-vars': 'off',
23+
'@typescript-eslint/no-unused-vars': [
24+
'warn',
1825
{
19-
argsIgnorePattern: "^_",
20-
varsIgnorePattern: "^_",
21-
caughtErrorsIgnorePattern: "^_",
26+
argsIgnorePattern: '^_',
27+
varsIgnorePattern: '^_',
28+
caughtErrorsIgnorePattern: '^_',
2229
},
2330
],
24-
"prettier/prettier": "error",
31+
'prettier/prettier': 'error',
32+
'import/order': [
33+
'error',
34+
{
35+
alphabetize: {
36+
order: 'asc',
37+
},
38+
groups: ['object', ['builtin', 'external'], 'parent', 'sibling', 'index', 'type'],
39+
'newlines-between': 'always',
40+
},
41+
],
42+
},
43+
parserOptions: {
44+
extraFileExtensions: ['.json'],
45+
project: '../tsconfig.json',
2546
},
26-
};
47+
}

.vscode/settings.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"editor.codeActionsOnSave": {
3+
"source.fixAll.eslint": "explicit"
4+
},
5+
"eslint.format.enable": true,
6+
"eslint.workingDirectories": [{ "pattern": "./*" }]
7+
}
8+

0 commit comments

Comments
 (0)