Skip to content

Commit 140c95c

Browse files
devversiontinayuangao
authored andcommitted
build: increase minimum angular version (#3017)
* Currently Angular Material supports Angular v2.2.0, but some components already use methods that are only available in `v2.3.0`. This means that Material isn't really compatible with v2.2.0 anymore. * Since Angular `v.2.3.0` includes a lot of good fixes (like proper metadata inheritance) we should upgrade to `v2.3.0`. See angular/angular@f5c8e09 Related to #2394
1 parent ac9c090 commit 140c95c

File tree

5 files changed

+82
-62
lines changed

5 files changed

+82
-62
lines changed

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@
2525
"node": ">= 5.4.1 < 7"
2626
},
2727
"dependencies": {
28-
"@angular/common": "^2.2.0",
29-
"@angular/compiler": "^2.2.0",
30-
"@angular/core": "^2.2.0",
31-
"@angular/forms": "^2.2.0",
32-
"@angular/http": "^2.2.0",
33-
"@angular/platform-browser": "^2.2.0",
28+
"@angular/common": "^2.3.0",
29+
"@angular/compiler": "^2.3.0",
30+
"@angular/core": "^2.3.0",
31+
"@angular/forms": "^2.3.0",
32+
"@angular/http": "^2.3.0",
33+
"@angular/platform-browser": "^2.3.0",
3434
"core-js": "^2.4.1",
35-
"rxjs": "5.0.0-beta.12",
35+
"rxjs": "^5.0.1",
3636
"systemjs": "0.19.43",
37-
"zone.js": "^0.6.23"
37+
"zone.js": "^0.7.2"
3838
},
3939
"devDependencies": {
40-
"@angular/compiler-cli": "^2.2.0",
41-
"@angular/platform-browser-dynamic": "^2.2.0",
42-
"@angular/platform-server": "^2.2.0",
43-
"@angular/router": "^3.2.0",
40+
"@angular/compiler-cli": "^2.3.0",
41+
"@angular/platform-browser-dynamic": "^2.3.0",
42+
"@angular/platform-server": "^2.3.0",
43+
"@angular/router": "^3.3.0",
4444
"@types/glob": "^5.0.30",
4545
"@types/gulp": "^3.8.32",
4646
"@types/hammerjs": "^2.0.34",

src/lib/button/button.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ export class MdButton {
184184
moduleId: module.id,
185185
selector: `a[md-button], a[md-raised-button], a[md-icon-button], a[md-fab], a[md-mini-fab],
186186
a[mat-button], a[mat-raised-button], a[mat-icon-button], a[mat-fab], a[mat-mini-fab]`,
187-
inputs: ['color', 'disabled', 'disableRipple'],
188187
host: {
189188
'[attr.disabled]': 'disabled',
190189
'[attr.aria-disabled]': '_isAriaDisabled',

src/lib/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
},
2222
"homepage": "https://github.com/angular/material2#readme",
2323
"peerDependencies": {
24-
"@angular/core": "^2.2.0",
25-
"@angular/common": "^2.2.0",
26-
"@angular/http": "^2.2.0"
24+
"@angular/core": "^2.3.0",
25+
"@angular/common": "^2.3.0",
26+
"@angular/http": "^2.3.0"
2727
}
2828
}

src/lib/progress-spinner/progress-spinner.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,6 @@ export class MdProgressSpinner implements OnDestroy {
291291
'mode': 'indeterminate',
292292
'[class.mat-spinner]': 'true',
293293
},
294-
// Due to the class extending we need to explicitly say that the input exists.
295-
inputs: ['color'],
296294
templateUrl: 'progress-spinner.html',
297295
styleUrls: ['progress-spinner.css'],
298296
})

yarn.lock

Lines changed: 67 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,55 @@
22
# yarn lockfile v1
33

44

5-
"@angular/common@^2.2.0":
6-
version "2.4.3"
7-
resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.3.tgz#78d96bd2f8a1a105f635cd25e362ba5704b47f56"
5+
"@angular/common@^2.3.0":
6+
version "2.4.7"
7+
resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.7.tgz#9316daf90e353e67187d2e0afec5521c2001bd4b"
88

9-
"@angular/compiler-cli@^2.2.0":
10-
version "2.4.3"
11-
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.4.3.tgz#8339c2f428d29df3ea0eac17f08d296fc87eb160"
9+
"@angular/compiler-cli@^2.3.0":
10+
version "2.4.7"
11+
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.4.7.tgz#15768141816903636593f430ff9a808d98a2a762"
1212
dependencies:
13-
"@angular/tsc-wrapped" "0.5.1"
13+
"@angular/tsc-wrapped" "0.5.2"
1414
minimist "^1.2.0"
1515
reflect-metadata "^0.1.2"
1616

17-
"@angular/compiler@^2.2.0":
18-
version "2.4.3"
19-
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.3.tgz#76a41916f90eda66643107740c4a9ae45cb7a6c1"
17+
"@angular/compiler@^2.3.0":
18+
version "2.4.7"
19+
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.7.tgz#008c1f0d1409c46fbba215fe8ab0d886252c7ff0"
2020

21-
"@angular/core@^2.2.0":
22-
version "2.4.3"
23-
resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.3.tgz#a72a13bb9f01659b8388558cd6e3a570a8434b1c"
21+
"@angular/core@^2.3.0":
22+
version "2.4.7"
23+
resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.7.tgz#8bed9a2d37e81342bd41d189df88aa3e02393cfb"
2424

25-
"@angular/forms@^2.2.0":
26-
version "2.4.3"
27-
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.4.3.tgz#0b4f59b8074e3d0fe987781e0f2af1ca1eec212b"
25+
"@angular/forms@^2.3.0":
26+
version "2.4.7"
27+
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.4.7.tgz#d34a36110e10f641aa1e1420b5c2df65987fd8bb"
2828

29-
"@angular/http@^2.2.0":
30-
version "2.4.3"
31-
resolved "https://registry.yarnpkg.com/@angular/http/-/http-2.4.3.tgz#d8afca7362efb010600fde02360e01e848579be6"
29+
"@angular/http@^2.3.0":
30+
version "2.4.7"
31+
resolved "https://registry.yarnpkg.com/@angular/http/-/http-2.4.7.tgz#b024b2b49ae0234258d42309e46f65862a42070d"
3232

33-
"@angular/platform-browser-dynamic@^2.2.0":
34-
version "2.4.3"
35-
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.3.tgz#d65cc9bc4487e2a86e2c6f6641c711fccfa90c5a"
33+
"@angular/platform-browser-dynamic@^2.3.0":
34+
version "2.4.7"
35+
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.7.tgz#9632586f9ce596186be4c124c3ea0a4a74b27b46"
3636

37-
"@angular/platform-browser@^2.2.0":
38-
version "2.4.3"
39-
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.3.tgz#eba8588d2fffc39d0b85a9180c297d9ca2f1f3a4"
37+
"@angular/platform-browser@^2.3.0":
38+
version "2.4.7"
39+
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.7.tgz#19f7996a70f07b34ce8d6d0e255544e62cae75f1"
4040

41-
"@angular/platform-server@^2.2.0":
42-
version "2.4.3"
43-
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-2.4.3.tgz#207af33919733696976b29bfc03c265a551dd05f"
41+
"@angular/platform-server@^2.3.0":
42+
version "2.4.7"
43+
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-2.4.7.tgz#e2a9f283b4eb25b967ab085c83350c0a08927617"
4444
dependencies:
4545
parse5 "^2.2.1"
4646

47-
"@angular/router@^3.2.0":
48-
version "3.4.3"
49-
resolved "https://registry.yarnpkg.com/@angular/router/-/router-3.4.3.tgz#19846caa1f87d9b83f005f45a2be15b6744db8fd"
47+
"@angular/router@^3.3.0":
48+
version "3.4.7"
49+
resolved "https://registry.yarnpkg.com/@angular/router/-/router-3.4.7.tgz#e9583eed5a1d50cc1628b2526244555444a746b8"
5050

51-
"@angular/[email protected].1":
52-
version "0.5.1"
53-
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.1.tgz#7a69bec999eef41903dddaaccdc862cfcface52c"
51+
"@angular/[email protected].2":
52+
version "0.5.2"
53+
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.2.tgz#2eddf472c467fcb334ea94deddaaa71990c5a482"
5454
dependencies:
5555
tsickle "^0.2"
5656

@@ -2665,6 +2665,21 @@ gulp-connect@^5.0.0:
26652665
gulp-util "^3.0.6"
26662666
tiny-lr "^0.2.1"
26672667

2668+
gulp-flatten@^0.3.1:
2669+
version "0.3.1"
2670+
resolved "https://registry.yarnpkg.com/gulp-flatten/-/gulp-flatten-0.3.1.tgz#51e7fec13a33c404578d18c1589d1b5bc45fe1d6"
2671+
dependencies:
2672+
gulp-util "^3.0.7"
2673+
through2 "^2.0.0"
2674+
2675+
2676+
version "0.0.4"
2677+
resolved "https://registry.yarnpkg.com/gulp-highlight-files/-/gulp-highlight-files-0.0.4.tgz#8cfd64209e53cac52cd7b8f6a8b5d9ea79795172"
2678+
dependencies:
2679+
gulp-util "^3.0.8"
2680+
highlight.js "^9.9.0"
2681+
through2 "^2.0.3"
2682+
26682683
gulp-htmlmin@^3.0.0:
26692684
version "3.0.0"
26702685
resolved "https://registry.yarnpkg.com/gulp-htmlmin/-/gulp-htmlmin-3.0.0.tgz#19ea8002d1231d6b1f18a12d20f2a66a77770fb3"
@@ -2698,6 +2713,10 @@ gulp-match@^1.0.3:
26982713
dependencies:
26992714
minimatch "^3.0.3"
27002715

2716+
gulp-rename@^1.2.2:
2717+
version "1.2.2"
2718+
resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817"
2719+
27012720
gulp-sass@^3.1.0:
27022721
version "3.1.0"
27032722
resolved "https://registry.yarnpkg.com/gulp-sass/-/gulp-sass-3.1.0.tgz#53dc4b68a1f5ddfe4424ab4c247655269a8b74b7"
@@ -2731,7 +2750,7 @@ gulp-transform@^1.1.0:
27312750
gulp-util "^3.0.7"
27322751
lodash "^4.13.1"
27332752

2734-
gulp-util@*, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7:
2753+
gulp-util@*, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8:
27352754
version "3.0.8"
27362755
resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
27372756
dependencies:
@@ -5201,9 +5220,9 @@ rx@^2.4.3:
52015220
version "2.5.3"
52025221
resolved "https://registry.yarnpkg.com/rx/-/rx-2.5.3.tgz#21adc7d80f02002af50dae97fd9dbf248755f566"
52035222

5204-
5205-
version "5.0.0-beta.12"
5206-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.0-beta.12.tgz#cdfde2d8c4639d20ae7794bff8fddf32da7ad337"
5223+
rxjs@^5.0.1:
5224+
version "5.1.0"
5225+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.1.0.tgz#0aa9018b7f440b505fa42bd742b6738be550e720"
52075226
dependencies:
52085227
symbol-observable "^1.0.1"
52095228

@@ -5726,9 +5745,9 @@ stylehacks@^2.3.0:
57265745
text-table "^0.2.0"
57275746
write-file-stdout "0.0.2"
57285747

5729-
stylelint@^7.7.1:
5730-
version "7.7.1"
5731-
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.7.1.tgz#af30b6677e307d38b0ad64b70e719c1752973c67"
5748+
stylelint@^7.8.0:
5749+
version "7.8.0"
5750+
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.8.0.tgz#ac701044ed03c44f7a9f73d4d5dc1bd1eaae12d1"
57325751
dependencies:
57335752
autoprefixer "^6.0.0"
57345753
balanced-match "^0.4.0"
@@ -6443,6 +6462,10 @@ wd@^1.0.0:
64436462
underscore.string "3.3.4"
64446463
vargs "0.1.0"
64456464

6465+
web-animations-js@^2.2.2:
6466+
version "2.2.2"
6467+
resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.2.2.tgz#7c3aa5382c5eade70cd206880d56a37869630638"
6468+
64466469
webdriver-js-extender@^1.0.0:
64476470
version "1.0.0"
64486471
resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
@@ -6714,6 +6737,6 @@ zip-stream@^1.1.0:
67146737
lodash "^4.8.0"
67156738
readable-stream "^2.0.0"
67166739

6717-
zone.js@^0.6.23:
6718-
version "0.6.26"
6719-
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.6.26.tgz#067c13b8b80223a89b62e9dc82680f09762c4636"
6740+
zone.js@^0.7.2:
6741+
version "0.7.6"
6742+
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"

0 commit comments

Comments
 (0)