From b3e18dbfd8cb78ea996fd3cd47bcc91e7524b29a Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 10 Sep 2019 12:42:58 +0200
Subject: [PATCH] build: include cdk testing entry-point in release output

---
 src/cdk/testing/tsconfig-build.json | 15 +++++++++++++++
 src/cdk/tsconfig-tests.json         | 14 +++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 src/cdk/testing/tsconfig-build.json

diff --git a/src/cdk/testing/tsconfig-build.json b/src/cdk/testing/tsconfig-build.json
new file mode 100644
index 000000000000..6880cb298b9d
--- /dev/null
+++ b/src/cdk/testing/tsconfig-build.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/testing",
+    "skipTemplateCodegen": true,
+    "fullTemplateTypeCheck": true
+  }
+}
diff --git a/src/cdk/tsconfig-tests.json b/src/cdk/tsconfig-tests.json
index 4c473f7aa116..a0c1ff35c635 100644
--- a/src/cdk/tsconfig-tests.json
+++ b/src/cdk/tsconfig-tests.json
@@ -14,7 +14,6 @@
     }
   },
   "files": [
-    "./testing/index.ts",
     "./index.ts",
     "typings.d.ts"
   ],
@@ -24,20 +23,25 @@
     "emitDecoratorMetadata": true,
     "fullTemplateTypeCheck": true,
 
-    // Unset options inherited from tsconfig-build
+    // Unset options inherited from tsconfig-build.
     "annotateForClosureCompiler": false,
     "flatModuleOutFile": null,
     "flatModuleId": null
   },
   "include": [
-    // Include the index.ts for each secondary entry-point
+    // Include the index.ts for each secondary entry-point.
     "./*/index.ts",
+    // Include the "private/testing" internal entry-point.
+    "./private/testing/",
+    // Include all spec files of the CDK.
     "**/*.spec.ts"
   ],
   "exclude": [
     "**/schematics/**/*.ts",
-    // Exclude end-to-end tests and utilities
+    // Exclude end-to-end tests and utilities.
     "**/*.e2e.spec.ts",
-    "./testing/e2e/**"
+    // Exclude internal e2e testing utilities. These are not needed by tests
+    // which execute through gulp.
+    "./private/testing/e2e/**"
   ]
 }