From 80b7fd0167cb6e91bc845f279f954f84152751cc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 15 Nov 2020 20:35:36 +0000
Subject: [PATCH 1/2] Bump eslint-plugin-simple-import-sort from 5.0.3 to 6.0.0

Bumps [eslint-plugin-simple-import-sort](https://github.com/lydell/eslint-plugin-simple-import-sort) from 5.0.3 to 6.0.0.
- [Release notes](https://github.com/lydell/eslint-plugin-simple-import-sort/releases)
- [Changelog](https://github.com/lydell/eslint-plugin-simple-import-sort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lydell/eslint-plugin-simple-import-sort/compare/v5.0.3...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 273a9bbc8..ac1ab04b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6692,9 +6692,9 @@
       }
     },
     "eslint-plugin-simple-import-sort": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-5.0.3.tgz",
-      "integrity": "sha512-1rf3AWiHeWNCQdAq0iXNnlccnH1UDnelGgrPbjBBHE8d2hXVtOudcmy0vTF4hri3iJ0MKz8jBhmH6lJ0ZWZLHQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-6.0.0.tgz",
+      "integrity": "sha512-YEx+2Zli3mw4mzLzotZSeor4GqdjFWv6S7LcQeKsoXWD4GzMtP42WCz40kAlB35ehxf7PR5V/4f8g8l9aqWGsg==",
       "dev": true
     },
     "eslint-scope": {
diff --git a/package.json b/package.json
index 5574e7dc8..b7d8656fa 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "eslint": "7.13.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-simple-import-sort": "^5.0.3",
+    "eslint-plugin-simple-import-sort": "^6.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.1.2",
     "ts-node": "~9.0.0",

From b67958f0e130b32ff75eebda4f2ce1ab06c011ec Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Tue, 17 Nov 2020 17:25:49 +0100
Subject: [PATCH 2/2] fix lint error

---
 .eslintrc.js                         | 2 +-
 src/app/app.module.ts                | 4 ++--
 src/app/control/control.component.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 32c4a46b0..c6c108dd4 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -21,7 +21,7 @@ module.exports = {
     '@typescript-eslint/no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars-experimental': 'warn',
     camelcase: 'warn',
-    'simple-import-sort/sort': 'warn',
+    'simple-import-sort/imports': 'warn',
     'sort-imports': 'off',
     'import/first': 'warn',
     'import/newline-after-import': 'warn',
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 1a6f5d9c1..4e425b223 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -20,8 +20,8 @@ import { NoConfigComponent } from './config/no-config/no-config.component';
 import { ControlComponent } from './control/control.component';
 import { FilamentComponent } from './filament/filament.component';
 import { FilesComponent } from './files/files.component';
-import { JobStatusComponent } from './job-status/job-status.component';
 import { JobService } from './job.service';
+import { JobStatusComponent } from './job-status/job-status.component';
 import { LayerProgressComponent } from './layer-progress/layer-progress.component';
 import { LongPress } from './long-press.directive';
 import { MainMenuComponent } from './main-menu/main-menu.component';
@@ -31,8 +31,8 @@ import { NotificationComponent } from './notification/notification.component';
 import { NotificationService } from './notification/notification.service';
 import { OctoprintScriptService } from './octoprint-script.service';
 import { PrintControlComponent } from './print-control/print-control.component';
-import { PrinterStatusComponent } from './printer-status/printer-status.component';
 import { PrinterService } from './printer.service';
+import { PrinterStatusComponent } from './printer-status/printer-status.component';
 import { SettingsComponent } from './settings/settings.component';
 import { StandbyComponent } from './standby/standby.component';
 import { UpdateComponent } from './update/update.component';
diff --git a/src/app/control/control.component.ts b/src/app/control/control.component.ts
index 846bf0b5d..02525d423 100644
--- a/src/app/control/control.component.ts
+++ b/src/app/control/control.component.ts
@@ -3,8 +3,8 @@ import { SafeResourceUrl } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 
 import { ConfigService } from '../config/config.service';
-import { OctoprintPrinterProfileAPI } from '../octoprint-api/printerProfileAPI';
 import { OctoprintService } from '../octoprint.service';
+import { OctoprintPrinterProfileAPI } from '../octoprint-api/printerProfileAPI';
 import { EnclosureService } from '../plugin-service/enclosure.service';
 import { PsuControlService } from '../plugin-service/psu-control.service';
 import { PrinterService } from '../printer.service';