diff options
6 files changed, 6 insertions, 11 deletions
diff --git a/client/package.json b/client/package.json index ee7743ff2..245563509 100644 --- a/client/package.json +++ b/client/package.json | |||
@@ -92,7 +92,6 @@ | |||
92 | "raw-loader": "^0.5.1", | 92 | "raw-loader": "^0.5.1", |
93 | "resolve-url-loader": "^2.0.0", | 93 | "resolve-url-loader": "^2.0.0", |
94 | "rxjs": "^6.1.0", | 94 | "rxjs": "^6.1.0", |
95 | "rxjs-compat": "^6.1.0", | ||
96 | "sanitize-html": "^1.16.3", | 95 | "sanitize-html": "^1.16.3", |
97 | "sass-loader": "^7.0.1", | 96 | "sass-loader": "^7.0.1", |
98 | "sass-resources-loader": "^1.2.1", | 97 | "sass-resources-loader": "^1.2.1", |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts index 400c3b889..967e21f0b 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts +++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts | |||
@@ -4,7 +4,7 @@ import { FormReactive, UserService } from '../../../shared' | |||
4 | import { User } from '@app/shared' | 4 | import { User } from '@app/shared' |
5 | import { I18n } from '@ngx-translate/i18n-polyfill' | 5 | import { I18n } from '@ngx-translate/i18n-polyfill' |
6 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 6 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' |
7 | import { Subject } from 'rxjs/Subject' | 7 | import { Subject } from 'rxjs' |
8 | import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service' | 8 | import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service' |
9 | 9 | ||
10 | @Component({ | 10 | @Component({ |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts index 36556706e..7089b2057 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts +++ b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts | |||
@@ -5,7 +5,7 @@ import { AuthService } from '../../../core' | |||
5 | import { FormReactive, User, UserService } from '../../../shared' | 5 | import { FormReactive, User, UserService } from '../../../shared' |
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | 6 | import { I18n } from '@ngx-translate/i18n-polyfill' |
7 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 7 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' |
8 | import { Subject } from 'rxjs/Subject' | 8 | import { Subject } from 'rxjs' |
9 | 9 | ||
10 | @Component({ | 10 | @Component({ |
11 | selector: 'my-account-video-settings', | 11 | selector: 'my-account-video-settings', |
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts index cd0463859..57c55d286 100644 --- a/client/src/app/+video-channels/video-channels.component.ts +++ b/client/src/app/+video-channels/video-channels.component.ts | |||
@@ -1,10 +1,10 @@ | |||
1 | import { Component, OnInit, OnDestroy } from '@angular/core' | 1 | import { Component, OnDestroy, OnInit } from '@angular/core' |
2 | import { ActivatedRoute } from '@angular/router' | 2 | import { ActivatedRoute } from '@angular/router' |
3 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' | 3 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' |
4 | import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' | 4 | import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' |
5 | import { RestExtractor } from '@app/shared' | 5 | import { RestExtractor } from '@app/shared' |
6 | import { catchError, switchMap, map, distinctUntilChanged } from 'rxjs/operators' | 6 | import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators' |
7 | import { Subscription } from 'rxjs/Subscription' | 7 | import { Subscription } from 'rxjs' |
8 | 8 | ||
9 | @Component({ | 9 | @Component({ |
10 | templateUrl: './video-channels.component.html', | 10 | templateUrl: './video-channels.component.html', |
diff --git a/client/src/app/shared/forms/markdown-textarea.component.ts b/client/src/app/shared/forms/markdown-textarea.component.ts index db6f9e5c8..b99169ed2 100644 --- a/client/src/app/shared/forms/markdown-textarea.component.ts +++ b/client/src/app/shared/forms/markdown-textarea.component.ts | |||
@@ -2,7 +2,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators' | |||
2 | import { Component, forwardRef, Input, OnInit } from '@angular/core' | 2 | import { Component, forwardRef, Input, OnInit } from '@angular/core' |
3 | import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' | 3 | import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' |
4 | import { MarkdownService } from '@app/videos/shared' | 4 | import { MarkdownService } from '@app/videos/shared' |
5 | import { Subject } from 'rxjs/Subject' | 5 | import { Subject } from 'rxjs' |
6 | import truncate from 'lodash-es/truncate' | 6 | import truncate from 'lodash-es/truncate' |
7 | import { ScreenService } from '@app/shared/misc/screen.service' | 7 | import { ScreenService } from '@app/shared/misc/screen.service' |
8 | 8 | ||
diff --git a/client/yarn.lock b/client/yarn.lock index b9b13c18c..76d170a58 100644 --- a/client/yarn.lock +++ b/client/yarn.lock | |||
@@ -8510,10 +8510,6 @@ rust-result@^1.0.0: | |||
8510 | dependencies: | 8510 | dependencies: |
8511 | individual "^2.0.0" | 8511 | individual "^2.0.0" |
8512 | 8512 | ||
8513 | rxjs-compat@^6.1.0: | ||
8514 | version "6.2.0" | ||
8515 | resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.2.0.tgz#2eb49cc6ac20d0d7057c6887d1895beaab0966f9" | ||
8516 | |||
8517 | rxjs@^5.5.2: | 8513 | rxjs@^5.5.2: |
8518 | version "5.5.11" | 8514 | version "5.5.11" |
8519 | resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87" | 8515 | resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87" |