feat: support TS 2.1 (angular#4572)

hansl · web-flow · commit c617c2117395 · 2017-02-09T15:14:43.000-08:00
This requires Angular 4.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
   fast_finish: true
   allow_failures:
     - node_js: "7"
-    - env: NODE_SCRIPT="tests/run_e2e.js --nightly"
+    - env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
   include:
     - node_js: "6"
       os: linux
@@ -32,7 +32,7 @@ matrix:
     # Optional builds.
     - node_js: "6"
       os: linux
-      env: NODE_SCRIPT="tests/run_e2e.js --nightly"
+      env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
     - node_js: "6"
       os: linux
       env: NODE_SCRIPT="tests/run_e2e.js --ng4"
diff --git a/packages/@angular/cli/blueprints/ng2/files/package.json b/packages/@angular/cli/blueprints/ng2/files/package.json
@@ -41,6 +41,6 @@
     "protractor": "~5.1.0",
     "ts-node": "1.2.1",
     "tslint": "^4.3.0",
-    "typescript": "~2.0.3"
+    "typescript": "<%= ng4 ? '~2.1.0' : '~2.0.0' %>"
   }
 }
diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
@@ -77,7 +77,7 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.4.0",
     "temp": "0.8.3",
-    "typescript": "~2.0.3",
+    "typescript": ">=2.0.0 <2.2.0",
     "url-loader": "^0.5.7",
     "walk-sync": "^0.3.1",
     "webpack": "~2.2.0",
diff --git a/tests/e2e/assets/webpack/test-app-weird/package.json b/tests/e2e/assets/webpack/test-app-weird/package.json
@@ -2,15 +2,15 @@
   "name": "test",
   "license": "MIT",
   "dependencies": {
-    "@angular/common": "^2.3.1",
-    "@angular/compiler": "^2.3.1",
-    "@angular/compiler-cli": "^2.3.1",
-    "@angular/core": "^2.3.1",
-    "@angular/http": "^2.3.1",
-    "@angular/platform-browser": "^2.3.1",
-    "@angular/platform-browser-dynamic": "^2.3.1",
-    "@angular/platform-server": "^2.3.1",
-    "@angular/router": "^3.3.1",
+    "@angular/common": ">=4.0.0-beta <5.0.0",
+    "@angular/compiler": ">=4.0.0-beta <5.0.0",
+    "@angular/compiler-cli": ">=4.0.0-beta <5.0.0",
+    "@angular/core": ">=4.0.0-beta <5.0.0",
+    "@angular/http": ">=4.0.0-beta <5.0.0",
+    "@angular/platform-browser": ">=4.0.0-beta <5.0.0",
+    "@angular/platform-browser-dynamic": ">=4.0.0-beta <5.0.0",
+    "@angular/platform-server": ">=4.0.0-beta <5.0.0",
+    "@angular/router": ">=4.0.0-beta <5.0.0",
     "@ngtools/webpack": "0.0.0",
     "core-js": "^2.4.1",
     "rxjs": "^5.0.1",
@@ -21,7 +21,7 @@
     "performance-now": "^0.2.0",
     "raw-loader": "^0.5.1",
     "sass-loader": "^3.2.0",
-    "typescript": "~2.0.3",
+    "typescript": "~2.1.0",
     "webpack": "2.2.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@`
`41`	`41`	`"protractor": "~5.1.0",`
`42`	`42`	`"ts-node": "1.2.1",`
`43`	`43`	`"tslint": "^4.3.0",`
`44`		`- "typescript": "~2.0.3"`
	`44`	`+ "typescript": "<%= ng4 ? '~2.1.0' : '~2.0.0' %>"`
`45`	`45`	`}`
`46`	`46`	`}`