diff --git a/demo/index-gh.html b/demo/index-gh.html index 04e0e3ec..2a951da5 100644 --- a/demo/index-gh.html +++ b/demo/index-gh.html @@ -10,14 +10,14 @@ diff --git a/demo/index.html b/demo/index.html index e1727b54..0ccf2ee0 100644 --- a/demo/index.html +++ b/demo/index.html @@ -10,14 +10,14 @@ diff --git a/lib/components/RequestSamples/request-samples.ts b/lib/components/RequestSamples/request-samples.ts index b0ebda94..adc8c23c 100644 --- a/lib/components/RequestSamples/request-samples.ts +++ b/lib/components/RequestSamples/request-samples.ts @@ -3,7 +3,7 @@ import { Component, ViewChildren, QueryList, Input, ChangeDetectionStrategy, OnInit, HostBinding, ElementRef, NgZone } from '@angular/core'; -import { Subject } from 'rxjs/Subject'; +import { Subject } from 'rxjs'; import { BaseComponent, SpecManager } from '../base'; import JsonPointer from '../../utils/JsonPointer'; diff --git a/lib/components/SideMenu/side-menu.ts b/lib/components/SideMenu/side-menu.ts index c92b8424..dee7efd8 100644 --- a/lib/components/SideMenu/side-menu.ts +++ b/lib/components/SideMenu/side-menu.ts @@ -11,7 +11,7 @@ import { Component, OnDestroy } from '@angular/core'; -import { trigger, state, animate, transition, style } from '@angular/core'; +import { trigger, state, animate, transition, style } from '@angular/animations'; import { ScrollService, MenuService, OptionsService, MenuItem } from '../../services/'; import { PerfectScrollbar } from '../../shared/components'; import { BrowserDomAdapter as DOM } from '../../utils/browser-adapter'; diff --git a/lib/components/base.ts b/lib/components/base.ts index f38e6d2e..c726f910 100644 --- a/lib/components/base.ts +++ b/lib/components/base.ts @@ -2,7 +2,7 @@ import { OnInit, OnDestroy } from '@angular/core'; import { SpecManager } from '../utils/spec-manager'; import { AppStateService } from '../services/app-state.service'; -import { Subscription } from 'rxjs/Subscription'; +import { Subscription } from 'rxjs'; export { SpecManager }; diff --git a/lib/services/app-state.service.ts b/lib/services/app-state.service.ts index 24eb85bd..6d3d7368 100644 --- a/lib/services/app-state.service.ts +++ b/lib/services/app-state.service.ts @@ -1,8 +1,7 @@ 'use strict'; import { Injectable } from '@angular/core'; -import { Subject } from 'rxjs/Subject'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { Subject , BehaviorSubject } from 'rxjs'; @Injectable() export class AppStateService { diff --git a/lib/services/hash.service.ts b/lib/services/hash.service.ts index df381559..575fe28d 100644 --- a/lib/services/hash.service.ts +++ b/lib/services/hash.service.ts @@ -1,7 +1,7 @@ 'use strict'; import { Injectable } from '@angular/core'; import { PlatformLocation } from '@angular/common'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { BehaviorSubject } from 'rxjs'; import { debounce } from '../utils/'; diff --git a/lib/services/menu.service.ts b/lib/services/menu.service.ts index 266e119c..2a401fcf 100644 --- a/lib/services/menu.service.ts +++ b/lib/services/menu.service.ts @@ -1,7 +1,6 @@ 'use strict'; import { Injectable, EventEmitter } from '@angular/core'; -import { Subscription } from 'rxjs/Subscription'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { Subscription , BehaviorSubject } from 'rxjs'; import { ScrollService, INVIEW_POSITION } from './scroll.service'; import { WarningsService } from './warnings.service'; import { Hash } from './hash.service'; diff --git a/lib/services/warnings.service.ts b/lib/services/warnings.service.ts index 265c2e3e..63900b7c 100644 --- a/lib/services/warnings.service.ts +++ b/lib/services/warnings.service.ts @@ -1,6 +1,6 @@ 'use strict'; import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { BehaviorSubject } from 'rxjs'; @Injectable() export class WarningsService { diff --git a/lib/shared/components/LazyFor/lazy-for.ts b/lib/shared/components/LazyFor/lazy-for.ts index 772ba8ca..4fa6cd8b 100644 --- a/lib/shared/components/LazyFor/lazy-for.ts +++ b/lib/shared/components/LazyFor/lazy-for.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { BehaviorSubject } from 'rxjs'; import { ScrollService } from '../../../services/scroll.service'; import { OptionsService } from '../../../services/options.service'; diff --git a/lib/utils/spec-manager.ts b/lib/utils/spec-manager.ts index a8fe674a..93809502 100644 --- a/lib/utils/spec-manager.ts +++ b/lib/utils/spec-manager.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; import * as JsonSchemaRefParser from 'json-schema-ref-parser'; import { JsonPointer } from './JsonPointer'; import { parse as urlParse, resolve as urlResolve } from 'url'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { BehaviorSubject } from 'rxjs'; import { MdRenderer } from './md-renderer'; diff --git a/package.json b/package.json index c293b09a..10f2f512 100644 --- a/package.json +++ b/package.json @@ -54,13 +54,13 @@ "author": "Roman Hotsiy", "license": "MIT", "devDependencies": { - "@angular/common": "^4.4.3", - "@angular/compiler": "^4.4.3", - "@angular/compiler-cli": "^4.4.3", - "@angular/core": "^4.4.3", - "@angular/platform-browser": "^4.4.3", - "@angular/platform-browser-dynamic": "^4.4.3", - "@angular/platform-server": "^4.4.3", + "@angular/common": "^6.1.10", + "@angular/compiler": "^6.1.10", + "@angular/compiler-cli": "^6.1.10", + "@angular/core": "^6.1.10", + "@angular/platform-browser": "^6.1.10", + "@angular/platform-browser-dynamic": "^6.1.10", + "@angular/platform-server": "^6.1.10", "@types/jasmine": "^2.6.0", "@types/requirejs": "^2.1.31", "@types/should": "^11.2.0", @@ -95,7 +95,7 @@ "protractor": "^5.1.1", "raw-loader": "^0.5.1", "rimraf": "^2.6.2", - "rxjs": "^5.4.3", + "rxjs": "^6.3.3", "sass-loader": "^6.0.6", "shelljs": "^0.7.7", "should": "^13.1.0", @@ -111,18 +111,13 @@ "webpack-merge": "^4.1.0" }, "peerDependencies": { - "@angular/common": "^4.1.1", "@angular/compiler": "^4.1.1", - "@angular/compiler-cli": "^4.1.1", "@angular/core": "^4.1.1", - "@angular/forms": "^4.1.1", - "@angular/platform-browser": "^4.1.1", - "@angular/platform-browser-dynamic": "^4.1.1", - "@angular/platform-server": "^4.1.1", - "core-js": "^2.4.1", - "rxjs": "^5.3.1" + "@angular/forms": "^6.1.0", + "core-js": "^2.4.1" }, "dependencies": { + "@angular/animations": "^6.1.10", "core-js": "^2.5.1", "dropkickjs": "~2.1.10", "hint.css": "2.3.2",