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/package-lock.json b/package-lock.json index 58e3f7043..4e23aab4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6684,9 +6684,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 c897e476c..627d9fad0 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,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", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 54cf02ef5..d205cd5b1 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -26,8 +26,8 @@ import { WelcomeComponent } from './config/setup/welcome/welcome.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'; @@ -36,8 +36,8 @@ import { MainScreenNoTouchComponent } from './main-screen/no-touch/main-screen-n import { NotificationComponent } from './notification/notification.component'; import { NotificationService } from './notification/notification.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';