From c741293ce2357b24d16f1338feb6a0adbd516341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Thu, 11 May 2017 15:21:14 -0700
Subject: [PATCH] fix: add typescript 2.3.2 typings test

Closes #16663
---
 integration/typings_test_ts21/include-all.ts | 20 +++++-----
 integration/typings_test_ts22/include-all.ts | 20 +++++-----
 integration/typings_test_ts23/include-all.ts | 41 ++++++++++++++++++++
 integration/typings_test_ts23/package.json   | 28 +++++++++++++
 integration/typings_test_ts23/tsconfig.json  | 24 ++++++++++++
 packages/http/testing/tsconfig-build.json    |  1 +
 packages/http/tsconfig-build.json            |  1 +
 7 files changed, 115 insertions(+), 20 deletions(-)
 create mode 100644 integration/typings_test_ts23/include-all.ts
 create mode 100644 integration/typings_test_ts23/package.json
 create mode 100644 integration/typings_test_ts23/tsconfig.json

diff --git a/integration/typings_test_ts21/include-all.ts b/integration/typings_test_ts21/include-all.ts
index 916cf719e4ec2..eaa53d24c2702 100644
--- a/integration/typings_test_ts21/include-all.ts
+++ b/integration/typings_test_ts21/include-all.ts
@@ -8,18 +8,18 @@
 
 import * as compiler from '@angular/compiler';
 import * as compilerTesting from '@angular/compiler/testing';
-import * as coreTesting from '@angular/core';
+import * as core from '@angular/core';
+import * as coreTesting from '@angular/core/testing';
 import * as forms from '@angular/forms';
-import * as core from '@angular/core/testing';
-import * as httpTesting from '@angular/http';
-import * as http from '@angular/http/testing';
-import * as platformBrowserTesting from '@angular/platform-browser';
+import * as http from '@angular/http';
+import * as httpTesting from '@angular/http/testing';
 import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
-import * as platformBrowser from '@angular/platform-browser/testing';
-import * as platformServerTesting from '@angular/platform-server';
-import * as platformServer from '@angular/platform-server/testing';
-import * as routerTesting from '@angular/router';
-import * as router from '@angular/router/testing';
+import * as platformBrowser from '@angular/platform-browser';
+import * as platformBrowserTesting from '@angular/platform-browser/testing';
+import * as platformServer from '@angular/platform-server';
+import * as platformServerTesting from '@angular/platform-server/testing';
+import * as router from '@angular/router';
+import * as routerTesting from '@angular/router/testing';
 import * as upgrade from '@angular/upgrade';
 
 export default {
diff --git a/integration/typings_test_ts22/include-all.ts b/integration/typings_test_ts22/include-all.ts
index 9a869b7ce2e32..eaa53d24c2702 100644
--- a/integration/typings_test_ts22/include-all.ts
+++ b/integration/typings_test_ts22/include-all.ts
@@ -8,18 +8,18 @@
 
 import * as compiler from '@angular/compiler';
 import * as compilerTesting from '@angular/compiler/testing';
-import * as coreTesting from '@angular/core';
-import * as core from '@angular/core/testing';
+import * as core from '@angular/core';
+import * as coreTesting from '@angular/core/testing';
 import * as forms from '@angular/forms';
-import * as httpTesting from '@angular/http';
-import * as http from '@angular/http/testing';
-import * as platformBrowserTesting from '@angular/platform-browser';
+import * as http from '@angular/http';
+import * as httpTesting from '@angular/http/testing';
 import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
-import * as platformBrowser from '@angular/platform-browser/testing';
-import * as platformServerTesting from '@angular/platform-server';
-import * as platformServer from '@angular/platform-server/testing';
-import * as routerTesting from '@angular/router';
-import * as router from '@angular/router/testing';
+import * as platformBrowser from '@angular/platform-browser';
+import * as platformBrowserTesting from '@angular/platform-browser/testing';
+import * as platformServer from '@angular/platform-server';
+import * as platformServerTesting from '@angular/platform-server/testing';
+import * as router from '@angular/router';
+import * as routerTesting from '@angular/router/testing';
 import * as upgrade from '@angular/upgrade';
 
 export default {
diff --git a/integration/typings_test_ts23/include-all.ts b/integration/typings_test_ts23/include-all.ts
new file mode 100644
index 0000000000000..eaa53d24c2702
--- /dev/null
+++ b/integration/typings_test_ts23/include-all.ts
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as compiler from '@angular/compiler';
+import * as compilerTesting from '@angular/compiler/testing';
+import * as core from '@angular/core';
+import * as coreTesting from '@angular/core/testing';
+import * as forms from '@angular/forms';
+import * as http from '@angular/http';
+import * as httpTesting from '@angular/http/testing';
+import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
+import * as platformBrowser from '@angular/platform-browser';
+import * as platformBrowserTesting from '@angular/platform-browser/testing';
+import * as platformServer from '@angular/platform-server';
+import * as platformServerTesting from '@angular/platform-server/testing';
+import * as router from '@angular/router';
+import * as routerTesting from '@angular/router/testing';
+import * as upgrade from '@angular/upgrade';
+
+export default {
+  compiler,
+  compilerTesting,
+  core,
+  coreTesting,
+  forms,
+  http,
+  httpTesting,
+  platformBrowser,
+  platformBrowserTesting,
+  platformBrowserDynamic,
+  platformServer,
+  platformServerTesting,
+  router,
+  routerTesting,
+  upgrade
+};
diff --git a/integration/typings_test_ts23/package.json b/integration/typings_test_ts23/package.json
new file mode 100644
index 0000000000000..12739138bcd11
--- /dev/null
+++ b/integration/typings_test_ts23/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "angular-integration",
+  "description": "Assert that users with TypeScript 2.2 can type-check an Angular application",
+  "version": "0.0.0",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/compiler": "file:../../dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/forms": "file:../../dist/packages-dist/forms",
+    "@angular/http": "file:../../dist/packages-dist/http",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
+    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
+    "@angular/router": "file:../../dist/packages-dist/router",
+    "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
+    "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
+    "@types/jasmine": "2.5.41",
+    "rxjs": "file:../../node_modules/rxjs",
+    "typescript": "2.3.2",
+    "zone.js": "0.7.6"
+  },
+  "scripts": {
+    "test": "tsc"
+  }
+}
diff --git a/integration/typings_test_ts23/tsconfig.json b/integration/typings_test_ts23/tsconfig.json
new file mode 100644
index 0000000000000..d9603e8dce799
--- /dev/null
+++ b/integration/typings_test_ts23/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../../dist/typing-test/",
+    "rootDir": ".",
+    "target": "es5",
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.collection",
+      "es2015.iterable",
+      "es2015.promise"
+    ],
+    "types": [],
+    "strictNullChecks": true
+  },
+  "files": [
+    "include-all.ts",
+    "node_modules/@types/jasmine/index.d.ts"
+  ]
+}
diff --git a/packages/http/testing/tsconfig-build.json b/packages/http/testing/tsconfig-build.json
index 7a18d963dc143..5b991faa2fee0 100644
--- a/packages/http/testing/tsconfig-build.json
+++ b/packages/http/testing/tsconfig-build.json
@@ -1,6 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "compilerOptions": {
+    "strictNullChecks": true,
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/http": ["../../dist/packages/http"],
diff --git a/packages/http/tsconfig-build.json b/packages/http/tsconfig-build.json
index aa16e6bfbddd6..23862fa523f41 100644
--- a/packages/http/tsconfig-build.json
+++ b/packages/http/tsconfig-build.json
@@ -3,6 +3,7 @@
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
+    "strictNullChecks": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",