Skip to content
This repository was archived by the owner on Dec 30, 2019. It is now read-only.

Commit acac89d

Browse files
authored
Merge pull request #3 from DorianGrey/angular-2-3-update
Bump angular to 2.4.x
2 parents 45f82c2 + 2081d5d commit acac89d

File tree

2 files changed

+67
-97
lines changed

2 files changed

+67
-97
lines changed

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
"translations:dev": "npm run translations:dist -- -w"
3939
},
4040
"devDependencies": {
41-
"@angular/compiler-cli": "2.2.4",
42-
"@angular/platform-server": "2.2.4",
41+
"@angular/compiler-cli": "^2.4.0",
42+
"@angular/platform-server": "^2.4.0",
4343
"@angularclass/hmr": "1.2.2",
4444
"@angularclass/hmr-loader": "3.0.2",
45-
"@ngtools/webpack": "^1.1.9",
45+
"@ngtools/webpack": "^1.2.1",
4646
"@types/core-js": "^0.9.35",
4747
"@types/jasmine": "2.5.38",
4848
"@types/lodash": "4.14.42",
@@ -92,23 +92,23 @@
9292
"webpack-merge": "^1.1.1"
9393
},
9494
"dependencies": {
95-
"@angular/common": "2.2.4",
96-
"@angular/compiler": "2.2.4",
97-
"@angular/core": "2.2.4",
98-
"@angular/forms": "2.2.4",
99-
"@angular/http": "2.2.4",
100-
"@angular/platform-browser": "2.2.4",
101-
"@angular/platform-browser-dynamic": "2.2.4",
102-
"@angular/router": "3.2.4",
95+
"@angular/common": "^2.4.0",
96+
"@angular/compiler": "^2.4.0",
97+
"@angular/core": "^2.4.0",
98+
"@angular/forms": "^2.4.0",
99+
"@angular/http": "^2.4.0",
100+
"@angular/platform-browser": "^2.4.0",
101+
"@angular/platform-browser-dynamic": "^2.4.0",
102+
"@angular/router": "^3.4.0",
103103
"@ngrx/core": "1.2.0",
104104
"@ngrx/store": "2.2.1",
105105
"angular-router-loader": "0.4.0",
106106
"core-js": "2.4.1",
107107
"immutable": "3.8.1",
108108
"lodash": "4.17.2",
109109
"ng2-translate": "^4.2.0",
110-
"rxjs": "5.0.0-rc.4",
111-
"zone.js": "0.6.26"
110+
"rxjs": "^5.0.1",
111+
"zone.js": "^0.7.4"
112112
},
113113
"engines": {
114114
"node": ">=6.9",

yarn.lock

Lines changed: 54 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -2,66 +2,57 @@
22
# yarn lockfile v1
33

44

5-
"@angular-cli/ast-tools@^1.0.0":
6-
version "1.0.9"
7-
resolved "https://registry.yarnpkg.com/@angular-cli/ast-tools/-/ast-tools-1.0.9.tgz#be2bf235e03a956c053a1f65661abc981c7ffe38"
8-
dependencies:
9-
"@angular/tsc-wrapped" "^0.3.0"
10-
denodeify "^1.2.1"
11-
rxjs "5.0.0-beta.12"
12-
typescript "~2.0.3"
13-
14-
"@angular/[email protected]":
15-
version "2.2.4"
16-
resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.2.4.tgz#0e798cce826ba304d3b29556527a1a531f407159"
5+
"@angular/common@^2.4.0":
6+
version "2.4.0"
7+
resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.0.tgz#8adcc00bdf87f7de8a648ef0ca048eb937bf342f"
178

18-
"@angular/compiler-cli@2.2.4":
19-
version "2.2.4"
20-
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.2.4.tgz#3828a9b4b47f6f1d21aa1c80a5a63ec9a6fc7740"
9+
"@angular/compiler-cli@^2.4.0":
10+
version "2.4.0"
11+
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.4.0.tgz#3262b941f4617f7c89955fb54cd68ff9ca0a9650"
2112
dependencies:
22-
"@angular/tsc-wrapped" "^0.3.0"
13+
"@angular/tsc-wrapped" "0.5.0"
2314
minimist "^1.2.0"
2415
reflect-metadata "^0.1.2"
2516

26-
"@angular/compiler@2.2.4":
27-
version "2.2.4"
28-
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.2.4.tgz#40e8db5f801939ddc1a163079dc71b3be81a06ae"
17+
"@angular/compiler@^2.4.0":
18+
version "2.4.0"
19+
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.0.tgz#275fa0a47ff2f1e4bae9ea053b94bbcdf8dee8ac"
2920

30-
"@angular/core@2.2.4":
31-
version "2.2.4"
32-
resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.2.4.tgz#d00d5cfc734fd610cbafc14eb0749c957f004aa9"
21+
"@angular/core@^2.4.0":
22+
version "2.4.0"
23+
resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.0.tgz#7da68c85c6f2d76e5c391daefd3eedf545305bb5"
3324

34-
"@angular/forms@2.2.4":
35-
version "2.2.4"
36-
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.2.4.tgz#95f15ca1938879298ccc0ef8a3e9ef5e750e31ef"
25+
"@angular/forms@^2.4.0":
26+
version "2.4.0"
27+
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.4.0.tgz#d0daf261d00927a3c09355ce21f8e6c118253cc3"
3728

38-
"@angular/http@2.2.4":
39-
version "2.2.4"
40-
resolved "https://registry.yarnpkg.com/@angular/http/-/http-2.2.4.tgz#ccfeb3f805e0628f6bb9efa129ef432d79548c63"
29+
"@angular/http@^2.4.0":
30+
version "2.4.0"
31+
resolved "https://registry.yarnpkg.com/@angular/http/-/http-2.4.0.tgz#21083c631f95b73a9e472d74170dfd70395be91f"
4132

42-
"@angular/platform-browser-dynamic@2.2.4":
43-
version "2.2.4"
44-
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.2.4.tgz#4895cc035ab393ec9e74e7684211a9209ea86825"
33+
"@angular/platform-browser-dynamic@^2.4.0":
34+
version "2.4.0"
35+
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.0.tgz#56348ae1ab5a4382442fe2c5436262c78dba48dc"
4536

46-
"@angular/platform-browser@2.2.4":
47-
version "2.2.4"
48-
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.2.4.tgz#6041e02c7ed62622c926060869506705f79fb5fb"
37+
"@angular/platform-browser@^2.4.0":
38+
version "2.4.0"
39+
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.0.tgz#c662a0fefec50ff18b8fface93686e2267037714"
4940

50-
"@angular/platform-server@2.2.4":
51-
version "2.2.4"
52-
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-2.2.4.tgz#b57d42e86ccf612dcaa39909b0ef5bf20e3856fb"
41+
"@angular/platform-server@^2.4.0":
42+
version "2.4.0"
43+
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-2.4.0.tgz#d6589a4640eb1c9eb85c80799e1b1cdff1c2cd1a"
5344
dependencies:
5445
parse5 "^2.2.1"
5546

56-
"@angular/router@3.2.4":
57-
version "3.2.4"
58-
resolved "https://registry.yarnpkg.com/@angular/router/-/router-3.2.4.tgz#dfec71ad072ec031364ba5d08bd6fe03fd5beadc"
47+
"@angular/router@^3.4.0":
48+
version "3.4.0"
49+
resolved "https://registry.yarnpkg.com/@angular/router/-/router-3.4.0.tgz#134346631c11a269d75cce3da9f0ef0b3d0b95b4"
5950

60-
"@angular/tsc-wrapped@^0.3.0":
61-
version "0.3.0"
62-
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.3.0.tgz#98cdeb5c38d145b187c0ad0397a8d98b217f33f2"
51+
"@angular/tsc-wrapped@0.5.0":
52+
version "0.5.0"
53+
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.0.tgz#e50f81af02c6817dcaba22032e49ba8060d628b4"
6354
dependencies:
64-
tsickle "^0.1.7"
55+
tsickle "^0.2"
6556

6657
"@angularclass/[email protected]":
6758
version "3.0.2"
@@ -81,11 +72,12 @@
8172
version "2.2.1"
8273
resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-2.2.1.tgz#316ec1e43aa5a0166e5e6e1aa2c34a4049386510"
8374

84-
"@ngtools/webpack@^1.1.9":
85-
version "1.1.9"
86-
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.1.9.tgz#ec40fb5e0082d517ae332b76de3fb46341fb8c7f"
75+
"@ngtools/webpack@^1.2.1":
76+
version "1.2.1"
77+
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.2.1.tgz#b32a2cda4aabb14518b3a16840b30d6a0e2f131e"
8778
dependencies:
88-
"@angular-cli/ast-tools" "^1.0.0"
79+
enhanced-resolve "^2.3.0"
80+
loader-utils "^0.2.16"
8981
magic-string "^0.16.0"
9082
source-map "^0.5.6"
9183

@@ -1242,10 +1234,6 @@ delegates@^1.0.0:
12421234
version "1.0.0"
12431235
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
12441236

1245-
denodeify@^1.2.1:
1246-
version "1.2.1"
1247-
resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
1248-
12491237
depd@~1.1.0:
12501238
version "1.1.0"
12511239
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
@@ -1438,7 +1426,7 @@ [email protected]:
14381426
engine.io-parser "1.2.4"
14391427
ws "1.0.1"
14401428

1441-
enhanced-resolve@^2.2.0, enhanced-resolve@^2.2.2:
1429+
enhanced-resolve@^2.2.0, enhanced-resolve@^2.2.2, enhanced-resolve@^2.3.0:
14421430
version "2.3.0"
14431431
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz#a115c32504b6302e85a76269d7a57ccdd962e359"
14441432
dependencies:
@@ -4275,15 +4263,9 @@ [email protected]:
42754263
version "2.3.24"
42764264
resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
42774265

4278-
4279-
version "5.0.0-beta.12"
4280-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.0-beta.12.tgz#cdfde2d8c4639d20ae7794bff8fddf32da7ad337"
4281-
dependencies:
4282-
symbol-observable "^1.0.1"
4283-
4284-
4285-
version "5.0.0-rc.4"
4286-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.0-rc.4.tgz#a4d08bc5d7f30d48ed7130e2995490c326a325c4"
4266+
rxjs@^5.0.1:
4267+
version "5.0.1"
4268+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.1.tgz#3a69bdf9f0ca0a986303370d4708f72bdfac8356"
42874269
dependencies:
42884270
symbol-observable "^1.0.1"
42894271

@@ -4490,24 +4472,12 @@ [email protected]:
44904472
loader-utils "~0.2.2"
44914473
source-map "~0.1.33"
44924474

4493-
source-map-support@^0.3.1:
4494-
version "0.3.3"
4495-
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.3.3.tgz#34900977d5ba3f07c7757ee72e73bb1a9b53754f"
4496-
dependencies:
4497-
source-map "0.1.32"
4498-
4499-
source-map-support@^0.4.0:
4475+
source-map-support@^0.4.0, source-map-support@^0.4.2:
45004476
version "0.4.6"
45014477
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.6.tgz#32552aa64b458392a85eab3b0b5ee61527167aeb"
45024478
dependencies:
45034479
source-map "^0.5.3"
45044480

4505-
4506-
version "0.1.32"
4507-
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
4508-
dependencies:
4509-
amdefine ">=0.0.4"
4510-
45114481
[email protected], source-map@^0.4.2, source-map@^0.4.4:
45124482
version "0.4.4"
45134483
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
@@ -4921,14 +4891,14 @@ [email protected]:
49214891
version "1.1.2"
49224892
resolved "https://registry.yarnpkg.com/ts-helpers/-/ts-helpers-1.1.2.tgz#fc69be9f1f3baed01fb1a0ef8d4cfe748814d835"
49234893

4924-
tsickle@^0.1.7:
4925-
version "0.1.7"
4926-
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.1.7.tgz#bfe8f4cdcdaf9a40b84a729a38480c2f824f18ab"
4894+
tsickle@^0.2:
4895+
version "0.2.2"
4896+
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.2.2.tgz#8ee081a3d6ea32052d23e8d112bf525926e44adb"
49274897
dependencies:
49284898
minimist "^1.2.0"
49294899
mkdirp "^0.5.1"
4930-
source-map "^0.4.2"
4931-
source-map-support "^0.3.1"
4900+
source-map "^0.5.6"
4901+
source-map-support "^0.4.2"
49324902

49334903
49344904
version "4.0.2"
@@ -4972,7 +4942,7 @@ typedarray@~0.0.5:
49724942
version "0.0.6"
49734943
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
49744944

4975-
[email protected], typescript@~2.0.3:
4945+
49764946
version "2.0.10"
49774947
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.10.tgz#ccdd4ed86fd5550a407101a0814012e1b3fac3dd"
49784948

@@ -5467,6 +5437,6 @@ [email protected]:
54675437
version "0.1.2"
54685438
resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
54695439

5470-
zone.js@0.6.26:
5471-
version "0.6.26"
5472-
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.6.26.tgz#067c13b8b80223a89b62e9dc82680f09762c4636"
5440+
zone.js@^0.7.4:
5441+
version "0.7.4"
5442+
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.4.tgz#0e624fe5b724450ee433495deff15c02b3908ee0"

0 commit comments

Comments
 (0)