From 688469c2218af123e916c2180321c061e040f5bb Mon Sep 17 00:00:00 2001 From: Pawel Kozlowski Date: Thu, 3 Dec 2015 15:35:40 +0100 Subject: [PATCH] refactor(broccoli-check-imports): allow imports from self by default Closes #5573 --- tools/broccoli/broccoli-check-imports.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/broccoli/broccoli-check-imports.ts b/tools/broccoli/broccoli-check-imports.ts index 9c2a90a43a..0756747fe4 100644 --- a/tools/broccoli/broccoli-check-imports.ts +++ b/tools/broccoli/broccoli-check-imports.ts @@ -13,13 +13,10 @@ class CheckImports implements DiffingBroccoliPlugin { static IMPORT_PATH_REGEXP = new RegExp(`['"]([^'"]+)+['"]`, "m"); static ALLOWED_IMPORTS = { - "angular2/src/core": [ - "angular2/src/core", - "angular2/src/facade", - ], - "angular2/src/facade": ["angular2/src/facade", "rxjs"], - "angular2/src/common": ["angular2/core", "angular2/src/facade", "angular2/src/common"], - "angular2/src/http": ["angular2/core", "angular2/src/facade", "angular2/src/http", "rxjs"] + "angular2/src/core": ["angular2/src/facade"], + "angular2/src/facade": ["rxjs"], + "angular2/src/common": ["angular2/core", "angular2/src/facade"], + "angular2/src/http": ["angular2/core", "angular2/src/facade", "rxjs"] //"angular2/src/render": [ // "angular2/animate", // "angular2/core", @@ -80,7 +77,8 @@ class CheckImports implements DiffingBroccoliPlugin { for (var prop in c) { if (c.hasOwnProperty(prop) && startsWith(sourceFile, prop)) { const allowedPaths = c[prop]; - return allowedPaths.filter(p => startsWith(importPath, p)).length > 0; + return startsWith(importPath, prop) || + allowedPaths.filter(p => startsWith(importPath, p)).length > 0; } }