From 4d089429fe91ab7793b9b05010acb483d61345de Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 18 Jun 2018 11:02:24 +0200 Subject: [PATCH] Remove uneeded rxjs-compat --- client/package.json | 1 - .../my-account-profile/my-account-profile.component.ts | 2 +- .../my-account-video-settings.component.ts | 2 +- client/src/app/+video-channels/video-channels.component.ts | 6 +++--- client/src/app/shared/forms/markdown-textarea.component.ts | 2 +- client/yarn.lock | 4 ---- 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 @@ "raw-loader": "^0.5.1", "resolve-url-loader": "^2.0.0", "rxjs": "^6.1.0", - "rxjs-compat": "^6.1.0", "sanitize-html": "^1.16.3", "sass-loader": "^7.0.1", "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' import { User } from '@app/shared' import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' -import { Subject } from 'rxjs/Subject' +import { Subject } from 'rxjs' import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service' @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' import { FormReactive, User, UserService } from '../../../shared' import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' -import { Subject } from 'rxjs/Subject' +import { Subject } from 'rxjs' @Component({ 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 @@ -import { Component, OnInit, OnDestroy } from '@angular/core' +import { Component, OnDestroy, OnInit } from '@angular/core' import { ActivatedRoute } from '@angular/router' import { VideoChannel } from '@app/shared/video-channel/video-channel.model' import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' import { RestExtractor } from '@app/shared' -import { catchError, switchMap, map, distinctUntilChanged } from 'rxjs/operators' -import { Subscription } from 'rxjs/Subscription' +import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators' +import { Subscription } from 'rxjs' @Component({ 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' import { Component, forwardRef, Input, OnInit } from '@angular/core' import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' import { MarkdownService } from '@app/videos/shared' -import { Subject } from 'rxjs/Subject' +import { Subject } from 'rxjs' import truncate from 'lodash-es/truncate' import { ScreenService } from '@app/shared/misc/screen.service' 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: dependencies: individual "^2.0.0" -rxjs-compat@^6.1.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.2.0.tgz#2eb49cc6ac20d0d7057c6887d1895beaab0966f9" - rxjs@^5.5.2: version "5.5.11" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87"