build: fixes for google3 build

alexeagle · hansl · commit 938a236f40c5 · 2018-06-08T14:33:31.000-07:00
diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
@@ -26,6 +26,8 @@ ts_library(
         "//packages/angular_devkit/schematics:tools",
         "@rxjs",
         "@rxjs//operators",
+        # @typings: node
+        # @typings: semver
     ],
     tsconfig = "//:tsconfig.json"
 )
diff --git a/packages/angular/cli/custom-typings.d.ts b/packages/angular/cli/custom-typings.d.ts
@@ -9,6 +9,6 @@
 // tslint:disable:no-global-tslint-disable no-any
 declare module 'yargs-parser' {
   const parseOptions: any;
-  const yargsParser: <T = any>(args: string | string[], options?: parseOptions) => T;
+  const yargsParser: <T = any>(args: string | string[], options?: typeof parseOptions) => T;
   export = yargsParser;
 }
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
@@ -25,6 +25,7 @@ ts_library(
         "@rxjs//operators",
         # @typings: es2015.core
         # @typings: es2015.symbol.wellknown
+        # @typings: es2016.array.include
         # @typings: ajv
         # @typings: node
         # @typings: source-map
@@ -47,6 +48,7 @@ ts_library(
         "//packages/angular_devkit/core",
         "@rxjs",
         "@rxjs//operators",
+        # @typings: node
     ],
 )
 
@@ -64,5 +66,6 @@ ts_library(
         "@rxjs",
         "@rxjs//operators",
         # @typings: jasmine
+        # @typings: node
     ],
 )
diff --git a/packages/angular_devkit/core/node/resolve.ts b/packages/angular_devkit/core/node/resolve.ts
@@ -32,7 +32,7 @@ function _caller(): string[] {
   const error = Error as {} as { prepareStackTrace: (x: {}, stack: {}) => {} };
   const origPrepareStackTrace = error.prepareStackTrace;
   error.prepareStackTrace = (_, stack) => stack;
-  const stack = (new Error()).stack as {}[] | undefined as { getFileName(): string }[] | undefined;
+  const stack = (new Error()).stack as {} | undefined as { getFileName(): string }[] | undefined;
   error.prepareStackTrace = origPrepareStackTrace;
 
   return stack ? stack.map(x => x.getFileName()).filter(x => !!x) : [];
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
@@ -24,6 +24,7 @@ ts_library(
         "//packages/angular_devkit/core:node",  # TODO: get rid of this for 6.0
         "@rxjs",
         "@rxjs//operators",
+        # @typings: node
     ],
 )
 
@@ -45,6 +46,9 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
+        # @typings: node
+        # @typings: tslint
+        # @typings: typescript
     ],
 )
 
@@ -114,5 +118,6 @@ ts_library(
         "@rxjs",
         "@rxjs//operators",
         # @typings: jasmine
+        # @typings: node
     ],
 )
diff --git a/packages/angular_devkit/schematics_cli/BUILD b/packages/angular_devkit/schematics_cli/BUILD
@@ -29,5 +29,6 @@ ts_library(
         "//packages/angular_devkit/schematics:tools",
         "@rxjs",
         "@rxjs//operators",
+        # @typings: minimist
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ ts_library(`
`26`	`26`	`"//packages/angular_devkit/schematics:tools",`
`27`	`27`	`"@rxjs",`
`28`	`28`	`"@rxjs//operators",`
	`29`	`+ # @typings: node`
	`30`	`+ # @typings: semver`
`29`	`31`	`],`
`30`	`32`	`tsconfig = "//:tsconfig.json"`
`31`	`33`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`// tslint:disable:no-global-tslint-disable no-any`
`10`	`10`	`declare module 'yargs-parser' {`
`11`	`11`	`const parseOptions: any;`
`12`		`- const yargsParser: <T = any>(args: string \| string[], options?: parseOptions) => T;`
	`12`	`+ const yargsParser: <T = any>(args: string \| string[], options?: typeof parseOptions) => T;`
`13`	`13`	`export = yargsParser;`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,6 @@ ts_library(`
`29`	`29`	`"//packages/angular_devkit/schematics:tools",`
`30`	`30`	`"@rxjs",`
`31`	`31`	`"@rxjs//operators",`
	`32`	`+ # @typings: minimist`
`32`	`33`	`],`
`33`	`34`	`)`