Skip to content

Commit a019c9b

Browse files
OceansideBillMarkPieszak
authored andcommitted
feat(rxjs6): added modifications to support updates to ngx-bootstrap
and get translation functioning with RXJS 6.
1 parent 82afbb5 commit a019c9b

File tree

6 files changed

+50
-84
lines changed

6 files changed

+50
-84
lines changed

ClientApp/app/app.component.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID, Injector } from '@angular/core';
1+
2+
import {mergeMap, map, filter} from 'rxjs/operators';
3+
import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID, Injector } from '@angular/core';
24
import { Router, NavigationEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router';
35
import { Meta, Title, DOCUMENT, MetaDefinition } from '@angular/platform-browser';
4-
import { Subscription } from 'rxjs/Subscription';
6+
import { Subscription } from 'rxjs';
57
import { isPlatformServer } from '@angular/common';
68
import { LinkService } from './shared/link.service';
79

@@ -60,15 +62,15 @@ export class AppComponent implements OnInit, OnDestroy {
6062

6163
private _changeTitleOnNavigation() {
6264

63-
this.routerSub$ = this.router.events
64-
.filter(event => event instanceof NavigationEnd)
65-
.map(() => this.activatedRoute)
66-
.map(route => {
65+
this.routerSub$ = this.router.events.pipe(
66+
filter(event => event instanceof NavigationEnd),
67+
map(() => this.activatedRoute),
68+
map(route => {
6769
while (route.firstChild) route = route.firstChild;
6870
return route;
69-
})
70-
.filter(route => route.outlet === 'primary')
71-
.mergeMap(route => route.data)
71+
}),
72+
filter(route => route.outlet === 'primary'),
73+
mergeMap(route => route.data),)
7274
.subscribe((event) => {
7375
this._setMetaAndLinks(event);
7476
});

ClientApp/app/app.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { FormsModule } from '@angular/forms';
77
import { BrowserModule, BrowserTransferStateModule } from '@angular/platform-browser';
88
import { TransferHttpCacheModule } from '@nguniversal/common';
99

10-
import { Ng2BootstrapModule } from 'ngx-bootstrap';
10+
import { AccordionModule } from 'ngx-bootstrap';
1111

1212
// i18n support
1313
import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
@@ -57,7 +57,7 @@ export function createTranslateLoader(http: HttpClient, baseHref) {
5757

5858

5959
FormsModule,
60-
Ng2BootstrapModule.forRoot(), // You could also split this up if you don't want the Entire Module imported
60+
AccordionModule.forRoot(), // You could also split this up if you don't want the Entire Module imported
6161

6262
// i18n support
6363
TranslateModule.forRoot({

ClientApp/app/shared/user.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Injectable, Inject, Injector } from '@angular/core';
1+
import { Injectable, Inject, Injector } from '@angular/core';
22
import { HttpClient } from '@angular/common/http';
33
import { Http, URLSearchParams } from '@angular/http';
44
import { APP_BASE_HREF } from '@angular/common';
55
import { ORIGIN_URL } from '@nguniversal/aspnetcore-engine/tokens';
66
import { IUser } from '../models/User';
7-
import { Observable } from 'rxjs/Observable';
7+
import { Observable } from 'rxjs';
88

99

1010
@Injectable()

ClientApp/polyfills/polyfills.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-

1+
22
/***************************************************************************************************
33
* BROWSER POLYFILLS
44
*/
@@ -28,10 +28,3 @@
2828
import 'core-js/es6/reflect';
2929
import 'core-js/es7/reflect';
3030

31-
/**
32-
* Date, currency, decimal and percent pipes.
33-
* Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
34-
*/
35-
// import 'intl'; // Run `npm install --save intl`.
36-
37-
import './rx-imports';

ClientApp/polyfills/rx-imports.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

package.json

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -28,65 +28,66 @@
2828
"@angular/router": "^5.0.0",
2929
"@nguniversal/aspnetcore-engine": "^5.0.0-beta.8",
3030
"@nguniversal/common": "^5.0.0-beta.8",
31-
"@ngx-translate/core": "^8.0.0",
32-
"@ngx-translate/http-loader": "^2.0.0",
31+
"@ngx-translate/core": "^9.1.1",
32+
"@ngx-translate/http-loader": "^2.0.1",
3333
"@types/node": "^7.0.12",
3434
"angular2-router-loader": "^0.3.5",
3535
"angular2-template-loader": "^0.6.2",
3636
"aspnet-prerendering": "^3.0.1",
37-
"aspnet-webpack": "^2.0.1",
38-
"awesome-typescript-loader": "^3.0.0",
39-
"bootstrap": "^3.3.7",
37+
"aspnet-webpack": "^2.0.3",
38+
"awesome-typescript-loader": "^3.2.3",
39+
"bootstrap": "^4.1.1",
4040
"bootstrap-sass": "^3.3.7",
41-
"core-js": "^2.5.1",
42-
"css": "^2.2.1",
43-
"css-loader": "^0.28.7",
44-
"event-source-polyfill": "^0.0.9",
45-
"expose-loader": "^0.7.3",
46-
"extract-text-webpack-plugin": "^3.0.0",
47-
"file-loader": "^0.11.2",
48-
"html-loader": "^0.5.1",
41+
"core-js": "^2.5.6",
42+
"css": "^2.2.3",
43+
"css-loader": "^0.28.11",
44+
"event-source-polyfill": "^0.0.12",
45+
"expose-loader": "^0.7.5",
46+
"extract-text-webpack-plugin": "^3.0.2",
47+
"file-loader": "^1.1.11",
48+
"html-loader": "^0.5.5",
4949
"isomorphic-fetch": "^2.2.1",
50-
"jquery": "^2.2.1",
51-
"json-loader": "^0.5.4",
50+
"jquery": "^3.3.1",
51+
"json-loader": "^0.5.7",
5252
"moment": "2.18.1",
53-
"ngx-bootstrap": "2.0.0-beta.6",
54-
"node-sass": "^4.5.2",
53+
"ngx-bootstrap": "2.0.5",
54+
"node-sass": "^4.9.0",
5555
"preboot": "^5.0.0",
5656
"raw-loader": "^0.5.1",
5757
"rimraf": "^2.6.2",
58-
"rxjs": "^5.5.6",
58+
"rxjs": "^6.1.0",
59+
"rxjs-compat": "^6.1.0",
5960
"sass-loader": "^6.0.6",
6061
"style-loader": "^0.18.2",
6162
"to-string-loader": "^1.1.5",
62-
"typescript": "~2.5.0",
63-
"url-loader": "^0.5.7",
63+
"typescript": "~2.7.2",
64+
"url-loader": "^1.0.1",
6465
"webpack": "^3.6.0",
65-
"webpack-hot-middleware": "^2.19.1",
66+
"webpack-hot-middleware": "^2.22.1",
6667
"webpack-merge": "^4.1.0",
67-
"zone.js": "^0.8.17"
68+
"zone.js": "^0.8.26"
6869
},
6970
"devDependencies": {
7071
"@angular/cli": "^1.7.0-beta.1",
7172
"@angular/compiler-cli": "^5.2.1",
7273
"@ngtools/webpack": "^1.9.0",
73-
"@types/chai": "^3.4.34",
74-
"@types/jasmine": "^2.5.37",
75-
"chai": "^3.5.0",
76-
"codelyzer": "^3.0.0",
77-
"istanbul-instrumenter-loader": "^3.0.0",
74+
"@types/chai": "^4.1.3",
75+
"@types/jasmine": "^2.8.7",
76+
"chai": "^4.1.2",
77+
"codelyzer": "^3.1.2",
78+
"istanbul-instrumenter-loader": "^3.0.1",
7879
"jasmine-core": "^2.5.2",
7980
"karma": "^1.7.1",
8081
"karma-chai": "^0.1.0",
8182
"karma-chrome-launcher": "^2.2.0",
8283
"karma-coverage": "^1.1.1",
83-
"karma-jasmine": "^1.1.0",
84-
"karma-mocha-reporter": "^2.2.4",
84+
"karma-jasmine": "^1.1.2",
85+
"karma-mocha-reporter": "^2.2.5",
8586
"karma-phantomjs-launcher": "^1.0.4",
86-
"karma-remap-coverage": "^0.1.4",
87+
"karma-remap-coverage": "^0.1.5",
8788
"karma-sourcemap-loader": "^0.3.7",
88-
"karma-webpack": "^2.0.3",
89-
"tslint": "^5.7.0",
90-
"webpack-bundle-analyzer": "^2.9.0"
89+
"karma-webpack": "^2.0.4",
90+
"tslint": "^5.10.0",
91+
"webpack-bundle-analyzer": "^2.12.0"
9192
}
9293
}

0 commit comments

Comments
 (0)