From f77eb73b5e02bed9e223dafc1c203ceb7c05b6e5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 7 Feb 2020 10:27:16 +0100 Subject: [PATCH] Fix angular 9 build --- client/angular.json | 8 -------- client/package.json | 2 +- .../instance-account-blocklist.component.ts | 2 +- .../instance-server-blocklist.component.ts | 2 +- .../video-abuse-list/video-abuse-list.component.ts | 2 +- .../video-blacklist-list.component.ts | 2 +- .../src/app/+admin/users/user-list/user-list.component.ts | 2 +- .../my-account-blocklist.component.ts | 2 +- .../my-account-server-blocklist.component.ts | 2 +- .../my-account-ownership.component.ts | 2 +- .../my-account-video-imports.component.ts | 2 +- client/src/app/shared/rest/rest-table.ts | 3 +-- client/src/app/shared/rest/rest.service.ts | 2 +- client/src/app/shared/shared.module.ts | 2 +- client/src/app/shared/video-abuse/video-abuse.service.ts | 2 +- .../app/shared/video-blacklist/video-blacklist.service.ts | 2 +- .../src/app/shared/video-import/video-import.service.ts | 2 +- .../app/shared/video-ownership/video-ownership.service.ts | 2 +- .../app/videos/+video-edit/shared/video-edit.module.ts | 2 +- client/yarn.lock | 8 ++++---- 20 files changed, 22 insertions(+), 31 deletions(-) diff --git a/client/angular.json b/client/angular.json index ddc9272ef..f3f146bcb 100644 --- a/client/angular.json +++ b/client/angular.json @@ -4,14 +4,6 @@ "newProjectRoot": "projects", "projects": { "PeerTube": { - "i18n": { - "locales": { - "fr_FR": { - "translation": "src/i18n/messages.fr_FR.xlf", - "baseHref": "" - } - } - }, "root": "", "sourceRoot": "src", "projectType": "application", diff --git a/client/package.json b/client/package.json index ed5dd7689..de5c0182b 100644 --- a/client/package.json +++ b/client/package.json @@ -109,7 +109,7 @@ "path-browserify": "^1.0.0", "primeng": "^9.0.0-rc.4", "process": "^0.11.10", - "protractor": "^5.3.2", + "protractor": "^5.4.3", "purify-css": "^1.2.5", "purifycss-webpack": "^0.7.0", "raw-loader": "^1", diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts index 032bf745a..03e3379e6 100644 --- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts +++ b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core' import { Notifier } from '@app/core' import { I18n } from '@ngx-translate/i18n-polyfill' import { RestPagination, RestTable } from '@app/shared' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { AccountBlock, BlocklistService } from '@app/shared/blocklist' @Component({ diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts index db3dfcd1c..d92a4f195 100644 --- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts +++ b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core' import { Notifier } from '@app/core' import { I18n } from '@ngx-translate/i18n-polyfill' import { RestPagination, RestTable } from '@app/shared' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { BlocklistService } from '@app/shared/blocklist' import { ServerBlock } from '../../../../../../shared' diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts index 778f18d3d..51114e087 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core' import { Account } from '../../../shared/account/account.model' import { Notifier } from '@app/core' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { VideoAbuse, VideoAbuseState } from '../../../../../../shared' import { RestPagination, RestTable, VideoAbuseService } from '../../../shared' import { I18n } from '@ngx-translate/i18n-polyfill' diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts index 5876f658b..a215714b8 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { Notifier, ServerService } from '@app/core' import { ConfirmService } from '../../../core' import { RestPagination, RestTable, VideoBlacklistService } from '../../../shared' diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts index 7c5e8eaa4..6e9a1feda 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/users/user-list/user-list.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core' import { AuthService, Notifier } from '@app/core' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { ConfirmService, ServerService } from '../../../core' import { RestPagination, RestTable, UserService } from '../../../shared' import { I18n } from '@ngx-translate/i18n-polyfill' diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts index e3025dec4..15b58e45c 100644 --- a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts +++ b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core' import { Notifier } from '@app/core' import { I18n } from '@ngx-translate/i18n-polyfill' import { RestPagination, RestTable } from '@app/shared' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { AccountBlock, BlocklistService } from '@app/shared/blocklist' @Component({ diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts index 4c5cc28b8..e735d4ab7 100644 --- a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts +++ b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core' import { Notifier } from '@app/core' import { I18n } from '@ngx-translate/i18n-polyfill' import { RestPagination, RestTable } from '@app/shared' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { ServerBlock } from '../../../../../shared' import { BlocklistService } from '@app/shared/blocklist' diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts index aeeb0e5a7..cd8065800 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts +++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core' import { Notifier } from '@app/core' import { RestPagination, RestTable } from '@app/shared' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { VideoChangeOwnership } from '../../../../../shared' import { VideoOwnershipService } from '@app/shared/video-ownership' import { Account } from '@app/shared/account/account.model' diff --git a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts index 21a10c8ff..74c42bb4f 100644 --- a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts +++ b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core' import { RestPagination, RestTable } from '@app/shared' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { Notifier } from '@app/core' import { I18n } from '@ngx-translate/i18n-polyfill' import { VideoImport, VideoImportState } from '../../../../../shared/models/videos' diff --git a/client/src/app/shared/rest/rest-table.ts b/client/src/app/shared/rest/rest-table.ts index c180346af..f44643c0f 100644 --- a/client/src/app/shared/rest/rest-table.ts +++ b/client/src/app/shared/rest/rest-table.ts @@ -1,6 +1,5 @@ import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage' -import { LazyLoadEvent } from 'primeng/components/common/lazyloadevent' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { LazyLoadEvent, SortMeta } from 'primeng/api' import { RestPagination } from './rest-pagination' import { Subject } from 'rxjs' import { debounceTime, distinctUntilChanged } from 'rxjs/operators' diff --git a/client/src/app/shared/rest/rest.service.ts b/client/src/app/shared/rest/rest.service.ts index 16bb6d82c..5bd2b5e43 100644 --- a/client/src/app/shared/rest/rest.service.ts +++ b/client/src/app/shared/rest/rest.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core' import { HttpParams } from '@angular/common/http' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { ComponentPagination, ComponentPaginationLight } from './component-pagination.model' import { RestPagination } from './rest-pagination' diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index d06d37d8c..f39a889e9 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -7,7 +7,7 @@ import { MarkdownTextareaComponent } from '@app/shared/forms/markdown-textarea.c import { HelpComponent } from '@app/shared/misc/help.component' import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive' import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' -import { SharedModule as PrimeSharedModule } from 'primeng/components/common/shared' +import { SharedModule as PrimeSharedModule } from 'primeng/api' import { AUTH_INTERCEPTOR_PROVIDER } from './auth' import { ButtonComponent } from './buttons/button.component' import { DeleteButtonComponent } from './buttons/delete-button.component' diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index b0b59ea0c..61a328575 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -1,7 +1,7 @@ import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { Observable } from 'rxjs' import { ResultList, VideoAbuse, VideoAbuseUpdate } from '../../../../../shared' import { environment } from '../../../environments/environment' diff --git a/client/src/app/shared/video-blacklist/video-blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts index 491fa698b..116177c4a 100644 --- a/client/src/app/shared/video-blacklist/video-blacklist.service.ts +++ b/client/src/app/shared/video-blacklist/video-blacklist.service.ts @@ -1,7 +1,7 @@ import { catchError, map, concatMap, toArray } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { from as observableFrom, Observable } from 'rxjs' import { VideoBlacklist, VideoBlacklistType, ResultList } from '../../../../../shared' import { Video } from '../video/video.model' diff --git a/client/src/app/shared/video-import/video-import.service.ts b/client/src/app/shared/video-import/video-import.service.ts index 3e3fb7dfb..afd9e3fb5 100644 --- a/client/src/app/shared/video-import/video-import.service.ts +++ b/client/src/app/shared/video-import/video-import.service.ts @@ -9,7 +9,7 @@ import { VideoImportCreate, VideoUpdate } from '../../../../../shared/models/vid import { objectToFormData } from '@app/shared/misc/utils' import { ResultList } from '../../../../../shared/models/result-list.model' import { UserService } from '@app/shared/users/user.service' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { RestPagination } from '@app/shared/rest' import { ServerService } from '@app/core' diff --git a/client/src/app/shared/video-ownership/video-ownership.service.ts b/client/src/app/shared/video-ownership/video-ownership.service.ts index aa9e4839a..b95d5b792 100644 --- a/client/src/app/shared/video-ownership/video-ownership.service.ts +++ b/client/src/app/shared/video-ownership/video-ownership.service.ts @@ -5,7 +5,7 @@ import { environment } from '../../../environments/environment' import { RestExtractor, RestService } from '../rest' import { VideoChangeOwnershipCreate } from '../../../../../shared/models/videos' import { Observable } from 'rxjs/index' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { ResultList, VideoChangeOwnership } from '../../../../../shared' import { RestPagination } from '@app/shared/rest' import { VideoChangeOwnershipAccept } from '../../../../../shared/models/videos/video-change-ownership-accept.model' diff --git a/client/src/app/videos/+video-edit/shared/video-edit.module.ts b/client/src/app/videos/+video-edit/shared/video-edit.module.ts index 39b6daa93..1357d607c 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.module.ts +++ b/client/src/app/videos/+video-edit/shared/video-edit.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core' import { TagInputModule } from 'ngx-chips' import { SharedModule } from '../../../shared/' import { VideoEditComponent } from './video-edit.component' -import { CalendarModule } from 'primeng/components/calendar/calendar' +import { CalendarModule } from 'primeng/calendar' import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component' @NgModule({ diff --git a/client/yarn.lock b/client/yarn.lock index e9d70f8ec..536bd1f99 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -8961,10 +8961,10 @@ protoduck@^5.0.1: dependencies: genfun "^5.0.0" -protractor@^5.3.2: - version "5.4.2" - resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.2.tgz#329efe37f48b2141ab9467799be2d4d12eb48c13" - integrity sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA== +protractor@^5.4.3: + version "5.4.3" + resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.3.tgz#35f050741e404a45868618ea648745d89af31683" + integrity sha512-7pMAolv8Ah1yJIqaorDTzACtn3gk7BamVKPTeO5lqIGOrfosjPgXFx/z1dqSI+m5EeZc2GMJHPr5DYlodujDNA== dependencies: "@types/q" "^0.0.32" "@types/selenium-webdriver" "^3.0.0" -- 2.25.1