summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-04-04 13:24:48 +0200
committerOskar Nyberg <oskar@mullvad.net>2022-04-05 15:59:45 +0200
commit9efaf2d3e48190927824853bbc41e7e08d216d69 (patch)
treeba03baf1f15209ddac182c9c2504f51464d6a2cb
parent4c7400240a147fd64ee2a2527a3b7c2e56b765de (diff)
downloadmullvadvpn-9efaf2d3e48190927824853bbc41e7e08d216d69.tar.xz
mullvadvpn-9efaf2d3e48190927824853bbc41e7e08d216d69.zip
Add eslint sort rule
-rw-r--r--gui/.eslintrc.js3
-rw-r--r--gui/package-lock.json17
-rw-r--r--gui/package.json1
3 files changed, 20 insertions, 1 deletions
diff --git a/gui/.eslintrc.js b/gui/.eslintrc.js
index 3e39fbd5d9..a4b2d46a28 100644
--- a/gui/.eslintrc.js
+++ b/gui/.eslintrc.js
@@ -64,7 +64,7 @@ module.exports = {
},
},
ignorePatterns: ['test/*', 'scripts/*'],
- plugins: ['prettier'],
+ plugins: ['prettier', 'simple-import-sort'],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
@@ -93,6 +93,7 @@ module.exports = {
'react/jsx-no-bind': 'error',
'@typescript-eslint/naming-convention': ['error', ...namingConvention],
'@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': false }],
+ 'simple-import-sort/imports': 'error',
'@typescript-eslint/no-use-before-define': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
diff --git a/gui/package-lock.json b/gui/package-lock.json
index 1a9d56a252..0da536322e 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -62,6 +62,7 @@
"eslint": "^7.27.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.23.2",
+ "eslint-plugin-simple-import-sort": "^7.0.0",
"gettext-extractor": "^3.5.2",
"grpc_tools_node_protoc_ts": "^5.3.2",
"gulp": "^4.0.2",
@@ -5767,6 +5768,15 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/eslint-plugin-simple-import-sort": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-7.0.0.tgz",
+ "integrity": "sha512-U3vEDB5zhYPNfxT5TYR7u01dboFZp+HNpnGhkDB2g/2E4wZ/g1Q9Ton8UwCLfRV9yAKyYqDh62oHOamvkFxsvw==",
+ "dev": true,
+ "peerDependencies": {
+ "eslint": ">=5.0.0"
+ }
+ },
"node_modules/eslint-scope": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -18861,6 +18871,13 @@
}
}
},
+ "eslint-plugin-simple-import-sort": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-7.0.0.tgz",
+ "integrity": "sha512-U3vEDB5zhYPNfxT5TYR7u01dboFZp+HNpnGhkDB2g/2E4wZ/g1Q9Ton8UwCLfRV9yAKyYqDh62oHOamvkFxsvw==",
+ "dev": true,
+ "requires": {}
+ },
"eslint-scope": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
diff --git a/gui/package.json b/gui/package.json
index 697d65381e..6bf10480f5 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -68,6 +68,7 @@
"eslint": "^7.27.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.23.2",
+ "eslint-plugin-simple-import-sort": "^7.0.0",
"gettext-extractor": "^3.5.2",
"grpc_tools_node_protoc_ts": "^5.3.2",
"gulp": "^4.0.2",