Skip to content

Commit bdb6212

Browse files
Dmitri Dimitriogloeistrati
authored andcommitted
Dev to master 2017-06-02 (#99)
* Upgrade to Angular4 * FIX: BrowserModule has already been loaded * FIX: Typescript and Awesome-typescript-loader version dependency * Fixing missing trailing comma
1 parent d3e7819 commit bdb6212

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

src/deep-root-angular/deepkg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"identifier": "deep-root-angular",
33
"name": "deep-root-angular",
4-
"description": "Manages root structure of a microservice based on AngularJS framework.",
5-
"version": "0.0.1",
4+
"description": "Manages root structure of a microservice based on Angular framework.",
5+
"version": "0.0.2",
66
"propertyRoot": true,
77
"author": {
88
"name": "Mitoc Group",

src/deep-root-angular/frontend/js/app/app.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BrowserModule } from '@angular/platform-browser';
1+
import { CommonModule } from '@angular/common';
22
import { NgModule } from '@angular/core';
33
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
44
import { SimpleNotificationsModule } from 'angular2-notifications';
@@ -8,9 +8,9 @@ import { DeepEventService } from './services/deep-event.service';
88
import { DeepNotifierService } from './services/deep-notifier.service';
99

1010
const imports = [
11-
BrowserModule,
11+
CommonModule,
1212
SimpleNotificationsModule.forRoot(),
13-
routing
13+
routing,
1414
].concat(DeepFramework.angularDependencies);
1515

1616
let providers : Array<any> = [
@@ -26,7 +26,7 @@ if (DeepFramework.Kernel.isLocalhost) {
2626
@NgModule({
2727
declarations: [
2828
RootAngular,
29-
DefaultRootAngular
29+
DefaultRootAngular,
3030
],
3131
imports: imports,
3232
bootstrap: [RootAngular],

src/deep-root-angular/frontend/package.json

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,24 @@
77
},
88
"license": "ISC",
99
"dependencies": {
10-
"@angular/common": "^2.2.0",
11-
"@angular/compiler": "^2.2.0",
12-
"@angular/core": "^2.2.0",
13-
"@angular/forms": "^2.2.0",
14-
"@angular/http": "^2.2.0",
15-
"@angular/platform-browser": "^2.2.0",
16-
"@angular/platform-browser-dynamic": "^2.2.0",
17-
"@angular/router": "^3.2.0",
10+
"@angular/animations": "^4.1.3",
11+
"@angular/common": "^4.1.3",
12+
"@angular/compiler": "^4.1.3",
13+
"@angular/compiler-cli": "^4.1.3",
14+
"@angular/core": "^4.1.3",
15+
"@angular/forms": "^4.1.3",
16+
"@angular/http": "^4.1.3",
17+
"@angular/platform-browser": "^4.1.3",
18+
"@angular/platform-browser-dynamic": "^4.1.3",
19+
"@angular/platform-server": "^4.1.3",
20+
"@angular/router": "^4.1.3",
21+
"angular2-notifications": "^0.4.46",
1822
"core-js": "^2.4.1",
1923
"reflect-metadata": "^0.1.8",
2024
"rxjs": "^5.0.0-beta.12",
21-
"zone.js": "^0.7.2",
25+
"setimmediate": "^1.0.5",
2226
"ts-helpers": "1.1.1",
23-
"angular2-notifications": "^0.4.46",
24-
"setimmediate": "^1.0.5"
27+
"zone.js": "^0.7.2"
2528
},
2629
"devDependencies": {
2730
"angular2-template-loader": "^0.4.0",
@@ -37,7 +40,7 @@
3740
"process": "^0.11.9",
3841
"raw-loader": "^0.5.1",
3942
"style-loader": "^0.13.1",
40-
"typescript": "2.0.10",
43+
"typescript": "^2.0.10",
4144
"typings": "^1.3.2",
4245
"webpack": "^2.1.0-beta.27",
4346
"webpack-merge": "^0.14.0"

0 commit comments

Comments
 (0)