perf: switch angular to use StaticInjector instead of ReflectiveInjector

This change allows ReflectiveInjector to be tree shaken resulting
in not needed Reflect polyfil and smaller bundles.

Code savings for HelloWorld using Closure:

Reflective: bundle.js:  105,864(34,190 gzip)
    Static: bundle.js:  154,889(33,555 gzip)
                            645( 2%)

BREAKING CHANGE:

`platformXXXX()` no longer accepts providers which depend on reflection.
Specifically the method signature when from `Provider[]` to
`StaticProvider[]`.

Example:
Before:
```
[
  MyClass,
  {provide: ClassA, useClass: SubClassA}
]

```

After:
```
[
  {provide: MyClass, deps: [Dep1,...]},
  {provide: ClassA, useClass: SubClassA, deps: [Dep1,...]}
]
```

NOTE: This only applies to platform creation and providers for the JIT
compiler. It does not apply to `@Compotent` or `@NgModule` provides
declarations.

Benchpress note: Previously Benchpress also supported reflective
provides, which now require static providers.

DEPRECATION:

- `ReflectiveInjector` is now deprecated as it will be remove. Use
  `Injector.create` as a replacement.

closes #18496

modules/e2e_util/perf_util.ts

@@ -11,7 +11,7 @@ const yargs = require('yargs');
 const nodeUuid = require('node-uuid');
 import * as fs from 'fs-extra';
 
-import {SeleniumWebDriverAdapter, Options, JsonFileReporter, Validator, RegressionSlopeValidator, ConsoleReporter, SizeValidator, MultiReporter, MultiMetric, Runner, Provider} from '@angular/benchpress';
+import {SeleniumWebDriverAdapter, Options, JsonFileReporter, Validator, RegressionSlopeValidator, ConsoleReporter, SizeValidator, MultiReporter, MultiMetric, Runner, StaticProvider} from '@angular/benchpress';
 import {readCommandLine as readE2eCommandLine, openBrowser} from './e2e_util';
 
 let cmdArgs: {'sample-size': number, 'force-gc': boolean, 'dryrun': boolean, 'bundles': boolean};
@@ -59,7 +59,7 @@ function createBenchpressRunner(): Runner {
   }
   const resultsFolder = './dist/benchmark_results';
   fs.ensureDirSync(resultsFolder);
-  const providers: Provider[] = [
+  const providers: StaticProvider[] = [
     SeleniumWebDriverAdapter.PROTRACTOR_PROVIDERS,
     {provide: Options.FORCE_GC, useValue: cmdArgs['force-gc']},
     {provide: Options.DEFAULT_DESCRIPTION, useValue: {'runId': runId}}, JsonFileReporter.PROVIDERS,

modules/playground/README.md

@@ -1,6 +1,8 @@
 # How to run the examples locally
 
+```
 $ cp -r ./modules/playground ./dist/all/
 $ ./node_modules/.bin/tsc -p modules --emitDecoratorMetadata -w
 $ gulp serve
 $ open http://localhost:8000/all/playground/src/hello_world/index.html?bundles=false
+```

packages/benchpress/index.ts

@@ -9,7 +9,7 @@
 // Must be imported first, because Angular decorators throw on load.
 import 'reflect-metadata';
 
-export {InjectionToken, Injector, Provider, ReflectiveInjector} from '@angular/core';
+export {InjectionToken, Injector, Provider, ReflectiveInjector, StaticProvider} from '@angular/core';
 export {Options} from './src/common_options';
 export {MeasureValues} from './src/measure_values';
 export {Metric} from './src/metric';

packages/benchpress/src/metric/perflog_metric.ts

@@ -20,7 +20,14 @@ import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_e
 export class PerflogMetric extends Metric {
   static SET_TIMEOUT = new InjectionToken('PerflogMetric.setTimeout');
   static PROVIDERS = [
-    PerflogMetric, {
+    {
+      provide: PerflogMetric,
+      deps: [
+        WebDriverExtension, PerflogMetric.SET_TIMEOUT, Options.MICRO_METRICS, Options.FORCE_GC,
+        Options.CAPTURE_FRAMES, Options.RECEIVED_DATA, Options.REQUEST_COUNT
+      ]
+    },
+    {
       provide: PerflogMetric.SET_TIMEOUT,
       useValue: (fn: Function, millis: number) => <any>setTimeout(fn, millis)
     }

packages/benchpress/src/metric/user_metric.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable} from '@angular/core';
+import {Inject, Injectable, StaticProvider} from '@angular/core';
 
 import {Options} from '../common_options';
 import {Metric} from '../metric';
@@ -14,7 +14,8 @@ import {WebDriverAdapter} from '../web_driver_adapter';
 
 @Injectable()
 export class UserMetric extends Metric {
-  static PROVIDERS = [UserMetric];
+  static PROVIDERS =
+      <StaticProvider[]>[{provide: UserMetric, deps: [Options.USER_METRICS, WebDriverAdapter]}];
 
   constructor(
       @Inject(Options.USER_METRICS) private _userMetrics: {[key: string]: string},

packages/benchpress/src/reporter/console_reporter.ts

@@ -22,7 +22,11 @@ export class ConsoleReporter extends Reporter {
   static PRINT = new InjectionToken('ConsoleReporter.print');
   static COLUMN_WIDTH = new InjectionToken('ConsoleReporter.columnWidth');
   static PROVIDERS = [
-    ConsoleReporter, {provide: ConsoleReporter.COLUMN_WIDTH, useValue: 18}, {
+    {
+      provide: ConsoleReporter,
+      deps: [ConsoleReporter.COLUMN_WIDTH, SampleDescription, ConsoleReporter.PRINT]
+    },
+    {provide: ConsoleReporter.COLUMN_WIDTH, useValue: 18}, {
       provide: ConsoleReporter.PRINT,
       useValue: function(v: any) {
         // tslint:disable-next-line:no-console

packages/benchpress/src/reporter/json_file_reporter.ts

@@ -22,7 +22,13 @@ import {formatStats, sortedProps} from './util';
 @Injectable()
 export class JsonFileReporter extends Reporter {
   static PATH = new InjectionToken('JsonFileReporter.path');
-  static PROVIDERS = [JsonFileReporter, {provide: JsonFileReporter.PATH, useValue: '.'}];
+  static PROVIDERS = [
+    {
+      provide: JsonFileReporter,
+      deps: [SampleDescription, JsonFileReporter.PATH, Options.WRITE_FILE, Options.NOW]
+    },
+    {provide: JsonFileReporter.PATH, useValue: '.'}
+  ];
 
   constructor(
       private _description: SampleDescription, @Inject(JsonFileReporter.PATH) private _path: string,

packages/benchpress/src/runner.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Provider, ReflectiveInjector} from '@angular/core';
+import {Injector, StaticProvider} from '@angular/core';
 
 import {Options} from './common_options';
 import {Metric} from './metric';
@@ -34,17 +34,17 @@ import {IOsDriverExtension} from './webdriver/ios_driver_extension';
  * It provides defaults, creates the injector and calls the sampler.
  */
 export class Runner {
-  constructor(private _defaultProviders: Provider[] = []) {}
+  constructor(private _defaultProviders: StaticProvider[] = []) {}
 
   sample({id, execute, prepare, microMetrics, providers, userMetrics}: {
     id: string,
     execute?: Function,
     prepare?: Function,
     microMetrics?: {[key: string]: string},
-    providers?: Provider[],
+    providers?: StaticProvider[],
     userMetrics?: {[key: string]: string}
   }): Promise<SampleState> {
-    const sampleProviders: Provider[] = [
+    const sampleProviders: StaticProvider[] = [
       _DEFAULT_PROVIDERS, this._defaultProviders, {provide: Options.SAMPLE_ID, useValue: id},
       {provide: Options.EXECUTE, useValue: execute}
     ];
@@ -61,7 +61,7 @@ export class Runner {
       sampleProviders.push(providers);
     }
 
-    const inj = ReflectiveInjector.resolveAndCreate(sampleProviders);
+    const inj = Injector.create(sampleProviders);
     const adapter: WebDriverAdapter = inj.get(WebDriverAdapter);
 
     return Promise
@@ -75,7 +75,7 @@ export class Runner {
           // Only WebDriverAdapter is reused.
           // TODO vsavkin consider changing it when toAsyncFactory is added back or when child
           // injectors are handled better.
-          const injector = ReflectiveInjector.resolveAndCreate([
+          const injector = Injector.create([
             sampleProviders, {provide: Options.CAPABILITIES, useValue: capabilities},
             {provide: Options.USER_AGENT, useValue: userAgent},
             {provide: WebDriverAdapter, useValue: adapter}

packages/benchpress/src/sampler.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable} from '@angular/core';
+import {Inject, Injectable, StaticProvider} from '@angular/core';
 
 import {Options} from './common_options';
 import {MeasureValues} from './measure_values';
@@ -26,8 +26,12 @@ import {WebDriverAdapter} from './web_driver_adapter';
  */
 @Injectable()
 export class Sampler {
-  static PROVIDERS = [Sampler];
+  static PROVIDERS = <StaticProvider[]>[{
-
+    provide: Sampler,
+    deps: [
+      WebDriverAdapter, Metric, Reporter, Validator, Options.PREPARE, Options.EXECUTE, Options.NOW
+    ]
+  }];
   constructor(
       private _driver: WebDriverAdapter, private _metric: Metric, private _reporter: Reporter,
       private _validator: Validator, @Inject(Options.PREPARE) private _prepare: Function,

packages/benchpress/src/validator/regression_slope_validator.ts

@@ -21,7 +21,11 @@ export class RegressionSlopeValidator extends Validator {
   static SAMPLE_SIZE = new InjectionToken('RegressionSlopeValidator.sampleSize');
   static METRIC = new InjectionToken('RegressionSlopeValidator.metric');
   static PROVIDERS = [
-    RegressionSlopeValidator, {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: 10},
+    {
+      provide: RegressionSlopeValidator,
+      deps: [RegressionSlopeValidator.SAMPLE_SIZE, RegressionSlopeValidator.METRIC]
+    },
+    {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: 10},
     {provide: RegressionSlopeValidator.METRIC, useValue: 'scriptTime'}
   ];
 

packages/benchpress/src/validator/size_validator.ts

@@ -17,7 +17,10 @@ import {Validator} from '../validator';
 @Injectable()
 export class SizeValidator extends Validator {
   static SAMPLE_SIZE = new InjectionToken('SizeValidator.sampleSize');
-  static PROVIDERS = [SizeValidator, {provide: SizeValidator.SAMPLE_SIZE, useValue: 10}];
+  static PROVIDERS = [
+    {provide: SizeValidator, deps: [SizeValidator.SAMPLE_SIZE]},
+    {provide: SizeValidator.SAMPLE_SIZE, useValue: 10}
+  ];
 
   constructor(@Inject(SizeValidator.SAMPLE_SIZE) private _sampleSize: number) { super(); }
 

packages/benchpress/src/webdriver/chrome_driver_extension.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable} from '@angular/core';
+import {Inject, Injectable, StaticProvider} from '@angular/core';
 
 import {Options} from '../common_options';
 import {WebDriverAdapter} from '../web_driver_adapter';
@@ -21,7 +21,10 @@ import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_e
  */
 @Injectable()
 export class ChromeDriverExtension extends WebDriverExtension {
-  static PROVIDERS = [ChromeDriverExtension];
+  static PROVIDERS = <StaticProvider>[{
+    provide: ChromeDriverExtension,
+    deps: [WebDriverAdapter, Options.USER_AGENT]
+  }];
 
   private _majorChromeVersion: number;
   private _firstRun = true;

packages/benchpress/src/webdriver/firefox_driver_extension.ts

@@ -13,7 +13,7 @@ import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_e
 
 @Injectable()
 export class FirefoxDriverExtension extends WebDriverExtension {
-  static PROVIDERS = [FirefoxDriverExtension];
+  static PROVIDERS = [{provide: FirefoxDriverExtension, deps: [WebDriverAdapter]}];
 
   private _profilerStarted: boolean;
 

packages/benchpress/src/webdriver/ios_driver_extension.ts

@@ -13,7 +13,7 @@ import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_e
 
 @Injectable()
 export class IOsDriverExtension extends WebDriverExtension {
-  static PROVIDERS = [IOsDriverExtension];
+  static PROVIDERS = [{provide: IOsDriverExtension, deps: [WebDriverAdapter]}];
 
   constructor(private _driver: WebDriverAdapter) { super(); }
 

packages/benchpress/src/webdriver/selenium_webdriver_adapter.ts

@@ -6,15 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {StaticProvider} from '@angular/core';
+
 import {WebDriverAdapter} from '../web_driver_adapter';
 
+
 /**
  * Adapter for the selenium-webdriver.
  */
 export class SeleniumWebDriverAdapter extends WebDriverAdapter {
-  static PROTRACTOR_PROVIDERS = [{
+  static PROTRACTOR_PROVIDERS = <StaticProvider[]>[{
     provide: WebDriverAdapter,
-    useFactory: () => new SeleniumWebDriverAdapter((<any>global).browser)
+    useFactory: () => new SeleniumWebDriverAdapter((<any>global).browser),
+    deps: []
   }];
 
   constructor(private _driver: any) { super(); }

packages/benchpress/test/metric/multi_metric_spec.ts

@@ -7,12 +7,13 @@
  */
 
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
-import {Metric, MultiMetric, ReflectiveInjector} from '../../index';
+
+import {Injector, Metric, MultiMetric} from '../../index';
 
 export function main() {
   function createMetric(ids: any[]) {
-    const m = ReflectiveInjector
+    const m = Injector
-                  .resolveAndCreate([
+                  .create([
                     ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
                     MultiMetric.provideWith(ids)
                   ])

packages/benchpress/test/metric/perflog_metric_spec.ts

@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Provider} from '@angular/core';
+import {StaticProvider} from '@angular/core';
 import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
 
-import {Metric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, ReflectiveInjector, WebDriverExtension} from '../../index';
+import {Injector, Metric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, WebDriverExtension} from '../../index';
 import {TraceEventFactory} from '../trace_event_factory';
 
 export function main() {
@@ -33,7 +33,7 @@ export function main() {
     if (!microMetrics) {
       microMetrics = {};
     }
-    const providers: Provider[] = [
+    const providers: StaticProvider[] = [
       Options.DEFAULT_PROVIDERS, PerflogMetric.PROVIDERS,
       {provide: Options.MICRO_METRICS, useValue: microMetrics}, {
         provide: PerflogMetric.SET_TIMEOUT,
@@ -59,7 +59,7 @@ export function main() {
     if (requestCount != null) {
       providers.push({provide: Options.REQUEST_COUNT, useValue: requestCount});
     }
-    return ReflectiveInjector.resolveAndCreate(providers).get(PerflogMetric);
+    return Injector.create(providers).get(PerflogMetric);
   }
 
   describe('perflog metric', () => {

packages/benchpress/test/metric/user_metric_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Provider, ReflectiveInjector} from '@angular/core';
+import {Injector, StaticProvider} from '@angular/core';
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
 
 import {Options, PerfLogEvent, PerfLogFeatures, UserMetric, WebDriverAdapter} from '../../index';
@@ -25,12 +25,12 @@ export function main() {
       userMetrics = {};
     }
     wdAdapter = new MockDriverAdapter();
-    const providers: Provider[] = [
+    const providers: StaticProvider[] = [
       Options.DEFAULT_PROVIDERS, UserMetric.PROVIDERS,
       {provide: Options.USER_METRICS, useValue: userMetrics},
       {provide: WebDriverAdapter, useValue: wdAdapter}
     ];
-    return ReflectiveInjector.resolveAndCreate(providers).get(UserMetric);
+    return Injector.create(providers).get(UserMetric);
   }
 
   describe('user metric', () => {

packages/benchpress/test/reporter/console_reporter_spec.ts

@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Provider} from '@angular/core';
+import {StaticProvider} from '@angular/core';
 import {describe, expect, it} from '@angular/core/testing/src/testing_internal';
 
-import {ConsoleReporter, MeasureValues, ReflectiveInjector, SampleDescription} from '../../index';
+import {ConsoleReporter, Injector, MeasureValues, SampleDescription} from '../../index';
 
 export function main() {
   describe('console reporter', () => {
@@ -30,7 +30,7 @@ export function main() {
       if (sampleId == null) {
         sampleId = 'null';
       }
-      const providers: Provider[] = [
+      const providers: StaticProvider[] = [
         ConsoleReporter.PROVIDERS, {
           provide: SampleDescription,
           useValue: new SampleDescription(sampleId, descriptions, metrics !)
@@ -40,7 +40,7 @@ export function main() {
       if (columnWidth != null) {
         providers.push({provide: ConsoleReporter.COLUMN_WIDTH, useValue: columnWidth});
       }
-      reporter = ReflectiveInjector.resolveAndCreate(providers).get(ConsoleReporter);
+      reporter = Injector.create(providers).get(ConsoleReporter);
     }
 
     it('should print the sample id, description and table header', () => {

packages/benchpress/test/reporter/json_file_reporter_spec.ts

@@ -8,7 +8,7 @@
 
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
 
-import {JsonFileReporter, MeasureValues, Options, ReflectiveInjector, SampleDescription} from '../../index';
+import {Injector, JsonFileReporter, MeasureValues, Options, SampleDescription} from '../../index';
 
 export function main() {
   describe('file reporter', () => {
@@ -34,7 +34,7 @@ export function main() {
           }
         }
       ];
-      return ReflectiveInjector.resolveAndCreate(providers).get(JsonFileReporter);
+      return Injector.create(providers).get(JsonFileReporter);
     }
 
     it('should write all data into a file',

packages/benchpress/test/reporter/multi_reporter_spec.ts

@@ -8,12 +8,12 @@
 
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
 
-import {MeasureValues, MultiReporter, ReflectiveInjector, Reporter} from '../../index';
+import {Injector, MeasureValues, MultiReporter, Reporter} from '../../index';
 
 export function main() {
   function createReporters(ids: any[]) {
-    const r = ReflectiveInjector
+    const r = Injector
-                  .resolveAndCreate([
+                  .create([
                     ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
                     MultiReporter.provideWith(ids)
                   ])

packages/benchpress/test/runner_spec.ts

@@ -8,11 +8,11 @@
 
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
 
-import {Injector, Metric, Options, ReflectiveInjector, Runner, SampleDescription, SampleState, Sampler, Validator, WebDriverAdapter} from '../index';
+import {Injector, Metric, Options, Runner, SampleDescription, SampleState, Sampler, Validator, WebDriverAdapter} from '../index';
 
 export function main() {
   describe('runner', () => {
-    let injector: ReflectiveInjector;
+    let injector: Injector;
     let runner: Runner;
 
     function createRunner(defaultProviders?: any[]): Runner {
@@ -22,7 +22,7 @@ export function main() {
       runner = new Runner([
         defaultProviders, {
           provide: Sampler,
-          useFactory: (_injector: ReflectiveInjector) => {
+          useFactory: (_injector: Injector) => {
             injector = _injector;
             return new MockSampler();
           },

packages/benchpress/test/sampler_spec.ts

@@ -8,7 +8,7 @@
 
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
 
-import {MeasureValues, Metric, Options, ReflectiveInjector, Reporter, Sampler, Validator, WebDriverAdapter} from '../index';
+import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator, WebDriverAdapter} from '../index';
 
 export function main() {
   const EMPTY_EXECUTE = () => {};
@@ -44,7 +44,7 @@ export function main() {
         providers.push({provide: Options.PREPARE, useValue: prepare});
       }
 
-      sampler = ReflectiveInjector.resolveAndCreate(providers).get(Sampler);
+      sampler = Injector.create(providers).get(Sampler);
     }
 
     it('should call the prepare and execute callbacks using WebDriverAdapter.waitFor',

packages/benchpress/test/validator/regression_slope_validator_spec.ts

@@ -8,15 +8,15 @@
 
 import {describe, expect, it} from '@angular/core/testing/src/testing_internal';
 
-import {MeasureValues, ReflectiveInjector, RegressionSlopeValidator} from '../../index';
+import {Injector, MeasureValues, RegressionSlopeValidator} from '../../index';
 
 export function main() {
   describe('regression slope validator', () => {
     let validator: RegressionSlopeValidator;
 
     function createValidator({size, metric}: {size: number, metric: string}) {
-      validator = ReflectiveInjector
+      validator = Injector
-                      .resolveAndCreate([
+                      .create([
                         RegressionSlopeValidator.PROVIDERS,
                         {provide: RegressionSlopeValidator.METRIC, useValue: metric},
                         {provide: RegressionSlopeValidator.SAMPLE_SIZE, useValue: size}

packages/benchpress/test/validator/size_validator_spec.ts

@@ -8,7 +8,7 @@
 
 import {describe, expect, it} from '@angular/core/testing/src/testing_internal';
 
-import {MeasureValues, ReflectiveInjector, SizeValidator} from '../../index';
+import {Injector, MeasureValues, SizeValidator} from '../../index';
 
 export function main() {
   describe('size validator', () => {
@@ -16,8 +16,8 @@ export function main() {
 
     function createValidator(size: number) {
       validator =
-          ReflectiveInjector
+          Injector
-              .resolveAndCreate(
+              .create(
                   [SizeValidator.PROVIDERS, {provide: SizeValidator.SAMPLE_SIZE, useValue: size}])
               .get(SizeValidator);
     }

packages/benchpress/test/web_driver_extension_spec.ts

@@ -8,14 +8,14 @@
 
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
 
-import {Options, ReflectiveInjector, WebDriverExtension} from '../index';
+import {Injector, Options, WebDriverExtension} from '../index';
 
 export function main() {
   function createExtension(ids: any[], caps: any) {
     return new Promise<any>((res, rej) => {
       try {
-        res(ReflectiveInjector
+        res(Injector
-                .resolveAndCreate([
+                .create([
                   ids.map((id) => ({provide: id, useValue: new MockExtension(id)})),
                   {provide: Options.CAPABILITIES, useValue: caps},
                   WebDriverExtension.provideFirstSupported(ids)

packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts

@@ -8,7 +8,7 @@
 
 import {AsyncTestCompleter, describe, expect, iit, inject, it} from '@angular/core/testing/src/testing_internal';
 
-import {ChromeDriverExtension, Options, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index';
+import {ChromeDriverExtension, Injector, Options, WebDriverAdapter, WebDriverExtension} from '../../index';
 import {TraceEventFactory} from '../trace_event_factory';
 
 export function main() {
@@ -41,8 +41,8 @@ export function main() {
         userAgent = CHROME45_USER_AGENT;
       }
       log = [];
-      extension = ReflectiveInjector
+      extension = Injector
-                      .resolveAndCreate([
+                      .create([
                         ChromeDriverExtension.PROVIDERS, {
                           provide: WebDriverAdapter,
                           useValue: new MockDriverAdapter(log, perfRecords, messageMethod)

packages/benchpress/test/webdriver/ios_driver_extension_spec.ts

@@ -8,7 +8,7 @@
 
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
 
-import {IOsDriverExtension, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index';
+import {IOsDriverExtension, Injector, WebDriverAdapter, WebDriverExtension} from '../../index';
 import {TraceEventFactory} from '../trace_event_factory';
 
 export function main() {
@@ -24,8 +24,8 @@ export function main() {
       }
       log = [];
       extension =
-          ReflectiveInjector
+          Injector
-              .resolveAndCreate([
+              .create([
                 IOsDriverExtension.PROVIDERS,
                 {provide: WebDriverAdapter, useValue: new MockDriverAdapter(log, perfRecords)}
               ])

packages/common/src/directives/ng_component_outlet.ts

@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ComponentFactoryResolver, ComponentRef, Directive, Injector, Input, NgModuleFactory, NgModuleRef, OnChanges, OnDestroy, Provider, SimpleChanges, Type, ViewContainerRef} from '@angular/core';
+import {ComponentFactoryResolver, ComponentRef, Directive, Injector, Input, NgModuleFactory, NgModuleRef, OnChanges, OnDestroy, SimpleChanges, StaticProvider, Type, ViewContainerRef} from '@angular/core';
+
 
 /**
  * Instantiates a single {@link Component} type and inserts its Host View into current View.

packages/common/test/directives/ng_component_outlet_spec.ts

@@ -8,7 +8,7 @@
 
 import {CommonModule} from '@angular/common';
 import {NgComponentOutlet} from '@angular/common/src/directives/ng_component_outlet';
-import {Compiler, Component, ComponentRef, Inject, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, NgModuleFactory, Optional, Provider, QueryList, ReflectiveInjector, TemplateRef, Type, ViewChild, ViewChildren, ViewContainerRef} from '@angular/core';
+import {Compiler, Component, ComponentRef, Inject, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, NgModuleFactory, Optional, QueryList, StaticProvider, TemplateRef, Type, ViewChild, ViewChildren, ViewContainerRef} from '@angular/core';
 import {TestBed, async, fakeAsync} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 
@@ -96,7 +96,7 @@ export function main() {
 
          const uniqueValue = {};
          fixture.componentInstance.currentComponent = InjectedComponent;
-         fixture.componentInstance.injector = ReflectiveInjector.resolveAndCreate(
+         fixture.componentInstance.injector = Injector.create(
              [{provide: TEST_TOKEN, useValue: uniqueValue}], fixture.componentRef.injector);
 
          fixture.detectChanges();

packages/compiler/src/aot/summary_serializer.ts

@@ -345,4 +345,4 @@ class FromJsonDeserializer extends ValueTransformer {
       return super.visitStringMap(map, context);
     }
   }
-}
+}

packages/compiler/src/jit/compiler_factory.ts

@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {COMPILER_OPTIONS, Compiler, CompilerFactory, CompilerOptions, Inject, InjectionToken, MissingTranslationStrategy, Optional, PlatformRef, Provider, ReflectiveInjector, TRANSLATIONS, TRANSLATIONS_FORMAT, Type, ViewEncapsulation, createPlatformFactory, isDevMode, platformCore, ɵConsole as Console} from '@angular/core';
+import {COMPILER_OPTIONS, Compiler, CompilerFactory, CompilerOptions, Inject, InjectionToken, Injector, MissingTranslationStrategy, Optional, PACKAGE_ROOT_URL, PlatformRef, StaticProvider, TRANSLATIONS, TRANSLATIONS_FORMAT, Type, ViewEncapsulation, createPlatformFactory, isDevMode, platformCore, ɵConsole as Console} from '@angular/core';
 
+import {StaticSymbolCache} from '../aot/static_symbol';
 import {CompileReflector} from '../compile_reflector';
 import {CompilerConfig} from '../config';
 import {DirectiveNormalizer} from '../directive_normalizer';
@@ -16,7 +17,7 @@ import {Lexer} from '../expression_parser/lexer';
 import {Parser} from '../expression_parser/parser';
 import * as i18n from '../i18n/index';
 import {CompilerInjectable} from '../injectable';
-import {CompileMetadataResolver} from '../metadata_resolver';
+import {CompileMetadataResolver, ERROR_COLLECTOR_TOKEN} from '../metadata_resolver';
 import {HtmlParser} from '../ml_parser/html_parser';
 import {NgModuleCompiler} from '../ng_module_compiler';
 import {NgModuleResolver} from '../ng_module_resolver';
@@ -26,7 +27,7 @@ import {DomElementSchemaRegistry} from '../schema/dom_element_schema_registry';
 import {ElementSchemaRegistry} from '../schema/element_schema_registry';
 import {StyleCompiler} from '../style_compiler';
 import {JitSummaryResolver, SummaryResolver} from '../summary_resolver';
-import {TemplateParser} from '../template_parser/template_parser';
+import {TEMPLATE_TRANSFORMS, TemplateParser} from '../template_parser/template_parser';
 import {DEFAULT_PACKAGE_URL_PROVIDER, UrlResolver} from '../url_resolver';
 import {ViewCompiler} from '../view_compiler/view_compiler';
 
@@ -45,17 +46,18 @@ const baseHtmlParser = new InjectionToken('HtmlParser');
  * A set of providers that provide `JitCompiler` and its dependencies to use for
  * template compilation.
  */
-export const COMPILER_PROVIDERS: Array<any|Type<any>|{[k: string]: any}|any[]> = [
+export const COMPILER_PROVIDERS = <StaticProvider[]>[
   {provide: CompileReflector, useValue: new JitReflector()},
   {provide: ResourceLoader, useValue: _NO_RESOURCE_LOADER},
-  JitSummaryResolver,
+  {provide: JitSummaryResolver, deps: []},
   {provide: SummaryResolver, useExisting: JitSummaryResolver},
-  Console,
+  {provide: Console, deps: []},
-  Lexer,
+  {provide: Lexer, deps: []},
-  Parser,
+  {provide: Parser, deps: [Lexer]},
   {
     provide: baseHtmlParser,
     useClass: HtmlParser,
+    deps: [],
   },
   {
     provide: i18n.I18NHtmlParser,
@@ -78,22 +80,37 @@ export const COMPILER_PROVIDERS: Array<any|Type<any>|{[k: string]: any}|any[]> =
     provide: HtmlParser,
     useExisting: i18n.I18NHtmlParser,
   },
-  TemplateParser,
+  {
-  DirectiveNormalizer,
+    provide: TemplateParser, deps: [CompilerConfig, CompileReflector,
-  CompileMetadataResolver,
+    Parser, ElementSchemaRegistry,
+    i18n.I18NHtmlParser, Console, [Optional, TEMPLATE_TRANSFORMS]]
+  },
+  { provide: DirectiveNormalizer, deps: [ResourceLoader, UrlResolver, HtmlParser, CompilerConfig]},
+  { provide: CompileMetadataResolver, deps: [CompilerConfig, NgModuleResolver,
+                      DirectiveResolver, PipeResolver,
+                      SummaryResolver,
+                      ElementSchemaRegistry,
+                      DirectiveNormalizer, Console,
+                      [Optional, StaticSymbolCache],
+                      CompileReflector,
+                      [Optional, ERROR_COLLECTOR_TOKEN]]},
   DEFAULT_PACKAGE_URL_PROVIDER,
-  StyleCompiler,
+  { provide: StyleCompiler, deps: [UrlResolver]},
-  ViewCompiler,
+  { provide: ViewCompiler, deps: [CompilerConfig, CompileReflector, ElementSchemaRegistry]},
-  NgModuleCompiler,
+  { provide: NgModuleCompiler, deps: [CompileReflector] },
-  {provide: CompilerConfig, useValue: new CompilerConfig()},
+  { provide: CompilerConfig, useValue: new CompilerConfig()},
-  JitCompiler,
+  { provide: JitCompiler, deps: [Injector, CompileMetadataResolver,
-  {provide: Compiler, useExisting: JitCompiler},
+                                TemplateParser, StyleCompiler,
-  DomElementSchemaRegistry,
+                                ViewCompiler, NgModuleCompiler,
-  {provide: ElementSchemaRegistry, useExisting: DomElementSchemaRegistry},
+                                SummaryResolver,  CompilerConfig,
-  UrlResolver,
+                                Console]},
-  DirectiveResolver,
+  { provide: Compiler, useExisting: JitCompiler},
-  PipeResolver,
+  { provide: DomElementSchemaRegistry, deps: []},
-  NgModuleResolver,
+  { provide: ElementSchemaRegistry, useExisting: DomElementSchemaRegistry},
+  { provide: UrlResolver, deps: [PACKAGE_ROOT_URL]},
+  { provide: DirectiveResolver, deps: [CompileReflector]},
+  { provide: PipeResolver, deps: [CompileReflector]},
+  { provide: NgModuleResolver, deps: [CompileReflector]},
 ];
 
 @CompilerInjectable()
@@ -112,7 +129,7 @@ export class JitCompilerFactory implements CompilerFactory {
   }
   createCompiler(options: CompilerOptions[] = []): Compiler {
     const opts = _mergeOptions(this._defaultOptions.concat(options));
-    const injector = ReflectiveInjector.resolveAndCreate([
+    const injector = Injector.create([
       COMPILER_PROVIDERS, {
         provide: CompilerConfig,
         useFactory: () => {
@@ -142,7 +159,7 @@ export class JitCompilerFactory implements CompilerFactory {
  */
 export const platformCoreDynamic = createPlatformFactory(platformCore, 'coreDynamic', [
   {provide: COMPILER_OPTIONS, useValue: {}, multi: true},
-  {provide: CompilerFactory, useClass: JitCompilerFactory},
+  {provide: CompilerFactory, useClass: JitCompilerFactory, deps: [COMPILER_OPTIONS]},
 ]);
 
 function _mergeOptions(optionsArr: CompilerOptions[]): CompilerOptions {

packages/compiler/src/view_compiler/view_compiler.ts

@@ -1071,4 +1071,4 @@ function calcStaticDynamicQueryFlags(
     flags |= NodeFlags.DynamicQuery;
   }
   return flags;
-}
+}

packages/compiler/test/directive_normalizer_spec.ts

@@ -328,10 +328,7 @@ export function main() {
 
     describe('normalizeExternalStylesheets', () => {
 
-      beforeEach(() => {
+      beforeEach(() => { TestBed.configureCompiler({providers: [SpyResourceLoader.PROVIDE]}); });
-        TestBed.configureCompiler(
-            {providers: [{provide: ResourceLoader, useClass: SpyResourceLoader}]});
-      });
 
       it('should load an external stylesheet',
          inject(

packages/compiler/test/i18n/integration_common.ts

@@ -26,6 +26,7 @@ export class I18nComponent {
 }
 
 export class FrLocalization extends NgLocalization {
+  public static PROVIDE = {provide: NgLocalization, useClass: FrLocalization, deps: []};
   getPluralCategory(value: number): string {
     switch (value) {
       case 0:

packages/compiler/test/i18n/integration_xliff2_spec.ts

@@ -26,8 +26,8 @@ export function main() {
     beforeEach(async(() => {
       TestBed.configureCompiler({
         providers: [
-          {provide: ResourceLoader, useClass: SpyResourceLoader},
+          SpyResourceLoader.PROVIDE,
-          {provide: NgLocalization, useClass: FrLocalization},
+          FrLocalization.PROVIDE,
           {provide: TRANSLATIONS, useValue: XLIFF2_TOMERGE},
           {provide: TRANSLATIONS_FORMAT, useValue: 'xlf2'},
         ]

packages/compiler/test/i18n/integration_xliff_spec.ts

@@ -26,8 +26,8 @@ export function main() {
     beforeEach(async(() => {
       TestBed.configureCompiler({
         providers: [
-          {provide: ResourceLoader, useClass: SpyResourceLoader},
+          SpyResourceLoader.PROVIDE,
-          {provide: NgLocalization, useClass: FrLocalization},
+          FrLocalization.PROVIDE,
           {provide: TRANSLATIONS, useValue: XLIFF_TOMERGE},
           {provide: TRANSLATIONS_FORMAT, useValue: 'xliff'},
         ]

packages/compiler/test/i18n/integration_xmb_xtb_spec.ts

@@ -26,8 +26,8 @@ export function main() {
     beforeEach(async(() => {
       TestBed.configureCompiler({
         providers: [
-          {provide: ResourceLoader, useClass: SpyResourceLoader},
+          SpyResourceLoader.PROVIDE,
-          {provide: NgLocalization, useClass: FrLocalization},
+          FrLocalization.PROVIDE,
           {provide: TRANSLATIONS, useValue: XTB},
           {provide: TRANSLATIONS_FORMAT, useValue: 'xtb'},
         ]

packages/compiler/test/runtime_compiler_spec.ts

@@ -36,7 +36,7 @@ export function main() {
 
         beforeEach(() => {
           TestBed.configureCompiler(
-              {providers: [{provide: ResourceLoader, useClass: StubResourceLoader}]});
+              {providers: [{provide: ResourceLoader, useClass: StubResourceLoader, deps: []}]});
         });
 
         it('should throw when using a templateUrl that has not been compiled before', async(() => {
@@ -68,7 +68,7 @@ export function main() {
 
         beforeEach(() => {
           TestBed.configureCompiler(
-              {providers: [{provide: ResourceLoader, useClass: StubResourceLoader}]});
+              {providers: [{provide: ResourceLoader, useClass: StubResourceLoader, deps: []}]});
         });
 
         it('should allow to use templateUrl components that have been loaded before', async(() => {
@@ -88,10 +88,7 @@ export function main() {
     let dirResolver: MockDirectiveResolver;
     let injector: Injector;
 
-    beforeEach(() => {
+    beforeEach(() => { TestBed.configureCompiler({providers: [SpyResourceLoader.PROVIDE]}); });
-      TestBed.configureCompiler(
-          {providers: [{provide: ResourceLoader, useClass: SpyResourceLoader}]});
-    });
 
     beforeEach(fakeAsync(inject(
         [Compiler, ResourceLoader, DirectiveResolver, Injector],

packages/compiler/test/spies.ts

@@ -11,5 +11,6 @@ import {ResourceLoader} from '@angular/compiler/src/resource_loader';
 import {SpyObject} from '@angular/core/testing/src/testing_internal';
 
 export class SpyResourceLoader extends SpyObject {
+  public static PROVIDE = {provide: ResourceLoader, useClass: SpyResourceLoader, deps: []};
   constructor() { super(ResourceLoader); }
 }

packages/compiler/test/template_parser/template_parser_spec.ts

@@ -308,7 +308,7 @@ export function main() {
       TestBed.configureCompiler({
         providers: [
           TEST_COMPILER_PROVIDERS,
-          {provide: ElementSchemaRegistry, useClass: DomElementSchemaRegistry}
+          {provide: ElementSchemaRegistry, useClass: DomElementSchemaRegistry, deps: []}
         ]
       });
     });

packages/compiler/testing/src/test_bindings.ts

@@ -20,6 +20,6 @@ export function createUrlResolverWithoutPackagePrefix(): UrlResolver {
 // TODO: get rid of it or move to a separate @angular/internal_testing package
 export const TEST_COMPILER_PROVIDERS: Provider[] = [
   {provide: ElementSchemaRegistry, useValue: new MockSchemaRegistry({}, {}, {}, [], [])},
-  {provide: ResourceLoader, useClass: MockResourceLoader},
+  {provide: ResourceLoader, useClass: MockResourceLoader, deps: []},
-  {provide: UrlResolver, useFactory: createUrlResolverWithoutPackagePrefix}
+  {provide: UrlResolver, useFactory: createUrlResolverWithoutPackagePrefix, deps: []}
 ];

packages/compiler/testing/src/testing.ts

@@ -28,7 +28,7 @@ export * from './pipe_resolver_mock';
 
 import {createPlatformFactory, ModuleWithComponentFactories, Injectable, CompilerOptions, COMPILER_OPTIONS, CompilerFactory, ComponentFactory, NgModuleFactory, Injector, NgModule, Component, Directive, Pipe, Type, PlatformRef, ɵstringify} from '@angular/core';
 import {MetadataOverride, ɵTestingCompilerFactory as TestingCompilerFactory, ɵTestingCompiler as TestingCompiler} from '@angular/core/testing';
-import {platformCoreDynamic, JitCompiler, DirectiveResolver, NgModuleResolver, PipeResolver, CompileMetadataResolver} from '@angular/compiler';
+import {platformCoreDynamic, JitCompiler, DirectiveResolver, NgModuleResolver, PipeResolver, CompileMetadataResolver, CompileReflector} from '@angular/compiler';
 import {MockDirectiveResolver} from './directive_resolver_mock';
 import {MockNgModuleResolver} from './ng_module_resolver_mock';
 import {MockPipeResolver} from './pipe_resolver_mock';
@@ -124,15 +124,19 @@ export const platformCoreDynamicTesting: (extraProviders?: any[]) => PlatformRef
         provide: COMPILER_OPTIONS,
         useValue: {
           providers: [
-            MockPipeResolver,
+            {provide: MockPipeResolver, deps: [Injector, CompileReflector]},
             {provide: PipeResolver, useExisting: MockPipeResolver},
-            MockDirectiveResolver,
+            {provide: MockDirectiveResolver, deps: [Injector, CompileReflector]},
             {provide: DirectiveResolver, useExisting: MockDirectiveResolver},
-            MockNgModuleResolver,
+            {provide: MockNgModuleResolver, deps: [Injector, CompileReflector]},
             {provide: NgModuleResolver, useExisting: MockNgModuleResolver},
           ]
         },
         multi: true
       },
-      {provide: TestingCompilerFactory, useClass: TestingCompilerFactoryImpl}
+      {
+        provide: TestingCompilerFactory,
+        useClass: TestingCompilerFactoryImpl,
+        deps: [CompilerFactory]
+      }
     ]);

packages/core/src/application_ref.ts

@@ -19,7 +19,7 @@ import {isPromise} from '../src/util/lang';
 import {ApplicationInitStatus} from './application_init';
 import {APP_BOOTSTRAP_LISTENER, PLATFORM_INITIALIZER} from './application_tokens';
 import {Console} from './console';
-import {Injectable, InjectionToken, Injector, Provider, ReflectiveInjector} from './di';
+import {Injectable, InjectionToken, Injector, StaticProvider} from './di';
 import {CompilerFactory, CompilerOptions} from './linker/compiler';
 import {ComponentFactory, ComponentRef} from './linker/component_factory';
 import {ComponentFactoryBoundToModule, ComponentFactoryResolver} from './linker/component_factory_resolver';
@@ -99,17 +99,18 @@ export function createPlatform(injector: Injector): PlatformRef {
  * @experimental APIs related to application bootstrap are currently under review.
  */
 export function createPlatformFactory(
-    parentPlatformFactory: ((extraProviders?: Provider[]) => PlatformRef) | null, name: string,
+    parentPlatformFactory: ((extraProviders?: StaticProvider[]) => PlatformRef) | null,
-    providers: Provider[] = []): (extraProviders?: Provider[]) => PlatformRef {
+    name: string, providers: StaticProvider[] = []): (extraProviders?: StaticProvider[]) =>
+    PlatformRef {
   const marker = new InjectionToken(`Platform: ${name}`);
-  return (extraProviders: Provider[] = []) => {
+  return (extraProviders: StaticProvider[] = []) => {
     let platform = getPlatform();
     if (!platform || platform.injector.get(ALLOW_MULTIPLE_PLATFORMS, false)) {
       if (parentPlatformFactory) {
         parentPlatformFactory(
             providers.concat(extraProviders).concat({provide: marker, useValue: true}));
       } else {
-        createPlatform(ReflectiveInjector.resolveAndCreate(
+        createPlatform(Injector.create(
             providers.concat(extraProviders).concat({provide: marker, useValue: true})));
       }
     }
@@ -292,8 +293,7 @@ export class PlatformRef_ extends PlatformRef {
     // Attention: Don't use ApplicationRef.run here,
     // as we want to be sure that all possible constructor calls are inside `ngZone.run`!
     return ngZone.run(() => {
-      const ngZoneInjector =
+      const ngZoneInjector = Injector.create([{provide: NgZone, useValue: ngZone}], this.injector);
-          ReflectiveInjector.resolveAndCreate([{provide: NgZone, useValue: ngZone}], this.injector);
       const moduleRef = <InternalNgModuleRef<M>>moduleFactory.create(ngZoneInjector);
       const exceptionHandler: ErrorHandler = moduleRef.injector.get(ErrorHandler, null);
       if (!exceptionHandler) {

packages/core/src/change_detection/differs/iterable_differs.ts

@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Optional, Provider, SkipSelf} from '../../di';
+import {Optional, SkipSelf, StaticProvider} from '../../di';
 import {ChangeDetectorRef} from '../change_detector_ref';
 
+
 /**
  * A type describing supported iterable types.
  *
@@ -181,7 +182,7 @@ export class IterableDiffers {
    * })
    * ```
    */
-  static extend(factories: IterableDifferFactory[]): Provider {
+  static extend(factories: IterableDifferFactory[]): StaticProvider {
     return {
       provide: IterableDiffers,
       useFactory: (parent: IterableDiffers) => {

packages/core/src/change_detection/differs/keyvalue_differs.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Optional, Provider, SkipSelf} from '../../di';
+import {Optional, SkipSelf, StaticProvider} from '../../di';
 import {ChangeDetectorRef} from '../change_detector_ref';
 
 
@@ -156,7 +156,7 @@ export class KeyValueDiffers {
    * })
    * ```
    */
-  static extend<S>(factories: KeyValueDifferFactory[]): Provider {
+  static extend<S>(factories: KeyValueDifferFactory[]): StaticProvider {
     return {
       provide: KeyValueDiffers,
       useFactory: (parent: KeyValueDiffers) => {

packages/core/src/linker/compiler.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, InjectionToken} from '../di';
+import {Injectable, InjectionToken, StaticProvider} from '../di';
 import {MissingTranslationStrategy} from '../i18n/tokens';
 import {ViewEncapsulation} from '../metadata';
 import {Type} from '../type';
@@ -14,6 +14,7 @@ import {Type} from '../type';
 import {ComponentFactory} from './component_factory';
 import {NgModuleFactory} from './ng_module_factory';
 
+
 /**
  * Combination of NgModuleFactory and ComponentFactorys.
  *
@@ -101,7 +102,7 @@ export type CompilerOptions = {
   useDebug?: boolean,
   useJit?: boolean,
   defaultEncapsulation?: ViewEncapsulation,
-  providers?: any[],
+  providers?: StaticProvider[],
   missingTranslation?: MissingTranslationStrategy,
   // Whether to support the `<template>` tag and the `template` attribute to define angular
   // templates. They have been deprecated in 4.x, `<ng-template>` should be used instead.

packages/core/src/platform_core_providers.ts

@@ -9,22 +9,16 @@
 import {PlatformRef, PlatformRef_, createPlatformFactory} from './application_ref';
 import {PLATFORM_ID} from './application_tokens';
 import {Console} from './console';
-import {Provider} from './di';
+import {Injector, StaticProvider} from './di';
-import {Reflector, reflector} from './reflection/reflection';
 import {TestabilityRegistry} from './testability/testability';
 
-function _reflector(): Reflector {
+const _CORE_PLATFORM_PROVIDERS: StaticProvider[] = [
-  return reflector;
-}
-
-const _CORE_PLATFORM_PROVIDERS: Provider[] = [
   // Set a default platform name for platforms that don't set it explicitly.
   {provide: PLATFORM_ID, useValue: 'unknown'},
-  PlatformRef_,
+  {provide: PlatformRef_, deps: [Injector]},
   {provide: PlatformRef, useExisting: PlatformRef_},
-  {provide: Reflector, useFactory: _reflector, deps: []},
+  {provide: TestabilityRegistry, deps: []},
-  TestabilityRegistry,
+  {provide: Console, deps: []},
-  Console,
 ];
 
 /**

packages/core/src/view/query.ts

@@ -190,4 +190,4 @@ export function getQueryValue(
     }
     return value;
   }
-}
+}

packages/core/src/view/view.ts

@@ -161,7 +161,7 @@ function validateNode(parent: NodeDef | null, node: NodeDef, nodeCount: number)
     const parentFlags = parent ? parent.flags : 0;
     if ((parentFlags & NodeFlags.TypeElement) === 0) {
       throw new Error(
-          `Illegal State: Provider/Directive nodes need to be children of elements or anchors, at index ${node.index}!`);
+          `Illegal State: StaticProvider/Directive nodes need to be children of elements or anchors, at index ${node.index}!`);
     }
   }
   if (node.query) {

packages/core/test/change_detection/differs/iterable_differs_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ReflectiveInjector} from '@angular/core';
+import {Injector} from '@angular/core';
 import {IterableDiffers} from '@angular/core/src/change_detection/differs/iterable_differs';
 
 import {SpyIterableDifferFactory} from '../../spies';
@@ -50,7 +50,7 @@ export function main() {
 
     describe('.extend()', () => {
       it('should throw if calling extend when creating root injector', () => {
-        const injector = ReflectiveInjector.resolveAndCreate([IterableDiffers.extend([])]);
+        const injector = Injector.create([IterableDiffers.extend([])]);
 
         expect(() => injector.get(IterableDiffers))
             .toThrowError(/Cannot extend IterableDiffers without a parent injector/);
@@ -58,9 +58,8 @@ export function main() {
 
       it('should extend di-inherited differs', () => {
         const parent = new IterableDiffers([factory1]);
-        const injector =
+        const injector = Injector.create([{provide: IterableDiffers, useValue: parent}]);
-            ReflectiveInjector.resolveAndCreate([{provide: IterableDiffers, useValue: parent}]);
+        const childInjector = Injector.create([IterableDiffers.extend([factory2])], injector);
-        const childInjector = injector.resolveAndCreateChild([IterableDiffers.extend([factory2])]);
 
         expect(injector.get(IterableDiffers).factories).toEqual([factory1]);
         expect(childInjector.get(IterableDiffers).factories).toEqual([factory2, factory1]);

packages/core/test/linker/integration_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {CommonModule} from '@angular/common';
-import {Compiler, ComponentFactory, ErrorHandler, EventEmitter, Host, Inject, Injectable, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, NgModuleRef, OnDestroy, ReflectiveInjector, SkipSelf} from '@angular/core';
+import {Compiler, ComponentFactory, ErrorHandler, EventEmitter, Host, Inject, Injectable, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, NgModuleRef, OnDestroy, SkipSelf} from '@angular/core';
 import {ChangeDetectionStrategy, ChangeDetectorRef, PipeTransform} from '@angular/core/src/change_detection/change_detection';
 import {getDebugContext} from '@angular/core/src/errors';
 import {ComponentFactoryResolver} from '@angular/core/src/linker/component_factory_resolver';
@@ -1850,8 +1850,7 @@ class DynamicViewport {
     const myService = new MyService();
     myService.greeting = 'dynamic greet';
 
-    this.injector = ReflectiveInjector.resolveAndCreate(
+    this.injector = Injector.create([{provide: MyService, useValue: myService}], vc.injector);
-        [{provide: MyService, useValue: myService}], vc.injector);
     this.componentFactory =
         componentFactoryResolver.resolveComponentFactory(ChildCompUsingService) !;
   }

packages/core/test/view/provider_spec.ts

@@ -163,13 +163,19 @@ export function main() {
 
           // root elements
           expect(() => createAndGetRootNodes(compViewDef(nodes)))
-              .toThrowError('No provider for Dep!');
+              .toThrowError(
+                  'StaticInjectorError[Dep]: \n' +
+                  '  StaticInjectorError[Dep]: \n' +
+                  '    NullInjectorError: No provider for Dep!');
 
           // non root elements
           expect(
               () => createAndGetRootNodes(compViewDef(
                   [elementDef(NodeFlags.None, null !, null !, 4, 'span')].concat(nodes))))
-              .toThrowError('No provider for Dep!');
+              .toThrowError(
+                  'StaticInjectorError[Dep]: \n' +
+                  '  StaticInjectorError[Dep]: \n' +
+                  '    NullInjectorError: No provider for Dep!');
         });
 
         it('should inject from a parent element in a parent view', () => {
@@ -191,7 +197,10 @@ export function main() {
                    elementDef(NodeFlags.None, null !, null !, 1, 'span'),
                    directiveDef(NodeFlags.None, null !, 0, SomeService, ['nonExistingDep'])
                  ])))
-              .toThrowError('No provider for nonExistingDep!');
+              .toThrowError(
+                  'StaticInjectorError[nonExistingDep]: \n' +
+                  '  StaticInjectorError[nonExistingDep]: \n' +
+                  '    NullInjectorError: No provider for nonExistingDep!');
         });
 
         it('should use null for optional missing dependencies', () => {

packages/core/testing/src/test_bed.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectionToken, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, ReflectiveInjector, SchemaMetadata, SkipSelf, Type, ɵDepFlags as DepFlags, ɵERROR_COMPONENT_TYPE, ɵNodeFlags as NodeFlags, ɵclearProviderOverrides as clearProviderOverrides, ɵoverrideProvider as overrideProvider, ɵstringify as stringify} from '@angular/core';
+import {ApplicationInitStatus, CompilerOptions, Component, Directive, InjectionToken, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgModuleRef, NgZone, Optional, Pipe, PlatformRef, Provider, SchemaMetadata, SkipSelf, Type, ɵDepFlags as DepFlags, ɵERROR_COMPONENT_TYPE, ɵNodeFlags as NodeFlags, ɵclearProviderOverrides as clearProviderOverrides, ɵoverrideProvider as overrideProvider, ɵstringify as stringify} from '@angular/core';
 
 import {AsyncTestCompleter} from './async_test_completer';
 import {ComponentFixture} from './component_fixture';
@@ -308,8 +308,8 @@ export class TestBed implements Injector {
       }
     }
     const ngZone = new NgZone({enableLongStackTrace: true});
-    const ngZoneInjector = ReflectiveInjector.resolveAndCreate(
+    const ngZoneInjector =
-        [{provide: NgZone, useValue: ngZone}], this.platform.injector);
+        Injector.create([{provide: NgZone, useValue: ngZone}], this.platform.injector);
     this._moduleRef = this._moduleFactory.create(ngZoneInjector);
     // ApplicationInitStatus.runInitializers() is marked @internal to core. So casting to any
     // before accessing it.

packages/forms/src/directives/range_value_accessor.ts

@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, ElementRef, Provider, Renderer2, forwardRef} from '@angular/core';
+import {Directive, ElementRef, Renderer2, StaticProvider, forwardRef} from '@angular/core';
 
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 
-export const RANGE_VALUE_ACCESSOR: Provider = {
+export const RANGE_VALUE_ACCESSOR: StaticProvider = {
   provide: NG_VALUE_ACCESSOR,
   useExisting: forwardRef(() => RangeValueAccessor),
   multi: true

packages/forms/src/directives/select_control_value_accessor.ts

@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, ElementRef, Host, Input, OnDestroy, Optional, Provider, Renderer2, forwardRef, ɵlooseIdentical as looseIdentical} from '@angular/core';
+import {Directive, ElementRef, Host, Input, OnDestroy, Optional, Renderer2, StaticProvider, forwardRef, ɵlooseIdentical as looseIdentical} from '@angular/core';
+
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 
-export const SELECT_VALUE_ACCESSOR: Provider = {
+export const SELECT_VALUE_ACCESSOR: StaticProvider = {
   provide: NG_VALUE_ACCESSOR,
   useExisting: forwardRef(() => SelectControlValueAccessor),
   multi: true

packages/forms/src/directives/select_multiple_control_value_accessor.ts

@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, ElementRef, Host, Input, OnDestroy, Optional, Provider, Renderer2, forwardRef, ɵlooseIdentical as looseIdentical} from '@angular/core';
+import {Directive, ElementRef, Host, Input, OnDestroy, Optional, Renderer2, StaticProvider, forwardRef, ɵlooseIdentical as looseIdentical} from '@angular/core';
+
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 
-export const SELECT_MULTIPLE_VALUE_ACCESSOR: Provider = {
+export const SELECT_MULTIPLE_VALUE_ACCESSOR: StaticProvider = {
   provide: NG_VALUE_ACCESSOR,
   useExisting: forwardRef(() => SelectMultipleControlValueAccessor),
   multi: true

packages/forms/src/directives/validators.ts

@@ -6,11 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Input, OnChanges, Provider, SimpleChanges, forwardRef} from '@angular/core';
+import {Directive, Input, OnChanges, SimpleChanges, StaticProvider, forwardRef} from '@angular/core';
 import {Observable} from 'rxjs/Observable';
+
 import {AbstractControl} from '../model';
 import {NG_VALIDATORS, Validators} from '../validators';
 
+
 /** @experimental */
 export type ValidationErrors = {
   [key: string]: any
@@ -45,13 +47,13 @@ export interface AsyncValidator extends Validator {
   validate(c: AbstractControl): Promise<ValidationErrors|null>|Observable<ValidationErrors|null>;
 }
 
-export const REQUIRED_VALIDATOR: Provider = {
+export const REQUIRED_VALIDATOR: StaticProvider = {
   provide: NG_VALIDATORS,
   useExisting: forwardRef(() => RequiredValidator),
   multi: true
 };
 
-export const CHECKBOX_REQUIRED_VALIDATOR: Provider = {
+export const CHECKBOX_REQUIRED_VALIDATOR: StaticProvider = {
   provide: NG_VALIDATORS,
   useExisting: forwardRef(() => CheckboxRequiredValidator),
   multi: true

packages/http/test/backends/jsonp_backend_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ReflectiveInjector} from '@angular/core';
+import {Injector} from '@angular/core';
 import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {BrowserJsonp} from '../../src/backends/browser_jsonp';
@@ -52,10 +52,10 @@ export function main() {
     let sampleRequest: Request;
 
     beforeEach(() => {
-      const injector = ReflectiveInjector.resolveAndCreate([
+      const injector = Injector.create([
-        {provide: ResponseOptions, useClass: BaseResponseOptions},
+        {provide: ResponseOptions, useClass: BaseResponseOptions, deps: []},
-        {provide: BrowserJsonp, useClass: MockBrowserJsonp},
+        {provide: BrowserJsonp, useClass: MockBrowserJsonp, deps: []},
-        {provide: JSONPBackend, useClass: JSONPBackend_}
+        {provide: JSONPBackend, useClass: JSONPBackend_, deps: [BrowserJsonp, ResponseOptions]}
       ]);
       backend = injector.get(JSONPBackend);
       const base = new BaseRequestOptions();

packages/http/test/backends/mock_backend_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ReflectiveInjector} from '@angular/core';
+import {Injector} from '@angular/core';
 import {AsyncTestCompleter, beforeEach, describe, inject, it, xit} from '@angular/core/testing/src/testing_internal';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {ReplaySubject} from 'rxjs/ReplaySubject';
@@ -27,8 +27,10 @@ export function main() {
     let sampleResponse2: Response;
 
     beforeEach(() => {
-      const injector = ReflectiveInjector.resolveAndCreate(
+      const injector = Injector.create([
-          [{provide: ResponseOptions, useClass: BaseResponseOptions}, MockBackend]);
+        {provide: ResponseOptions, useClass: BaseResponseOptions, deps: []},
+        {provide: MockBackend, deps: []}
+      ]);
       backend = injector.get(MockBackend);
       const base = new BaseRequestOptions();
       sampleRequest1 =

packages/http/test/http_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injector, ReflectiveInjector} from '@angular/core';
+import {Injector} from '@angular/core';
 import {TestBed, getTestBed} from '@angular/core/testing';
 import {AsyncTestCompleter, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
@@ -79,8 +79,8 @@ export function main() {
     let jsonp: Jsonp;
 
     beforeEach(() => {
-      injector = ReflectiveInjector.resolveAndCreate([
+      injector = Injector.create([
-        BaseRequestOptions, MockBackend, {
+        {provide: BaseRequestOptions, deps: []}, {provide: MockBackend, deps: []}, {
           provide: Http,
           useFactory: function(backend: ConnectionBackend, defaultOptions: BaseRequestOptions) {
             return new Http(backend, defaultOptions);

packages/http/testing/src/mock_backend.ts

@@ -114,7 +114,7 @@ export class MockConnection implements Connection {
  * ### Example
  *
  * ```
- * import {Injectable, ReflectiveInjector} from '@angular/core';
+ * import {Injectable, Injector} from '@angular/core';
  * import {async, fakeAsync, tick} from '@angular/core/testing';
  * import {BaseRequestOptions, ConnectionBackend, Http, RequestOptions} from '@angular/http';
  * import {Response, ResponseOptions} from '@angular/http';
@@ -142,7 +142,7 @@ export class MockConnection implements Connection {
  *
  * describe('MockBackend HeroService Example', () => {
  *   beforeEach(() => {
- *     this.injector = ReflectiveInjector.resolveAndCreate([
+ *     this.injector = Injector.create([
  *       {provide: ConnectionBackend, useClass: MockBackend},
  *       {provide: RequestOptions, useClass: BaseRequestOptions},
  *       Http,
@@ -202,7 +202,7 @@ export class MockBackend implements ConnectionBackend {
    * ### Example
    *
    * ```
-   * import {ReflectiveInjector} from '@angular/core';
+   * import {Injector} from '@angular/core';
    * import {fakeAsync, tick} from '@angular/core/testing';
    * import {BaseRequestOptions, ConnectionBackend, Http, RequestOptions} from '@angular/http';
    * import {Response, ResponseOptions} from '@angular/http';
@@ -213,7 +213,7 @@ export class MockBackend implements ConnectionBackend {
    *          MockConnection;  // this will be set when a new connection is emitted from the
    *                           // backend.
    *      let text: string;    // this will be set from mock response
-   *      let injector = ReflectiveInjector.resolveAndCreate([
+   *      let injector = Injector.create([
    *        {provide: ConnectionBackend, useClass: MockBackend},
    *        {provide: RequestOptions, useClass: BaseRequestOptions},
    *        Http,

packages/platform-browser-dynamic/src/platform-browser-dynamic.ts

@@ -7,7 +7,7 @@
  */
 
 import {ResourceLoader, platformCoreDynamic} from '@angular/compiler';
-import {PlatformRef, Provider, createPlatformFactory} from '@angular/core';
+import {PlatformRef, Provider, StaticProvider, createPlatformFactory} from '@angular/core';
 
 import {INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from './platform_providers';
 import {CachedResourceLoader} from './resource_loader/resource_loader_cache';

packages/platform-browser-dynamic/src/platform_providers.ts

@@ -8,17 +8,17 @@
 
 import {ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
 import {ResourceLoader} from '@angular/compiler';
-import {COMPILER_OPTIONS, PLATFORM_ID, Provider} from '@angular/core';
+import {COMPILER_OPTIONS, PLATFORM_ID, StaticProvider} from '@angular/core';
 
 import {ɵINTERNAL_BROWSER_PLATFORM_PROVIDERS as INTERNAL_BROWSER_PLATFORM_PROVIDERS} from '@angular/platform-browser';
 
 import {ResourceLoaderImpl} from './resource_loader/resource_loader_impl';
 
-export const INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS: Provider[] = [
+export const INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS: StaticProvider[] = [
   INTERNAL_BROWSER_PLATFORM_PROVIDERS,
   {
     provide: COMPILER_OPTIONS,
-    useValue: {providers: [{provide: ResourceLoader, useClass: ResourceLoaderImpl}]},
+    useValue: {providers: [{provide: ResourceLoader, useClass: ResourceLoaderImpl, deps: []}]},
     multi: true
   },
   {provide: PLATFORM_ID, useValue: PLATFORM_BROWSER_ID},

packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts

@@ -26,8 +26,8 @@ export function main() {
     beforeEach(fakeAsync(() => {
       TestBed.configureCompiler({
         providers: [
-          {provide: UrlResolver, useClass: TestUrlResolver},
+          {provide: UrlResolver, useClass: TestUrlResolver, deps: []},
-          {provide: ResourceLoader, useFactory: createCachedResourceLoader}
+          {provide: ResourceLoader, useFactory: createCachedResourceLoader, deps: []}
         ]
       });
 

packages/platform-browser-dynamic/testing/src/testing.ts

@@ -7,7 +7,7 @@
  */
 
 import {platformCoreDynamicTesting} from '@angular/compiler/testing';
-import {NgModule, PlatformRef, Provider, createPlatformFactory} from '@angular/core';
+import {NgModule, PlatformRef, StaticProvider, createPlatformFactory} from '@angular/core';
 import {TestComponentRenderer} from '@angular/core/testing';
 import {ɵINTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS as INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from '@angular/platform-browser-dynamic';
 import {BrowserTestingModule} from '@angular/platform-browser/testing';

packages/platform-browser/src/browser.ts

@@ -7,7 +7,7 @@
  */
 
 import {CommonModule, PlatformLocation, ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
-import {APP_ID, ApplicationModule, ErrorHandler, ModuleWithProviders, NgModule, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, Testability, createPlatformFactory, platformCore} from '@angular/core';
+import {APP_ID, ApplicationModule, ErrorHandler, ModuleWithProviders, NgModule, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, Sanitizer, SkipSelf, StaticProvider, Testability, createPlatformFactory, platformCore} from '@angular/core';
 
 import {BrowserDomAdapter} from './browser/browser_adapter';
 import {BrowserPlatformLocation} from './browser/location/browser_platform_location';
@@ -26,10 +26,10 @@ import {KeyEventsPlugin} from './dom/events/key_events';
 import {DomSharedStylesHost, SharedStylesHost} from './dom/shared_styles_host';
 import {DomSanitizer, DomSanitizerImpl} from './security/dom_sanitization_service';
 
-export const INTERNAL_BROWSER_PLATFORM_PROVIDERS: Provider[] = [
+export const INTERNAL_BROWSER_PLATFORM_PROVIDERS: StaticProvider[] = [
   {provide: PLATFORM_ID, useValue: PLATFORM_BROWSER_ID},
   {provide: PLATFORM_INITIALIZER, useValue: initDomAdapter, multi: true},
-  {provide: PlatformLocation, useClass: BrowserPlatformLocation},
+  {provide: PlatformLocation, useClass: BrowserPlatformLocation, deps: [DOCUMENT]},
   {provide: DOCUMENT, useFactory: _document, deps: []},
 ];
 
@@ -39,15 +39,15 @@ export const INTERNAL_BROWSER_PLATFORM_PROVIDERS: Provider[] = [
  * application to XSS risks. For more detail, see the [Security Guide](http://g.co/ng/security).
  * @experimental
  */
-export const BROWSER_SANITIZATION_PROVIDERS: Array<any> = [
+export const BROWSER_SANITIZATION_PROVIDERS: StaticProvider[] = [
   {provide: Sanitizer, useExisting: DomSanitizer},
-  {provide: DomSanitizer, useClass: DomSanitizerImpl},
+  {provide: DomSanitizer, useClass: DomSanitizerImpl, deps: [DOCUMENT]},
 ];
 
 /**
  * @stable
  */
-export const platformBrowser: (extraProviders?: Provider[]) => PlatformRef =
+export const platformBrowser: (extraProviders?: StaticProvider[]) => PlatformRef =
     createPlatformFactory(platformCore, 'browser', INTERNAL_BROWSER_PLATFORM_PROVIDERS);
 
 export function initDomAdapter() {

packages/platform-browser/src/browser/server-transition.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {APP_INITIALIZER, ApplicationInitStatus, Inject, InjectionToken, Injector, Provider} from '@angular/core';
+import {APP_INITIALIZER, ApplicationInitStatus, Inject, InjectionToken, Injector, StaticProvider} from '@angular/core';
 
 import {getDOM} from '../dom/dom_adapter';
 import {DOCUMENT} from '../dom/dom_tokens';
@@ -31,7 +31,7 @@ export function appInitializerFactory(transitionId: string, document: any, injec
   };
 }
 
-export const SERVER_TRANSITION_PROVIDERS: Provider[] = [
+export const SERVER_TRANSITION_PROVIDERS: StaticProvider[] = [
   {
     provide: APP_INITIALIZER,
     useFactory: appInitializerFactory,

packages/platform-browser/test/browser/bootstrap_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {isPlatformBrowser} from '@angular/common';
-import {APP_INITIALIZER, CUSTOM_ELEMENTS_SCHEMA, Compiler, Component, Directive, ErrorHandler, Inject, Input, LOCALE_ID, NgModule, OnDestroy, PLATFORM_ID, PLATFORM_INITIALIZER, Pipe, Provider, VERSION, createPlatformFactory, ɵstringify as stringify} from '@angular/core';
+import {APP_INITIALIZER, CUSTOM_ELEMENTS_SCHEMA, Compiler, Component, Directive, ErrorHandler, Inject, Input, LOCALE_ID, NgModule, OnDestroy, PLATFORM_ID, PLATFORM_INITIALIZER, Pipe, Provider, StaticProvider, VERSION, createPlatformFactory, ɵstringify as stringify} from '@angular/core';
 import {ApplicationRef, destroyPlatform} from '@angular/core/src/application_ref';
 import {Console} from '@angular/core/src/console';
 import {ComponentRef} from '@angular/core/src/linker/component_factory';
@@ -112,8 +112,8 @@ class DummyConsole implements Console {
 
 
 class TestModule {}
-function bootstrap(
+function bootstrap(cmpType: any, providers: Provider[] = [], platformProviders: StaticProvider[] = [
-    cmpType: any, providers: Provider[] = [], platformProviders: Provider[] = []): Promise<any> {
+]): Promise<any> {
   @NgModule({
     imports: [BrowserModule],
     declarations: [cmpType],

packages/platform-browser/test/browser/tools/spies.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ReflectiveInjector, ɵglobal as global} from '@angular/core';
+import {Injector, ɵglobal as global} from '@angular/core';
 import {ApplicationRef, ApplicationRef_} from '@angular/core/src/application_ref';
 import {SpyObject} from '@angular/core/testing/src/testing_internal';
 
@@ -18,8 +18,8 @@ export class SpyComponentRef extends SpyObject {
   injector: any /** TODO #9100 */;
   constructor() {
     super();
-    this.injector = ReflectiveInjector.resolveAndCreate(
+    this.injector =
-        [{provide: ApplicationRef, useClass: SpyApplicationRef}]);
+        Injector.create([{provide: ApplicationRef, useClass: SpyApplicationRef, deps: []}]);
   }
 }
 

packages/platform-browser/testing/src/browser.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {APP_ID, NgModule, NgZone, PLATFORM_INITIALIZER, PlatformRef, Provider, createPlatformFactory, platformCore} from '@angular/core';
+import {APP_ID, NgModule, NgZone, PLATFORM_INITIALIZER, PlatformRef, StaticProvider, createPlatformFactory, platformCore} from '@angular/core';
 import {BrowserModule, ɵBrowserDomAdapter as BrowserDomAdapter, ɵELEMENT_PROBE_PROVIDERS as ELEMENT_PROBE_PROVIDERS} from '@angular/platform-browser';
 import {BrowserDetection, createNgZone} from './browser_util';
 
@@ -14,7 +14,7 @@ function initBrowserTests() {
   BrowserDetection.setup();
 }
 
-const _TEST_BROWSER_PLATFORM_PROVIDERS: Provider[] =
+const _TEST_BROWSER_PLATFORM_PROVIDERS: StaticProvider[] =
     [{provide: PLATFORM_INITIALIZER, useValue: initBrowserTests, multi: true}];
 
 /**

packages/platform-server/src/server.ts

@@ -10,9 +10,9 @@ import {ɵAnimationEngine} from '@angular/animations/browser';
 import {PlatformLocation, ɵPLATFORM_SERVER_ID as PLATFORM_SERVER_ID} from '@angular/common';
 import {HttpClientModule} from '@angular/common/http';
 import {platformCoreDynamic} from '@angular/compiler';
-import {Injectable, InjectionToken, Injector, NgModule, NgZone, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactory2, RootRenderer, Testability, createPlatformFactory, isDevMode, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core';
+import {Injectable, InjectionToken, Injector, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactory2, RootRenderer, StaticProvider, Testability, createPlatformFactory, isDevMode, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core';
 import {HttpModule} from '@angular/http';
-import {BrowserModule, DOCUMENT, ɵSharedStylesHost as SharedStylesHost, ɵgetDOM as getDOM} from '@angular/platform-browser';
+import {BrowserModule, DOCUMENT, ɵSharedStylesHost as SharedStylesHost, ɵTRANSITION_ID, ɵgetDOM as getDOM} from '@angular/platform-browser';
 import {NoopAnimationsModule, ɵAnimationRendererFactory} from '@angular/platform-browser/animations';
 
 import {SERVER_HTTP_PROVIDERS} from './http';
@@ -27,11 +27,15 @@ function notSupported(feature: string): Error {
   throw new Error(`platform-server does not support '${feature}'.`);
 }
 
-export const INTERNAL_SERVER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [
+export const INTERNAL_SERVER_PLATFORM_PROVIDERS: StaticProvider[] = [
   {provide: DOCUMENT, useFactory: _document, deps: [Injector]},
   {provide: PLATFORM_ID, useValue: PLATFORM_SERVER_ID},
-  {provide: PLATFORM_INITIALIZER, useFactory: initParse5Adapter, multi: true, deps: [Injector]},
+  {provide: PLATFORM_INITIALIZER, useFactory: initParse5Adapter, multi: true, deps: [Injector]}, {
-  {provide: PlatformLocation, useClass: ServerPlatformLocation}, PlatformState,
+    provide: PlatformLocation,
+    useClass: ServerPlatformLocation,
+    deps: [DOCUMENT, [Optional, INITIAL_CONFIG]]
+  },
+  {provide: PlatformState, deps: [DOCUMENT]},
   // Add special provider that allows multiple instances of platformServer* to be created.
   {provide: ALLOW_MULTIPLE_PLATFORMS, useValue: true}
 ];

packages/platform-server/src/utils.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationRef, NgModuleFactory, NgModuleRef, PlatformRef, Provider, Type} from '@angular/core';
+import {ApplicationRef, NgModuleFactory, NgModuleRef, PlatformRef, StaticProvider, Type} from '@angular/core';
 import {ɵTRANSITION_ID} from '@angular/platform-browser';
 import {filter} from 'rxjs/operator/filter';
 import {first} from 'rxjs/operator/first';
@@ -21,11 +21,11 @@ const parse5 = require('parse5');
 interface PlatformOptions {
   document?: string;
   url?: string;
-  extraProviders?: Provider[];
+  extraProviders?: StaticProvider[];
 }
 
 function _getPlatform(
-    platformFactory: (extraProviders: Provider[]) => PlatformRef,
+    platformFactory: (extraProviders: StaticProvider[]) => PlatformRef,
     options: PlatformOptions): PlatformRef {
   const extraProviders = options.extraProviders ? options.extraProviders : [];
   return platformFactory([
@@ -67,8 +67,8 @@ the server-rendered app can be properly bootstrapped into a client app.`);
  * @experimental
  */
 export function renderModule<T>(
-    module: Type<T>,
+    module: Type<T>, options: {document?: string, url?: string, extraProviders?: StaticProvider[]}):
-    options: {document?: string, url?: string, extraProviders?: Provider[]}): Promise<string> {
+    Promise<string> {
   const platform = _getPlatform(platformDynamicServer, options);
   return _render(platform, platform.bootstrapModule(module));
 }
@@ -84,7 +84,8 @@ export function renderModule<T>(
  */
 export function renderModuleFactory<T>(
     moduleFactory: NgModuleFactory<T>,
-    options: {document?: string, url?: string, extraProviders?: Provider[]}): Promise<string> {
+    options: {document?: string, url?: string, extraProviders?: StaticProvider[]}):
+    Promise<string> {
   const platform = _getPlatform(platformServer, options);
   return _render(platform, platform.bootstrapModuleFactory(moduleFactory));
 }

packages/platform-server/testing/src/server.ts

@@ -7,7 +7,7 @@
  */
 
 import {platformCoreDynamicTesting} from '@angular/compiler/testing';
-import {NgModule, PlatformRef, Provider, createPlatformFactory} from '@angular/core';
+import {NgModule, PlatformRef, StaticProvider, createPlatformFactory} from '@angular/core';
 import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {ɵINTERNAL_SERVER_PLATFORM_PROVIDERS as INTERNAL_SERVER_PLATFORM_PROVIDERS, ɵSERVER_RENDER_PROVIDERS as SERVER_RENDER_PROVIDERS} from '@angular/platform-server';

packages/platform-webworker-dynamic/src/platform-webworker-dynamic.ts

@@ -8,7 +8,7 @@
 
 import {ɵPLATFORM_WORKER_UI_ID as PLATFORM_WORKER_UI_ID} from '@angular/common';
 import {ResourceLoader, platformCoreDynamic} from '@angular/compiler';
-import {COMPILER_OPTIONS, PLATFORM_ID, PlatformRef, Provider, createPlatformFactory} from '@angular/core';
+import {COMPILER_OPTIONS, PLATFORM_ID, PlatformRef, StaticProvider, createPlatformFactory} from '@angular/core';
 import {ɵResourceLoaderImpl as ResourceLoaderImpl} from '@angular/platform-browser-dynamic';
 export {VERSION} from './version';
 

packages/platform-webworker/src/platform-webworker.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {PlatformRef, Provider} from '@angular/core';
+import {PlatformRef, StaticProvider} from '@angular/core';
 
 import {WORKER_SCRIPT, platformWorkerUi} from './worker_render';
 
@@ -26,7 +26,7 @@ export {platformWorkerUi} from './worker_render';
  * @experimental
  */
 export function bootstrapWorkerUi(
-    workerScriptUri: string, customProviders: Provider[] = []): Promise<PlatformRef> {
+    workerScriptUri: string, customProviders: StaticProvider[] = []): Promise<PlatformRef> {
   // For now, just creates the worker ui platform...
   const platform = platformWorkerUi([
     {provide: WORKER_SCRIPT, useValue: workerScriptUri},

packages/platform-webworker/src/web_workers/ui/location_providers.ts

@@ -6,9 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injector, NgZone, PLATFORM_INITIALIZER, Provider} from '@angular/core';
+import {DOCUMENT} from '@angular/common';
-
+import {Injector, NgZone, PLATFORM_INITIALIZER, StaticProvider} from '@angular/core';
 import {ɵBrowserPlatformLocation as BrowserPlatformLocation} from '@angular/platform-browser';
+
+import {MessageBus} from '../shared/message_bus';
+import {Serializer} from '../shared/serializer';
+import {ServiceMessageBrokerFactory} from '../shared/service_message_broker';
+
 import {MessageBasedPlatformLocation} from './platform_location';
 
 
@@ -18,8 +23,10 @@ import {MessageBasedPlatformLocation} from './platform_location';
  * include these providers when setting up the render thread.
  * @experimental
  */
-export const WORKER_UI_LOCATION_PROVIDERS: Provider[] = [
+export const WORKER_UI_LOCATION_PROVIDERS = <StaticProvider[]>[
-  MessageBasedPlatformLocation, BrowserPlatformLocation,
+  {provide: MessageBasedPlatformLocation, deps: [ServiceMessageBrokerFactory,
+    BrowserPlatformLocation, MessageBus, Serializer]},
+  {provide: BrowserPlatformLocation, deps: [DOCUMENT]},
   {provide: PLATFORM_INITIALIZER, useFactory: initUiLocation, multi: true, deps: [Injector]}
 ];
 

packages/platform-webworker/src/worker_app.ts

@@ -7,8 +7,9 @@
  */
 
 import {CommonModule, ɵPLATFORM_WORKER_APP_ID as PLATFORM_WORKER_APP_ID} from '@angular/common';
-import {APP_INITIALIZER, ApplicationModule, ErrorHandler, NgModule, NgZone, PLATFORM_ID, PlatformRef, Provider, RendererFactory2, RootRenderer, createPlatformFactory, platformCore} from '@angular/core';
+import {APP_INITIALIZER, ApplicationModule, ErrorHandler, NgModule, NgZone, PLATFORM_ID, PlatformRef, RendererFactory2, RootRenderer, StaticProvider, createPlatformFactory, platformCore} from '@angular/core';
 import {DOCUMENT, ɵBROWSER_SANITIZATION_PROVIDERS as BROWSER_SANITIZATION_PROVIDERS} from '@angular/platform-browser';
+
 import {ON_WEB_WORKER} from './web_workers/shared/api';
 import {ClientMessageBrokerFactory, ClientMessageBrokerFactory_} from './web_workers/shared/client_message_broker';
 import {MessageBus} from './web_workers/shared/message_bus';

packages/platform-webworker/src/worker_render.ts

@@ -7,7 +7,7 @@
  */
 
 import {CommonModule, ɵPLATFORM_WORKER_UI_ID as PLATFORM_WORKER_UI_ID} from '@angular/common';
-import {ErrorHandler, Injectable, InjectionToken, Injector, NgZone, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactory2, RootRenderer, Testability, createPlatformFactory, isDevMode, platformCore, ɵAPP_ID_RANDOM_PROVIDER as APP_ID_RANDOM_PROVIDER} from '@angular/core';
+import {ErrorHandler, Injectable, InjectionToken, Injector, NgZone, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, RendererFactory2, RootRenderer, StaticProvider, Testability, createPlatformFactory, isDevMode, platformCore, ɵAPP_ID_RANDOM_PROVIDER as APP_ID_RANDOM_PROVIDER} from '@angular/core';
 import {DOCUMENT, EVENT_MANAGER_PLUGINS, EventManager, HAMMER_GESTURE_CONFIG, HammerGestureConfig, ɵBROWSER_SANITIZATION_PROVIDERS as BROWSER_SANITIZATION_PROVIDERS, ɵBrowserDomAdapter as BrowserDomAdapter, ɵBrowserGetTestability as BrowserGetTestability, ɵDomEventsPlugin as DomEventsPlugin, ɵDomRendererFactory2 as DomRendererFactory2, ɵDomSharedStylesHost as DomSharedStylesHost, ɵHammerGesturesPlugin as HammerGesturesPlugin, ɵKeyEventsPlugin as KeyEventsPlugin, ɵSharedStylesHost as SharedStylesHost, ɵgetDOM as getDOM} from '@angular/platform-browser';
 
 import {ON_WEB_WORKER} from './web_workers/shared/api';
@@ -20,6 +20,7 @@ import {ServiceMessageBrokerFactory, ServiceMessageBrokerFactory_} from './web_w
 import {MessageBasedRenderer2} from './web_workers/ui/renderer';
 
 
+
 /**
  * Wrapper class that exposes the Worker
  * and underlying {@link MessageBus} for lower level message passing.
@@ -52,32 +53,53 @@ export const WORKER_SCRIPT = new InjectionToken<string>('WebWorkerScript');
 export const WORKER_UI_STARTABLE_MESSAGING_SERVICE =
     new InjectionToken<({start: () => void})[]>('WorkerRenderStartableMsgService');
 
-export const _WORKER_UI_PLATFORM_PROVIDERS: Provider[] = [
+export const _WORKER_UI_PLATFORM_PROVIDERS: StaticProvider[] = [
   {provide: NgZone, useFactory: createNgZone, deps: []},
-  MessageBasedRenderer2,
+  {
+    provide: MessageBasedRenderer2,
+    deps: [ServiceMessageBrokerFactory, MessageBus, Serializer, RenderStore, RendererFactory2]
+  },
   {provide: WORKER_UI_STARTABLE_MESSAGING_SERVICE, useExisting: MessageBasedRenderer2, multi: true},
   BROWSER_SANITIZATION_PROVIDERS,
   {provide: ErrorHandler, useFactory: _exceptionHandler, deps: []},
   {provide: DOCUMENT, useFactory: _document, deps: []},
   // TODO(jteplitz602): Investigate if we definitely need EVENT_MANAGER on the render thread
   // #5298
-  {provide: EVENT_MANAGER_PLUGINS, useClass: DomEventsPlugin, multi: true},
+  {
-  {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, multi: true},
+    provide: EVENT_MANAGER_PLUGINS,
-  {provide: EVENT_MANAGER_PLUGINS, useClass: HammerGesturesPlugin, multi: true},
+    useClass: DomEventsPlugin,
-  {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig},
+    deps: [DOCUMENT, NgZone],
+    multi: true
+  },
+  {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, deps: [DOCUMENT], multi: true},
+  {
+    provide: EVENT_MANAGER_PLUGINS,
+    useClass: HammerGesturesPlugin,
+    deps: [DOCUMENT, HAMMER_GESTURE_CONFIG],
+    multi: true
+  },
+  {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig, deps: []},
   APP_ID_RANDOM_PROVIDER,
-  DomRendererFactory2,
+  {provide: DomRendererFactory2, deps: [EventManager, DomSharedStylesHost]},
   {provide: RendererFactory2, useExisting: DomRendererFactory2},
   {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
-  {provide: ServiceMessageBrokerFactory, useClass: ServiceMessageBrokerFactory_},
+  {
-  {provide: ClientMessageBrokerFactory, useClass: ClientMessageBrokerFactory_},
+    provide: ServiceMessageBrokerFactory,
-  Serializer,
+    useClass: ServiceMessageBrokerFactory_,
+    deps: [MessageBus, Serializer]
+  },
+  {
+    provide: ClientMessageBrokerFactory,
+    useClass: ClientMessageBrokerFactory_,
+    deps: [MessageBus, Serializer]
+  },
+  {provide: Serializer, deps: [RenderStore]},
   {provide: ON_WEB_WORKER, useValue: false},
-  RenderStore,
+  {provide: RenderStore, deps: []},
-  DomSharedStylesHost,
+  {provide: DomSharedStylesHost, deps: [DOCUMENT]},
-  Testability,
+  {provide: Testability, deps: [NgZone]},
-  EventManager,
+  {provide: EventManager, deps: [EVENT_MANAGER_PLUGINS, NgZone]},
-  WebWorkerInstance,
+  {provide: WebWorkerInstance, deps: []},
   {
     provide: PLATFORM_INITIALIZER,
     useFactory: initWebWorkerRenderPlatform,

packages/upgrade/src/common/downgrade_component_adapter.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ApplicationRef, ChangeDetectorRef, ComponentFactory, ComponentRef, EventEmitter, Injector, OnChanges, ReflectiveInjector, SimpleChange, SimpleChanges, Type} from '@angular/core';
+import {ApplicationRef, ChangeDetectorRef, ComponentFactory, ComponentRef, EventEmitter, Injector, OnChanges, SimpleChange, SimpleChanges, Type} from '@angular/core';
 
 import * as angular from './angular1';
 import {PropertyBinding} from './component_info';
@@ -57,8 +57,8 @@ export class DowngradeComponentAdapter {
   }
 
   createComponent(projectableNodes: Node[][]) {
-    const childInjector = ReflectiveInjector.resolveAndCreate(
+    const childInjector =
-        [{provide: $SCOPE, useValue: this.componentScope}], this.parentInjector);
+        Injector.create([{provide: $SCOPE, useValue: this.componentScope}], this.parentInjector);
 
     this.componentRef =
         this.componentFactory.create(childInjector, projectableNodes, this.element[0]);

packages/upgrade/src/dynamic/upgrade_adapter.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Compiler, CompilerOptions, Directive, Injector, NgModule, NgModuleRef, NgZone, Provider, Testability, Type} from '@angular/core';
+import {Compiler, CompilerOptions, Directive, Injector, NgModule, NgModuleRef, NgZone, StaticProvider, Testability, Type} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 import * as angular from '../common/angular1';
@@ -110,7 +110,7 @@ export class UpgradeAdapter {
    * @internal
    */
   private ng1ComponentsToBeUpgraded: {[name: string]: UpgradeNg1ComponentAdapterBuilder} = {};
-  private upgradedProviders: Provider[] = [];
+  private upgradedProviders: StaticProvider[] = [];
   private ngZone: NgZone;
   private ng1Module: angular.IModule;
   private moduleRef: NgModuleRef<any>|null = null;

packages/upgrade/src/static/angular1_providers.ts

@@ -43,7 +43,7 @@ export const angular1Providers = [
   // > Metadata collected contains an error that will be reported at runtime:
   // >   Function calls are not supported.
   // >   Consider replacing the function or lambda with a reference to an exported function
-  {provide: '$injector', useFactory: injectorFactory},
+  {provide: '$injector', useFactory: injectorFactory, deps: []},
   {provide: '$rootScope', useFactory: rootScopeFactory, deps: ['$injector']},
   {provide: '$compile', useFactory: compileFactory, deps: ['$injector']},
   {provide: '$parse', useFactory: parseFactory, deps: ['$injector']}

packages/upgrade/src/static/downgrade_module.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injector, NgModuleFactory, NgModuleRef, Provider} from '@angular/core';
+import {Injector, NgModuleFactory, NgModuleRef, StaticProvider} from '@angular/core';
 import {platformBrowser} from '@angular/platform-browser';
 
 import * as angular from '../common/angular1';
@@ -20,11 +20,11 @@ import {NgAdapterInjector} from './util';
 /** @experimental */
 export function downgradeModule<T>(
     moduleFactoryOrBootstrapFn: NgModuleFactory<T>|
-    ((extraProviders: Provider[]) => Promise<NgModuleRef<T>>)): string {
+    ((extraProviders: StaticProvider[]) => Promise<NgModuleRef<T>>)): string {
   const LAZY_MODULE_NAME = UPGRADE_MODULE_NAME + '.lazy';
   const bootstrapFn = isFunction(moduleFactoryOrBootstrapFn) ?
       moduleFactoryOrBootstrapFn :
-      (extraProviders: Provider[]) =>
+      (extraProviders: StaticProvider[]) =>
           platformBrowser(extraProviders).bootstrapModuleFactory(moduleFactoryOrBootstrapFn);
 
   let injector: Injector;

packages/upgrade/test/static/integration/downgrade_module_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Inject, Injector, Input, NgModule, NgZone, OnChanges, Provider, destroyPlatform} from '@angular/core';
+import {Component, Inject, Injector, Input, NgModule, NgZone, OnChanges, StaticProvider, destroyPlatform} from '@angular/core';
 import {async, fakeAsync, tick} from '@angular/core/testing';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
@@ -46,7 +46,7 @@ export function main() {
              ngDoBootstrap() {}
            }
 
-           const bootstrapFn = (extraProviders: Provider[]) =>
+           const bootstrapFn = (extraProviders: StaticProvider[]) =>
                platformBrowserDynamic(extraProviders).bootstrapModule(Ng2Module);
            const lazyModuleName = downgradeModule<Ng2Module>(bootstrapFn);
            const ng1Module =
@@ -108,7 +108,7 @@ export function main() {
              ngDoBootstrap() {}
            }
 
-           const bootstrapFn = (extraProviders: Provider[]) =>
+           const bootstrapFn = (extraProviders: StaticProvider[]) =>
                platformBrowserDynamic(extraProviders).bootstrapModule(Ng2Module);
            const lazyModuleName = downgradeModule<Ng2Module>(bootstrapFn);
            const ng1Module =
@@ -152,7 +152,7 @@ export function main() {
              ngDoBootstrap() {}
            }
 
-           const bootstrapFn = (extraProviders: Provider[]) =>
+           const bootstrapFn = (extraProviders: StaticProvider[]) =>
                platformBrowserDynamic(extraProviders).bootstrapModule(Ng2Module);
            const lazyModuleName = downgradeModule<Ng2Module>(bootstrapFn);
            const ng1Module =
@@ -191,7 +191,7 @@ export function main() {
              ngDoBootstrap() {}
            }
 
-           const bootstrapFn = (extraProviders: Provider[]) =>
+           const bootstrapFn = (extraProviders: StaticProvider[]) =>
                platformBrowserDynamic(extraProviders).bootstrapModule(Ng2Module);
            const lazyModuleName = downgradeModule<Ng2Module>(bootstrapFn);
            const ng1Module =
@@ -245,7 +245,7 @@ export function main() {
              ngDoBootstrap() {}
            }
 
-           const bootstrapFn = (extraProviders: Provider[]) =>
+           const bootstrapFn = (extraProviders: StaticProvider[]) =>
                platformBrowserDynamic(extraProviders).bootstrapModule(Ng2Module);
            const lazyModuleName = downgradeModule<Ng2Module>(bootstrapFn);
            const ng1Module =
@@ -300,7 +300,7 @@ export function main() {
            }
 
            const tickDelay = browserDetection.isIE ? 100 : 0;
-           const bootstrapFn = (extraProviders: Provider[]) =>
+           const bootstrapFn = (extraProviders: StaticProvider[]) =>
                platformBrowserDynamic(extraProviders).bootstrapModule(Ng2Module);
            const lazyModuleName = downgradeModule<Ng2Module>(bootstrapFn);
            const ng1Module =
@@ -355,7 +355,7 @@ export function main() {
              ngDoBootstrap() {}
            }
 
-           const bootstrapFn = (extraProviders: Provider[]) =>
+           const bootstrapFn = (extraProviders: StaticProvider[]) =>
                platformBrowserDynamic(extraProviders).bootstrapModule(Ng2Module);
            const lazyModuleName = downgradeModule<Ng2Module>(bootstrapFn);
            const ng1Module =

tools/public_api_guard/core/core.d.ts

@@ -209,7 +209,7 @@ export declare type CompilerOptions = {
     /** @deprecated */ useDebug?: boolean;
     useJit?: boolean;
     defaultEncapsulation?: ViewEncapsulation;
-    providers?: any[];
+    providers?: StaticProvider[];
     missingTranslation?: MissingTranslationStrategy;
     enableLegacyTemplate?: boolean;
 };
@@ -289,7 +289,7 @@ export interface ContentChildrenDecorator {
 export declare function createPlatform(injector: Injector): PlatformRef;
 
 /** @experimental */
-export declare function createPlatformFactory(parentPlatformFactory: ((extraProviders?: Provider[]) => PlatformRef) | null, name: string, providers?: Provider[]): (extraProviders?: Provider[]) => PlatformRef;
+export declare function createPlatformFactory(parentPlatformFactory: ((extraProviders?: StaticProvider[]) => PlatformRef) | null, name: string, providers?: StaticProvider[]): (extraProviders?: StaticProvider[]) => PlatformRef;
 
 /** @stable */
 export declare const CUSTOM_ELEMENTS_SCHEMA: SchemaMetadata;
@@ -537,7 +537,7 @@ export declare class IterableDiffers {
     constructor(factories: IterableDifferFactory[]);
     find(iterable: any): IterableDifferFactory;
     static create(factories: IterableDifferFactory[], parent?: IterableDiffers): IterableDiffers;
-    static extend(factories: IterableDifferFactory[]): Provider;
+    static extend(factories: IterableDifferFactory[]): StaticProvider;
 }
 
 /** @deprecated */
@@ -580,7 +580,7 @@ export declare class KeyValueDiffers {
     constructor(factories: KeyValueDifferFactory[]);
     find(kv: any): KeyValueDifferFactory;
     static create<S>(factories: KeyValueDifferFactory[], parent?: KeyValueDiffers): KeyValueDiffers;
-    static extend<S>(factories: KeyValueDifferFactory[]): Provider;
+    static extend<S>(factories: KeyValueDifferFactory[]): StaticProvider;
 }
 
 /** @experimental */
@@ -715,7 +715,7 @@ export declare const PLATFORM_ID: InjectionToken<Object>;
 export declare const PLATFORM_INITIALIZER: InjectionToken<(() => void)[]>;
 
 /** @experimental */
-export declare const platformCore: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformCore: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
 /** @stable */
 export declare abstract class PlatformRef {
@@ -772,7 +772,7 @@ export declare abstract class ReflectiveInjector implements Injector {
     static resolveAndCreate(providers: Provider[], parent?: Injector): ReflectiveInjector;
 }
 
-/** @experimental */
+/** @deprecated */
 export declare class ReflectiveKey {
     readonly displayName: string;
     id: number;

tools/public_api_guard/platform-browser-dynamic/platform-browser-dynamic.d.ts

@@ -1,5 +1,5 @@
 /** @stable */
-export declare const platformBrowserDynamic: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformBrowserDynamic: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
 /** @experimental */
 export declare const RESOURCE_CACHE_PROVIDER: Provider[];

tools/public_api_guard/platform-browser-dynamic/testing.d.ts

@@ -3,4 +3,4 @@ export declare class BrowserDynamicTestingModule {
 }
 
 /** @stable */
-export declare const platformBrowserDynamicTesting: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformBrowserDynamicTesting: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;

tools/public_api_guard/platform-browser/platform-browser.d.ts

@@ -90,7 +90,7 @@ export declare class NgProbeToken {
 }
 
 /** @stable */
-export declare const platformBrowser: (extraProviders?: Provider[]) => PlatformRef;
+export declare const platformBrowser: (extraProviders?: StaticProvider[]) => PlatformRef;
 
 /** @stable */
 export interface SafeHtml extends SafeValue {

tools/public_api_guard/platform-browser/testing.d.ts

@@ -3,4 +3,4 @@ export declare class BrowserTestingModule {
 }
 
 /** @stable */
-export declare const platformBrowserTesting: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformBrowserTesting: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;

tools/public_api_guard/platform-server/platform-server.d.ts

@@ -8,10 +8,10 @@ export interface PlatformConfig {
 }
 
 /** @experimental */
-export declare const platformDynamicServer: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformDynamicServer: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
 /** @experimental */
-export declare const platformServer: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformServer: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
 /** @experimental */
 export declare class PlatformState {
@@ -24,14 +24,14 @@ export declare class PlatformState {
 export declare function renderModule<T>(module: Type<T>, options: {
     document?: string;
     url?: string;
-    extraProviders?: Provider[];
+    extraProviders?: StaticProvider[];
 }): Promise<string>;
 
 /** @experimental */
 export declare function renderModuleFactory<T>(moduleFactory: NgModuleFactory<T>, options: {
     document?: string;
     url?: string;
-    extraProviders?: Provider[];
+    extraProviders?: StaticProvider[];
 }): Promise<string>;
 
 /** @experimental */

tools/public_api_guard/platform-server/testing.d.ts

@@ -1,5 +1,5 @@
 /** @experimental */
-export declare const platformServerTesting: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformServerTesting: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
 /** @experimental */
 export declare class ServerTestingModule {

tools/public_api_guard/platform-webworker-dynamic/platform-webworker-dynamic.d.ts

@@ -1,5 +1,5 @@
 /** @experimental */
-export declare const platformWorkerAppDynamic: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformWorkerAppDynamic: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
 /** @stable */
 export declare const VERSION: Version;

tools/public_api_guard/platform-webworker/platform-webworker.d.ts

@@ -1,5 +1,5 @@
 /** @experimental */
-export declare function bootstrapWorkerUi(workerScriptUri: string, customProviders?: Provider[]): Promise<PlatformRef>;
+export declare function bootstrapWorkerUi(workerScriptUri: string, customProviders?: StaticProvider[]): Promise<PlatformRef>;
 
 /** @experimental */
 export declare abstract class ClientMessageBroker {
@@ -41,10 +41,10 @@ export interface MessageBusSource {
 }
 
 /** @experimental */
-export declare const platformWorkerApp: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformWorkerApp: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
 /** @experimental */
-export declare const platformWorkerUi: (extraProviders?: Provider[] | undefined) => PlatformRef;
+export declare const platformWorkerUi: (extraProviders?: StaticProvider[] | undefined) => PlatformRef;
 
 /** @experimental */
 export declare const PRIMITIVE: SerializerTypes;
@@ -100,7 +100,7 @@ export declare const WORKER_APP_LOCATION_PROVIDERS: ({
 })[];
 
 /** @experimental */
-export declare const WORKER_UI_LOCATION_PROVIDERS: Provider[];
+export declare const WORKER_UI_LOCATION_PROVIDERS: StaticProvider[];
 
 /** @experimental */
 export declare class WorkerAppModule {

tools/public_api_guard/upgrade/static.d.ts

@@ -11,7 +11,7 @@ export declare function downgradeComponent(info: {
 export declare function downgradeInjectable(token: any): Function;
 
 /** @experimental */
-export declare function downgradeModule<T>(moduleFactoryOrBootstrapFn: NgModuleFactory<T> | ((extraProviders: Provider[]) => Promise<NgModuleRef<T>>)): string;
+export declare function downgradeModule<T>(moduleFactoryOrBootstrapFn: NgModuleFactory<T> | ((extraProviders: StaticProvider[]) => Promise<NgModuleRef<T>>)): string;
 
 /** @stable */
 export declare function getAngularLib(): any;