ci: add option to ignore imports/requires from dependencies

hansl · hansl · commit fe69b5b110e0 · 2017-03-20T09:20:03.000-07:00
It needs to be in the file itself where the require/import is made.
diff --git a/packages/@angular/cli/lib/cli/index.js b/packages/@angular/cli/lib/cli/index.js
@@ -3,7 +3,6 @@
 // Prevent the dependency validation from tripping because we don't import these. We need
 // it as a peer dependency of @angular/core.
 // require('zone.js')
-// require('@angular/tsc-wrapped')
 
 
 // This file hooks up on require calls to transpile TypeScript.
diff --git a/packages/@ngtools/webpack/src/extract_i18n_plugin.ts b/packages/@ngtools/webpack/src/extract_i18n_plugin.ts
@@ -1,3 +1,4 @@
+// @ignoreDep @angular/compiler-cli
 import * as ts from 'typescript';
 import * as path from 'path';
 import * as fs from 'fs';
diff --git a/packages/@ngtools/webpack/src/index.ts b/packages/@ngtools/webpack/src/index.ts
@@ -1,3 +1,4 @@
+// @ignoreDep @angular/compiler-cli
 import * as path from 'path';
 
 let version;
diff --git a/packages/@ngtools/webpack/src/plugin.ts b/packages/@ngtools/webpack/src/plugin.ts
@@ -1,3 +1,4 @@
+// @ignoreDep @angular/compiler-cli
 import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
diff --git a/packages/@ngtools/webpack/src/reflector_host.ts b/packages/@ngtools/webpack/src/reflector_host.ts
@@ -1,3 +1,4 @@
+// @ignoreDep @angular/compiler-cli
 import {CodeGenerator} from '@angular/compiler-cli';
 
 
diff --git a/scripts/publish/validate_dependencies.js b/scripts/publish/validate_dependencies.js
@@ -11,6 +11,7 @@ const path = require('path');
 
 const IMPORT_RE = /(^|\n)\s*import\b(?:.|\n)*?\'[^\']*\'/g;
 const REQUIRE_RE = /\brequire\('[^)]+?'\)/g;
+const IGNORE_RE = /\s+@ignoreDep\s+\S+/g;
 const NODE_PACKAGES = [
   'child_process',
   'fs',
@@ -72,6 +73,16 @@ function listRequiredModules(source) {
     });
 }
 
+function listIgnoredModules(source) {
+  const ignored = source.match(IGNORE_RE);
+  return (ignored || [])
+    .map(match => {
+      const m = match.match(/@ignoreDep\s+(\S+)/);
+      return m && m[1];
+    })
+    .filter(x => !!x);
+}
+
 function reportMissingDependencies(missingDeps) {
   if (missingDeps.length == 0) {
     console.log(chalk.green('  no dependency missing from package.json.'));
@@ -110,6 +121,10 @@ for (const packageName of Object.keys(packages)) {
       .forEach(modulePath => importMap[modulePath] = true);
     listRequiredModules(source)
       .forEach(modulePath => importMap[modulePath] = true);
+    listIgnoredModules(source)
+      .forEach(modulePath => {
+        delete importMap[modulePath];
+      });
   });
 
   const dependencies = Object.keys(importMap)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// @ignoreDep @angular/compiler-cli`
`1`	`2`	`import * as ts from 'typescript';`
`2`	`3`	`import * as path from 'path';`
`3`	`4`	`import * as fs from 'fs';`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// @ignoreDep @angular/compiler-cli`
`1`	`2`	`import {CodeGenerator} from '@angular/compiler-cli';`
`2`	`3`
`3`	`4`