refactor: Update Prettier configuration to include @trivago/prettier-plugin-sort-imports

This code change updates the .prettierrc.json file to include the @trivago/prettier-plugin-sort-imports plugin. By adding this plugin, the codebase will automatically sort imports according to specified rules. This improves code organization and maintainability.

Note: This commit message follows the established convention of starting with a verb in the imperative form (e.g., "Update", "Add", "Fix") and providing a concise summary of the changes made.
This commit is contained in:
Simon Larsen
2024-05-31 17:44:51 +01:00
parent a0f7324c01
commit a27b51ea94
4 changed files with 34 additions and 31 deletions

View File

@@ -50,4 +50,7 @@ marketing/*/*
licenses/*
certifications/*
ApiReference/public/assets/*
JavaScriptSDK/src/cli/server-monitor/out/scripts/prettify/*
JavaScriptSDK/src/cli/server-monitor/out/scripts/prettify/*
CommonServer/Tests/TestingUtils/__mocks__/Stripe.mock.ts

View File

@@ -4,5 +4,9 @@
"semi": true,
"singleQuote": true,
"bracketSpacing": true,
"arrowParens": "avoid"
"arrowParens": "avoid",
"plugins": ["@trivago/prettier-plugin-sort-imports"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"importOrderParserPlugins": ["typescript", "decorators", "dynamicImport", "jsx"]
}

View File

@@ -1,32 +1,28 @@
import '../TestingUtils/Init';
import Database from '../TestingUtils/Database';
import UserServiceHelper from '../TestingUtils/Services/UserServiceHelper';
import ProjectServiceHelper from '../TestingUtils/Services/ProjectServiceHelper';
import TeamServiceHelper from '../TestingUtils/Services/TeamServiceHelper';
import TeamMemberServiceHelper from '../TestingUtils/Services/TeamMemberServiceHelper';
import { describe, expect, it } from '@jest/globals';
import ObjectID from 'Common/Types/ObjectID';
import Email from 'Common/Types/Email';
import { faker } from '@faker-js/faker';
import TeamMember from 'Model/Models/TeamMember';
import User from 'Model/Models/User';
import Project from 'Model/Models/Project';
import Team from 'Model/Models/Team';
import TeamService from '../../Services/TeamService';
import { TeamMemberService } from '../../Services/TeamMemberService';
import { Host, HttpProtocol } from '../../EnvironmentConfig';
import AccessTokenService from '../../Services/AccessTokenService';
import BillingService from '../../Services/BillingService';
import ProjectService from '../../Services/ProjectService';
import MailService from '../../Services/MailService';
import UserNotificationSettingService from '../../Services/UserNotificationSettingService';
import ProjectService from '../../Services/ProjectService';
import { TeamMemberService } from '../../Services/TeamMemberService';
import TeamService from '../../Services/TeamService';
import UserNotificationRuleService from '../../Services/UserNotificationRuleService';
import Errors from '../../Utils/Errors';
import UserNotificationSettingService from '../../Services/UserNotificationSettingService';
import CreateBy from '../../Types/Database/CreateBy';
import { Host, HttpProtocol } from '../../EnvironmentConfig';
import Errors from '../../Utils/Errors';
import Database from '../TestingUtils/Database';
import '../TestingUtils/Init';
import ProjectServiceHelper from '../TestingUtils/Services/ProjectServiceHelper';
import TeamMemberServiceHelper from '../TestingUtils/Services/TeamMemberServiceHelper';
import TeamServiceHelper from '../TestingUtils/Services/TeamServiceHelper';
import UserServiceHelper from '../TestingUtils/Services/UserServiceHelper';
import { faker } from '@faker-js/faker';
import { describe, expect, it } from '@jest/globals';
import Email from 'Common/Types/Email';
import ObjectID from 'Common/Types/ObjectID';
import Project from 'Model/Models/Project';
import Team from 'Model/Models/Team';
import TeamMember from 'Model/Models/TeamMember';
import User from 'Model/Models/User';
jest.setTimeout(60000); // Increase test timeout to 60 seconds becuase GitHub runners are slow

View File

@@ -1,9 +1,6 @@
// import libraries to mock (we do it here because of hoisting)
// import the mock library
import * as mock from 'jest-mock-extended';
import Stripe from 'stripe';
let mockStripe: jest.Mocked<Stripe> | null = null;
let mockStripe: jest.Mocked<Stripe>;
jest.mock('stripe', () => {
mockStripe = mock.mockDeep<Stripe>();
@@ -12,5 +9,8 @@ jest.mock('stripe', () => {
});
});
// import libraries to mock (we do it here because of hoisting)
import Stripe from 'stripe';
// return the mocked library and the library itself
export { mockStripe, Stripe };
export { mockStripe, Stripe };