Skip to content

Commit

Permalink
build: increase minimum angular version (#3017)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@devversion @tinayuangao
devversion authored and tinayuangao committed Feb 10, 2017
1 parent ac9c090 commit 140c95c
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 62 deletions.
24 changes: 12 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@
"node": ">= 5.4.1 < 7"
},
"dependencies": {
"@angular/common": "^2.2.0",
"@angular/compiler": "^2.2.0",
"@angular/core": "^2.2.0",
"@angular/forms": "^2.2.0",
"@angular/http": "^2.2.0",
"@angular/platform-browser": "^2.2.0",
"@angular/common": "^2.3.0",
"@angular/compiler": "^2.3.0",
"@angular/core": "^2.3.0",
"@angular/forms": "^2.3.0",
"@angular/http": "^2.3.0",
"@angular/platform-browser": "^2.3.0",
"core-js": "^2.4.1",
"rxjs": "5.0.0-beta.12",
"rxjs": "^5.0.1",
"systemjs": "0.19.43",
"zone.js": "^0.6.23"
"zone.js": "^0.7.2"
},
"devDependencies": {
"@angular/compiler-cli": "^2.2.0",
"@angular/platform-browser-dynamic": "^2.2.0",
"@angular/platform-server": "^2.2.0",
"@angular/router": "^3.2.0",
"@angular/compiler-cli": "^2.3.0",
"@angular/platform-browser-dynamic": "^2.3.0",
"@angular/platform-server": "^2.3.0",
"@angular/router": "^3.3.0",
"@types/glob": "^5.0.30",
"@types/gulp": "^3.8.32",
"@types/hammerjs": "^2.0.34",
Expand Down
1 change: 0 additions & 1 deletion src/lib/button/button.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ export class MdButton {
moduleId: module.id,
selector: `a[md-button], a[md-raised-button], a[md-icon-button], a[md-fab], a[md-mini-fab],
a[mat-button], a[mat-raised-button], a[mat-icon-button], a[mat-fab], a[mat-mini-fab]`,
inputs: ['color', 'disabled', 'disableRipple'],
host: {
'[attr.disabled]': 'disabled',
'[attr.aria-disabled]': '_isAriaDisabled',
Expand Down
6 changes: 3 additions & 3 deletions src/lib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
},
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular/core": "^2.2.0",
"@angular/common": "^2.2.0",
"@angular/http": "^2.2.0"
"@angular/core": "^2.3.0",
"@angular/common": "^2.3.0",
"@angular/http": "^2.3.0"
}
}
2 changes: 0 additions & 2 deletions src/lib/progress-spinner/progress-spinner.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,6 @@ export class MdProgressSpinner implements OnDestroy {
'mode': 'indeterminate',
'[class.mat-spinner]': 'true',
},
// Due to the class extending we need to explicitly say that the input exists.
inputs: ['color'],
templateUrl: 'progress-spinner.html',
styleUrls: ['progress-spinner.css'],
})
Expand Down
111 changes: 67 additions & 44 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,55 @@
# yarn lockfile v1


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

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

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

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

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

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

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

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

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

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

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

Expand Down Expand Up @@ -2665,6 +2665,21 @@ gulp-connect@^5.0.0:
gulp-util "^3.0.6"
tiny-lr "^0.2.1"

gulp-flatten@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/gulp-flatten/-/gulp-flatten-0.3.1.tgz#51e7fec13a33c404578d18c1589d1b5bc45fe1d6"
dependencies:
gulp-util "^3.0.7"
through2 "^2.0.0"

[email protected]:
version "0.0.4"
resolved "https://registry.yarnpkg.com/gulp-highlight-files/-/gulp-highlight-files-0.0.4.tgz#8cfd64209e53cac52cd7b8f6a8b5d9ea79795172"
dependencies:
gulp-util "^3.0.8"
highlight.js "^9.9.0"
through2 "^2.0.3"

gulp-htmlmin@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/gulp-htmlmin/-/gulp-htmlmin-3.0.0.tgz#19ea8002d1231d6b1f18a12d20f2a66a77770fb3"
Expand Down Expand Up @@ -2698,6 +2713,10 @@ gulp-match@^1.0.3:
dependencies:
minimatch "^3.0.3"

gulp-rename@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817"

gulp-sass@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/gulp-sass/-/gulp-sass-3.1.0.tgz#53dc4b68a1f5ddfe4424ab4c247655269a8b74b7"
Expand Down Expand Up @@ -2731,7 +2750,7 @@ gulp-transform@^1.1.0:
gulp-util "^3.0.7"
lodash "^4.13.1"

gulp-util@*, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7:
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:
version "3.0.8"
resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
dependencies:
Expand Down Expand Up @@ -5201,9 +5220,9 @@ rx@^2.4.3:
version "2.5.3"
resolved "https://registry.yarnpkg.com/rx/-/rx-2.5.3.tgz#21adc7d80f02002af50dae97fd9dbf248755f566"

[email protected].0-beta.12:
version "5.0.0-beta.12"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.0-beta.12.tgz#cdfde2d8c4639d20ae7794bff8fddf32da7ad337"
rxjs@^5.0.1:
version "5.1.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.1.0.tgz#0aa9018b7f440b505fa42bd742b6738be550e720"
dependencies:
symbol-observable "^1.0.1"

Expand Down Expand Up @@ -5726,9 +5745,9 @@ stylehacks@^2.3.0:
text-table "^0.2.0"
write-file-stdout "0.0.2"

stylelint@^7.7.1:
version "7.7.1"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.7.1.tgz#af30b6677e307d38b0ad64b70e719c1752973c67"
stylelint@^7.8.0:
version "7.8.0"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.8.0.tgz#ac701044ed03c44f7a9f73d4d5dc1bd1eaae12d1"
dependencies:
autoprefixer "^6.0.0"
balanced-match "^0.4.0"
Expand Down Expand Up @@ -6443,6 +6462,10 @@ wd@^1.0.0:
underscore.string "3.3.4"
vargs "0.1.0"

web-animations-js@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.2.2.tgz#7c3aa5382c5eade70cd206880d56a37869630638"

webdriver-js-extender@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
Expand Down Expand Up @@ -6714,6 +6737,6 @@ zip-stream@^1.1.0:
lodash "^4.8.0"
readable-stream "^2.0.0"

zone.js@^0.6.23:
version "0.6.26"
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.6.26.tgz#067c13b8b80223a89b62e9dc82680f09762c4636"
zone.js@^0.7.2:
version "0.7.6"
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"

0 comments on commit 140c95c

Please sign in to comment.