Skip to content

Commit c617c21

Browse files
hanslhansl
authored
feat: support TS 2.1 (#4572)
This requires Angular 4.
1 parent 8d2d93a commit c617c21

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ matrix:
1111
fast_finish: true
1212
allow_failures:
1313
- node_js: "7"
14-
- env: NODE_SCRIPT="tests/run_e2e.js --nightly"
14+
- env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
1515
include:
1616
- node_js: "6"
1717
os: linux
@@ -32,7 +32,7 @@ matrix:
3232
# Optional builds.
3333
- node_js: "6"
3434
os: linux
35-
env: NODE_SCRIPT="tests/run_e2e.js --nightly"
35+
env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
3636
- node_js: "6"
3737
os: linux
3838
env: NODE_SCRIPT="tests/run_e2e.js --ng4"

‎packages/@angular/cli/blueprints/ng2/files/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
"protractor": "~5.1.0",
4242
"ts-node": "1.2.1",
4343
"tslint": "^4.3.0",
44-
"typescript": "~2.0.3"
44+
"typescript": "<%= ng4 ? '~2.1.0' : '~2.0.0' %>"
4545
}
4646
}

‎packages/@angular/cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"stylus": "^0.54.5",
7878
"stylus-loader": "^2.4.0",
7979
"temp": "0.8.3",
80-
"typescript": "~2.0.3",
80+
"typescript": ">=2.0.0 <2.2.0",
8181
"url-loader": "^0.5.7",
8282
"walk-sync": "^0.3.1",
8383
"webpack": "~2.2.0",

‎tests/e2e/assets/webpack/test-app-weird/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"name": "test",
33
"license": "MIT",
44
"dependencies": {
5-
"@angular/common": "^2.3.1",
6-
"@angular/compiler": "^2.3.1",
7-
"@angular/compiler-cli": "^2.3.1",
8-
"@angular/core": "^2.3.1",
9-
"@angular/http": "^2.3.1",
10-
"@angular/platform-browser": "^2.3.1",
11-
"@angular/platform-browser-dynamic": "^2.3.1",
12-
"@angular/platform-server": "^2.3.1",
13-
"@angular/router": "^3.3.1",
5+
"@angular/common": ">=4.0.0-beta <5.0.0",
6+
"@angular/compiler": ">=4.0.0-beta <5.0.0",
7+
"@angular/compiler-cli": ">=4.0.0-beta <5.0.0",
8+
"@angular/core": ">=4.0.0-beta <5.0.0",
9+
"@angular/http": ">=4.0.0-beta <5.0.0",
10+
"@angular/platform-browser": ">=4.0.0-beta <5.0.0",
11+
"@angular/platform-browser-dynamic": ">=4.0.0-beta <5.0.0",
12+
"@angular/platform-server": ">=4.0.0-beta <5.0.0",
13+
"@angular/router": ">=4.0.0-beta <5.0.0",
1414
"@ngtools/webpack": "0.0.0",
1515
"core-js": "^2.4.1",
1616
"rxjs": "^5.0.1",
@@ -21,7 +21,7 @@
2121
"performance-now": "^0.2.0",
2222
"raw-loader": "^0.5.1",
2323
"sass-loader": "^3.2.0",
24-
"typescript": "~2.0.3",
24+
"typescript": "~2.1.0",
2525
"webpack": "2.2.0"
2626
}
2727
}

0 commit comments

Comments
 (0)