build: Add GitHub scripts for rebasing PRs (#18359)

PR Close #18359

.circleci/config.yml

@@ -41,8 +41,8 @@ jobs:
       - restore_cache:
           key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
 
-      - run: bazel run @nodejs//:npm install
-      - run: bazel build packages/...
+      - run: bazel run @build_bazel_rules_typescript_node//:bin/npm install
+      - run: bazel build ...
       - save_cache:
           key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
           paths:

.gitignore

@@ -5,7 +5,6 @@ bazel-*
 e2e_test.*
 node_modules
 bower_components
-tools/gulp-tasks/cldr/cldr-data/
 
 # Include when developing application packages.
 pubspec.lock

.pullapprove.yml

@@ -69,6 +69,7 @@ groups:
           - "*.lock"
           - "tools/*"
         exclude:
+          - "tools/@angular/tsc-wrapped/*"
           - "tools/public_api_guard/*"
           - "aio/*"
     users:
@@ -135,9 +136,8 @@ groups:
   compiler-cli:
     conditions:
       files:
-        - "packages/tsc-wrapped/*"
+        - "tools/@angular/tsc-wrapped/*"
         - "packages/compiler-cli/*"
-        - "packages/bazel/*"
     users:
       - alexeagle
       - chuckjaz

CHANGELOG.md

@@ -1,28 +1,22 @@
-<a name="5.0.0-beta.4"></a>
-# [5.0.0-beta.4](https://github.com/angular/angular/compare/5.0.0-beta.3...5.0.0-beta.4) (2017-08-16)
+<a name="4.3.6"></a>
+## [4.3.6](https://github.com/angular/angular/compare/4.3.5...4.3.6) (2017-08-23)
 
 
 ### Bug Fixes
 
-* **aio:** fix compilation error by using the correct type for `providers` ([4d523fd](https://github.com/angular/angular/commit/4d523fd))
-* **aio:** skip PWA test when redeploying non-public commit ([06faac8](https://github.com/angular/angular/commit/06faac8))
-* **compiler:** Don't strip CSS source maps ([64b4be9](https://github.com/angular/angular/commit/64b4be9))
-* **forms:** re-assigning options should not clear select ([32ff21c](https://github.com/angular/angular/commit/32ff21c)), closes [#18330](https://github.com/angular/angular/issues/18330)
-* **language-service:** remove tsickle dependency ([bc22ff1](https://github.com/angular/angular/commit/bc22ff1))
+* **animations:** ensure animations are disabled on the element containing the @.disabled flag ([#18714](https://github.com/angular/angular/issues/18714)) ([5d68c83](https://github.com/angular/angular/commit/5d68c83))
+* **animations:** make sure @.disabled respects disabled parent/sub animation sequences ([#18715](https://github.com/angular/angular/issues/18715)) ([c3dcbf9](https://github.com/angular/angular/commit/c3dcbf9))
+* **animations:** make sure animation cancellations respect AUTO style values ([#18787](https://github.com/angular/angular/issues/18787)) ([9a754f9](https://github.com/angular/angular/commit/9a754f9)), closes [#17450](https://github.com/angular/angular/issues/17450)
+* **animations:** resolve error when using AnimationBuilder with platform-server ([#18642](https://github.com/angular/angular/issues/18642)) ([f9b2905](https://github.com/angular/angular/commit/f9b2905)), closes [#18635](https://github.com/angular/angular/issues/18635)
+* **animations:** restore auto-style support for removed DOM nodes ([#18787](https://github.com/angular/angular/issues/18787)) ([e1f45a3](https://github.com/angular/angular/commit/e1f45a3))
+* **core:** correct order in ContentChildren query result ([#18326](https://github.com/angular/angular/issues/18326)) ([fec3b1a](https://github.com/angular/angular/commit/fec3b1a)), closes [#16568](https://github.com/angular/angular/issues/16568)
+* **core:** make sure onStable runs in the right zone ([#18706](https://github.com/angular/angular/issues/18706)) ([ee5591d](https://github.com/angular/angular/commit/ee5591d))
 
 
 ### Features
 
-* **common:** mark NgTemplateOutlet API as stable ([0a73e8d](https://github.com/angular/angular/commit/0a73e8d))
-* **forms:** add status to `AbstractControlDirective` ([233ef93](https://github.com/angular/angular/commit/233ef93))
-* **forms:** add updateOn support to ngModelOptions ([1cfa79c](https://github.com/angular/angular/commit/1cfa79c))
-
-
-### Performance Improvements
-
-* **aio:** update to new version of build-optimizer ([088532b](https://github.com/angular/angular/commit/088532b))
-* **core:** add option to remove blank text nodes from compiled templates ([d2c0d98](https://github.com/angular/angular/commit/d2c0d98))
-* **core:** Remove decorator DSL which depends on Reflect ([cac130e](https://github.com/angular/angular/commit/cac130e))
+* **animations:** allow @.disabled property to work without an expression ([#18713](https://github.com/angular/angular/issues/18713)) ([ac58914](https://github.com/angular/angular/commit/ac58914))
+* **common:** add an empty DeprecatedI18NPipesModule module ([793f31b](https://github.com/angular/angular/commit/793f31b))
 
 
 
@@ -54,90 +48,6 @@
 * **compiler:** cleanly compile with TypeScript 2.4 ([#18456](https://github.com/angular/angular/issues/18456)) ([5e4054b](https://github.com/angular/angular/commit/5e4054b))
 * **compiler:** ignore [@import](https://github.com/import) in multi-line css ([#18452](https://github.com/angular/angular/issues/18452)) ([e7e7622](https://github.com/angular/angular/commit/e7e7622)), closes [#18038](https://github.com/angular/angular/issues/18038)
 
-
-<a name="5.0.0-beta.3"></a>
-# [5.0.0-beta.3](https://github.com/angular/angular/compare/5.0.0-beta.2...5.0.0-beta.3) (2017-08-09)
-
-
-### Bug Fixes
-
-* **animations:** revert container/queried animations accordingly during cancel ([#18516](https://github.com/angular/angular/issues/18516)) ([c0c03dc](https://github.com/angular/angular/commit/c0c03dc))
-* **animations:** support persisting dynamic styles within animation states ([#18468](https://github.com/angular/angular/issues/18468)) ([05472cb](https://github.com/angular/angular/commit/05472cb)), closes [#18423](https://github.com/angular/angular/issues/18423) [#17505](https://github.com/angular/angular/issues/17505)
-* **benchpress:** compile cleanly with TS 2.4 ([#18455](https://github.com/angular/angular/issues/18455)) ([e25b3dd](https://github.com/angular/angular/commit/e25b3dd))
-* **common:** don't recreate view when context shape doesn't change ([#18277](https://github.com/angular/angular/issues/18277)) ([685cc26](https://github.com/angular/angular/commit/685cc26)), closes [#13407](https://github.com/angular/angular/issues/13407)
-* **compiler:** cleanly compile with TypeScript 2.4 ([#18456](https://github.com/angular/angular/issues/18456)) ([7c47b62](https://github.com/angular/angular/commit/7c47b62))
-* **compiler:** ignore [@import](https://github.com/import) in multi-line css ([#18452](https://github.com/angular/angular/issues/18452)) ([1dca575](https://github.com/angular/angular/commit/1dca575)), closes [#18038](https://github.com/angular/angular/issues/18038)
-* **compiler-cli:** disable buggy expression lowering ([#18513](https://github.com/angular/angular/issues/18513)) ([ca695e0](https://github.com/angular/angular/commit/ca695e0))
-* **compiler-cli:** fix and re-enable expression lowering ([#18570](https://github.com/angular/angular/issues/18570)) ([6f2038c](https://github.com/angular/angular/commit/6f2038c)), closes [#18388](https://github.com/angular/angular/issues/18388)
-* **compiler-cli:** modified ngc to throw all errors, not just syntax ([#18388](https://github.com/angular/angular/issues/18388)) ([5651e4a](https://github.com/angular/angular/commit/5651e4a))
-* **compiler-cli:** remove minimist dependency of compiler-cli/index ([#18532](https://github.com/angular/angular/issues/18532)) ([5b7432b](https://github.com/angular/angular/commit/5b7432b))
-* **core:** fix platform-browser-dynamic ([#18576](https://github.com/angular/angular/issues/18576)) ([f0a5501](https://github.com/angular/angular/commit/f0a5501))
-* **core:** forbid destroyed views to be inserted or moved in VC ([#18568](https://github.com/angular/angular/issues/18568)) ([e54bd59](https://github.com/angular/angular/commit/e54bd59)), closes [#17780](https://github.com/angular/angular/issues/17780)
-
-### Features
-
-* **core:** Create StaticInjector which does not depend on Reflect polyfill. ([d9d00bd](https://github.com/angular/angular/commit/d9d00bd))
-* **forms:** add default updateOn values for groups and arrays ([#18536](https://github.com/angular/angular/issues/18536)) ([ff5c58b](https://github.com/angular/angular/commit/ff5c58b))
-* **forms:** add updateOn blur option to FormControls ([#18408](https://github.com/angular/angular/issues/18408)) ([333a708](https://github.com/angular/angular/commit/333a708)), closes [#7113](https://github.com/angular/angular/issues/7113)
-* **forms:** add updateOn submit option to FormControls ([#18514](https://github.com/angular/angular/issues/18514)) ([f69561b](https://github.com/angular/angular/commit/f69561b))
-
-### Performance Improvements
-
-* switch angular to use StaticInjector instead of ReflectiveInjector ([fcadbf4](https://github.com/angular/angular/commit/fcadbf4)), closes [#18496](https://github.com/angular/angular/issues/18496)
-
-
-### BREAKING CHANGES
-
-* `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 `@Component` 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.
-
-<a name="5.0.0-beta.2"></a>
-# [5.0.0-beta.2](https://github.com/angular/angular/compare/5.0.0-beta.1...5.0.0-beta.2) (2017-08-02)
-
-
-### Bug Fixes
-
-* **compiler:** do not consider arguments when determining recursion ([e64b54b](https://github.com/angular/angular/commit/e64b54b))
-* **compiler:** fix for element needing implicit parent placed in top-level ng-container ([381471d](https://github.com/angular/angular/commit/381471d)), closes [#18314](https://github.com/angular/angular/issues/18314)
-
-
-### Features
-
-* **forms:** add options arg to abstract controls ([ebef5e6](https://github.com/angular/angular/commit/ebef5e6))
-* **router:** add events tracking activation of individual routes ([49cd851](https://github.com/angular/angular/commit/49cd851))
-
-
 <a name="4.3.3"></a>
 ## [4.3.3](https://github.com/angular/angular/compare/4.3.2...4.3.3) (2017-08-02)
 
@@ -145,36 +55,6 @@ DEPRECATION:
 
 * **compiler:** fix for element needing implicit parent placed in top-level ng-container ([f5cbc2e](https://github.com/angular/angular/commit/f5cbc2e)), closes [#18314](https://github.com/angular/angular/issues/18314)
 
-
-<a name="5.0.0-beta.1"></a>
-# [5.0.0-beta.1](https://github.com/angular/angular/compare/5.0.0-beta.0...5.0.0-beta.1) (2017-07-27)
-
-
-### Bug Fixes
-
-* **animations:** export BrowserModule as apart of BrowserAnimationsModule ([#18263](https://github.com/angular/angular/issues/18263)) ([fd0cc01](https://github.com/angular/angular/commit/fd0cc01))
-* **compiler:** add equiv & disp attributes to Xliff2 ICU placeholders ([#18283](https://github.com/angular/angular/issues/18283)) ([38ec05f](https://github.com/angular/angular/commit/38ec05f)), closes [#17344](https://github.com/angular/angular/issues/17344)
-* **compiler:** allow numbers for ICU message cases in lexer ([#18095](https://github.com/angular/angular/issues/18095)) ([a3a5429](https://github.com/angular/angular/commit/a3a5429)), closes [#17799](https://github.com/angular/angular/issues/17799)
-* **core:** invoke error handler outside of the Angular Zone ([#18269](https://github.com/angular/angular/issues/18269)) ([7ae7573](https://github.com/angular/angular/commit/7ae7573)), closes [#17073](https://github.com/angular/angular/issues/17073) [#7774](https://github.com/angular/angular/issues/7774)
-* **platform-server:** don't clobber parse5 properties when setting ([#18237](https://github.com/angular/angular/issues/18237)) ([a094769](https://github.com/angular/angular/commit/a094769)), closes [#17050](https://github.com/angular/angular/issues/17050)
-* **router:** child CanActivate guard should wait for parent to complete ([#18110](https://github.com/angular/angular/issues/18110)) ([086f4aa](https://github.com/angular/angular/commit/086f4aa)), closes [#15670](https://github.com/angular/angular/issues/15670)
-* **router:** should throw when lazy loaded module doesn't define any routes ([#15001](https://github.com/angular/angular/issues/15001)) ([82923a3](https://github.com/angular/angular/commit/82923a3)), closes [#14596](https://github.com/angular/angular/issues/14596)
-* **upgrade:** ensure downgraded components are created in the Angular zone ([#18209](https://github.com/angular/angular/issues/18209)) ([43c33d5](https://github.com/angular/angular/commit/43c33d5))
-* **upgrade:** throw error if trying to get injector before setting ([#18209](https://github.com/angular/angular/issues/18209)) ([d31dc7b](https://github.com/angular/angular/commit/d31dc7b))
-
-
-### Features
-
-* **compiler:** add representation of placeholders to xliff & xmb ([b3085e9](https://github.com/angular/angular/commit/b3085e9)), closes [#17345](https://github.com/angular/angular/issues/17345)
-
-
-### Performance Improvements
-
-* latest tsickle to tree shake: abstract class methods & interfaces ([#18236](https://github.com/angular/angular/issues/18236)) ([b7a6f52](https://github.com/angular/angular/commit/b7a6f52))
-* **core:** use native addEventListener for faster rendering. ([#18107](https://github.com/angular/angular/issues/18107)) ([6279e50](https://github.com/angular/angular/commit/6279e50))
-
-
-
 <a name="4.3.2"></a>
 ## [4.3.2](https://github.com/angular/angular/compare/4.3.1...4.3.2) (2017-07-26)
 
@@ -192,35 +72,6 @@ DEPRECATION:
 
 
 
-<a name="5.0.0-beta.0"></a>
-# [5.0.0-beta.0](https://github.com/angular/angular/compare/4.3.0...5.0.0-beta.0) (2017-07-19)
-
-
-### Bug Fixes
-
-* **animations:** always camelcase style property names that contain auto styles ([d22f8f5](https://github.com/angular/angular/commit/d22f8f5)), closes [#17938](https://github.com/angular/angular/issues/17938)
-* **animations:** capture cancelled animation styles within grouped animations ([23146c9](https://github.com/angular/angular/commit/23146c9)), closes [#17170](https://github.com/angular/angular/issues/17170)
-* **animations:** do not crash animations if a nested component fires CD during CD ([5db6f38](https://github.com/angular/angular/commit/5db6f38)), closes [#18193](https://github.com/angular/angular/issues/18193)
-* **animations:** make sure @.disabled works in non-animation components ([5344be5](https://github.com/angular/angular/commit/5344be5))
-* **common:** send flushed body as error instead of null ([5c62e30](https://github.com/angular/angular/commit/5c62e30)), closes [#18181](https://github.com/angular/angular/issues/18181)
-* **compiler:** ensure jit external id arguments names are unique ([95635c1](https://github.com/angular/angular/commit/95635c1))
-* **compiler-cli:** don't generate empty <target/> when extracting xliff ([65c9e13](https://github.com/angular/angular/commit/65c9e13)), closes [#15754](https://github.com/angular/angular/issues/15754)
-* **platform-server:** provide XhrFactory for HttpClient ([8076482](https://github.com/angular/angular/commit/8076482))
-* **router:** canDeactivate guards should run from bottom to top ([e20cfe1](https://github.com/angular/angular/commit/e20cfe1)), closes [#15657](https://github.com/angular/angular/issues/15657)
-* **router:** should navigate to the same url when config changes ([eb6fb5f](https://github.com/angular/angular/commit/eb6fb5f)), closes [#15535](https://github.com/angular/angular/issues/15535)
-* **router:** should run resolvers for the same route concurrently ([ad3029e](https://github.com/angular/angular/commit/ad3029e)), closes [#14279](https://github.com/angular/angular/issues/14279)
-* **router:** terminal route in custom matcher ([b399cb2](https://github.com/angular/angular/commit/b399cb2))
-* **upgrade:** allow accessing AngularJS injector from downgraded module ([a5205c6](https://github.com/angular/angular/commit/a5205c6))
-
-
-### Features
-
-* **animations:** support :increment and :decrement transition aliases ([6f45519](https://github.com/angular/angular/commit/6f45519))
-* **upgrade:** propagate touched state of NgModelController ([59c23c7](https://github.com/angular/angular/commit/59c23c7))
-* **upgrade:** support lazy-loading Angular module into AngularJS app ([30e76fc](https://github.com/angular/angular/commit/30e76fc))
-
-
-
 <a name="4.3.1"></a>
 ## [4.3.1](https://github.com/angular/angular/compare/4.3.0...4.3.1) (2017-07-19)
 

WORKSPACE

@@ -1,21 +1,17 @@
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
-    name = "build_bazel_rules_nodejs",
-    remote = "https://github.com/bazelbuild/rules_nodejs.git",
-    tag = "0.0.2",
+   name = "build_bazel_rules_typescript",
+   remote = "https://github.com/bazelbuild/rules_typescript.git",
+   tag = "0.0.5",
 )
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
+load("@build_bazel_rules_typescript//:defs.bzl", "node_repositories")
 
-node_repositories(package_json = ["//:package.json"])
+node_repositories(package_json = "//:package.json")
 
-local_repository(
-    name = "build_bazel_rules_typescript",
-    path = "node_modules/@bazel/typescript",
-)
-
-local_repository(
-    name = "angular",
-    path = "packages/bazel",
+git_repository(
+    name = "build_bazel_rules_angular",
+    remote = "https://github.com/bazelbuild/rules_angular.git",
+    tag = "0.0.1",
 )

aio/content/examples/i18n/src/app/app.locale_data.ts

@@ -1,6 +0,0 @@
-// #docregion import-locale
-import { registerLocaleData } from '@angular/common';
-import localeFr from '@angular/common/i18n_data/locale_fr';
-
-registerLocaleData(localeFr);
-// #enddocregion import-locale

aio/content/examples/i18n/src/app/app.locale_data_extra.ts

@@ -1,7 +0,0 @@
-// #docregion import-locale-extra
-import { registerLocaleData } from '@angular/common';
-import localeEnGB from '@angular/common/i18n_data/locale_en-GB';
-import localeEnGBExtra from '@angular/common/i18n_data/extra/locale_en-GB';
-
-registerLocaleData(localeEnGB, localeEnGBExtra);
-// #enddocregion import-locale-extra

aio/content/examples/i18n/src/app/i18n-providers.ts

@@ -1,15 +1,15 @@
 // #docplaster
 // #docregion without-missing-translation
-import { TRANSLATIONS, TRANSLATIONS_FORMAT, LOCALE_ID, MissingTranslationStrategy, StaticProvider } from '@angular/core';
+import { TRANSLATIONS, TRANSLATIONS_FORMAT, LOCALE_ID, MissingTranslationStrategy } from '@angular/core';
 import { CompilerConfig } from '@angular/compiler';
 
-export function getTranslationProviders(): Promise<StaticProvider[]> {
+export function getTranslationProviders(): Promise<Object[]> {
 
   // Get the locale id from the global
   const locale = document['locale'] as string;
 
   // return no providers if fail to get translation file for locale
-  const noProviders: StaticProvider[] = [];
+  const noProviders: Object[] = [];
 
   // No locale or U.S. English: no translation providers
   if (!locale || locale === 'en-US') {

aio/content/examples/pipes/e2e-spec.ts

@@ -28,7 +28,7 @@ describe('Pipes', function () {
 
   it('should be able to toggle birthday formats', function () {
     let birthDayEle = element(by.css('hero-birthday2 > p'));
-    expect(birthDayEle.getText()).toEqual(`The hero's birthday is 4/15/88`);
+    expect(birthDayEle.getText()).toEqual(`The hero's birthday is 4/15/1988`);
     let buttonEle = element(by.cssContainingText('hero-birthday2 > button', 'Toggle Format'));
     expect(buttonEle.isDisplayed()).toBe(true);
     buttonEle.click().then(function() {

aio/content/guide/browser-support.md

@@ -347,7 +347,7 @@ Here are the features which may require additional polyfills:
 
     <td>
 
-    If you use the following deprecated i18n pipes: [date](api/common/DeprecatedDatePipe), [currency](api/common/DeprecatedCurrencyPipe), [decimal](api/common/DeprecatedDecimalPipe) and [percent](api/common/DeprecatedPercentPipe)
+    [Date](api/common/DatePipe), [currency](api/common/CurrencyPipe), [decimal](api/common/DecimalPipe) and [percent](api/common/PercentPipe) pipes
     </td>
 
     <td>

aio/content/guide/i18n.md

@@ -40,28 +40,6 @@ You need to build and deploy a separate version of the application for each supp
 
 {@a i18n-attribute}
 
-## i18n pipes
-
-Angular pipes can help you with internationalization: the `DatePipe`, `CurrencyPipe`, `DecimalPipe`
-and `PercentPipe` use locale data to format your data based on your `LOCALE_ID`.
-
-By default Angular only contains locale data for the language `en-US`, if you set the value of
-`LOCALE_ID` to another locale, you will have to import new locale data for this language:
-
-<code-example path="i18n/src/app/app.locale_data.ts" region="import-locale" title="src/app/app.locale_data.ts" linenums="false">
-</code-example>
-
-<div class="l-sub-section">
-
-Note that the files in `@angular/common/i18n_data` contain most of the locale data that you will
-need, but some advanced formatting options might only be available in the extra dataset that you can
-import from `@angular/common/i18n_data/extra`:
-
-<code-example path="i18n/src/app/app.locale_data_extra.ts" region="import-locale-extra" title="src/app/app.locale_data_extra.ts" linenums="false">
-</code-example>
-
-</div>
-
 ## Mark text with the _i18n_ attribute
 
 The Angular `i18n` attribute is a marker for translatable content.

aio/content/guide/language-service.md

@@ -1,176 +0,0 @@
-# Angular Language Service
-
-The Angular Language Service is a way to get completions, errors, 
-hints, and navigation inside your Angular templates whether they 
-are external in an HTML file or embedded in annotations/decorators 
-in a string. The Angular Language Service autodetects that you are 
-opening an Angular file, reads your `tsconfig.json` file, finds all the 
-templates you have in your application, and then provides language 
-services for any templates that you open.
-
-
-## Autocompletion
-
-Autocompletion can speed up your development time by providing you with 
-contextual possibilities and hints as you type. This example shows 
-autocomplete in an interpolation. As you type it out, 
-you can hit tab to complete.
-
-<figure>
-  <img src="generated/images/guide/language-service/language-completion.gif" alt="autocompletion">
-</figure>
-
-There are also completions within 
-elements. Any elements you have as a component selector will 
-show up in the completion list.
-
-## Error checking
-
-The Angular Language Service can also forewarn you of mistakes in your code. 
-In this example, Angular doesn't know what `orders` is or where it comes from. 
-
-<figure>
-  <img src="generated/images/guide/language-service/language-error.gif" alt="error checking">
-</figure>
-
-## Navigation
-
-Navigation allows you to hover to 
-see where a component, directive, module, etc. is from and then 
-click and press F12 to go directly to its definition.
-
-<figure>
-  <img src="generated/images/guide/language-service/language-navigation.gif" alt="navigation">
-</figure>
-
-
-## Angular Language Service in your editor
-
-Angular Language Service is currently available for [Visual Studio Code](https://code.visualstudio.com/) and 
-[WebStorm](https://www.jetbrains.com/webstorm). 
-
-### Visual Studio Code
-
-In Visual Studio Code, install Angular Language Service from the store, 
-which is accessible from the bottom icon on the left menu pane. 
-You can also use the VS Quick Open (⌘+P) to search for the extension. When you've opened it, 
-enter the following command: 
-
-```sh
-ext install ng-template
-```
-
-Then click the install button to install the Angular Language Service. 
-
-
-### WebStorm
-
-In webstorm, you have to install the language service as a dev dependency. 
-When Angular sees this dev dependency, it provides the 
-language service inside of WebStorm. Webstorm then gives you 
-colorization inside the template and autocomplete in addition to the Angular Language Service.
-
-Here's the dev dependency 
-you need to have in `package.json`:
-
-```json
-
-devDependencies {
-	"@angular/language-service": "^4.0.0"
-}
-```
-
-Then in the terminal window at the root of your project, 
-install the `devDependencies` with `npm` or `yarn`: 
-
-```sh
-npm install 
-```
-*OR* 
-
-```sh
-yarn
-```
-
-*OR* 
-
-```sh
-yarn install
-```
-
-
-### Sublime Text
-
-In [Sublime Text](https://www.sublimetext.com/), you first need an extension to allow Typescript. 
-Install the latest version of typescript in a local `node_modules` directory:
-
-```sh
-npm install --save-dev typescript
-```
-
-Then install the Angular Language Service in the same location:
-```sh
-npm install --save-dev @angular/language-service
-```
-
-Starting with TypeScript 2.3, TypeScript has a language service plugin model that the language service can use. 
-
-Next, in your user preferences (`Cmd+,` or `Ctrl+,`), add:
-
-```json
-"typescript-tsdk": "<path to your folder>/node_modules/typescript/lib"
-```
-
-
-## Installing in your project
-
-You can also install Angular Language Service in your project with the 
-following `npm` command:
-
-```sh
-npm install --save-dev @angular/language-service
-```
-Additionally, add the following to the `"compilerOptions"` section of 
-your project's `tsconfig.json`.
-
-```json
-  "plugins": [
-      {"name": "@angular/language-service"}
-  ]
-```
-Note that this only provides diagnostics and completions in `.ts` 
-files. You need a custom sublime plugin (or modifications to the current plugin) 
-for completions in HTML files.
-
-
-## How the Language Service works
-
-When you use an editor with a language service, there's an 
-editor process which starts a separate language process/service 
-to which it speaks through an [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call). 
-Any time you type inside of the editor, it sends information to the other process to 
-track the state of your project. When you trigger a completion list within a template, the editor process first parses the template into an HTML AST, or [abstract syntax tree](https://en.wikipedia.org/wiki/Abstract_syntax_tree). Then the Angular compiler interprets 
-what module the template is part of, the scope you're in, and the component selector. Then it figures out where in the template AST your cursor is. When it determines the 
-context, it can then determine what the children can be.
-
-It's a little more involved if you are in an interpolation. If you have an interpolation of `{{data.---}}` inside a `div` and need the completion list after `data.---`, the compiler can't use the HTML AST to find the answer. The HTML AST can only tell the compiler that there is some text with the characters "`{{data.---}}`". That's when the template parser produces an expression AST, which resides within the template AST. The Angular Language Services then looks at `data.---` within its context and asks the TypeScript Language Service what the members of data are. TypeScript then returns the list of possibilities.
-
-
-For more in-depth information, see the 
-[Angular Language Service API](https://github.com/angular/angular/blob/master/packages/language-service/src/types.ts)
-
-
-
-
-
-
-
-
-<hr>
-
-## More on Information
-
-For more information, see [Chuck Jazdzewski's presentation](https://www.youtube.com/watch?v=ez3R0Gi4z5A&t=368s) on the Angular Language 
-Service from [ng-conf](https://www.ng-conf.org/) 2017.
-
-

aio/content/guide/metadata.md

@@ -16,7 +16,7 @@ In the following example, the `@Component()` metadata object and the class const
 ```typescript
 @Component({
   selector: 'app-typical',
-  template: '<div>A typical component for {{data.name}}</div>'
+  template: 'div>A typical component for {{data.name}}</div>
 )}
 export class TypicalComponent {
   @Input() data: TypicalData;

aio/content/guide/pipes.md

@@ -46,6 +46,24 @@ Inside the interpolation expression, you flow the component's `birthday` value t
 function on the right. All pipes work this way.
 
 
+<div class="l-sub-section">
+
+
+
+The `Date` and `Currency` pipes need the *ECMAScript Internationalization API*.
+Safari and other older browsers don't support it. You can add support with a polyfill.
+
+
+<code-example language="html">
+  &lt;script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=Intl.~locale.en"&gt;&lt;/script&gt;
+
+</code-example>
+
+
+
+</div>
+
+
 
 
 ## Built-in pipes

aio/content/guide/structural-directives.md

@@ -313,7 +313,7 @@ It's intended source is implicit.
 Angular sets `let-hero` to the value of the context's `$implicit` property
 which `NgFor` has initialized with the hero for the current iteration.
 
-* The [API guide](api/common/NgForOf "API: NgFor")
+* The [API guide](api/common/NgFor "API: NgFor")
 describes additional `NgFor` directive properties and context properties.
 
 These microsyntax mechanisms are available to you when you write your own structural directives.

aio/content/guide/template-syntax.md

@@ -1361,8 +1361,8 @@ to group elements when there is no suitable host element for the directive.
 _This_ section is an introduction to the common structural directives:
 
 * [`NgIf`](guide/template-syntax#ngIf) - conditionally add or remove an element from the DOM
+* [`NgFor`](guide/template-syntax#ngFor) - repeat a template for each item in a list
 * [`NgSwitch`](guide/template-syntax#ngSwitch) - a set of directives that switch among alternative views
-* [NgForOf](guide/template-syntax#ngFor) - repeat a template for each item in a list
 
 <hr/>
 
@@ -1437,18 +1437,18 @@ described below.
 
 {@a ngFor}
 
-### NgForOf
+### NgFor
 
-`NgForOf` is a _repeater_ directive &mdash; a way to present a list of items.
+`NgFor` is a _repeater_ directive &mdash; a way to present a list of items.
 You define a block of HTML that defines how a single item should be displayed.
 You tell Angular to use that block as a template for rendering each item in the list.
 
-Here is an example of `NgForOf` applied to a simple `<div>`:
+Here is an example of `NgFor` applied to a simple `<div>`:
 
 <code-example path="template-syntax/src/app/app.component.html" region="NgFor-1" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-You can also apply an `NgForOf` to a component element, as in this example:
+You can also apply an `NgFor` to a component element, as in this example:
 
 <code-example path="template-syntax/src/app/app.component.html" region="NgFor-2" title="src/app/app.component.html" linenums="false">
 </code-example>
@@ -1485,10 +1485,10 @@ Learn about the _microsyntax_ in the [_Structural Directives_](guide/structural-
 ### Template input variables
 
 The `let` keyword before `hero` creates a _template input variable_ called `hero`.
-The `NgForOf` directive iterates over the `heroes` array returned by the parent component's `heroes` property
+The `ngFor` directive iterates over the `heroes` array returned by the parent component's `heroes` property
 and sets `hero` to the current item from the array during each iteration.
 
-You reference the `hero` input variable within the `NgForOf` host element
+You reference the `hero` input variable within the `ngFor` host element
 (and within its descendents) to access the hero's properties.
 Here it is referenced first in an interpolation
 and then passed in a binding to the `hero` property of the `<hero-detail>` component.
@@ -1501,7 +1501,7 @@ Learn more about _template input variables_ in the
 
 #### *ngFor with _index_
 
-The `index` property of the `NgForOf` directive context returns the zero-based index of the item in each iteration.
+The `index` property of the `NgFor` directive context  returns the zero-based index of the item in each iteration.
 You can capture the `index` in a template input variable and use it in the template.
 
 The next example captures the `index` in a variable named `i` and displays it with the hero name like this.
@@ -1511,8 +1511,8 @@ The next example captures the `index` in a variable named `i` and displays it wi
 
 <div class="l-sub-section">
 
-Learn about the other `NgForOf` context values such as `last`, `even`,
-and `odd` in the [NgForOf API reference](api/common/NgForOf).
+Learn about the other `NgFor` context values such as `last`, `even`,
+and `odd` in the [NgFor API reference](api/common/NgFor).
 
 </div>
 
@@ -1520,7 +1520,7 @@ and `odd` in the [NgForOf API reference](api/common/NgForOf).
 
 #### *ngFor with _trackBy_
 
-The `NgForOf` directive may perform poorly, especially with large lists.
+The `NgFor` directive may perform poorly, especially with large lists.
 A small change to one item, an item removed, or an item added can trigger a cascade of DOM manipulations.
 
 For example, re-querying the server could reset the list with all new hero objects.
@@ -1531,7 +1531,7 @@ But Angular sees only a fresh list of new object references.
 It has no choice but to tear down the old DOM elements and insert all new DOM elements.
 
 Angular can avoid this churn with `trackBy`.
-Add a method to the component that returns the value `NgForOf` _should_ track.
+Add a method to the component that returns the value `NgFor` _should_ track.
 In this case, that value is the hero's `id`.
 
 <code-example path="template-syntax/src/app/app.component.ts" region="trackByHeroes" title="src/app/app.component.ts" linenums="false">

aio/content/marketing/index.html

@@ -1,10 +1,10 @@
-<!-- FULL HEADER BLOCK -->
+<!--FULL HEADER BLOCK-->
 <header>
 
-  <!-- BACKGROUND IMAGE -->
+  <!--BACKGROUND IMAGE-->
   <div class="background-sky hero"></div>
 
-  <!-- INTRO SECTION -->
+<!--INTRO SECTION -->
   <section id="intro">
 
     <!-- LOGO -->
@@ -12,33 +12,31 @@
       <img src="assets/images/logos/angular/angular.svg"/>
     </div>
 
-    <!-- CONTAINER -->
+      <!-- CONTAINER     -->
     <div class="homepage-container">
+      <!-- container content starts -->
+
       <div class="hero-headline no-toc">One framework.<br>Mobile &amp; desktop.</div>
       <a class="button hero-cta" href="guide/quickstart">Get Started</a>
-    </div>
-
+  </div><!-- CONTAINER END -->
   </section>
 
+
 </header>
 
-<!-- MAIN CONTENT -->
 <article>
-
-  <h1 class="no-toc" style="display: none"></h1>
-
   <div class="home-rows">
 
-    <!-- Announcement Bar -->
+    <!--Announcement Bar-->
     <div class="homepage-container">
       <div class="announcement-bar">
         <img src="generated/images/marketing/home/angular-mix.png" height="40" width="151">
         <p>Join us at our newest event, October 2017</p>
         <a class="button" href="https://angularmix.com/">Learn More</a>
-      </div>
+     </div>
     </div>
 
-    <!-- Group 1 -->
+    <!-- Group 1-->
     <div layout="row" layout-xs="column" class="home-row homepage-container">
       <div class="promo-img-container promo-1">
         <div>
@@ -55,8 +53,7 @@
       </div>
     </div>
     <hr>
-
-    <!-- Group 2 -->
+    <!-- Group 2-->
     <div layout="row" layout-xs="column" class="home-row">
       <div class="text-container">
         <div class="text-block">
@@ -74,7 +71,7 @@
     </div>
     <hr>
 
-    <!-- Group 3 -->
+    <!-- Group 3-->
     <div layout="row" layout-xs="column" class="home-row">
       <div class="promo-img-container promo-3">
         <div><img src="generated/images/marketing/home/joyful-development.svg" alt="IDE example"></div>
@@ -91,8 +88,9 @@
     </div>
     <hr>
 
-    <!-- Group 4 -->
+    <!-- Group 4-->
     <div layout="row" layout-xs="column" class="home-row">
+
       <div class="text-container">
         <div class="text-block l-pad-top-2">
           <div class="text-headline">Loved by Millions</div>
@@ -107,19 +105,20 @@
       </div>
     </div>
 
-    <!-- CTA CARDS -->
-    <div layout="row" layout-xs="column" class="home-row">
-      <a href="guide/quickstart">
-        <div class="card">
+  <!-- CTA CARDS -->
+  <div layout="row" layout-xs="column" class="home-row">
+
+    <a href="guide/quickstart">
+      <div class="card">
           <img src="generated/images/marketing/home/code-icon.svg" height="70px">
           <div class="card-text-container">
             <div class="text-headline">Get Started</div>
             <p>Start building your Angular application.</p>
           </div>
-        </div>
-      </a>
-    </div>
+      </div>
+    </a>
+  </div>
 
-  </div><!-- end of home rows -->
+  </div> <!-- end of home rows -->
 
 </article>

aio/content/navigation.json

@@ -288,11 +288,6 @@
           "title": "Internationalization (i18n)",
           "tooltip": "Translate the app's template text into multiple languages."
         },
-        {
-          "url": "guide/language-service",
-          "title": "Language Service",
-          "tooltip": "Use Angular Language Service to speed up dev time."
-        },
         {
           "url": "guide/security",
           "title": "Security",

aio/scripts/_payload-limits.sh

@@ -2,13 +2,9 @@
 
 set -u -e -o pipefail
 
-declare -A payloadLimits
-payloadLimits["aio", "uncompressed", "inline"]=1600
-payloadLimits["aio", "uncompressed", "main"]=525000
-payloadLimits["aio", "uncompressed", "polyfills"]=38000
-payloadLimits["aio", "gzip7", "inline"]=1000
-payloadLimits["aio", "gzip7", "main"]=127000
-payloadLimits["aio", "gzip7", "polyfills"]=12500
-payloadLimits["aio", "gzip9", "inline"]=1000
-payloadLimits["aio", "gzip9", "main"]=127000
-payloadLimits["aio", "gzip9", "polyfills"]=12500
+declare -A limitUncompressed
+limitUncompressed=(["inline"]=1600 ["main"]=525000 ["polyfills"]=38000)
+declare -A limitGzip7
+limitGzip7=(["inline"]=1000 ["main"]=127000 ["polyfills"]=12500)
+declare -A limitGzip9
+limitGzip9=(["inline"]=1000 ["main"]=127000 ["polyfills"]=12500)

aio/scripts/payload.sh

@@ -4,10 +4,79 @@ set -eu -o pipefail
 
 readonly thisDir=$(cd $(dirname $0); pwd)
 readonly parentDir=$(dirname $thisDir)
+readonly PROJECT_NAME="angular-payload-size"
 
-# Track payload size functions
-source ../scripts/ci/payload-size.sh
 source ${thisDir}/_payload-limits.sh
 
-trackPayloadSize "aio" "dist/*.bundle.js" true true
+failed=false
+payloadData=""
+for filename in dist/*.bundle.js; do
+  size=$(stat -c%s "$filename")
+  label=$(echo "$filename" | sed "s/.*\///" | sed "s/\..*//")
+  payloadData="$payloadData\"uncompressed/$label\": $size, "
 
+
+  gzip -7 $filename -c >> "${filename}7.gz"
+  size7=$(stat -c%s "${filename}7.gz")
+  payloadData="$payloadData\"gzip7/$label\": $size7, "
+
+  gzip -9 $filename -c >> "${filename}9.gz"
+  size9=$(stat -c%s "${filename}9.gz")
+  payloadData="$payloadData\"gzip9/$label\": $size9, "
+
+  if [[ $size -gt ${limitUncompressed[$label]} ]]; then
+    failed=true
+    echo "Uncompressed $label size is $size which is greater than ${limitUncompressed[$label]}"
+  elif [[ $size7 -gt ${limitGzip7[$label]} ]]; then
+    failed=true
+    echo "Gzip7 $label size is $size7 which is greater than ${limitGzip7[$label]}"
+  elif [[ $size9 -gt ${limitGzip9[$label]} ]]; then
+    failed=true
+    echo "Gzip9 $label size is $size9 which is greater than ${limitGzip9[$label]}"
+  fi
+done
+
+# Add Timestamp
+timestamp=$(date +%s)
+payloadData="$payloadData\"timestamp\": $timestamp, "
+
+# Add change source: application, dependencies, or 'application+dependencies'
+applicationChanged=false
+dependenciesChanged=false
+if [[ $(git diff --name-only $TRAVIS_COMMIT_RANGE $parentDir | grep -v aio/yarn.lock | grep -v content) ]]; then
+  applicationChanged=true
+fi
+if [[ $(git diff --name-only $TRAVIS_COMMIT_RANGE $parentDir/yarn.lock) ]]; then
+  dependenciesChanged=true
+fi
+
+if $dependenciesChanged && $applicationChanged; then
+  change='application+dependencies'
+elif $dependenciesChanged; then
+  # only yarn.lock changed
+  change='dependencies'
+elif $applicationChanged; then
+  change='application'
+else
+  # Nothing changed in aio/
+  exit 0
+fi
+message=$(echo $TRAVIS_COMMIT_MESSAGE | sed 's/"/\\"/g' | sed 's/\\/\\\\/g')
+payloadData="$payloadData\"change\": \"$change\", \"message\": \"$message\""
+
+payloadData="{${payloadData}}"
+
+echo $payloadData
+
+if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
+  readonly safeBranchName=$(echo $TRAVIS_BRANCH | sed -e 's/\./_/g')
+  readonly dbPath=/payload/aio/$safeBranchName/$TRAVIS_COMMIT
+
+  # WARNING: FIREBASE_TOKEN should NOT be printed.
+  set +x
+  firebase database:update --data "$payloadData" --project $PROJECT_NAME --confirm --token "$ANGULAR_PAYLOAD_FIREBASE_TOKEN" $dbPath
+fi
+
+if [[ $failed = true ]]; then
+  exit 1
+fi

aio/tools/examples/example-boilerplate.js

@@ -41,9 +41,12 @@ const ANGULAR_PACKAGES = [
   'platform-browser-dynamic',
   'platform-server',
   'router',
-  'tsc-wrapped',
   'upgrade',
 ];
+const ANGULAR_TOOLS_PACKAGES_PATH = path.resolve(ANGULAR_DIST_PATH, 'tools', '@angular');
+const ANGULAR_TOOLS_PACKAGES = [
+  'tsc-wrapped'
+];
 
 const EXAMPLE_CONFIG_FILENAME = 'example-config.json';
 
@@ -60,6 +63,7 @@ class ExampleBoilerPlate {
     // Replace the Angular packages with those from the dist folder, if necessary
     if (useLocal) {
       ANGULAR_PACKAGES.forEach(packageName => this.overridePackage(ANGULAR_PACKAGES_PATH, packageName));
+      ANGULAR_TOOLS_PACKAGES.forEach(packageName => this.overridePackage(ANGULAR_TOOLS_PACKAGES_PATH, packageName));
     }
 
     // Get all the examples folders, indicated by those that contain a `example-config.json` file
@@ -133,4 +137,4 @@ module.exports = new ExampleBoilerPlate();
 // If this file was run directly then run the main function,
 if (require.main === module) {
   module.exports.main();
-}
+}

aio/tools/examples/example-boilerplate.spec.js

@@ -32,7 +32,7 @@ describe('example-boilerplate tool', () => {
       // for example
       expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/packages-dist'), 'common');
       expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/packages-dist'), 'core');
-      expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/packages-dist'), 'tsc-wrapped');
+      expect(exampleBoilerPlate.overridePackage).toHaveBeenCalledWith(path.resolve(__dirname, '../../../dist/tools/@angular'), 'tsc-wrapped');
     });
 
     it('should process all the example folders', () => {

aio/tools/transforms/angular-base-package/post-processors/h1-checker.js

@@ -34,5 +34,5 @@ function getText(h1) {
     (node.properties.ariaHidden === 'true' || node.properties['aria-hidden'] === 'true')
   ));
 
-  return cleaned ? toString(cleaned) : '';
-}
+  return toString(cleaned);
+}

aio/tools/transforms/angular-base-package/post-processors/h1-checker.spec.js

@@ -69,14 +69,4 @@ describe('h1Checker postprocessor', () => {
     processor.$process([doc]);
     expect(doc.vFile.title).toEqual('What is Angular?');
   });
-
-  it('should not break if the h1 is empty (except for an aria-hidden anchor)', () => {
-    const doc = {
-      docType: 'a',
-      renderedContent: `
-        <h1><a aria-hidden="true"></a></h1>
-      `
-    };
-    expect(() => processor.$process([doc])).not.toThrow();
-  });
-});
+});

build.sh

@@ -86,7 +86,7 @@ done
 #######################################
 isIgnoredDirectory() {
   name=$(basename ${1})
-  if [[ -f "${1}" || "${name}" == "src" || "${name}" == "test" || "${name}" == "integrationtest" || "${name}" == "i18n_data" ]]; then
+  if [[ -f "${1}" || "${name}" == "src" || "${name}" == "test" || "${name}" == "integrationtest" ]]; then
     return 0
   else
     return 1
@@ -327,23 +327,13 @@ mapSources() {
   fi
 }
 
-updateVersionReferences() {
-  NPM_DIR="$1"
-  (
-    echo "======      VERSION: Updating version references in ${NPM_DIR}"
-    cd ${NPM_DIR}
-    echo "======       EXECUTE: perl -p -i -e \"s/0\.0\.0\-PLACEHOLDER/${VERSION}/g\" $""(grep -ril 0\.0\.0\-PLACEHOLDER .)"
-    perl -p -i -e "s/0\.0\.0\-PLACEHOLDER/${VERSION}/g" $(grep -ril 0\.0\.0\-PLACEHOLDER .) < /dev/null 2> /dev/null
-  )
-}
-
 VERSION="${VERSION_PREFIX}${VERSION_SUFFIX}"
 echo "====== BUILDING: Version ${VERSION}"
 
 N="
 "
 TSC=`pwd`/node_modules/.bin/tsc
-NGC="node --max-old-space-size=3000 dist/packages-dist/tsc-wrapped/src/main"
+NGC="node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main"
 MAP_SOURCES="node `pwd`/scripts/build/map_sources.js "
 UGLIFYJS=`pwd`/node_modules/.bin/uglifyjs
 TSCONFIG=./tools/tsconfig.json
@@ -355,6 +345,8 @@ if [[ ${BUILD_TOOLS} == true ]]; then
     rm -rf ./dist/tools/
     mkdir -p ./dist/tools/
     $(npm bin)/tsc -p ${TSCONFIG}
+
+    cp ./tools/@angular/tsc-wrapped/package.json ./dist/tools/@angular/tsc-wrapped
   travisFoldEnd "build tools"
 fi
 
@@ -406,11 +398,11 @@ if [[ ${BUILD_ALL} == true && ${TYPECHECK_ALL} == true ]]; then
 
   TSCONFIG="packages/tsconfig.json"
   travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
-    $TSC -p ${TSCONFIG}
+    $NGC -p ${TSCONFIG}
   travisFoldEnd "tsc -p ${TSCONFIG}"
   TSCONFIG="modules/tsconfig.json"
   travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
-    $TSC -p ${TSCONFIG}
+    $NGC -p ${TSCONFIG}
   travisFoldEnd "tsc -p ${TSCONFIG}"
 
 fi
@@ -422,22 +414,6 @@ if [[ ${BUILD_ALL} == true ]]; then
   fi
 fi
 
-if [[ ${BUILD_TOOLS} == true || ${BUILD_ALL} == true ]]; then
-  echo "====== (tsc-wrapped)COMPILING: \$(npm bin)/tsc -p packages/tsc-wrapped/tsconfig.json ====="
-  $(npm bin)/tsc -p packages/tsc-wrapped/tsconfig.json
-  echo "====== (tsc-wrapped)COMPILING: \$(npm bin)/tsc -p packages/tsc-wrapped/tsconfig-build.json ====="
-  $(npm bin)/tsc -p packages/tsc-wrapped/tsconfig-build.json
-  cp ./packages/tsc-wrapped/package.json ./dist/packages-dist/tsc-wrapped
-  cp ./packages/tsc-wrapped/README.md ./dist/packages-dist/tsc-wrapped
-  updateVersionReferences dist/packages-dist/tsc-wrapped
-
-  rsync -a packages/bazel/ ./dist/packages-dist/bazel
-  # Remove BEGIN-INTERNAL...END-INTERAL blocks
-  # https://stackoverflow.com/questions/24175271/how-can-i-match-multi-line-patterns-in-the-command-line-with-perl-style-regex
-  perl -0777 -n -i -e "s/(?m)^.*BEGIN-INTERNAL[\w\W]*END-INTERNAL.*\n//g; print" $(grep -ril BEGIN-INTERNAL dist/packages-dist/bazel) < /dev/null 2> /dev/null
-  updateVersionReferences dist/packages-dist/bazel
-fi
-
 for PACKAGE in ${PACKAGES[@]}
 do
   travisFoldStart "build package: ${PACKAGE}" "no-xtrace"
@@ -482,11 +458,6 @@ do
         minify ${BUNDLES_DIR}
 
       ) 2>&1 | grep -v "as external dependency"
-
-      if [[ ${PACKAGE} == "common" ]]; then
-        echo "======      Copy i18n locale data"
-        rsync -a --exclude=*.d.ts --exclude=*.metadata.json ${OUT_DIR}/i18n_data/ ${NPM_DIR}/i18n_data
-      fi
     else
       echo "======        Copy ${PACKAGE} node tool"
       rsync -a ${OUT_DIR}/ ${NPM_DIR}
@@ -501,7 +472,12 @@ do
 
 
   if [[ -d ${NPM_DIR} ]]; then
-    updateVersionReferences ${NPM_DIR}
+    (
+      echo "======      VERSION: Updating version references"
+      cd ${NPM_DIR}
+      echo "======       EXECUTE: perl -p -i -e \"s/0\.0\.0\-PLACEHOLDER/${VERSION}/g\" $""(grep -ril 0\.0\.0\-PLACEHOLDER .)"
+      perl -p -i -e "s/0\.0\.0\-PLACEHOLDER/${VERSION}/g" $(grep -ril 0\.0\.0\-PLACEHOLDER .) < /dev/null 2> /dev/null
+    )
   fi
 
   travisFoldEnd "build package: ${PACKAGE}"

docs/CARETAKER.md

@@ -0,0 +1,92 @@
+# Caretaker
+
+Caretaker is responsible for merging PRs into the individual branches and internally at Google.
+
+## Responsibilities
+
+- Draining the queue of PRs ready to be merged. (PRs with [`PR action: merge`](https://github.com/angular/angular/pulls?q=is%3Aopen+is%3Apr+label%3A%22PR+action%3A+merge%22) label)
+- Assigining [new issues](https://github.com/angular/angular/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) to individual component authors.
+
+## Setup
+
+### Set `upstream` to fetch PRs into your local repo
+
+Use this conmmands to configure your `git` to fetch PRs into your local repo.
+
+```
+git remote add upstream git@github.com:angular/angular.git
+git config --add remote.upstream.fetch +refs/pull/*/head:refs/remotes/upstream/pr/*
+```
+
+
+## Merging the PR
+
+A PR needs to have `PR action: merge` and `PR target: *` labels to be considered
+ready to merge. Merging is performed by running `merge-pr` with a PR number to merge.
+
+NOTE: before running `merge-pr` ensure that you have synced all of the PRs
+locally by running:
+
+```
+$ git fetch upstream
+```
+
+To merge a PR run:
+
+```
+$ ./scripts/github/merge-pr 1234
+```
+
+The `merge-pr` script will:
+- Ensure that all approriate labels are on the PR.
+- That the current branch (`master` or `?.?.x` patch) mathches the `PR target: *` label.
+- It will `cherry-pick` all of the SHAs from the PR into the current branch.
+- It will rewrite commit history by automatically adding `Close #1234` and `(#1234)` into the commit message.
+
+
+### Recovering from failed `merge-pr` due to conflicts
+
+When running `merge-pr` the script will output the commands which it is about to run.
+
+```
+$ ./scripts/github/merge-pr 1234
+======================
+GitHub Merge PR Steps
+======================
+   git cherry-pick upstream/pr/1234~1..upstream/pr/1234
+   git filter-branch -f --msg-filter "/usr/local/google/home/misko/angular-pr/scripts/github/utils/github.closes 1234" HEAD~1..HEAD
+```
+
+If the `cherry-pick` command fails than resolve conflicts and use `git cherry-pick --continue` once ready. After the `cherry-pick` is done cut&paste and run the `filter-branch` command to properly rewrite the messages
+
+## Cherry-picking PRs into patch branch
+
+In addition to merging PRs into the master branch, many PRs need to be also merged into a patch branch.
+Follow these steps to get path brach up to date.
+
+1. Check out the most recent patch branch: `git checkout 4.3.x`
+2. Get a list of PRs merged into master: `git log master --oneline -n10`
+3. For each PR number in the commit message run: `././scripts/github/merge-pr 1234`
+   - The PR will only merge if the `PR target:` matches the branch.
+
+Once all of the PRs are in patch branch, push the all branches and tags to github using `push-upstream` script.
+
+
+## Pushing merged PRs into github
+
+Use `push-upstream` script to push all of the branch and tags to github.
+
+```
+$ ./scripts/github/push-upstream
+git push git@github.com:angular/angular.git master:master 4.3.x:4.3.x
+Counting objects: 25, done.
+Delta compression using up to 6 threads.
+Compressing objects: 100% (17/17), done.
+Writing objects: 100% (25/25), 2.22 KiB | 284.00 KiB/s, done.
+Total 25 (delta 22), reused 8 (delta 7)
+remote: Resolving deltas: 100% (22/22), completed with 18 local objects.
+To github.com:angular/angular.git
+   079d884b6..d1c4a94bb  master -> master
+git push --tags -f git@github.com:angular/angular.git patch_sync:patch_sync
+Everything up-to-date
+```

docs/COMMITTER.md

@@ -13,8 +13,8 @@ Change approvals in our monorepo are managed via [pullapprove.com](https://about
 
 # Merging
 
-Once a change has all the approvals either the last approver or the PR author (if PR author has the project collaborator status) should mark the PR with "PR: merge" label.
-This signals to the caretaker that the PR should be merged.
+Once a change has all the approvals either the last approver or the PR author (if PR author has the project collaborator status) should mark the PR with `PR: merge` as well as `PR target: *` labels.
+This signals to the caretaker that the PR should be merged. See [merge instructions](../CARETAKER.md).
 
 # Who is the Caretaker?
 

gulpfile.js

@@ -42,5 +42,3 @@ gulp.task('serve', loadTask('serve', 'default'));
 gulp.task('serve-examples', loadTask('serve', 'examples'));
 gulp.task('changelog', loadTask('changelog'));
 gulp.task('check-env', () => {/* this is a noop because the env test ran already above */});
-gulp.task('cldr:extract', loadTask('cldr', 'extract'));
-gulp.task('cldr:download', loadTask('cldr', 'download'));

integration/.gitignore

@@ -1,13 +1,10 @@
 built/
 dist/
 vendor/
-yarn.lock
-.ng-cli/
-cli-*/**
 */src/*.d.ts
 */src/*.js
 **/*.ngfactory.ts
 **/*.ngsummary.json
 **/*.ngsummary.ts
 */yarn*
-**/.yarn_local_cache*
+*/.yarn_local_cache*

integration/_payload-limits.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -u -e -o pipefail
-
-declare -A payloadLimits
-payloadLimits["hello_world__closure", "uncompressed", "bundle"]=106000
-payloadLimits["hello_world__closure", "gzip7", "bundle"]=35000
-payloadLimits["hello_world__closure", "gzip9", "bundle"]=35000
-
-payloadLimits["cli-hello-world", "uncompressed", "inline"]=1500
-payloadLimits["cli-hello-world", "uncompressed", "main"]=183000
-payloadLimits["cli-hello-world", "uncompressed", "polyfills"]=63000
-payloadLimits["cli-hello-world", "gzip7", "inline"]=900
-payloadLimits["cli-hello-world", "gzip7", "main"]=48000
-payloadLimits["cli-hello-world", "gzip7", "polyfills"]=21000
-payloadLimits["cli-hello-world", "gzip9", "inline"]=900
-payloadLimits["cli-hello-world", "gzip9", "main"]=48000
-payloadLimits["cli-hello-world", "gzip9", "polyfills"]=21000
-

integration/bazel/BUILD.bazel

@@ -1,10 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "node_modules",
-    srcs = glob([
-        "node_modules/**/*.js",
-        "node_modules/**/*.d.ts",
-        "node_modules/**/*.json",
-    ])
-)

integration/bazel/WORKSPACE

@@ -1,30 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-git_repository(
-    name = "build_bazel_rules_nodejs",
-    remote = "https://github.com/bazelbuild/rules_nodejs.git",
-    tag = "0.0.2",
-)
-
-load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
-node_repositories(package_json = ["//:package.json"])
-
-local_repository(
-    name = "build_bazel_rules_typescript",
-    path = "node_modules/@bazel/typescript",
-)
-
-local_repository(
-    name = "angular",
-    path = "node_modules/@angular/bazel",
-)
-
-git_repository(
-    name = "io_bazel_rules_sass",
-    remote = "https://github.com/bazelbuild/rules_sass.git",
-    tag = "0.0.2",
-)
-
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
-
-sass_repositories()

integration/bazel/angular.tsconfig.json

@@ -1,23 +0,0 @@
-// WORKAROUND https://github.com/angular/angular/issues/18810
-// This file is required to run ngc on angular libraries, to write files like
-// node_modules/@angular/core/core.ngsummary.json
-{
-  "compilerOptions": {
-      "lib": [
-          "dom",
-          "es2015"
-      ],
-      "experimentalDecorators": true,
-      "types": []
-  },
-   "include": [
-      "node_modules/@angular/**/*"
-  ],
-  "exclude": [
-      "node_modules/@angular/bazel/**",
-      "node_modules/@angular/compiler-cli/**",
-      // Workaround bug introduced by 079d884
-      "node_modules/@angular/common/i18n_data*",
-      "node_modules/@angular/tsc-wrapped/**"
-  ]
-}

integration/bazel/package.json

@@ -1,25 +0,0 @@
-{
-  "name": "angular-bazel",
-  "description": "example and integration test for building Angular apps with Bazel",
-  "version": "0.0.0",
-  "license": "MIT",
-  "dependencies": {
-    "@angular/animations": "file:../../dist/packages-dist/animations",
-    "@angular/common": "file:../../dist/packages-dist/common",
-    "@angular/compiler": "file:../../dist/packages-dist/compiler",
-    "@angular/core": "file:../../dist/packages-dist/core",
-    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
-    "rxjs": "5.3.1",
-    "zone.js": "0.8.6"
-  },
-  "devDependencies": {
-    "@angular/bazel": "file:../../dist/packages-dist/bazel",
-    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
-    "@bazel/typescript": "0.0.7",
-    "typescript": "~2.3.1"
-  },
-  "scripts": {
-    "postinstall": "ngc -p angular.tsconfig.json",
-    "test": "bazel build ..."
-  }
-}

integration/bazel/src/BUILD.bazel

@@ -1,11 +0,0 @@
-load("@angular//:index.bzl", "ng_module")
-
-# Allow targets under sub-packages to reference the tsconfig.json file
-exports_files(["tsconfig.json"])
-
-ng_module(
-    name = "app",
-    srcs = ["app.module.ts"],
-    deps = ["//src/hello-world"],
-    tsconfig = ":tsconfig.json",
-)

integration/bazel/src/app.module.ts

@@ -1,9 +0,0 @@
-import {HelloWorldModule} from './hello-world/hello-world.module';
-
-import {NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-
-@NgModule({
-  imports: [BrowserModule, HelloWorldModule]
-})
-export class AppModule {}

integration/bazel/src/hello-world/BUILD.bazel

@@ -1,19 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-load("@angular//:index.bzl", "ng_module")
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
-
-sass_binary(
-    name = "styles",
-    src = "hello-world.component.scss",
-    deps = [
-         "//src/shared:colors",
-         "//src/shared:fonts",
-    ],
-)
-
-ng_module(
-    name = "hello-world",
-    srcs = glob(["*.ts"]),
-    tsconfig = "//src:tsconfig.json",
-    assets = [":styles"],
-)

integration/bazel/src/hello-world/hello-world.component.scss

@@ -1,12 +0,0 @@
-@import "src/shared/fonts";
-@import "src/shared/colors";
-
-html {
-  body {
-    font-family: $default-font-stack;
-    h1 {
-      font-family: $modern-font-stack;
-      color: $example-red;
-    }
-  }
-}

integration/bazel/src/hello-world/hello-world.component.ts

@@ -1,15 +0,0 @@
-
-import {Component, NgModule} from '@angular/core';
-
-@Component({
-  selector: 'hello-world-app',
-  template: `
-    <div>Hello {{ name }}!</div>
-    <input type="text" [value]="name" (input)="name = $event.target.value"/>
-  `,
-  // TODO: might be better to point to .scss so this looks valid at design-time
-  styleUrls: ['./styles.css']
-})
-export class HelloWorldComponent {
-  name: string = 'world';
-}

integration/bazel/src/hello-world/hello-world.module.ts

@@ -1,8 +0,0 @@
-import {HelloWorldComponent} from './hello-world.component';
-import {NgModule} from '@angular/core';
-
-@NgModule({
-  declarations: [HelloWorldComponent],
-  bootstrap: [HelloWorldComponent],
-})
-export class HelloWorldModule {}

integration/bazel/src/shared/BUILD.bazel

@@ -1,13 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library")
-
-sass_library(
-    name = "colors",
-    srcs = ["_colors.scss"],
-)
-
-sass_library(
-    name = "fonts",
-    srcs = ["_fonts.scss"],
-)

integration/bazel/src/shared/_colors.scss

@@ -1,2 +0,0 @@
-$example-blue: #0000ff;
-$example-red: #ff0000;

integration/bazel/src/shared/_fonts.scss

@@ -1,2 +0,0 @@
-$default-font-stack: Cambria, "Hoefler Text", Utopia, "Liberation Serif", "Nimbus Roman No9 L Regular", Times, "Times New Roman", serif;
-$modern-font-stack: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;

integration/bazel/src/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "experimentalDecorators": true,
-    "lib": [
-      "dom",
-      "es5",
-      "es2015.collection",
-      "es2015.iterable",
-      "es2015.promise"
-    ]
-  }
-}

integration/hello_world__closure/package.json

@@ -10,10 +10,10 @@
     "@angular/core": "file:../../dist/packages-dist/core",
     "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
     "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
-    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
+    "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
     "google-closure-compiler": "20170409.0.0",
     "rxjs": "5.3.1",
-    "typescript": "~2.3.1",
+    "typescript": "2.1.6",
     "zone.js": "0.8.6"
   },
   "devDependencies": {

integration/i18n/closure.conf

@@ -1,30 +0,0 @@
---compilation_level=ADVANCED_OPTIMIZATIONS
---language_out=ES5
---js_output_file=dist/bundle.js
---output_manifest=dist/manifest.MF
---variable_renaming_report=dist/variable_renaming_report
---property_renaming_report=dist/property_renaming_report
---create_source_map=%outname%.map
-
---warning_level=QUIET
---dependency_mode=STRICT
---rewrite_polyfills=false
-
-node_modules/zone.js/dist/zone_externs.js
-
---js node_modules/rxjs/**.js
---process_common_js_modules
---module_resolution=node
-
-node_modules/@angular/core/@angular/core.js
---js_module_root=node_modules/@angular/core
-node_modules/@angular/core/src/testability/testability.externs.js
-
-node_modules/@angular/common/@angular/common.js
---js_module_root=node_modules/@angular/common
-
-node_modules/@angular/platform-browser/@angular/platform-browser.js
---js_module_root=node_modules/@angular/platform-browser
-
---js built/**.js
---entry_point=built/src/main

integration/i18n/e2e/app.e2e-spec.ts

@@ -1,10 +0,0 @@
-import { browser, element, by } from 'protractor';
-
-describe('i18n E2E Tests', function () {
-  it('remove i18n attributes', function () {
-    browser.get('');
-    const div = element(by.css('div'));
-    expect(div.getAttribute('title')).not.toBe(null);
-    expect(div.getAttribute('i18n')).toBe(null);
-  });
-});

integration/i18n/e2e/browser.config.json

@@ -1,15 +0,0 @@
-{
-  "open": false,
-  "logLevel": "silent",
-  "port": 8080,
-  "server": {
-    "baseDir": "src",
-    "routes": {
-      "/dist": "dist",
-      "/node_modules": "node_modules"
-    },
-    "middleware": {
-      "0": null
-    }
-  }
-}

integration/i18n/e2e/protractor.config.js

@@ -1,16 +0,0 @@
-exports.config = {
-  specs: [
-    '../built/e2e/*.e2e-spec.js'
-  ],
-  capabilities: {
-    browserName: 'chrome',
-    chromeOptions: {
-      args: ['--no-sandbox'],
-      binary: process.env.CHROME_BIN,
-    }
-  },
-  directConnect: true,
-  baseUrl: 'http://localhost:8080/',
-  framework: 'jasmine',
-  useAllAngular2AppRoots: true
-};

integration/i18n/e2e/tsconfig.json

@@ -1,8 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "../built/e2e",
-    "types": ["jasmine"],
-    // TODO(alexeagle): was required for Protractor 4.0.11
-    "skipLibCheck": true
-  }
-}

integration/i18n/package.json

@@ -1,32 +0,0 @@
-{
-  "name": "angular-integration",
-  "version": "0.0.0",
-  "license": "MIT",
-  "dependencies": {
-    "@angular/animations": "file:../../dist/packages-dist/animations",
-    "@angular/common": "file:../../dist/packages-dist/common",
-    "@angular/compiler": "file:../../dist/packages-dist/compiler",
-    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
-    "@angular/core": "file:../../dist/packages-dist/core",
-    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
-    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
-    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
-    "google-closure-compiler": "20170409.0.0",
-    "rxjs": "5.3.1",
-    "typescript": "~2.3.1",
-    "zone.js": "0.8.6"
-  },
-  "devDependencies": {
-    "@types/jasmine": "2.5.41",
-    "concurrently": "3.4.0",
-    "lite-server": "2.2.2",
-    "protractor": "file:../../node_modules/protractor"
-  },
-  "scripts": {
-    "closure": "java -jar node_modules/google-closure-compiler/compiler.jar --flagfile closure.conf",
-    "test": "ngc && yarn run closure && concurrently \"yarn run serve\" \"yarn run protractor\" --kill-others --success first",
-    "serve": "lite-server -c e2e/browser.config.json",
-    "preprotractor": "tsc -p e2e",
-    "protractor": "protractor e2e/protractor.config.js"
-  }
-}

integration/i18n/src/app.ts

@@ -1,11 +0,0 @@
-import {HelloWorldComponent} from './hello-world.component';
-
-import {NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-
-@NgModule({
-  declarations: [HelloWorldComponent],
-  bootstrap: [HelloWorldComponent],
-  imports: [BrowserModule],
-})
-export class AppModule {}

integration/i18n/src/hello-world.component.ts

@@ -1,9 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-  selector: 'hello-world-app',
-  template: `<div i18n="desc|meaning" title="i18n attribute should be removed">Hello {{ name }}!</div>`,
-})
-export class HelloWorldComponent {
-  name: string = 'world';
-}

integration/i18n/src/index.html

@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-
-<head>
-  <meta charset="utf-8">
-  <title>Hello World</title>
-  <base href="/">
-</head>
-
-<body>
-  <hello-world-app>Loading...</hello-world-app>
-
-  <script src="node_modules/zone.js/dist/zone.min.js"></script>
-  <script src="dist/bundle.js"></script>
-
-</body>
-
-</html>

integration/i18n/src/main.ts

@@ -1,4 +0,0 @@
-import {platformBrowser} from '@angular/platform-browser';
-import {AppModuleNgFactory} from './app.ngfactory';
-
-platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);

integration/i18n/tsconfig.json

@@ -1,30 +0,0 @@
-{
-  "angularCompilerOptions": {
-    "annotationsAs": "static fields",
-    "annotateForClosureCompiler": true,
-    "alwaysCompileGeneratedCode": true
-  },
-
-  "compilerOptions": {
-    "module": "es2015",
-    "moduleResolution": "node",
-    // TODO(i): strictNullChecks should turned on but are temporarily disabled due to #15432
-    "strictNullChecks": false,
-    "target": "es6",
-    "noImplicitAny": false,
-    "sourceMap": false,
-    "experimentalDecorators": true,
-    "outDir": "built",
-    "rootDir": ".",
-    "declaration": true,
-    "types": []
-  },
-
-  "exclude": [
-    "vendor",
-    "node_modules",
-    "built",
-    "dist",
-    "e2e"
-  ]
-}

integration/language_service_plugin/package.json

@@ -12,7 +12,7 @@
     "@angular/language-service": "file:../../dist/packages-dist/language-service",
     "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
     "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
-    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
+    "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
     "@types/minimist": "^1.2.0",
     "@types/node": "^7.0.5",
     "minimist": "^1.2.0",

integration/language_service_plugin/scripts/test.sh

@@ -9,11 +9,6 @@ source scripts/env.sh
 HOST="node tools/typescript_host.js"
 VALIDATE="node tools/typescript_validator.js"
 
-# Ensure the languages service can load correctly in node before typescript loads it.
-# This verifies its dependencies and emits any exceptions, both of which are  only  
-# emitted to the typescript logs (not the validated output).
-node tools/load_test.js
-
 for TYPESCRIPT in ${TYPESCRIPTS[@]}
 do
   SERVER="node typescripts/$TYPESCRIPT/node_modules/typescript/lib/tsserver.js"

integration/language_service_plugin/tools/load_test.ts

@@ -1,35 +0,0 @@
-const ts = require('typescript');
-const Module = require('module');
-
-const existingRequire = Module.prototype.require;
-
-const recordedRequires: string[] = [];
-
-function recordingRequire(path: string) {
-  recordedRequires.push(path);
-  return existingRequire.call(this, path);
-}
-
-Module.prototype.require = recordingRequire;
-
-try {
-  const lsf = require('@angular/language-service');
-  const ls = lsf({typescript: ts});
-
-  // Assert that the only module that should have been required are '@angular/langauge-service', 'fs', and 'path'
-
-  const allowedLoads = new Set(["@angular/language-service", "fs", "path"]);
-
-  const invalidModules = recordedRequires.filter(m => !allowedLoads.has(m));
-
-  if (invalidModules.length > 0) {
-    console.error(`FAILED: Loading the language service required: ${invalidModules.join(', ')}`);
-    process.exit(1);
-  }
-} catch (e) {
-  console.error(`FAILED: Loading the language service caused the following exception: ${e.stack || e}`);
-  process.exit(1);
-}
-
-console.log('SUCCESS: Loading passed')
-process.exit(0);

integration/language_service_plugin/tools/tsconfig.json

@@ -13,7 +13,6 @@
     },
     "files": [
         "typescript_host.ts", 
-        "typescript_validator.ts",
-        "load_test.ts"
+        "typescript_validator.ts"
     ]
 }

integration/ng-cli-create.sh

@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-set -e -o pipefail
-
-if [ $# -eq 0 ]
-  then
-    echo "Angular cli integration create project"
-    echo
-    echo "./ng-cli-create.sh [project-name]"
-    echo
-else
-  TEMP=`dirname $0`
-  INTEGRATION_DIR=`(cd $TEMP; pwd)`
-  PROJECT=$1
-  PROJECT_DIR=$INTEGRATION_DIR/$PROJECT
-  NG=$INTEGRATION_DIR/.ng-cli/node_modules/.bin/ng
-  (
-    echo "==================="
-    echo Creating $PROJECT...
-    echo "==================="
-    cd $INTEGRATION_DIR
-    rm -rf $PROJECT
-    $NG set --global packageManager=yarn
-    $NG new $PROJECT --skip-install
-    echo "==================="
-    echo $PROJECT created
-    echo "==================="
-  )
-
-
-  # By default `ng new` creates a package.json which uses @angular/* from NPM.
-  # Instead we want to use them from the current build so we overwrite theme here.
-  (
-    echo "==================="
-    echo Updating $PROJECT bundles
-    echo "==================="
-    cd $PROJECT_DIR
-
-    sed -i -E 's/ng build/ng build --prod --build-optimizer/g' package.json
-    sed -i -E 's/ng test/ng test --single-run/g' package.json
-    # workaround for https://github.com/angular/angular-cli/issues/7401
-    sed -i -E 's/"@angular\/cli\"\: \".*\"/"@angular\/cli":  "https:\/\/github.com\/angular\/cli-builds"/g' package.json
-
-    yarn add \
-      file:../../dist/packages-dist/compiler-cli \
-      file:../../dist/packages-dist/language-service \
-      --save-dev --skip-integrity-check --emoji
-
-    yarn add \
-      file:../../dist/packages-dist/core \
-      file:../../dist/packages-dist/common \
-      file:../../dist/packages-dist/forms \
-      file:../../dist/packages-dist/http \
-      --save --skip-integrity-check --emoji
-
-    # yarn bug: can not install all of them in a single command and it has to be broken into separate invocations.
-    yarn add \
-      file:../../dist/packages-dist/animations \
-      file:../../dist/packages-dist/compiler \
-      file:../../dist/packages-dist/platform-browser \
-      file:../../dist/packages-dist/platform-browser-dynamic \
-      --save --skip-integrity-check --emoji
-
-    yarn install --emoji
-
-    echo "==================="
-    echo $PROJECT created succesfully
-    echo "==================="
-  )
-fi

integration/run_tests.sh

@@ -4,10 +4,6 @@ set -e -o pipefail
 
 cd `dirname $0`
 
-# Track payload size functions
-source ../scripts/ci/payload-size.sh
-source ./_payload-limits.sh
-
 # Workaround https://github.com/yarnpkg/yarn/issues/2165
 # Yarn will cache file://dist URIs and not update Angular code
 readonly cache=.yarn_local_cache
@@ -18,17 +14,6 @@ rm_cache
 mkdir $cache
 trap rm_cache EXIT
 
-# We need to install `ng` but don't want to do it globally so we plate it into `.ng-cli` folder.
-# This check prevents constant re-installing.
-if [ ! -d ".ng-cli" ]; then
-  (
-    mkdir -p .ng-cli
-    cd .ng-cli
-    yarn add https://github.com/angular/cli-builds --cache-folder ../$cache
-  )
-fi
-./ng-cli-create.sh cli-hello-world
-
 for testDir in $(ls | grep -v node_modules) ; do
   [[ -d "$testDir" ]] || continue
   echo "#################################"
@@ -38,17 +23,7 @@ for testDir in $(ls | grep -v node_modules) ; do
     cd $testDir
     # Workaround for https://github.com/yarnpkg/yarn/issues/2256
     rm -f yarn.lock
-    rm -rf dist
     yarn install --cache-folder ../$cache
     yarn test || exit 1
-    # Track payload size for cli-hello-world and hello_world__closure
-    if [[ $testDir == cli-hello-world ]] || [[ $testDir == hello_world__closure ]]; then
-      if [[ $testDir == cli-hello-world ]]; then
-        yarn build
-      fi
-      trackPayloadSize "$testDir" "dist/*.js" true false
-    fi
   )
 done
-
-trackPayloadSize "umd" "../dist/packages-dist/*/bundles/*.umd.min.js" false false

integration/typings_test_ts21/include-all.ts

@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * 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 * as compiler from '@angular/compiler';
+import * as compilerTesting from '@angular/compiler/testing';
+import * as core from '@angular/core';
+import * as coreTesting from '@angular/core/testing';
+import * as forms from '@angular/forms';
+import * as http from '@angular/http';
+import * as httpTesting from '@angular/http/testing';
+import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
+import * as platformBrowser from '@angular/platform-browser';
+import * as platformBrowserTesting from '@angular/platform-browser/testing';
+import * as platformServer from '@angular/platform-server';
+import * as platformServerTesting from '@angular/platform-server/testing';
+import * as router from '@angular/router';
+import * as routerTesting from '@angular/router/testing';
+import * as upgrade from '@angular/upgrade';
+
+export default {
+  compiler,
+  compilerTesting,
+  core,
+  coreTesting,
+  forms,
+  http,
+  httpTesting,
+  platformBrowser,
+  platformBrowserTesting,
+  platformBrowserDynamic,
+  platformServer,
+  platformServerTesting,
+  router,
+  routerTesting,
+  upgrade
+};

integration/typings_test_ts21/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "angular-integration",
+  "description": "Assert that users with TypeScript 2.1 can type-check an Angular application",
+  "version": "0.0.0",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/compiler": "file:../../dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/forms": "file:../../dist/packages-dist/forms",
+    "@angular/http": "file:../../dist/packages-dist/http",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
+    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
+    "@angular/router": "file:../../dist/packages-dist/router",
+    "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
+    "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
+    "@types/jasmine": "2.5.41",
+    "rxjs": "file:../../node_modules/rxjs",
+    "typescript": "2.1.6",
+    "zone.js": "0.7.6"
+  },
+  "scripts": {
+    "test": "tsc"
+  }
+}

integration/typings_test_ts21/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../../dist/typing-test/",
+    "rootDir": ".",
+    "target": "es5",
+    "lib": ["es5", "dom", "es2015.collection", "es2015.iterable", "es2015.promise"],
+    "types": [],
+    "strictNullChecks": true
+  },
+  "files": [
+    "include-all.ts",
+    "node_modules/@types/jasmine/index.d.ts"
+  ]
+}

integration/typings_test_ts22/package.json

@@ -15,7 +15,7 @@
     "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
     "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
     "@angular/router": "file:../../dist/packages-dist/router",
-    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
+    "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
     "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
     "@types/jasmine": "2.5.41",
     "rxjs": "file:../../node_modules/rxjs",

integration/typings_test_ts23/package.json

@@ -15,7 +15,7 @@
     "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
     "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
     "@angular/router": "file:../../dist/packages-dist/router",
-    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
+    "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
     "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
     "@types/jasmine": "2.5.41",
     "rxjs": "file:../../node_modules/rxjs",

karma-js.conf.js

@@ -47,8 +47,7 @@ module.exports = function(config) {
         pattern: 'packages/platform-browser/test/browser/static_assets/**',
         included: false,
         watched: false,
-      },
-      {pattern: 'packages/common/i18n/**', included: false, watched: false, served: true},
+      }
     ],
 
     exclude: [
@@ -60,7 +59,6 @@ module.exports = function(config) {
       'dist/all/@angular/examples/**/e2e_test/*',
       'dist/all/@angular/language-service/**',
       'dist/all/@angular/router/test/**',
-      'dist/all/@angular/tsc-wrapped/**',
       'dist/all/@angular/platform-browser/testing/e2e_util.js',
       'dist/all/angular1_router.js',
       'dist/examples/**/e2e_test/**',

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, StaticProvider} from '@angular/benchpress';
+import {SeleniumWebDriverAdapter, Options, JsonFileReporter, Validator, RegressionSlopeValidator, ConsoleReporter, SizeValidator, MultiReporter, MultiMetric, Runner, Provider} 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: StaticProvider[] = [
+  const providers: Provider[] = [
     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,8 +1,6 @@
 # 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
-```

modules/tsconfig.json

@@ -13,8 +13,8 @@
       "selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
       "rxjs/*": ["../node_modules/rxjs/*"],
       "@angular/*": ["../dist/all/@angular/*"],
-      "@angular/tsc-wrapped": ["../dist/packages-dist/tsc-wrapped"],
-      "@angular/tsc-wrapped/*": ["../dist/packages-dist/tsc-wrapped/*"]
+      "@angular/tsc-wrapped": ["../dist/tools/@angular/tsc-wrapped"],
+      "@angular/tsc-wrapped/*": ["../dist/tools/@angular/tsc-wrapped/*"]
     },
     "rootDir": ".",
     "inlineSourceMap": true,

npm-shrinkwrap.clean.json

@@ -1,18 +1,7 @@
 {
   "name": "angular-srcs",
-  "version": "5.0.0-beta.4",
+  "version": "4.3.0-beta.1",
   "dependencies": {
-    "@bazel/typescript": {
-      "version": "0.0.7",
-      "dependencies": {
-        "@types/node": {
-          "version": "7.0.18"
-        },
-        "tsickle": {
-          "version": "0.23.6"
-        }
-      }
-    },
     "@types/angularjs": {
       "version": "1.5.13-alpha"
     },
@@ -1553,7 +1542,7 @@
       }
     },
     "cldr": {
-      "version": "4.5.0",
+      "version": "3.5.2",
       "dependencies": {
         "uglify-js": {
           "version": "1.3.3"
@@ -1563,59 +1552,6 @@
         }
       }
     },
-    "cldr-data-downloader": {
-      "version": "0.3.2",
-      "dependencies": {
-        "adm-zip": {
-          "version": "0.4.4"
-        },
-        "async": {
-          "version": "2.5.0"
-        },
-        "bl": {
-          "version": "1.1.2"
-        },
-        "form-data": {
-          "version": "1.0.1"
-        },
-        "isarray": {
-          "version": "1.0.0"
-        },
-        "lodash": {
-          "version": "4.17.4"
-        },
-        "mime-db": {
-          "version": "1.27.0"
-        },
-        "mime-types": {
-          "version": "2.1.15"
-        },
-        "minimist": {
-          "version": "0.0.8"
-        },
-        "mkdirp": {
-          "version": "0.5.0"
-        },
-        "q": {
-          "version": "1.0.1"
-        },
-        "qs": {
-          "version": "6.2.3"
-        },
-        "readable-stream": {
-          "version": "2.0.6"
-        },
-        "request": {
-          "version": "2.74.0"
-        },
-        "tough-cookie": {
-          "version": "2.3.2"
-        }
-      }
-    },
-    "cldrjs": {
-      "version": "0.5.0"
-    },
     "cli-boxes": {
       "version": "1.0.0"
     },
@@ -1724,9 +1660,6 @@
         }
       }
     },
-    "config-chain": {
-      "version": "1.1.11"
-    },
     "configstore": {
       "version": "2.1.0",
       "dependencies": {
@@ -3784,10 +3717,13 @@
       "version": "0.3.0"
     },
     "memoizeasync": {
-      "version": "1.0.0",
+      "version": "0.8.0",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0"
+        },
+        "passerror": {
+          "version": "0.0.2"
         }
       }
     },
@@ -3940,14 +3876,6 @@
     "normalize-path": {
       "version": "2.0.1"
     },
-    "npmconf": {
-      "version": "2.0.9",
-      "dependencies": {
-        "semver": {
-          "version": "4.3.6"
-        }
-      }
-    },
     "npmlog": {
       "version": "4.0.2"
     },
@@ -4086,7 +4014,7 @@
       "version": "2.0.0"
     },
     "passerror": {
-      "version": "1.1.1"
+      "version": "0.0.1"
     },
     "path-browserify": {
       "version": "0.0.0"
@@ -4153,9 +4081,6 @@
     "process-nextick-args": {
       "version": "1.0.6"
     },
-    "progress": {
-      "version": "1.1.8"
-    },
     "promise": {
       "version": "7.1.1"
     },
@@ -4170,9 +4095,6 @@
         }
       }
     },
-    "proto-list": {
-      "version": "1.2.4"
-    },
     "protobufjs": {
       "version": "5.0.0",
       "dependencies": {
@@ -4420,9 +4342,6 @@
     "request-capture-har": {
       "version": "1.1.4"
     },
-    "request-progress": {
-      "version": "0.3.1"
-    },
     "requires-port": {
       "version": "1.0.0"
     },
@@ -4841,9 +4760,6 @@
     "text-extensions": {
       "version": "1.3.3"
     },
-    "throttleit": {
-      "version": "0.0.2"
-    },
     "through": {
       "version": "2.3.8"
     },
@@ -4925,7 +4841,7 @@
       }
     },
     "tsickle": {
-      "version": "0.23.4"
+      "version": "0.21.6"
     },
     "tslib": {
       "version": "1.7.1"
@@ -4985,7 +4901,7 @@
       "version": "0.0.6"
     },
     "typescript": {
-      "version": "2.3.4"
+      "version": "2.3.2"
     },
     "ua-parser-js": {
       "version": "0.7.10"
@@ -5016,9 +4932,6 @@
     "uglify-to-browserify": {
       "version": "1.0.2"
     },
-    "uid-number": {
-      "version": "0.0.5"
-    },
     "uid-safe": {
       "version": "2.0.0"
     },
@@ -5358,13 +5271,13 @@
       "version": "8.2.2"
     },
     "xmldom": {
-      "version": "0.1.27"
+      "version": "0.1.19"
     },
     "xmlhttprequest-ssl": {
       "version": "1.5.1"
     },
     "xpath": {
-      "version": "0.0.24"
+      "version": "0.0.7"
     },
     "xtend": {
       "version": "4.0.1"

npm-shrinkwrap.json

@@ -1,24 +1,7 @@
 {
   "name": "angular-srcs",
-  "version": "5.0.0-beta.4",
+  "version": "4.3.0-beta.1",
   "dependencies": {
-    "@bazel/typescript": {
-      "version": "0.0.7",
-      "from": "@bazel/typescript@latest",
-      "resolved": "https://registry.npmjs.org/@bazel/typescript/-/typescript-0.0.7.tgz",
-      "dependencies": {
-        "@types/node": {
-          "version": "7.0.18",
-          "from": "@types/node@7.0.18",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.18.tgz"
-        },
-        "tsickle": {
-          "version": "0.23.6",
-          "from": "tsickle@0.23.6",
-          "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.23.6.tgz"
-        }
-      }
-    },
     "@types/angularjs": {
       "version": "1.5.13-alpha",
       "from": "@types/angularjs@latest",
@@ -2425,9 +2408,9 @@
       }
     },
     "cldr": {
-      "version": "4.5.0",
-      "from": "cldr@4.5.0",
-      "resolved": "https://registry.npmjs.org/cldr/-/cldr-4.5.0.tgz",
+      "version": "3.5.2",
+      "from": "cldr@>=3.5.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/cldr/-/cldr-3.5.2.tgz",
       "dependencies": {
         "uglify-js": {
           "version": "1.3.3",
@@ -2441,93 +2424,6 @@
         }
       }
     },
-    "cldr-data-downloader": {
-      "version": "0.3.2",
-      "from": "cldr-data-downloader@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/cldr-data-downloader/-/cldr-data-downloader-0.3.2.tgz",
-      "dependencies": {
-        "adm-zip": {
-          "version": "0.4.4",
-          "from": "adm-zip@0.4.4",
-          "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz"
-        },
-        "async": {
-          "version": "2.5.0",
-          "from": "async@>=2.0.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz"
-        },
-        "bl": {
-          "version": "1.1.2",
-          "from": "bl@>=1.1.2 <1.2.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"
-        },
-        "form-data": {
-          "version": "1.0.1",
-          "from": "form-data@>=1.0.0-rc4 <1.1.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "from": "isarray@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-        },
-        "lodash": {
-          "version": "4.17.4",
-          "from": "lodash@>=4.14.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "from": "mime-db@>=1.27.0 <1.28.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"
-        },
-        "mime-types": {
-          "version": "2.1.15",
-          "from": "mime-types@>=2.1.7 <2.2.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "from": "minimist@0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-        },
-        "mkdirp": {
-          "version": "0.5.0",
-          "from": "mkdirp@0.5.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"
-        },
-        "q": {
-          "version": "1.0.1",
-          "from": "q@1.0.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
-        },
-        "qs": {
-          "version": "6.2.3",
-          "from": "qs@>=6.2.0 <6.3.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"
-        },
-        "readable-stream": {
-          "version": "2.0.6",
-          "from": "readable-stream@>=2.0.5 <2.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
-        },
-        "request": {
-          "version": "2.74.0",
-          "from": "request@>=2.74.0 <2.75.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz"
-        },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "from": "tough-cookie@>=2.3.0 <2.4.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"
-        }
-      }
-    },
-    "cldrjs": {
-      "version": "0.5.0",
-      "from": "cldrjs@0.5.0",
-      "resolved": "https://registry.npmjs.org/cldrjs/-/cldrjs-0.5.0.tgz"
-    },
     "cli-boxes": {
       "version": "1.0.0",
       "from": "cli-boxes@>=1.0.0 <2.0.0",
@@ -2700,11 +2596,6 @@
         }
       }
     },
-    "config-chain": {
-      "version": "1.1.11",
-      "from": "config-chain@>=1.1.8 <1.2.0",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"
-    },
     "configstore": {
       "version": "2.1.0",
       "from": "configstore@>=2.0.0 <3.0.0",
@@ -6026,14 +5917,19 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
     },
     "memoizeasync": {
-      "version": "1.0.0",
-      "from": "memoizeasync@1.0.0",
-      "resolved": "https://registry.npmjs.org/memoizeasync/-/memoizeasync-1.0.0.tgz",
+      "version": "0.8.0",
+      "from": "memoizeasync@0.8.0",
+      "resolved": "https://registry.npmjs.org/memoizeasync/-/memoizeasync-0.8.0.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
           "from": "lru-cache@2.5.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+        },
+        "passerror": {
+          "version": "0.0.2",
+          "from": "passerror@0.0.2",
+          "resolved": "https://registry.npmjs.org/passerror/-/passerror-0.0.2.tgz"
         }
       }
     },
@@ -6280,18 +6176,6 @@
       "from": "normalize-path@>=2.0.1 <3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
     },
-    "npmconf": {
-      "version": "2.0.9",
-      "from": "npmconf@2.0.9",
-      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz",
-      "dependencies": {
-        "semver": {
-          "version": "4.3.6",
-          "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-        }
-      }
-    },
     "npmlog": {
       "version": "4.0.2",
       "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0||>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
@@ -6516,9 +6400,9 @@
       "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.0.tgz"
     },
     "passerror": {
-      "version": "1.1.1",
-      "from": "passerror@1.1.1",
-      "resolved": "https://registry.npmjs.org/passerror/-/passerror-1.1.1.tgz"
+      "version": "0.0.1",
+      "from": "passerror@0.0.1",
+      "resolved": "https://registry.npmjs.org/passerror/-/passerror-0.0.1.tgz"
     },
     "path-browserify": {
       "version": "0.0.0",
@@ -6627,11 +6511,6 @@
       "from": "process-nextick-args@>=1.0.6 <1.1.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
     },
-    "progress": {
-      "version": "1.1.8",
-      "from": "progress@1.1.8",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"
-    },
     "promise": {
       "version": "7.1.1",
       "from": "promise@>=7.0.3 <8.0.0",
@@ -6654,11 +6533,6 @@
         }
       }
     },
-    "proto-list": {
-      "version": "1.2.4",
-      "from": "proto-list@>=1.2.1 <1.3.0",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-    },
     "protobufjs": {
       "version": "5.0.0",
       "from": "protobufjs@5.0.0",
@@ -7060,11 +6934,6 @@
       "from": "request-capture-har@>=1.1.4 <2.0.0",
       "resolved": "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz"
     },
-    "request-progress": {
-      "version": "0.3.1",
-      "from": "request-progress@0.3.1",
-      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"
-    },
     "requires-port": {
       "version": "1.0.0",
       "from": "requires-port@>=1.0.0 <2.0.0",
@@ -7735,11 +7604,6 @@
       "from": "text-extensions@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.3.3.tgz"
     },
-    "throttleit": {
-      "version": "0.0.2",
-      "from": "throttleit@>=0.0.2 <0.1.0",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
-    },
     "through": {
       "version": "2.3.8",
       "from": "through@>=2.2.7 <3.0.0",
@@ -7869,9 +7733,9 @@
       }
     },
     "tsickle": {
-      "version": "0.23.4",
-      "from": "tsickle@0.23.4",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.23.4.tgz"
+      "version": "0.21.6",
+      "from": "tsickle@0.21.6",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz"
     },
     "tslib": {
       "version": "1.7.1",
@@ -8016,11 +7880,6 @@
       "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
     },
-    "uid-number": {
-      "version": "0.0.5",
-      "from": "uid-number@0.0.5",
-      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
-    },
     "uid-safe": {
       "version": "2.0.0",
       "from": "uid-safe@>=2.0.0 <2.1.0",
@@ -8568,9 +8427,9 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"
     },
     "xmldom": {
-      "version": "0.1.27",
-      "from": "xmldom@0.1.27",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"
+      "version": "0.1.19",
+      "from": "xmldom@0.1.19",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
     },
     "xmlhttprequest-ssl": {
       "version": "1.5.1",
@@ -8578,9 +8437,9 @@
       "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz"
     },
     "xpath": {
-      "version": "0.0.24",
-      "from": "xpath@0.0.24",
-      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.24.tgz"
+      "version": "0.0.7",
+      "from": "xpath@0.0.7",
+      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.7.tgz"
     },
     "xtend": {
       "version": "4.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "5.0.0-beta.4",
+  "version": "4.3.6",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",
@@ -31,7 +31,6 @@
     "fsevents": "^1.0.14"
   },
   "devDependencies": {
-    "@bazel/typescript": "0.0.7",
     "@types/angularjs": "^1.5.13-alpha",
     "@types/base64-js": "^1.2.5",
     "@types/fs-extra": "0.0.22-alpha",
@@ -49,9 +48,7 @@
     "canonical-path": "0.0.2",
     "chokidar": "^1.1.0",
     "clang-format": "^1.0.32",
-    "cldr": "^4.5.0",
-    "cldr-data-downloader": "^0.3.2",
-    "cldrjs": "^0.5.0",
+    "cldr": "^3.5.2",
     "conventional-changelog": "^1.1.0",
     "cors": "^2.7.1",
     "dgeni": "^0.4.2",
@@ -81,6 +78,7 @@
     "nan": "^2.4.0",
     "node-uuid": "1.4.x",
     "parse5": "^3.0.1",
+    "protobufjs": "^5.0.0",
     "protractor": "^4.0.14",
     "react": "^0.14.0",
     "rewire": "^2.3.3",
@@ -95,10 +93,10 @@
     "source-map-support": "^0.4.2",
     "systemjs": "0.18.10",
     "ts-api-guardian": "^0.2.2",
-    "tsickle": "^0.23.4",
+    "tsickle": "^0.21.1",
     "tslint": "^4.1.1",
     "tslint-eslint-rules": "^3.1.0",
-    "typescript": "^2.3.4",
+    "typescript": "^2.3.2",
     "universal-analytics": "^0.3.9",
     "vrsource-tslint-rules": "^4.0.0",
     "webpack": "^1.12.6",

packages/animations/browser/src/dsl/animation.ts

@@ -20,7 +20,7 @@ export class Animation {
   private _animationAst: Ast;
   constructor(private _driver: AnimationDriver, input: AnimationMetadata|AnimationMetadata[]) {
     const errors: any[] = [];
-    const ast = buildAnimationAst(_driver, input, errors);
+    const ast = buildAnimationAst(input, errors);
     if (errors.length) {
       const errorMessage = `animation validation failed:\n${errors.join("\n")}`;
       throw new Error(errorMessage);

packages/animations/browser/src/dsl/animation_ast_builder.ts

@@ -7,7 +7,6 @@
  */
 import {AUTO_STYLE, AnimateTimings, AnimationAnimateChildMetadata, AnimationAnimateMetadata, AnimationAnimateRefMetadata, AnimationGroupMetadata, AnimationKeyframesSequenceMetadata, AnimationMetadata, AnimationMetadataType, AnimationOptions, AnimationQueryMetadata, AnimationQueryOptions, AnimationReferenceMetadata, AnimationSequenceMetadata, AnimationStaggerMetadata, AnimationStateMetadata, AnimationStyleMetadata, AnimationTransitionMetadata, AnimationTriggerMetadata, style, ɵStyleData} from '@angular/animations';
 
-import {AnimationDriver} from '../render/animation_driver';
 import {getOrSetAsInMap} from '../render/shared';
 import {ENTER_SELECTOR, LEAVE_SELECTOR, NG_ANIMATING_SELECTOR, NG_TRIGGER_SELECTOR, SUBSTITUTION_EXPR_START, copyObj, extractStyleParams, iteratorToArray, normalizeAnimationEntry, resolveTiming, validateStyleParams} from '../util';
 
@@ -55,9 +54,8 @@ const SELF_TOKEN_REGEX = new RegExp(`\s*${SELF_TOKEN}\s*,?`, 'g');
  * Otherwise an error will be thrown.
  */
 export function buildAnimationAst(
-    driver: AnimationDriver, metadata: AnimationMetadata | AnimationMetadata[],
-    errors: any[]): Ast {
-  return new AnimationAstBuilderVisitor(driver).build(metadata, errors);
+    metadata: AnimationMetadata | AnimationMetadata[], errors: any[]): Ast {
+  return new AnimationAstBuilderVisitor().build(metadata, errors);
 }
 
 const LEAVE_TOKEN = ':leave';
@@ -67,8 +65,6 @@ const ENTER_TOKEN_REGEX = new RegExp(ENTER_TOKEN, 'g');
 const ROOT_SELECTOR = '';
 
 export class AnimationAstBuilderVisitor implements AnimationDslVisitor {
-  constructor(private _driver: AnimationDriver) {}
-
   build(metadata: AnimationMetadata|AnimationMetadata[], errors: any[]): Ast {
     const context = new AnimationAstBuilderContext(errors);
     this._resetContextStyleTimingState(context);
@@ -277,12 +273,6 @@ export class AnimationAstBuilderVisitor implements AnimationDslVisitor {
       if (typeof tuple == 'string') return;
 
       Object.keys(tuple).forEach(prop => {
-        if (!this._driver.validateStyleProperty(prop)) {
-          context.errors.push(
-              `The provided animation property "${prop}" is not a supported CSS property for animations`);
-          return;
-        }
-
         const collectedStyles = context.collectedStyles[context.currentQuerySelector !];
         const collectedEntry = collectedStyles[prop];
         let updateCollectedStyle = true;

packages/animations/browser/src/dsl/animation_timeline_builder.ts

@@ -447,7 +447,7 @@ export class AnimationTimelineContext {
       private _driver: AnimationDriver, public element: any,
       public subInstructions: ElementInstructionMap, public errors: any[],
       public timelines: TimelineBuilder[], initialTimeline?: TimelineBuilder) {
-    this.currentTimeline = initialTimeline || new TimelineBuilder(this._driver, element, 0);
+    this.currentTimeline = initialTimeline || new TimelineBuilder(element, 0);
     timelines.push(this.currentTimeline);
   }
 
@@ -530,7 +530,7 @@ export class AnimationTimelineContext {
       easing: ''
     };
     const builder = new SubTimelineBuilder(
-        this._driver, instruction.element, instruction.keyframes, instruction.preStyleProps,
+        instruction.element, instruction.keyframes, instruction.preStyleProps,
         instruction.postStyleProps, updatedTimings, instruction.stretchStartingKeyframe);
     this.timelines.push(builder);
     return updatedTimings;
@@ -582,7 +582,7 @@ export class TimelineBuilder {
   private _currentEmptyStepKeyframe: ɵStyleData|null = null;
 
   constructor(
-      private _driver: AnimationDriver, public element: any, public startTime: number,
+      public element: any, public startTime: number,
       private _elementTimelineStylesLookup?: Map<any, ɵStyleData>) {
     if (!this._elementTimelineStylesLookup) {
       this._elementTimelineStylesLookup = new Map<any, ɵStyleData>();
@@ -632,7 +632,7 @@ export class TimelineBuilder {
   fork(element: any, currentTime?: number): TimelineBuilder {
     this.applyStylesToKeyframe();
     return new TimelineBuilder(
-        this._driver, element, currentTime || this.currentTime, this._elementTimelineStylesLookup);
+        element, currentTime || this.currentTime, this._elementTimelineStylesLookup);
   }
 
   private _loadKeyframe() {
@@ -796,10 +796,10 @@ class SubTimelineBuilder extends TimelineBuilder {
   public timings: AnimateTimings;
 
   constructor(
-      driver: AnimationDriver, public element: any, public keyframes: ɵStyleData[],
-      public preStyleProps: string[], public postStyleProps: string[], timings: AnimateTimings,
+      public element: any, public keyframes: ɵStyleData[], public preStyleProps: string[],
+      public postStyleProps: string[], timings: AnimateTimings,
       private _stretchStartingKeyframe: boolean = false) {
-    super(driver, element, timings.delay);
+    super(element, timings.delay);
     this.timings = {duration: timings.duration, delay: timings.delay, easing: timings.easing};
   }
 

packages/animations/browser/src/dsl/animation_transition_expr.ts

@@ -24,14 +24,8 @@ export function parseTransitionExpr(
 function parseInnerTransitionStr(
     eventStr: string, expressions: TransitionMatcherFn[], errors: string[]) {
   if (eventStr[0] == ':') {
-    const result = parseAnimationAlias(eventStr, errors);
-    if (typeof result == 'function') {
-      expressions.push(result);
-      return;
-    }
-    eventStr = result as string;
+    eventStr = parseAnimationAlias(eventStr, errors);
   }
-
   const match = eventStr.match(/^(\*|[-\w]+)\s*(<?[=-]>)\s*(\*|[-\w]+)$/);
   if (match == null || match.length < 4) {
     errors.push(`The provided transition expression "${eventStr}" is not supported`);
@@ -49,16 +43,12 @@ function parseInnerTransitionStr(
   }
 }
 
-function parseAnimationAlias(alias: string, errors: string[]): string|TransitionMatcherFn {
+function parseAnimationAlias(alias: string, errors: string[]): string {
   switch (alias) {
     case ':enter':
       return 'void => *';
     case ':leave':
       return '* => void';
-    case ':increment':
-      return (fromState: any, toState: any): boolean => parseFloat(toState) > parseFloat(fromState);
-    case ':decrement':
-      return (fromState: any, toState: any): boolean => parseFloat(toState) < parseFloat(fromState);
     default:
       errors.push(`The transition alias value "${alias}" is not supported`);
       return '* => *';

packages/animations/browser/src/render/animation_driver.ts

@@ -7,14 +7,13 @@
  */
 import {AnimationPlayer, NoopAnimationPlayer} from '@angular/animations';
 
-import {containsElement, invokeQuery, matchesElement, validateStyleProperty} from './shared';
+import {containsElement, invokeQuery, matchesElement} from './shared';
+
 
 /**
  * @experimental
  */
 export class NoopAnimationDriver implements AnimationDriver {
-  validateStyleProperty(prop: string): boolean { return validateStyleProperty(prop); }
-
   matchesElement(element: any, selector: string): boolean {
     return matchesElement(element, selector);
   }
@@ -42,8 +41,6 @@ export class NoopAnimationDriver implements AnimationDriver {
 export abstract class AnimationDriver {
   static NOOP: AnimationDriver = new NoopAnimationDriver();
 
-  abstract validateStyleProperty(prop: string): boolean;
-
   abstract matchesElement(element: any, selector: string): boolean;
 
   abstract containsElement(elm1: any, elm2: any): boolean;

packages/animations/browser/src/render/animation_engine_next.ts

@@ -25,9 +25,9 @@ export class AnimationEngine {
   // this method is designed to be overridden by the code that uses this engine
   public onRemovalComplete = (element: any, context: any) => {};
 
-  constructor(private _driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
-    this._transitionEngine = new TransitionAnimationEngine(_driver, normalizer);
-    this._timelineEngine = new TimelineAnimationEngine(_driver, normalizer);
+  constructor(driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
+    this._transitionEngine = new TransitionAnimationEngine(driver, normalizer);
+    this._timelineEngine = new TimelineAnimationEngine(driver, normalizer);
 
     this._transitionEngine.onRemovalComplete = (element: any, context: any) =>
         this.onRemovalComplete(element, context);
@@ -40,8 +40,7 @@ export class AnimationEngine {
     let trigger = this._triggerCache[cacheKey];
     if (!trigger) {
       const errors: any[] = [];
-      const ast =
-          buildAnimationAst(this._driver, metadata as AnimationMetadata, errors) as TriggerAst;
+      const ast = buildAnimationAst(metadata as AnimationMetadata, errors) as TriggerAst;
       if (errors.length) {
         throw new Error(
             `The animation trigger "${name}" has failed to build due to the following errors:\n - ${errors.join("\n - ")}`);

packages/animations/browser/src/render/shared.ts

@@ -166,21 +166,6 @@ if (typeof Element != 'undefined') {
   };
 }
 
-let _CACHED_BODY: {style: any}|null = null;
-export function validateStyleProperty(prop: string): boolean {
-  if (!_CACHED_BODY) {
-    _CACHED_BODY = getBodyNode() || {};
-  }
-  return _CACHED_BODY !.style ? prop in _CACHED_BODY !.style : true;
-}
-
-export function getBodyNode(): any|null {
-  if (typeof document != 'undefined') {
-    return document.body;
-  }
-  return null;
-}
-
 export const matchesElement = _matches;
 export const containsElement = _contains;
 export const invokeQuery = _query;

packages/animations/browser/src/render/timeline_animation_engine.ts

@@ -28,7 +28,7 @@ export class TimelineAnimationEngine {
 
   register(id: string, metadata: AnimationMetadata|AnimationMetadata[]) {
     const errors: any[] = [];
-    const ast = buildAnimationAst(this._driver, metadata, errors);
+    const ast = buildAnimationAst(metadata, errors);
     if (errors.length) {
       throw new Error(
           `Unable to build the animation due to the following errors: ${errors.join("\n")}`);

packages/animations/browser/src/render/transition_animation_engine.ts

@@ -16,7 +16,7 @@ import {AnimationStyleNormalizer} from '../dsl/style_normalization/animation_sty
 import {ENTER_CLASSNAME, LEAVE_CLASSNAME, NG_ANIMATING_CLASSNAME, NG_ANIMATING_SELECTOR, NG_TRIGGER_CLASSNAME, NG_TRIGGER_SELECTOR, copyObj, eraseStyles, setStyles} from '../util';
 
 import {AnimationDriver} from './animation_driver';
-import {getBodyNode, getOrSetAsInMap, listenOnPlayer, makeAnimationEvent, normalizeKeyframes, optimizeGroupPlayer} from './shared';
+import {getOrSetAsInMap, listenOnPlayer, makeAnimationEvent, normalizeKeyframes, optimizeGroupPlayer} from './shared';
 
 const QUEUED_CLASSNAME = 'ng-animate-queued';
 const QUEUED_SELECTOR = '.ng-animate-queued';
@@ -509,7 +509,7 @@ export class TransitionAnimationEngine {
   // this method is designed to be overridden by the code that uses this engine
   public onRemovalComplete = (element: any, context: any) => {};
 
-  /** @internal */
+  // tslint:disable-next-line
   _onRemovalComplete(element: any, context: any) { this.onRemovalComplete(element, context); }
 
   constructor(public driver: AnimationDriver, private _normalizer: AnimationStyleNormalizer) {}
@@ -1525,6 +1525,13 @@ function removeClass(element: any, className: string) {
   }
 }
 
+function getBodyNode(): any|null {
+  if (typeof document != 'undefined') {
+    return document.body;
+  }
+  return null;
+}
+
 function removeNodesAfterAnimationDone(
     engine: TransitionAnimationEngine, element: any, players: AnimationPlayer[]) {
   optimizeGroupPlayer(players).onDone(() => engine.processLeaveNode(element));

packages/animations/browser/src/render/web_animations/web_animations_driver.ts

@@ -8,13 +8,11 @@
 import {AnimationPlayer, ɵStyleData} from '@angular/animations';
 
 import {AnimationDriver} from '../animation_driver';
-import {containsElement, invokeQuery, matchesElement, validateStyleProperty} from '../shared';
+import {containsElement, invokeQuery, matchesElement} from '../shared';
 
 import {WebAnimationsPlayer} from './web_animations_player';
 
 export class WebAnimationsDriver implements AnimationDriver {
-  validateStyleProperty(prop: string): boolean { return validateStyleProperty(prop); }
-
   matchesElement(element: any, selector: string): boolean {
     return matchesElement(element, selector);
   }

packages/animations/browser/test/dsl/animation_spec.ts

@@ -177,12 +177,10 @@ export function main() {
 
       it('should throw if dynamic style substitutions are used without defaults within state() definitions',
          () => {
-           const steps = [
-             state('final', style({
-                     'width': '{{ one }}px',
-                     'borderRadius': '{{ two }}px {{ three }}px',
-                   })),
-           ];
+           const steps = [state('final', style({
+                                  'width': '{{ one }}px',
+                                  'borderRadius': '{{ two }}px {{ three }}px',
+                                }))];
 
            expect(() => { validateAndThrowAnimationSequence(steps); })
                .toThrowError(
@@ -200,14 +198,6 @@ export function main() {
                .toThrowError(
                    /state\("panfinal", ...\) must define default values for all the following style substitutions: greyColor/);
          });
-
-      it('should throw an error if an invalid CSS property is used in the animation', () => {
-        const steps = [animate(1000, style({abc: '500px'}))];
-
-        expect(() => { validateAndThrowAnimationSequence(steps); })
-            .toThrowError(
-                /The provided animation property "abc" is not a supported CSS property for animations/);
-      });
     });
 
     describe('keyframe building', () => {
@@ -398,13 +388,14 @@ export function main() {
 
         it('should allow multiple substitutions to occur within the same style value', () => {
           const steps = [
-            style({borderRadius: '100px 100px'}),
-            animate(1000, style({borderRadius: '{{ one }}px {{ two }}'})),
+            style({transform: ''}),
+            animate(1000, style({transform: 'translateX({{ x }}) translateY({{ y }})'}))
           ];
           const players =
-              invokeAnimationSequence(rootElement, steps, buildParams({one: '200', two: '400px'}));
+              invokeAnimationSequence(rootElement, steps, buildParams({x: '200px', y: '400px'}));
           expect(players[0].keyframes).toEqual([
-            {offset: 0, borderRadius: '100px 100px'}, {offset: 1, borderRadius: '200px 400px'}
+            {offset: 0, transform: ''},
+            {offset: 1, transform: 'translateX(200px) translateY(400px)'}
           ]);
         });
 
@@ -580,12 +571,18 @@ export function main() {
            () => {
              const steps = [
                animate(1000, style({height: '50px'})),
-               animate(2000, keyframes([
-                         style({left: '0', top: '0', offset: 0}),
-                         style({left: '40%', top: '50%', offset: .33}),
-                         style({left: '60%', top: '80%', offset: .66}),
-                         style({left: 'calc(100% - 100px)', top: '100%', offset: 1}),
-                       ])),
+               animate(
+                   2000, keyframes([
+                     style({left: '0', transform: 'rotate(0deg)', offset: 0}),
+                     style({
+                       left: '40%',
+                       transform: 'rotate(250deg) translateY(-200px)',
+                       offset: .33
+                     }),
+                     style(
+                         {left: '60%', transform: 'rotate(180deg) translateY(200px)', offset: .66}),
+                     style({left: 'calc(100% - 100px)', transform: 'rotate(0deg)', offset: 1}),
+                   ])),
                group([animate('2s', style({width: '200px'}))]),
                animate('2s', style({height: '300px'})),
                group([animate('2s', style({height: '500px', width: '500px'}))])
@@ -990,9 +987,8 @@ function invokeAnimationSequence(
 }
 
 function validateAndThrowAnimationSequence(steps: AnimationMetadata | AnimationMetadata[]) {
-  const driver = new MockAnimationDriver();
   const errors: any[] = [];
-  const ast = buildAnimationAst(driver, steps, errors);
+  const ast = buildAnimationAst(steps, errors);
   if (errors.length) {
     throw new Error(errors.join('\n'));
   }

packages/animations/browser/test/render/transition_animation_engine_spec.ts

@@ -657,9 +657,8 @@ function registerTrigger(
     element: any, engine: TransitionAnimationEngine, metadata: AnimationTriggerMetadata,
     id: string = DEFAULT_NAMESPACE_ID) {
   const errors: any[] = [];
-  const driver = new MockAnimationDriver();
   const name = metadata.name;
-  const ast = buildAnimationAst(driver, metadata as AnimationMetadata, errors) as TriggerAst;
+  const ast = buildAnimationAst(metadata as AnimationMetadata, errors) as TriggerAst;
   if (errors.length) {
   }
   const trigger = buildTrigger(name, ast);

packages/animations/browser/test/shared.ts

@@ -11,14 +11,12 @@ import {trigger} from '@angular/animations';
 import {TriggerAst} from '../src/dsl/animation_ast';
 import {buildAnimationAst} from '../src/dsl/animation_ast_builder';
 import {AnimationTrigger, buildTrigger} from '../src/dsl/animation_trigger';
-import {MockAnimationDriver} from '../testing/src/mock_animation_driver';
 
 export function makeTrigger(
     name: string, steps: any, skipErrors: boolean = false): AnimationTrigger {
-  const driver = new MockAnimationDriver();
   const errors: any[] = [];
   const triggerData = trigger(name, steps);
-  const triggerAst = buildAnimationAst(driver, triggerData, errors) as TriggerAst;
+  const triggerAst = buildAnimationAst(triggerData, errors) as TriggerAst;
   if (!skipErrors && errors.length) {
     const LINE_START = '\n - ';
     throw new Error(

packages/animations/browser/testing/src/mock_animation_driver.ts

@@ -8,18 +8,15 @@
 import {AUTO_STYLE, AnimationPlayer, NoopAnimationPlayer, ɵStyleData} from '@angular/animations';
 
 import {AnimationDriver} from '../../src/render/animation_driver';
-import {containsElement, invokeQuery, matchesElement, validateStyleProperty} from '../../src/render/shared';
+import {containsElement, invokeQuery, matchesElement} from '../../src/render/shared';
 import {allowPreviousPlayerStylesMerge} from '../../src/util';
 
-
 /**
  * @experimental Animation support is experimental.
  */
 export class MockAnimationDriver implements AnimationDriver {
   static log: AnimationPlayer[] = [];
 
-  validateStyleProperty(prop: string): boolean { return validateStyleProperty(prop); }
-
   matchesElement(element: any, selector: string): boolean {
     return matchesElement(element, selector);
   }

packages/animations/src/animation_metadata.ts

@@ -711,7 +711,7 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * ])
  * ```
  *
- * ### Using :enter and :leave
+ * ### Transition Aliases (`:enter` and `:leave`)
  *
  * Given that enter (insertion) and leave (removal) animations are so common, the `transition`
  * function accepts both `:enter` and `:leave` values which are aliases for the `void => *` and `*
@@ -721,88 +721,12 @@ export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSe
  * transition(":enter", [
  *   style({ opacity: 0 }),
  *   animate(500, style({ opacity: 1 }))
- * ]),
+ * ])
  * transition(":leave", [
  *   animate(500, style({ opacity: 0 }))
  * ])
  * ```
  *
- * ### Using :increment and :decrement
- * In addition to the :enter and :leave transition aliases, the :increment and :decrement aliases
- * can be used to kick off a transition when a numeric value has increased or decreased in value.
- *
- * ```
- * import {group, animate, query, transition, style, trigger} from '@angular/animations';
- * import {Component} from '@angular/core';
- *
- * @Component({
- *   selector: 'banner-carousel-component',
- *   styles: [`
- *     .banner-container {
- *        position:relative;
- *        height:500px;
- *        overflow:hidden;
- *      }
- *     .banner-container > .banner {
- *        position:absolute;
- *        left:0;
- *        top:0;
- *        font-size:200px;
- *        line-height:500px;
- *        font-weight:bold;
- *        text-align:center;
- *        width:100%;
- *      }
- *   `],
- *   template: `
- *     <button (click)="previous()">Previous</button>
- *     <button (click)="next()">Next</button>
- *     <hr>
- *     <div [@bannerAnimation]="selectedIndex" class="banner-container">
- *       <div class="banner"> {{ banner }} </div>
- *     </div>
- *   `
- *   animations: [
- *     trigger('bannerAnimation', [
- *       transition(":increment", group([
- *         query(':enter', [
- *           style({ left: '100%' }),
- *           animate('0.5s ease-out', style('*'))
- *         ]),
- *         query(':leave', [
- *           animate('0.5s ease-out', style({ left: '-100%' }))
- *         ])
- *       ])),
- *       transition(":decrement", group([
- *         query(':enter', [
- *           style({ left: '-100%' }),
- *           animate('0.5s ease-out', style('*'))
- *         ]),
- *         query(':leave', [
- *           animate('0.5s ease-out', style({ left: '100%' }))
- *         ])
- *       ])),
- *     ])
- *   ]
- * })
- * class BannerCarouselComponent {
- *   allBanners: string[] = ['1', '2', '3', '4'];
- *   selectedIndex: number = 0;
- *
- *   get banners() {
- *      return [this.allBanners[this.selectedIndex]];
- *   }
- *
- *   previous() {
- *     this.selectedIndex = Math.max(this.selectedIndex - 1, 0);
- *   }
- *
- *   next() {
- *     this.selectedIndex = Math.min(this.selectedIndex + 1, this.allBanners.length - 1);
- *   }
- * }
- * ```
- *
  * {@example core/animation/ts/dsl/animation_example.ts region='Component'}
  *
  * @experimental Animation support is experimental.

packages/bazel/BUILD.bazel

@@ -1 +0,0 @@
-# Empty marker file, indicating this directory is a Bazel package.

packages/bazel/WORKSPACE

@@ -1,9 +0,0 @@
-# By convention, the name should "describe the project in reverse-DNS form"
-# https://docs.bazel.build/versions/master/be/functions.html#workspace
-# But if we use "io_angular" then the loads used in BUILD files will
-# be unfamiliar to Angular users who import from '@angular/pkg' in
-# TypeScript files. We want to reduce the impedance between the Bazel
-# and node naming schemes.
-# We take the name "angular" so that users can write
-# load("@angular//:index.bzl", "ng_module")
-workspace(name = "angular")

packages/bazel/index.bzl

@@ -1,9 +0,0 @@
-# Copyright Google Inc. All Rights Reserved.
-#
-# 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
-""" Public API surface is re-exported here.
-Users should not load files under "/src"
-"""
-
-load("//src:ng_module.bzl", "ng_module")

packages/bazel/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "@angular/bazel",
-  "version": "0.0.0-PLACEHOLDER",
-  "description": "Angular - bazel build rules",
-  "author": "angular",
-  "license": "MIT",
-  "peerDependencies": {
-    "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
-    "typescript": "~2.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular.git"
-  }
-}

packages/bazel/src/BUILD.bazel

@@ -1 +0,0 @@
-# Empty marker file, indicating this directory is a Bazel package.

packages/bazel/src/ng_module.bzl

@@ -1,192 +0,0 @@
-# Copyright Google Inc. All Rights Reserved.
-#
-# 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
-
-load(":rules_typescript.bzl",
-    "tsc_wrapped_tsconfig",
-    "COMMON_ATTRIBUTES",
-    "compile_ts",
-    "DEPS_ASPECTS",
-    "ts_providers_dict_to_struct",
-    "json_marshal",
-)
-
-# Calculate the expected output of the template compiler for every source in
-# in the library. Most of these will be produced as empty files but it is
-# unknown, without parsing, which will be empty.
-def _expected_outs(ctx, label):
-  devmode_js_files = []
-  closure_js_files = []
-  declaration_files = []
-  summary_files = []
-
-  codegen_inputs = ctx.files.srcs
-
-  for src in ctx.files.srcs + ctx.files.assets:
-    if src.short_path.endswith(".ts") and not src.short_path.endswith(".d.ts"):
-      basename = src.short_path[len(ctx.label.package) + 1:-len(".ts")]
-      devmode_js = [
-          ".ngfactory.js",
-          ".ngsummary.js",
-          ".js",
-      ]
-      summaries = [".ngsummary.json"]
-
-    elif src.short_path.endswith(".css"):
-      basename = src.short_path[len(ctx.label.package) + 1:-len(".css")]
-      devmode_js = [
-          ".css.shim.ngstyle.js",
-          ".css.ngstyle.js",
-      ]
-      summaries = []
-
-    closure_js = [f.replace(".js", ".closure.js") for f in devmode_js]
-    declarations = [f.replace(".js", ".d.ts") for f in devmode_js]
-
-    devmode_js_files += [ctx.new_file(ctx.bin_dir, basename + ext) for ext in devmode_js]
-    closure_js_files += [ctx.new_file(ctx.bin_dir, basename + ext) for ext in closure_js]
-    declaration_files += [ctx.new_file(ctx.bin_dir, basename + ext) for ext in declarations]
-    summary_files += [ctx.new_file(ctx.bin_dir, basename + ext) for ext in summaries]
-
-  return struct(
-    closure_js = closure_js_files,
-    devmode_js = devmode_js_files,
-    declarations = declaration_files,
-    summaries = summary_files,
-  )
-
-def _ngc_tsconfig(ctx, files, srcs, **kwargs):
-  outs = _expected_outs(ctx, ctx.label)
-  if "devmode_manifest" in kwargs:
-    expected_outs = outs.devmode_js + outs.declarations + outs.summaries
-  else:
-    expected_outs = outs.closure_js
-
-  return dict(tsc_wrapped_tsconfig(ctx, files, srcs, **kwargs), **{
-      "angularCompilerOptions": {
-          "generateCodeForLibraries": False,
-          # FIXME: wrong place to de-dupe
-          "expectedOut": depset([o.path for o in expected_outs]).to_list()
-      }
-  })
-
-def _collect_summaries_aspect_impl(target, ctx):
-  results = target.angular.summaries if hasattr(target, "angular") else depset()
-
-  # If we are visiting empty-srcs ts_library, this is a re-export
-  srcs = target.srcs if hasattr(target, "srcs") else []
-
-  # "re-export" rules should expose all the files of their deps
-  if not srcs:
-    for dep in ctx.rule.attr.deps:
-      if (hasattr(dep, "angular")):
-        results += dep.angular.summaries
-
-  return struct(collect_summaries_aspect_result = results)
-
-_collect_summaries_aspect = aspect(
-    implementation = _collect_summaries_aspect_impl,
-    attr_aspects = ["deps"],
-)
-
-def _compile_action(ctx, inputs, outputs, config_file_path):
-  summaries = depset()
-  for dep in ctx.attr.deps:
-    if hasattr(dep, "collect_summaries_aspect_result"):
-      summaries += dep.collect_summaries_aspect_result
-
-  action_inputs = inputs + summaries.to_list() + ctx.files.assets
-  # print("ASSETS", [a.path for a in ctx.files.assets])
-  # print("INPUTS", ctx.label, [o.path for o in summaries if o.path.find("core/src") > 0])
-
-  if hasattr(ctx.attr, "node_modules"):
-    action_inputs += [f for f in ctx.files.node_modules
-                      if f.path.endswith(".ts") or f.path.endswith(".json")]
-  if hasattr(ctx.attr, "tsconfig") and ctx.file.tsconfig:
-    action_inputs += [ctx.file.tsconfig]
-
-  # One at-sign makes this a params-file, enabling the worker strategy.
-  # Two at-signs escapes the argument so it's passed through to ngc
-  # rather than the contents getting expanded.
-  if ctx.attr._supports_workers:
-    arguments = ["@@" + config_file_path]
-  else:
-    arguments = ["-p", config_file_path]
-
-  ctx.action(
-      progress_message = "Compiling Angular templates (ngc) %s" % ctx.label,
-      mnemonic = "AngularTemplateCompile",
-      inputs = action_inputs,
-      outputs = outputs,
-      arguments = arguments,
-      executable = ctx.executable.compiler,
-      execution_requirements = {
-          "supports-workers": str(int(ctx.attr._supports_workers)),
-      },
-  )
-
-def _prodmode_compile_action(ctx, inputs, outputs, config_file_path):
-  outs = _expected_outs(ctx, ctx.label)
-  _compile_action(ctx, inputs, outputs + outs.closure_js, config_file_path)
-
-def _devmode_compile_action(ctx, inputs, outputs, config_file_path):
-  outs = _expected_outs(ctx, ctx.label)
-  _compile_action(ctx, inputs, outputs + outs.devmode_js + outs.declarations + outs.summaries, config_file_path)
-
-def ng_module_impl(ctx, ts_compile_actions):
-  providers = ts_compile_actions(
-      ctx, is_library=True, compile_action=_prodmode_compile_action,
-      devmode_compile_action=_devmode_compile_action,
-      tsc_wrapped_tsconfig=_ngc_tsconfig,
-      outputs = _expected_outs)
-
-  #addl_declarations = [_expected_outs(ctx)]
-  #providers["typescript"]["declarations"] += addl_declarations
-  #providers["typescript"]["transitive_declarations"] += addl_declarations
-  providers["angular"] = {
-    "summaries": _expected_outs(ctx, ctx.label).summaries
-  }
-
-  return providers
-
-def _ng_module_impl(ctx):
-  return ts_providers_dict_to_struct(ng_module_impl(ctx, compile_ts))
-
-NG_MODULE_ATTRIBUTES = {
-    "srcs": attr.label_list(allow_files = [".ts"]),
-
-    "deps": attr.label_list(aspects = DEPS_ASPECTS + [_collect_summaries_aspect]),
-
-    "assets": attr.label_list(allow_files = [
-      ".css",
-      # TODO(alexeagle): change this to ".ng.html" when usages updated
-      ".html",
-    ]),
-
-    # TODO(alexeagle): wire up when we have i18n in bazel
-    "no_i18n": attr.bool(default = False),
-
-    "compiler": attr.label(
-        default = Label("//src/ngc-wrapped"),
-        executable = True,
-        cfg = "host",
-    ),
-
-    # TODO(alexeagle): enable workers for ngc
-    "_supports_workers": attr.bool(default = False),
-}
-
-ng_module = rule(
-    implementation = _ng_module_impl,
-    attrs = COMMON_ATTRIBUTES + NG_MODULE_ATTRIBUTES + {
-        "tsconfig": attr.label(allow_files = True, single_file = True),
-
-        # @// is special syntax for the "main" repository
-        # The default assumes the user specified a target "node_modules" in their
-        # root BUILD file.
-        "node_modules": attr.label(
-            default = Label("@//:node_modules")
-        ),
-    },
-)

packages/bazel/src/ngc-wrapped/BUILD.bazel

@@ -1,27 +0,0 @@
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
-
-licenses(["notice"])  # Apache 2.0
-
-ts_library(
-    name = "ngc_lib",
-    srcs = ["index.ts"],
-    deps = [
-        # BEGIN-INTERNAL
-        # Only needed when compiling within the Angular repo.
-        # Users will get this dependency from node_modules.
-        "@//packages/compiler-cli",
-        # END-INTERNAL
-        "@build_bazel_rules_typescript//internal/tsc_wrapped"
-    ],
-    tsconfig = ":tsconfig.json",
-)
-
-nodejs_binary(
-    name = "ngc-wrapped",
-    # Entry point assumes the user is outside this WORKSPACE,
-    # and references our rules with @angular//src/ngc-wrapped
-    entry_point = "angular/src/ngc-wrapped/index.js",
-    data = [":ngc_lib"],
-    visibility = ["//visibility:public"],
-)