Skip to content

Commit

Permalink
Merge pull request #104 from boostcampwm-2024/fix-be-#100-main_server…
Browse files Browse the repository at this point in the history
…_esm_fix

[FIX] main server esm 수정 사항 적용
  • Loading branch information
i3kae authored Nov 14, 2024
2 parents 252d564 + 1d9b7a9 commit 63f2c74
Show file tree
Hide file tree
Showing 11 changed files with 265 additions and 400 deletions.
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ plugins:

yarnPath: .yarn/releases/yarn-4.5.1.cjs

enableGlobalCache: false

packageExtensions:
'@typescript-eslint/utils@*':
peerDependencies:
Expand Down
1 change: 1 addition & 0 deletions backend/mainServer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"author": "",
"private": true,
"license": "UNLICENSED",
"type": "module",
"scripts": {
"build": "nest build",
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
Expand Down
2 changes: 1 addition & 1 deletion backend/mainServer/src/app.controller.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Test, TestingModule } from '@nestjs/testing';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { AppService } from './app.service.js';

describe('AppController', () => {
let appController: AppController;
Expand Down
2 changes: 1 addition & 1 deletion backend/mainServer/src/app.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller, Get } from '@nestjs/common';
import { AppService } from './app.service';
import { AppService } from './app.service.js';

@Controller()
export class AppController {
Expand Down
8 changes: 4 additions & 4 deletions backend/mainServer/src/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Module } from '@nestjs/common';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { HostController } from './host/host.controller';
import { HostService } from './host/host.service';
import { AppController } from './app.controller.js';
import { AppService } from './app.service.js';
import { HostController } from './host/host.controller.js';
import { HostService } from './host/host.service.js';

@Module({
imports: [],
Expand Down
4 changes: 2 additions & 2 deletions backend/mainServer/src/host/host.controller.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// host.controller.spec.ts
import { Test, TestingModule } from '@nestjs/testing';
import { HostController } from './host.controller';
import { HostService } from './host.service';
import { HostController } from './host.controller.js';
import { HostService } from './host.service.js';
import { HttpStatus } from '@nestjs/common';
import {describe, expect, jest} from '@jest/globals';
import {Request, Response} from 'express';
Expand Down
2 changes: 1 addition & 1 deletion backend/mainServer/src/host/host.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Controller, Post, Req, Res, HttpException, HttpStatus } from '@nestjs/common';
import { HostService } from './host.service';
import { HostService } from './host.service.js';
import { Request, Response } from 'express';

@Controller('host')
Expand Down
2 changes: 1 addition & 1 deletion backend/mainServer/src/host/host.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Test, TestingModule } from '@nestjs/testing';
import { HostService } from './host.service';
import { HostService } from './host.service.js';

describe('HostService', () => {
let service: HostService;
Expand Down
2 changes: 1 addition & 1 deletion backend/mainServer/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NestFactory } from '@nestjs/core';
import { AppModule } from './app.module';
import { AppModule } from './app.module.js';

async function bootstrap() {
const app = await NestFactory.create(AppModule);
Expand Down
2 changes: 1 addition & 1 deletion backend/rtmpServer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"packageManager": "[email protected]",
"dependencies": {
"@hoeeeeeh/node-media-server": "2.7.28",
"@hoeeeeeh/node-media-server": "2.7.29",
"@types/node": "^22.9.0",
"dotenv": "^16.4.5",
"path": "0.12.7"
Expand Down
Loading

0 comments on commit 63f2c74

Please sign in to comment.