Skip to content

Commit dec4075

Browse files
authored
Merge pull request CirclonGroup#126 from schmuli/master
Update to Angular 2.3.0 and update dependencies
2 parents e79aea6 + cdaad79 commit dec4075

File tree

2 files changed

+19
-26
lines changed

2 files changed

+19
-26
lines changed

package.json

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,43 +32,35 @@
3232
"Adam Klein <adam@500tech.com>"
3333
],
3434
"peerDependencies": {
35-
"@angular/common": "^2.0.0",
36-
"@angular/compiler": "^2.0.0",
3735
"@angular/core": "^2.0.0",
38-
"@angular/http": "^2.0.0",
39-
"@angular/platform-browser": "^2.0.0",
40-
"@angular/platform-browser-dynamic": "^2.0.0",
41-
"zone.js": "^0.6.21"
36+
"@angular/common": "^2.0.0",
4237
},
4338
"dependencies": {
44-
"core-js": "^2.4.0",
45-
"es6-promise": "^3.1.2",
46-
"es6-shim": "^0.35.0",
47-
"lodash": "^4.6.1",
48-
"reflect-metadata": "^0.1.3",
49-
"rxjs": "5.0.0-beta.12",
50-
"ts-helpers": "^1.1.1"
39+
"lodash": "^4.6.1"
5140
},
5241
"devDependencies": {
53-
"@angular/common": "^2.0.0",
54-
"@angular/compiler": "^2.0.0",
55-
"@angular/compiler-cli": "^2.0.0",
56-
"@angular/core": "^2.0.0",
57-
"@angular/http": "^2.0.0",
58-
"@angular/platform-browser": "^2.0.0",
59-
"@angular/platform-browser-dynamic": "^2.0.0",
60-
"@angular/platform-server": "^2.0.1",
61-
"@types/angular2": "0.0.2",
42+
"@angular/common": "^2.3.0",
43+
"@angular/compiler": "^2.3.0",
44+
"@angular/compiler-cli": "^2.3.0",
45+
"@angular/core": "^2.3.0",
46+
"@angular/http": "^2.3.0",
47+
"@angular/platform-browser": "^2.3.0",
48+
"@angular/platform-browser-dynamic": "^2.3.0",
49+
"@angular/platform-server": "^2.3.0",
6250
"@types/core-js": "0.9.34",
6351
"@types/jasmine": "2.5.38",
6452
"@types/lodash": "4.14.40",
6553
"@types/node": "^6.0.38",
6654
"@types/rx": "2.5.34",
6755
"@types/webpack": "^1.12.29",
56+
"core-js": "^2.4.0",
57+
"lodash": "^4.6.1",
58+
"reflect-metadata": "^0.1.3",
6859
"rimraf": "^2.5.1",
60+
"rxjs": "5.0.0-rc.4",
6961
"typedoc": "^0.3.12",
70-
"typescript": "^2.0.3",
71-
"zone.js": "^0.6.21"
62+
"typescript": "^2.1.4",
63+
"zone.js": "^0.7.2"
7264
},
7365
"repository": {
7466
"type": "git",

tsconfig.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"compileOnSave": false,
2020
"buildOnSave": false,
2121
"angularCompilerOptions": {
22-
"genDir": "compiled"
22+
"genDir": "compiled",
23+
"skipMetadataEmit": true
2324
}
24-
}
25+
}

0 commit comments

Comments
 (0)