diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-31 14:34:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-08-11 15:02:33 +0200 |
commit | 3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch) | |
tree | e4510b39bdac9c318fdb4b47018d08f15368b8f0 /client/src/app/shared/shared-main/users | |
parent | 04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff) | |
download | PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip |
Migrate server to ESM
Sorry for the very big commit that may lead to git log issues and merge
conflicts, but it's a major step forward:
* Server can be faster at startup because imports() are async and we can
easily lazy import big modules
* Angular doesn't seem to support ES import (with .js extension), so we
had to correctly organize peertube into a monorepo:
* Use yarn workspace feature
* Use typescript reference projects for dependencies
* Shared projects have been moved into "packages", each one is now a
node module (with a dedicated package.json/tsconfig.json)
* server/tools have been moved into apps/ and is now a dedicated app
bundled and published on NPM so users don't have to build peertube
cli tools manually
* server/tests have been moved into packages/ so we don't compile
them every time we want to run the server
* Use isolatedModule option:
* Had to move from const enum to const
(https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums)
* Had to explictely specify "type" imports when used in decorators
* Prefer tsx (that uses esbuild under the hood) instead of ts-node to
load typescript files (tests with mocha or scripts):
* To reduce test complexity as esbuild doesn't support decorator
metadata, we only test server files that do not import server
models
* We still build tests files into js files for a faster CI
* Remove unmaintained peertube CLI import script
* Removed some barrels to speed up execution (less imports)
Diffstat (limited to 'client/src/app/shared/shared-main/users')
4 files changed, 11 insertions, 10 deletions
diff --git a/client/src/app/shared/shared-main/users/user-history.service.ts b/client/src/app/shared/shared-main/users/user-history.service.ts index 4cebbc707..90a9a0eb9 100644 --- a/client/src/app/shared/shared-main/users/user-history.service.ts +++ b/client/src/app/shared/shared-main/users/user-history.service.ts | |||
@@ -2,7 +2,7 @@ import { catchError, switchMap } from 'rxjs/operators' | |||
2 | import { HttpClient, HttpParams } from '@angular/common/http' | 2 | import { HttpClient, HttpParams } from '@angular/common/http' |
3 | import { Injectable } from '@angular/core' | 3 | import { Injectable } from '@angular/core' |
4 | import { ComponentPaginationLight, RestExtractor, RestService } from '@app/core' | 4 | import { ComponentPaginationLight, RestExtractor, RestService } from '@app/core' |
5 | import { ResultList } from '@shared/models' | 5 | import { ResultList } from '@peertube/peertube-models' |
6 | import { environment } from '../../../../environments/environment' | 6 | import { environment } from '../../../../environments/environment' |
7 | import { Video } from '../video/video.model' | 7 | import { Video } from '../video/video.model' |
8 | import { VideoService } from '../video/video.service' | 8 | import { VideoService } from '../video/video.service' |
diff --git a/client/src/app/shared/shared-main/users/user-notification.model.ts b/client/src/app/shared/shared-main/users/user-notification.model.ts index 96e7b4dd0..865eff378 100644 --- a/client/src/app/shared/shared-main/users/user-notification.model.ts +++ b/client/src/app/shared/shared-main/users/user-notification.model.ts | |||
@@ -2,22 +2,23 @@ import { AuthUser } from '@app/core' | |||
2 | import { Account } from '@app/shared/shared-main/account/account.model' | 2 | import { Account } from '@app/shared/shared-main/account/account.model' |
3 | import { Actor } from '@app/shared/shared-main/account/actor.model' | 3 | import { Actor } from '@app/shared/shared-main/account/actor.model' |
4 | import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model' | 4 | import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model' |
5 | import { logger } from '@root-helpers/logger' | ||
6 | import { | 5 | import { |
7 | AbuseState, | 6 | AbuseStateType, |
8 | ActorInfo, | 7 | ActorInfo, |
9 | FollowState, | 8 | FollowState, |
10 | PluginType, | 9 | PluginType_Type, |
11 | UserNotification as UserNotificationServer, | 10 | UserNotification as UserNotificationServer, |
12 | UserNotificationType, | 11 | UserNotificationType, |
12 | UserNotificationType_Type, | ||
13 | UserRight, | 13 | UserRight, |
14 | VideoInfo | 14 | VideoInfo |
15 | } from '@shared/models' | 15 | } from '@peertube/peertube-models' |
16 | import { logger } from '@root-helpers/logger' | ||
16 | import { Video } from '../video' | 17 | import { Video } from '../video' |
17 | 18 | ||
18 | export class UserNotification implements UserNotificationServer { | 19 | export class UserNotification implements UserNotificationServer { |
19 | id: number | 20 | id: number |
20 | type: UserNotificationType | 21 | type: UserNotificationType_Type |
21 | read: boolean | 22 | read: boolean |
22 | 23 | ||
23 | video?: VideoInfo & { | 24 | video?: VideoInfo & { |
@@ -41,7 +42,7 @@ export class UserNotification implements UserNotificationServer { | |||
41 | 42 | ||
42 | abuse?: { | 43 | abuse?: { |
43 | id: number | 44 | id: number |
44 | state: AbuseState | 45 | state: AbuseStateType |
45 | 46 | ||
46 | video?: VideoInfo | 47 | video?: VideoInfo |
47 | 48 | ||
@@ -75,7 +76,7 @@ export class UserNotification implements UserNotificationServer { | |||
75 | 76 | ||
76 | plugin?: { | 77 | plugin?: { |
77 | name: string | 78 | name: string |
78 | type: PluginType | 79 | type: PluginType_Type |
79 | latestVersion: string | 80 | latestVersion: string |
80 | } | 81 | } |
81 | 82 | ||
diff --git a/client/src/app/shared/shared-main/users/user-notification.service.ts b/client/src/app/shared/shared-main/users/user-notification.service.ts index 0b3dd9a53..1f7adb994 100644 --- a/client/src/app/shared/shared-main/users/user-notification.service.ts +++ b/client/src/app/shared/shared-main/users/user-notification.service.ts | |||
@@ -4,7 +4,7 @@ import { HttpClient, HttpContext, HttpParams } from '@angular/common/http' | |||
4 | import { Injectable } from '@angular/core' | 4 | import { Injectable } from '@angular/core' |
5 | import { AuthService, ComponentPaginationLight, PeerTubeSocket, RestExtractor, RestService } from '@app/core' | 5 | import { AuthService, ComponentPaginationLight, PeerTubeSocket, RestExtractor, RestService } from '@app/core' |
6 | import { NGX_LOADING_BAR_IGNORED } from '@ngx-loading-bar/http-client' | 6 | import { NGX_LOADING_BAR_IGNORED } from '@ngx-loading-bar/http-client' |
7 | import { ResultList, UserNotification as UserNotificationServer, UserNotificationSetting } from '@shared/models' | 7 | import { ResultList, UserNotification as UserNotificationServer, UserNotificationSetting } from '@peertube/peertube-models' |
8 | import { environment } from '../../../../environments/environment' | 8 | import { environment } from '../../../../environments/environment' |
9 | import { UserNotification } from './user-notification.model' | 9 | import { UserNotification } from './user-notification.model' |
10 | 10 | ||
diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.ts b/client/src/app/shared/shared-main/users/user-notifications.component.ts index 50005b855..4318973fa 100644 --- a/client/src/app/shared/shared-main/users/user-notifications.component.ts +++ b/client/src/app/shared/shared-main/users/user-notifications.component.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Subject } from 'rxjs' | 1 | import { Subject } from 'rxjs' |
2 | import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' | 2 | import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' |
3 | import { ComponentPagination, hasMoreItems, Notifier } from '@app/core' | 3 | import { ComponentPagination, hasMoreItems, Notifier } from '@app/core' |
4 | import { AbuseState } from '@shared/models' | 4 | import { AbuseState } from '@peertube/peertube-models' |
5 | import { UserNotification } from './user-notification.model' | 5 | import { UserNotification } from './user-notification.model' |
6 | import { UserNotificationService } from './user-notification.service' | 6 | import { UserNotificationService } from './user-notification.service' |
7 | 7 | ||