Skip to content

Commit 372449f

Browse files
author
borysn
committed
angular rc6 updates
1 parent 56aebf5 commit 372449f

File tree

10 files changed

+62
-55
lines changed

10 files changed

+62
-55
lines changed

‎frontend/config/spec-bundle.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ require('rxjs/Rx');
2424
var testing = require('@angular/core/testing');
2525
var browser = require('@angular/platform-browser-dynamic/testing');
2626

27-
testing.setBaseTestProviders(
28-
browser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
29-
browser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS
27+
testing.TestBed.initTestEnvironment(
28+
browser.BrowserDynamicTestingModule,
29+
browser.platformBrowserDynamicTesting()
3030
);
3131

3232
/*

‎frontend/npm-debug.log.763116677‎

Whitespace-only changes.

‎frontend/package.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,24 @@
3535
"coverage": "http-server -c-1 -o -p 9875 ./coverage"
3636
},
3737
"dependencies": {
38-
"@angular/common": "2.0.0-rc.5",
39-
"@angular/compiler": "2.0.0-rc.5",
40-
"@angular/core": "2.0.0-rc.5",
41-
"@angular/forms": "0.3.0",
42-
"@angular/http": "2.0.0-rc.5",
43-
"@angular/platform-browser": "2.0.0-rc.5",
44-
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
45-
"@angular/platform-server": "2.0.0-rc.5",
46-
"@angular/router": "3.0.0-rc.1",
38+
"@angular/common": "2.0.0-rc.6",
39+
"@angular/compiler": "2.0.0-rc.6",
40+
"@angular/core": "2.0.0-rc.6",
41+
"@angular/forms": "2.0.0-rc.6",
42+
"@angular/http": "2.0.0-rc.6",
43+
"@angular/platform-browser": "2.0.0-rc.6",
44+
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
45+
"@angular/platform-server": "2.0.0-rc.6",
46+
"@angular/router": "3.0.0-rc.2",
4747
"bootstrap": "4.0.0-alpha.2",
4848
"core-js": "^2.4.1",
4949
"font-awesome": "^4.6.3",
5050
"jquery": "^3.1.0",
5151
"lodash": "^4.15.0",
5252
"moment": "^2.14.1",
53-
"ng2-bootstrap": "^1.0.24",
53+
"ng2-bootstrap": "^1.1.1",
5454
"rxjs": "5.0.0-beta.11",
55-
"tether": "^1.3.4",
55+
"tether": "^1.3.7",
5656
"zone.js": "^0.6.17"
5757
},
5858
"devDependencies": {
@@ -63,10 +63,10 @@
6363
"@types/webpack": "^1.12.33",
6464
"angular2-hmr": "~0.8.1",
6565
"angular2-template-loader": "^0.5.0",
66-
"autoprefixer": "^6.4.0",
66+
"autoprefixer": "^6.4.1",
6767
"awesome-typescript-loader": "2.2.1",
68-
"bootstrap-loader": "^2.0.0-beta.3",
69-
"codelyzer": "0.0.28",
68+
"bootstrap-loader": "^2.0.0-beta.9",
69+
"codelyzer": "^0.0.28",
7070
"copy-webpack-plugin": "^3.0.1",
7171
"css-loader": "^0.24.0",
7272
"extract-text-webpack-plugin": "^2.0.0-beta.3",
@@ -77,7 +77,7 @@
7777
"http-server": "^0.9.0",
7878
"imports-loader": "^0.6.5",
7979
"istanbul-instrumenter-loader": "^0.2.0",
80-
"jasmine-core": "^2.4.1",
80+
"jasmine-core": "^2.5.0",
8181
"json-loader": "^0.5.4",
8282
"karma": "^1.2.0",
8383
"karma-chrome-launcher": "^2.0.0",
@@ -87,17 +87,17 @@
8787
"karma-sourcemap-loader": "^0.3.7",
8888
"karma-webpack": "^1.8.0",
8989
"node-sass": "^3.8.0",
90-
"postcss-loader": "^0.11.0",
90+
"postcss-loader": "^0.11.1",
9191
"raw-loader": "^0.5.1",
9292
"remap-istanbul": "^0.6.4",
9393
"resolve": "^1.1.7",
9494
"resolve-url-loader": "^1.6.0",
9595
"rimraf": "^2.5.4",
96-
"sass-loader": "^4.0.0",
96+
"sass-loader": "^4.0.1",
9797
"source-map-loader": "^0.1.5",
9898
"style-loader": "^0.13.1",
9999
"to-string-loader": "^1.1.4",
100-
"ts-helpers": "1.1.1",
100+
"ts-helpers": "^1.1.1",
101101
"ts-node": "^1.3.0",
102102
"tslint": "^3.15.1",
103103
"tslint-loader": "^2.1.5",
@@ -107,4 +107,4 @@
107107
"webpack-dev-server": "^2.1.0-beta.0",
108108
"webpack-merge": "^0.14.1"
109109
}
110-
}
110+
}

‎frontend/src/app/app.component.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import { Component, ViewEncapsulation } from '@angular/core';
2-
import { ROUTER_DIRECTIVES } from '@angular/router';
32

43
@Component({
54
selector: 'spring-boot-angular2',
65
template: '<router-outlet></router-outlet>',
76
styleUrls: ['app.scss'],
8-
encapsulation: ViewEncapsulation.None,
9-
directives: [ROUTER_DIRECTIVES]
7+
encapsulation: ViewEncapsulation.None
108
})
119
export class AppComponent {
1210
name = 'spring-boot-angular2';

‎frontend/src/app/app.module.ts‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,33 @@
1-
import { NgModule, CUSTOM_ELEMENTS_SCHEMA, provide } from '@angular/core';
1+
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
22
import { LocationStrategy, HashLocationStrategy, APP_BASE_HREF } from '@angular/common';
33
import { BrowserModule } from '@angular/platform-browser';
4-
import { HTTP_PROVIDERS } from '@angular/http';
54
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
5+
import { HttpModule } from '@angular/http';
6+
import { AlertModule, DatepickerModule } from 'ng2-bootstrap/ng2-bootstrap';
67

7-
import { appRouterProviders } from './app.routes';
8+
import { routing, appRouterProviders } from './app.routing';
89
import { AppComponent } from './app.component';
910
import { HelloComponent } from './hello/hello.component';
1011
import { CalendarComponent } from './calendar/calendar.component';
1112
import { HomeComponent } from './home/home.component';
1213

1314
@NgModule({
14-
declarations: [AppComponent, HelloComponent, CalendarComponent, HomeComponent],
15-
imports: [BrowserModule, FormsModule, ReactiveFormsModule],
15+
declarations: [AppComponent,
16+
HelloComponent,
17+
CalendarComponent,
18+
HomeComponent],
19+
imports: [BrowserModule,
20+
FormsModule,
21+
ReactiveFormsModule,
22+
HttpModule,
23+
AlertModule,
24+
DatepickerModule,
25+
routing],
1626
schemas: [CUSTOM_ELEMENTS_SCHEMA],
1727
providers: [
18-
HTTP_PROVIDERS,
1928
appRouterProviders,
20-
provide(APP_BASE_HREF, {useValue: '/'}),
21-
provide(LocationStrategy, {useClass: HashLocationStrategy})
29+
[{provide: APP_BASE_HREF, useValue: '/'}],
30+
[{provide: LocationStrategy, useClass: HashLocationStrategy}]
2231
],
2332
bootstrap: [AppComponent]
2433
})

frontend/src/app/app.routes.ts renamed to frontend/src/app/app.routing.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
import { provideRouter, RouterConfig } from '@angular/router';
1+
import { ModuleWithProviders } from '@angular/core';
2+
import { Routes, RouterModule } from '@angular/router';
23

34
import { HelloComponent } from './hello/hello.component';
45
import { CalendarComponent } from './calendar/calendar.component';
56
import { HomeComponent } from './home/home.component';
67

7-
const routes: RouterConfig = [
8+
const appRoutes: Routes = [
89
{path: '', component: HomeComponent},
910
{path: 'calendar', component: CalendarComponent},
1011
{path: 'hello', component: HelloComponent}
1112
];
1213

13-
export const appRouterProviders = [
14-
provideRouter(routes)
15-
];
14+
export const appRouterProviders: any[] = [];
15+
16+
export const routing: ModuleWithProviders =
17+
RouterModule.forRoot(appRoutes);

‎frontend/src/app/app.spec.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
import { addProviders, inject } from '@angular/core/testing';
1+
import { TestBed, inject, async } from '@angular/core/testing';
22

33
// Load the implementations that should be tested
44
import { AppComponent } from './app.component';
55

6+
// app component test
67
describe('AppComponent', () => {
78
// provide our implementations or mocks to the dependency injector
8-
beforeEach(() => addProviders([AppComponent]));
9+
beforeEach(async(() => {
10+
TestBed.configureTestingModule({
11+
providers: [AppComponent]
12+
});
13+
}));
914

15+
// sample test
1016
it('should have a name', inject([AppComponent], (app) => {
1117
expect(app.name).toEqual('spring-boot-angular2');
1218
}));

‎frontend/src/app/calendar/calendar.component.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import { Component } from '@angular/core';
2-
import { ROUTER_DIRECTIVES } from '@angular/router';
3-
import { AlertComponent, DATEPICKER_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
42

53
@Component({
64
selector: 'calendar',
75
templateUrl: 'calendar.component.html',
8-
styleUrls: ['calendar.scss'],
9-
directives: [ROUTER_DIRECTIVES, AlertComponent, DATEPICKER_DIRECTIVES]
6+
styleUrls: ['calendar.scss']
107
})
118
export class CalendarComponent {
129

‎frontend/src/app/hello/hello.component.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { Component } from '@angular/core';
2-
import { CORE_DIRECTIVES } from '@angular/common';
3-
import { ROUTER_DIRECTIVES } from '@angular/router';
1+
import { Component, OnInit, OnDestroy } from '@angular/core';
42
import { HelloService } from './hello.service';
53

64
interface MessageJson {
@@ -12,14 +10,13 @@ interface MessageJson {
1210
selector: 'test',
1311
templateUrl: 'hello.component.html',
1412
styleUrls: ['hello.scss'],
15-
providers: [HelloService],
16-
directives: [CORE_DIRECTIVES, ROUTER_DIRECTIVES]
13+
providers: [HelloService]
1714
})
18-
export class HelloComponent {
15+
export class HelloComponent implements OnInit, OnDestroy {
1916

2017
// vars
21-
public jsonResponse: string;
22-
public messages: Array<MessageJson>;
18+
private jsonResponse: string;
19+
private messages: Array<MessageJson>;
2320
private _subscription;
2421

2522
// constructor

‎frontend/src/app/home/home.component.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { Component } from '@angular/core';
2-
import { ROUTER_DIRECTIVES } from '@angular/router';
32

43
@Component({
54
selector: 'home',
65
templateUrl: 'home.component.html',
7-
styleUrls: ['home.scss'],
8-
directives: [ROUTER_DIRECTIVES]
6+
styleUrls: ['home.scss']
97
})
108
export class HomeComponent {}

0 commit comments

Comments
 (0)