Skip to content

Commit b7addc8

Browse files
authored
Merge pull request #518 from Jo-Minseok/chore/prettier-import-sort
🧼 clean: prettier import sort 적용
2 parents 1420a0b + a13c106 commit b7addc8

File tree

278 files changed

+2606
-1650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+2606
-1650
lines changed

email-worker/.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
node_modules
2+
dist
3+
coverage

email-worker/.prettierrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

email-worker/.prettierrc.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
module.exports = {
2+
singleQuote: true,
3+
trailingComma: 'all',
4+
endOfLine: 'lf',
5+
plugins: ['@trivago/prettier-plugin-sort-imports'],
6+
importOrderParserPlugins: [
7+
'typescript',
8+
'decorators-legacy',
9+
'classProperties',
10+
],
11+
importOrder: [
12+
'^reflect-metadata$',
13+
'^tsconfig-paths/register$',
14+
'^tsyringe$',
15+
'<THIRD_PARTY_MODULES>',
16+
'^@src/env-load$',
17+
'^@src/(.*)?$',
18+
'^@email/(.*)?$',
19+
'^@rabbitmq/(.*)?$',
20+
'^@app-types/(.*)?$',
21+
'^[./]',
22+
],
23+
importOrderSeparation: true,
24+
importOrderSortSpecifiers: true,
25+
importOrderGroupNamespaceSpecifiers: true,
26+
importOrderCaseInsensitive: true,
27+
};

email-worker/package-lock.json

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

email-worker/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
},
1212
"devDependencies": {
1313
"@testcontainers/rabbitmq": "^11.7.2",
14+
"@trivago/prettier-plugin-sort-imports": "^6.0.2",
1415
"@types/amqplib": "^0.10.7",
1516
"@types/jest": "^29.5.2",
1617
"@types/node": "^22.9.0",
@@ -27,6 +28,7 @@
2728
"typescript-eslint": "^8.51.0"
2829
},
2930
"scripts": {
31+
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
3032
"lint": "eslint .",
3133
"lint:fix": "eslint . --fix",
3234
"build": "tsc --project tsconfig.build.json && tsc-alias",

email-worker/src/container.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import { container } from 'tsyringe';
2-
import { RabbitmqService } from '@rabbitmq/rabbitmq.service';
3-
import { DEPENDENCY_SYMBOLS } from '@app-types/dependency-symbols';
4-
import { RabbitMQManager } from '@rabbitmq/rabbitmq.manager';
2+
53
import { EmailConsumer } from '@email/email.consumer';
64
import { EmailService } from '@email/email.service';
75

6+
import { RabbitMQManager } from '@rabbitmq/rabbitmq.manager';
7+
import { RabbitmqService } from '@rabbitmq/rabbitmq.service';
8+
9+
import { DEPENDENCY_SYMBOLS } from '@app-types/dependency-symbols';
10+
811
container.registerSingleton<RabbitmqService>(
912
DEPENDENCY_SYMBOLS.RabbitMQService,
1013
RabbitmqService,

email-worker/src/email/email.consumer.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
import { RabbitmqService } from '@rabbitmq/rabbitmq.service';
21
import { inject, injectable } from 'tsyringe';
3-
import { DEPENDENCY_SYMBOLS } from '@app-types/dependency-symbols';
4-
import { EmailService } from '@email/email.service';
2+
3+
import { Options } from 'amqplib/properties';
4+
55
import logger from '@src/logger';
6+
7+
import { EmailService } from '@email/email.service';
8+
69
import { RETRY_CONFIG, RMQ_QUEUES } from '@rabbitmq/rabbitmq.constant';
10+
import { RabbitmqService } from '@rabbitmq/rabbitmq.service';
11+
12+
import { DEPENDENCY_SYMBOLS } from '@app-types/dependency-symbols';
713
import { EmailPayload, EmailPayloadConstant } from '@app-types/types';
8-
import { Options } from 'amqplib/properties';
914

1015
@injectable()
1116
export class EmailConsumer {

email-worker/src/email/email.service.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
import { injectable } from 'tsyringe';
2+
13
import * as nodemailer from 'nodemailer';
24
import SMTPTransport from 'nodemailer/lib/smtp-transport';
5+
6+
import logger from '@src/logger';
7+
38
import {
9+
createDeleteAccountContent,
410
createPasswordResetMailContent,
511
createRssRegistrationContent,
612
createRssRemoveCertificateContent,
713
createVerificationMailContent,
8-
createDeleteAccountContent,
914
PRODUCT_DOMAIN,
1015
} from '@email/email.content';
11-
import { injectable } from 'tsyringe';
12-
import logger from '@src/logger';
16+
1317
import { Rss, RssRegistration, RssRemoval, User } from '@app-types/types';
1418

1519
@injectable()

email-worker/src/env-load.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as dotenv from 'dotenv';
2-
import * as path from 'path';
32
import * as fs from 'fs';
3+
import * as path from 'path';
44

55
if (process.env.NODE_ENV !== 'PROD') {
66
const envMap = {

email-worker/src/main.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
import 'reflect-metadata';
2+
23
import '@src/env-load';
4+
35
import { container } from '@src/container';
4-
import { DEPENDENCY_SYMBOLS } from '@app-types/dependency-symbols';
5-
import { RabbitMQManager } from '@rabbitmq/rabbitmq.manager';
6-
import { EmailConsumer } from '@email/email.consumer';
76
import logger from '@src/logger';
87

8+
import { EmailConsumer } from '@email/email.consumer';
9+
10+
import { RabbitMQManager } from '@rabbitmq/rabbitmq.manager';
11+
12+
import { DEPENDENCY_SYMBOLS } from '@app-types/dependency-symbols';
13+
914
function initializeDependencies() {
1015
return {
1116
rabbitMQManager: container.resolve<RabbitMQManager>(

0 commit comments

Comments
 (0)