From 248dee8265e6a82814a0bacc08e779776602b4b6 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 00:52:31 +0200
Subject: [PATCH] chore: remove cdk testing from rollup globals (#7169)

Previously the `missingRollupGlobals` tslint rule checked every TS file in the `src/` directory. This meant that the `@angular/cdk/testing` package from spec files needs to be added there as well.

With the recent switcht to Minimatch for our custom TSLint rules, the spec files are no longer linted and the testing package can be removed there.
---
 tools/package-tools/rollup-globals.ts | 8 ++------
 tools/tslint-rules/tsLoaderRule.js    | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 3319cbb7646..e274f8d8049 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -42,7 +42,8 @@ export const rollupGlobals = {
   '@angular/common/testing': 'ng.common.testing',
   '@angular/http/testing': 'ng.http.testing',
 
-
+  // Some packages are not really needed for the UMD bundles, but for the missingRollupGlobals rule.
+  '@angular/material-examples': 'ng.materialExamples',
   '@angular/material': 'ng.material',
   '@angular/cdk': 'ng.cdk',
 
@@ -50,11 +51,6 @@ export const rollupGlobals = {
   ...rollupCdkEntryPoints,
   ...rollupMatEntryPoints,
 
-  // Some packages are not really needed for the UMD bundles, but for the missingRollupGlobals rule.
-  // TODO(devversion): remove by adding minimatch and better globbing to rules
-  '@angular/cdk/testing': 'ng.cdk.testing',
-  '@angular/material-examples': 'ng.materialExamples',
-
   'rxjs/BehaviorSubject': 'Rx',
   'rxjs/Observable': 'Rx',
   'rxjs/Subject': 'Rx',
diff --git a/tools/tslint-rules/tsLoaderRule.js b/tools/tslint-rules/tsLoaderRule.js
index 4ba565f1b9d..85cf80d6ea2 100644
--- a/tools/tslint-rules/tsLoaderRule.js
+++ b/tools/tslint-rules/tsLoaderRule.js
@@ -10,4 +10,4 @@ require('ts-node').register({
 // Add a noop rule so tslint doesn't complain.
 exports.Rule = class Rule extends Lint.Rules.AbstractRule {
   apply() {}
-}
+};