From bb0672d6df149224eb2364593df269a41aa5c961 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2020 19:46:59 +0800 Subject: [PATCH] chore(deps-dev): bump eslint-plugin-simple-import-sort from 5.0.3 to 6.0.0 (#646) * chore(deps-dev): bump eslint-plugin-simple-import-sort 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[bot] * fix: fix .eslintrc * chore: run lint Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Antariksh --- .eslintrc | 2 +- package-lock.json | 6 +++--- package.json | 2 +- .../modules/examples/__tests__/helpers/prepareTestData.ts | 2 +- src/app/modules/examples/examples.service.ts | 2 +- .../form/public-form/__tests__/public-form.service.spec.ts | 2 +- src/app/modules/form/public-form/public-form.service.ts | 2 +- src/app/services/sms/__tests__/sms.service.spec.ts | 2 +- .../services/sms/__tests__/sms_count.server.model.spec.ts | 2 +- src/app/services/sms/sms.service.ts | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.eslintrc b/.eslintrc index 0c86678a9f..bd6442f48d 100644 --- a/.eslintrc +++ b/.eslintrc @@ -28,7 +28,7 @@ "extends": ["plugin:@typescript-eslint/recommended"], "rules": { // Rules for auto sort of imports - "simple-import-sort/sort": [ + "simple-import-sort/imports": [ "error", { "groups": [ diff --git a/package-lock.json b/package-lock.json index 47e64b3107..4ad3afd432 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11258,9 +11258,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 93c488a9e0..35bb67bc3f 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "eslint-plugin-import": "^2.22.1", "eslint-plugin-jest": "^24.0.2", "eslint-plugin-prettier": "^3.1.3", - "eslint-plugin-simple-import-sort": "^5.0.3", + "eslint-plugin-simple-import-sort": "^6.0.0", "google-fonts-plugin": "4.1.0", "html-loader": "~0.5.5", "htmlhint": "^0.14.1", diff --git a/src/app/modules/examples/__tests__/helpers/prepareTestData.ts b/src/app/modules/examples/__tests__/helpers/prepareTestData.ts index 10aaeaebb7..f3706dcd3a 100644 --- a/src/app/modules/examples/__tests__/helpers/prepareTestData.ts +++ b/src/app/modules/examples/__tests__/helpers/prepareTestData.ts @@ -1,9 +1,9 @@ import { flatten, times } from 'lodash' import mongoose from 'mongoose' +import getFormModel from 'src/app/models/form.server.model' import getFormFeedbackModel from 'src/app/models/form_feedback.server.model' import getFormStatisticsTotalModel from 'src/app/models/form_statistics_total.server.model' -import getFormModel from 'src/app/models/form.server.model' import getSubmissionModel from 'src/app/models/submission.server.model' import { IAgencySchema, diff --git a/src/app/modules/examples/examples.service.ts b/src/app/modules/examples/examples.service.ts index c6acda4e66..3ca8f7ba31 100644 --- a/src/app/modules/examples/examples.service.ts +++ b/src/app/modules/examples/examples.service.ts @@ -4,8 +4,8 @@ import { errAsync, okAsync, ResultAsync } from 'neverthrow' import { Except, Merge } from 'type-fest' import { createLoggerWithLabel } from '../../../config/logger' -import getFormStatisticsTotalModel from '../../models/form_statistics_total.server.model' import getFormModel from '../../models/form.server.model' +import getFormStatisticsTotalModel from '../../models/form_statistics_total.server.model' import getSubmissionModel from '../../models/submission.server.model' import { DatabaseError } from '../core/core.errors' diff --git a/src/app/modules/form/public-form/__tests__/public-form.service.spec.ts b/src/app/modules/form/public-form/__tests__/public-form.service.spec.ts index 6f7c811929..58624daa76 100644 --- a/src/app/modules/form/public-form/__tests__/public-form.service.spec.ts +++ b/src/app/modules/form/public-form/__tests__/public-form.service.spec.ts @@ -3,8 +3,8 @@ import mockingoose from 'mockingoose' import mongoose from 'mongoose' import { PartialDeep } from 'type-fest' -import getFormFeedbackModel from 'src/app/models/form_feedback.server.model' import getFormModel from 'src/app/models/form.server.model' +import getFormFeedbackModel from 'src/app/models/form_feedback.server.model' import { DatabaseError } from 'src/app/modules/core/core.errors' import { IFormSchema } from 'src/types' diff --git a/src/app/modules/form/public-form/public-form.service.ts b/src/app/modules/form/public-form/public-form.service.ts index 227df6bec2..0aa0929d5a 100644 --- a/src/app/modules/form/public-form/public-form.service.ts +++ b/src/app/modules/form/public-form/public-form.service.ts @@ -3,8 +3,8 @@ import { errAsync, okAsync, ResultAsync } from 'neverthrow' import { createLoggerWithLabel } from '../../../../config/logger' import { IFormFeedbackSchema } from '../../../../types' -import getFormFeedbackModel from '../../../models/form_feedback.server.model' import getFormModel from '../../../models/form.server.model' +import getFormFeedbackModel from '../../../models/form_feedback.server.model' import { DatabaseError } from '../../core/core.errors' import { FormNotFoundError } from '../form.errors' diff --git a/src/app/services/sms/__tests__/sms.service.spec.ts b/src/app/services/sms/__tests__/sms.service.spec.ts index de2755b465..d69a67d93f 100644 --- a/src/app/services/sms/__tests__/sms.service.spec.ts +++ b/src/app/services/sms/__tests__/sms.service.spec.ts @@ -6,9 +6,9 @@ import { FormOtpData, IFormSchema, IUserSchema, ResponseMode } from 'src/types' import dbHandler from 'tests/unit/backend/helpers/jest-db' -import getSmsCountModel from '../sms_count.server.model' import * as SmsService from '../sms.service' import { LogType, SmsType, TwilioConfig } from '../sms.types' +import getSmsCountModel from '../sms_count.server.model' const FormModel = getFormModel(mongoose) const SmsCountModel = getSmsCountModel(mongoose) diff --git a/src/app/services/sms/__tests__/sms_count.server.model.spec.ts b/src/app/services/sms/__tests__/sms_count.server.model.spec.ts index fc1d597c46..abc3c49a75 100644 --- a/src/app/services/sms/__tests__/sms_count.server.model.spec.ts +++ b/src/app/services/sms/__tests__/sms_count.server.model.spec.ts @@ -5,8 +5,8 @@ import mongoose from 'mongoose' import dbHandler from 'tests/unit/backend/helpers/jest-db' -import getSmsCountModel from '../sms_count.server.model' import { IVerificationSmsCount, LogType, SmsType } from '../sms.types' +import getSmsCountModel from '../sms_count.server.model' const SmsCount = getSmsCountModel(mongoose) diff --git a/src/app/services/sms/sms.service.ts b/src/app/services/sms/sms.service.ts index 15a395f85e..fde7ac97b0 100644 --- a/src/app/services/sms/sms.service.ts +++ b/src/app/services/sms/sms.service.ts @@ -11,7 +11,6 @@ import { VfnErrors } from '../../../shared/util/verification' import { AdminContactOtpData, FormOtpData } from '../../../types' import getFormModel from '../../models/form.server.model' -import getSmsCountModel from './sms_count.server.model' import { SmsSendError } from './sms.errors' import { LogSmsParams, @@ -20,6 +19,7 @@ import { TwilioConfig, TwilioCredentials, } from './sms.types' +import getSmsCountModel from './sms_count.server.model' const logger = createLoggerWithLabel(module) const SmsCount = getSmsCountModel(mongoose)