github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-25 03:06:31 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: replace RouterModule from nest-router with @nestjs/core

Browse source 
Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
This commit is contained in:
Tilman Vatteroth 2023-06-16 22:49:45 +02:00
parent cf34a19494
commit ac825edbe3
4 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend/package.json
View file

@ -60,7 +60,6 @@
"ldapauth-fork": "5.0.5", "ldapauth-fork": "5.0.5",
"minio": "7.1.1", "minio": "7.1.1",
"mysql": "2.18.1", "mysql": "2.18.1",
"nest-router": "1.0.9",
"node-fetch": "2.6.11", "node-fetch": "2.6.11",
"passport": "0.6.0", "passport": "0.6.0",
"passport-custom": "1.1.1", "passport-custom": "1.1.1",

4
backend/src/app.module.ts
View file

@ -5,10 +5,10 @@
*/ */
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { ConfigModule } from '@nestjs/config'; import { ConfigModule } from '@nestjs/config';
import { RouterModule, Routes } from '@nestjs/core';
import { EventEmitterModule } from '@nestjs/event-emitter'; import { EventEmitterModule } from '@nestjs/event-emitter';
import { ScheduleModule } from '@nestjs/schedule'; import { ScheduleModule } from '@nestjs/schedule';
import { TypeOrmModule } from '@nestjs/typeorm'; import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule, Routes } from 'nest-router';
import { PrivateApiModule } from './api/private/private-api.module'; import { PrivateApiModule } from './api/private/private-api.module';
import { PublicApiModule } from './api/public/public-api.module'; import { PublicApiModule } from './api/public/public-api.module';
@ -53,7 +53,7 @@ const routes: Routes = [
@Module({ @Module({
imports: [ imports: [
RouterModule.forRoutes(routes), RouterModule.register(routes),
TypeOrmModule.forRootAsync({ TypeOrmModule.forRootAsync({
imports: [ConfigModule, LoggerModule], imports: [ConfigModule, LoggerModule],
inject: [databaseConfig.KEY, TypeormLoggerService], inject: [databaseConfig.KEY, TypeormLoggerService],

4
backend/test/test-setup.ts
View file

@ -4,11 +4,11 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import { ConfigModule, ConfigService } from '@nestjs/config'; import { ConfigModule, ConfigService } from '@nestjs/config';
import { RouterModule, Routes } from '@nestjs/core';
import { EventEmitterModule } from '@nestjs/event-emitter'; import { EventEmitterModule } from '@nestjs/event-emitter';
import { NestExpressApplication } from '@nestjs/platform-express'; import { NestExpressApplication } from '@nestjs/platform-express';
import { Test, TestingModule, TestingModuleBuilder } from '@nestjs/testing'; import { Test, TestingModule, TestingModuleBuilder } from '@nestjs/testing';
import { TypeOrmModule, TypeOrmModuleOptions } from '@nestjs/typeorm'; import { TypeOrmModule, TypeOrmModuleOptions } from '@nestjs/typeorm';
import { RouterModule, Routes } from 'nest-router';
import { Connection, createConnection } from 'typeorm'; import { Connection, createConnection } from 'typeorm';
import { PrivateApiModule } from '../src/api/private/private-api.module'; import { PrivateApiModule } from '../src/api/private/private-api.module';
@ -240,7 +240,7 @@ export class TestSetupBuilder {
'https://md-' + testSetupBuilder.testId + '.example.com'; 'https://md-' + testSetupBuilder.testId + '.example.com';
testSetupBuilder.testingModuleBuilder = Test.createTestingModule({ testSetupBuilder.testingModuleBuilder = Test.createTestingModule({
imports: [ imports: [
RouterModule.forRoutes(routes), RouterModule.register(routes),
TypeOrmModule.forRoot( TypeOrmModule.forRoot(
TestSetupBuilder.getTestDBConf(testSetupBuilder.testId), TestSetupBuilder.getTestDBConf(testSetupBuilder.testId),
), ),

8
yarn.lock
View file

@ -2339,7 +2339,6 @@ __metadata:
minio: 7.1.1 minio: 7.1.1
mocked-env: 1.3.5 mocked-env: 1.3.5
mysql: 2.18.1 mysql: 2.18.1
nest-router: 1.0.9
node-fetch: 2.6.11 node-fetch: 2.6.11
passport: 0.6.0 passport: 0.6.0
passport-custom: 1.1.1 passport-custom: 1.1.1
@ -13975,13 +13974,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"nest-router@npm:1.0.9":
version: 1.0.9
resolution: "nest-router@npm:1.0.9"
checksum: 431d0b9e344f842f0eb759b07ab461d0f06e9733a806fdeb070004f041657d7e1e9ce270a32129a7b6ac2eda6f118fde3bea0b2e7211edb4d3aa67e02d0508e4
languageName: node
linkType: hard
"next-tick@npm:1, next-tick@npm:^1.1.0": "next-tick@npm:1, next-tick@npm:^1.1.0":
version: 1.1.0 version: 1.1.0
resolution: "next-tick@npm:1.1.0" resolution: "next-tick@npm:1.1.0"